diff --git a/lib/federation/http_signatures/signature.ex b/lib/federation/http_signatures/signature.ex index 732738b61..cf334487a 100644 --- a/lib/federation/http_signatures/signature.ex +++ b/lib/federation/http_signatures/signature.ex @@ -59,7 +59,7 @@ defmodule Mobilizon.Federation.HTTPSignatures.Signature do {:error, :actor_not_found} -> Logger.info( - "Unable to get actor from URL from local database, returning empty keys to trigger refreshment" + "Unable to get actor with URL #{url} from local database, returning empty keys to trigger refreshment" ) {:ok, ""} diff --git a/lib/service/activity/renderer/discussion.ex b/lib/service/activity/renderer/discussion.ex index 8c1d58f4f..5ea83b2a0 100644 --- a/lib/service/activity/renderer/discussion.ex +++ b/lib/service/activity/renderer/discussion.ex @@ -17,65 +17,91 @@ defmodule Mobilizon.Service.Activity.Renderer.Discussion do Gettext.put_locale(locale) profile = profile(activity) title = title(activity) + group = group(activity) case activity.subject do :discussion_created -> %{ body: - dgettext("activity", "%{profile} created the discussion %{discussion}.", %{ - profile: profile, - discussion: title - }), + dgettext( + "activity", + "%{profile} created the discussion %{discussion} in group {group}.", + %{ + profile: profile, + discussion: title, + group: group + } + ), url: discussion_url(activity) } :discussion_replied -> %{ body: - dgettext("activity", "%{profile} replied to the discussion %{discussion}.", %{ - profile: profile, - discussion: title - }), + dgettext( + "activity", + "%{profile} replied to the discussion %{discussion} in group {group}.", + %{ + profile: profile, + discussion: title + } + ), url: discussion_url(activity) } :discussion_mention -> %{ body: - dgettext("activity", "%{profile} mentionned you in the discussion %{discussion}.", %{ - profile: profile, - discussion: title - }), + dgettext( + "activity", + "%{profile} mentionned you in the discussion %{discussion} in group {group}.", + %{ + profile: profile, + discussion: title + } + ), url: discussion_url(activity) } :discussion_renamed -> %{ body: - dgettext("activity", "%{profile} renamed the discussion %{discussion}.", %{ - profile: profile, - discussion: title - }), + dgettext( + "activity", + "%{profile} renamed the discussion %{discussion} in group {group}.", + %{ + profile: profile, + discussion: title + } + ), url: discussion_url(activity) } :discussion_archived -> %{ body: - dgettext("activity", "%{profile} archived the discussion %{discussion}.", %{ - profile: profile, - discussion: title - }), + dgettext( + "activity", + "%{profile} archived the discussion %{discussion} in group {group}.", + %{ + profile: profile, + discussion: title + } + ), url: discussion_url(activity) } :discussion_deleted -> %{ body: - dgettext("activity", "%{profile} deleted the discussion %{discussion}.", %{ - profile: profile, - discussion: title - }), + dgettext( + "activity", + "%{profile} deleted the discussion %{discussion} in group {group}.", + %{ + profile: profile, + discussion: title + } + ), url: nil } end @@ -91,8 +117,10 @@ defmodule Mobilizon.Service.Activity.Renderer.Discussion do |> URI.decode() end - defp profile(%Activity{author: author}), do: Actor.display_name_and_username(author) + defp profile(%Activity{author: author}), do: Actor.display_name(author) defp title(%Activity{subject_params: %{"discussion_title" => discussion_title}}), do: discussion_title + + defp group(%Activity{group: group}), do: Actor.display_name(group) end diff --git a/lib/service/activity/renderer/member.ex b/lib/service/activity/renderer/member.ex index cbd9c6438..47509b532 100644 --- a/lib/service/activity/renderer/member.ex +++ b/lib/service/activity/renderer/member.ex @@ -20,54 +20,63 @@ defmodule Mobilizon.Service.Activity.Renderer.Member do body: text(activity.subject, %{ profile: profile(activity), - member: member(activity) + member: member(activity), + group: group(activity) }), url: member_url(activity) } end defp text(:member_request, args) do - dgettext("activity", "%{member} requested to join the group.", args) + dgettext("activity", "%{member} requested to join the group %{group}.", args) end defp text(:member_invited, args) do - dgettext("activity", "%{member} was invited by %{profile}.", args) + dgettext("activity", "%{member} was invited by %{profile} to group %{group}.", args) end defp text(:member_accepted_invitation, args) do - dgettext("activity", "%{member} accepted the invitation to join the group.", args) + dgettext("activity", "%{member} accepted the invitation to join the group %{group}.", args) end defp text(:member_rejected_invitation, args) do - dgettext("activity", "%{member} rejected the invitation to join the group.", args) + dgettext("activity", "%{member} rejected the invitation to join the group %{group}.", args) end defp text(:member_joined, args) do - dgettext("activity", "%{member} joined the group.", args) + dgettext("activity", "%{member} joined the group %{group}.", args) end defp text(:member_added, args) do - dgettext("activity", "%{profile} added the member %{member}.", args) + dgettext("activity", "%{profile} added the member %{member} to group %{group}.", args) end defp text(:member_approved, args) do - dgettext("activity", "%{profile} approved the membership request from %{member}.", args) + dgettext( + "activity", + "%{profile} approved the membership request from %{member} for group %{group}.", + args + ) end defp text(:member_rejected, args) do - dgettext("activity", "%{profile} rejected the membership request from %{member}.", args) + dgettext( + "activity", + "%{profile} rejected the membership request from %{member} for group %{group}.", + args + ) end defp text(:member_updated, args) do - dgettext("activity", "%{profile} updated the member %{member}.", args) + dgettext("activity", "%{profile} updated the member %{member} in group %{group}.", args) end defp text(:member_removed, args) do - dgettext("activity", "%{profile} excluded member %{member}.", args) + dgettext("activity", "%{profile} excluded member %{member} from the group %{group}.", args) end defp text(:member_quit, args) do - dgettext("activity", "%{profile} quit the group.", args) + dgettext("activity", "%{profile} quit the group %{group}.", args) end defp member_url(activity) do @@ -88,4 +97,6 @@ defmodule Mobilizon.Service.Activity.Renderer.Member do do: activity.subject_params["member_actor_name"] || activity.subject_params["member_actor_federated_username"] + + defp group(%Activity{group: group}), do: Actor.display_name(group) end diff --git a/lib/service/activity/renderer/resource.ex b/lib/service/activity/renderer/resource.ex index 4e328b236..4ad175048 100644 --- a/lib/service/activity/renderer/resource.ex +++ b/lib/service/activity/renderer/resource.ex @@ -16,100 +16,59 @@ defmodule Mobilizon.Service.Activity.Renderer.Resource do locale = Keyword.get(options, :locale, "en") Gettext.put_locale(locale) - case activity.subject do - :resource_created -> - if activity.subject_params["is_folder"] do - %{ - body: - dgettext("activity", "%{profile} created the folder %{resource}.", %{ - profile: profile(activity), - resource: title(activity) - }), - url: resource_url(activity) - } - else - %{ - body: - dgettext("activity", "%{profile} created the resource %{resource}.", %{ - profile: profile(activity), - resource: title(activity) - }), - url: resource_url(activity) - } - end + %{ + body: + text(activity.subject, %{ + profile: profile(activity), + resource: title(activity), + group: group(activity), + subject_params: activity.subject_params + }), + resource_url: resource_url(activity) + } + end - :resource_renamed -> - if activity.subject_params["is_folder"] do - %{ - body: - dgettext( - "activity", - "%{profile} renamed the folder from %{old_resource_title} to %{resource}.", - %{ - profile: profile(activity), - resource: title(activity), - old_resource_title: activity.subject_params["old_resource_title"] - } - ), - url: resource_url(activity) - } - else - %{ - body: - dgettext( - "activity", - "%{profile} renamed the resource from %{old_resource_title} to %{resource}.", - %{ - profile: profile(activity), - resource: title(activity), - old_resource_title: activity.subject_params["old_resource_title"] - } - ), - url: resource_url(activity) - } - end + defp text(:resource_created, %{subject_params: subject_params} = args) do + if subject_params["is_folder"] do + dgettext("activity", "%{profile} created the folder %{resource} in group %{group}.", args) + else + dgettext( + "activity", + "%{profile} created the resource %{resource} in group %{group}.", + args + ) + end + end - :resource_moved -> - if activity.subject_params["is_folder"] do - %{ - body: - dgettext("activity", "%{profile} moved the folder %{resource}.", %{ - profile: profile(activity), - resource: title(activity) - }), - url: resource_url(activity) - } - else - %{ - body: - dgettext("activity", "%{profile} moved the resource %{resource}.", %{ - profile: profile(activity), - resource: title(activity) - }), - url: resource_url(activity) - } - end + defp text(:resource_renamed, %{subject_params: subject_params} = args) do + if subject_params["is_folder"] do + dgettext( + "activity", + "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}.", + Map.put(args, :old_resource_title, subject_params["old_resource_title"]) + ) + else + dgettext( + "activity", + "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}.", + Map.put(args, :old_resource_title, subject_params["old_resource_title"]) + ) + end + end - :resource_deleted -> - if activity.subject_params["is_folder"] do - %{ - body: - dgettext("activity", "%{profile} deleted the folder %{resource}.", %{ - profile: profile(activity), - resource: title(activity) - }), - url: resource_url(activity) - } - else - %{ - body: - dgettext("activity", "%{profile} deleted the resource %{resource}.", %{ - profile: profile(activity), - resource: title(activity) - }), - url: resource_url(activity) - } - end + defp text(:resource_moved, %{subject_params: subject_params} = args) do + if subject_params["is_folder"] do + dgettext("activity", "%{profile} moved the folder %{resource} in group %{group}.", args) + else + dgettext("activity", "%{profile} moved the resource %{resource} in group %{group}.", args) + end + end + + defp text(:resource_deleted, %{subject_params: subject_params} = args) do + if subject_params["is_folder"] do + dgettext("activity", "%{profile} deleted the folder %{resource} in group %{group}.", args) + else + dgettext("activity", "%{profile} deleted the resource %{resource} in group %{group}.", args) end end @@ -121,4 +80,5 @@ defmodule Mobilizon.Service.Activity.Renderer.Resource do defp profile(activity), do: Actor.display_name_and_username(activity.author) defp title(activity), do: activity.subject_params["resource_title"] + defp group(%Activity{group: group}), do: Actor.display_name(group) end diff --git a/lib/web/plugs/http_signatures.ex b/lib/web/plugs/http_signatures.ex index 3d0bfd6c3..df3785e8d 100644 --- a/lib/web/plugs/http_signatures.ex +++ b/lib/web/plugs/http_signatures.ex @@ -38,7 +38,18 @@ defmodule Mobilizon.Web.Plugs.HTTPSignatures do ) |> maybe_put_digest_header() - signature_valid = HTTPSignatures.validate_conn(conn) + signature_valid = + try do + HTTPSignatures.validate_conn(conn) + rescue + # Because if the actor is not found in + # Mobilizon.Federation.HTTPSignatures.Signature.get_public_key_for_url/1 + # we return an empty string as key, + # to give an extra-chance of fetching new actor keys + # and :public_key.verify doesn't like this + ArgumentError -> false + end + Logger.debug("Is signature valid ? #{inspect(signature_valid)}") date_valid = date_valid?(conn) Logger.debug("Is date valid ? #{inspect(date_valid)}") diff --git a/priv/gettext/activity.pot b/priv/gettext/activity.pot index c972f8527..1fada58dc 100644 --- a/priv/gettext/activity.pot +++ b/priv/gettext/activity.pot @@ -11,50 +11,50 @@ msgid "" msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -65,74 +65,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -143,8 +143,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -185,8 +185,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -242,11 +242,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -317,11 +312,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/ar/LC_MESSAGES/activity.po b/priv/gettext/ar/LC_MESSAGES/activity.po index 3dfccc42e..2acaef5bd 100644 --- a/priv/gettext/ar/LC_MESSAGES/activity.po +++ b/priv/gettext/ar/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=6\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -251,11 +251,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -326,11 +321,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/ar/LC_MESSAGES/default.po b/priv/gettext/ar/LC_MESSAGES/default.po index f06a83371..b5d72f598 100644 --- a/priv/gettext/ar/LC_MESSAGES/default.po +++ b/priv/gettext/ar/LC_MESSAGES/default.po @@ -1392,12 +1392,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1691,7 +1691,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/ar/LC_MESSAGES/errors.po b/priv/gettext/ar/LC_MESSAGES/errors.po index a6b254716..64be0c40c 100644 --- a/priv/gettext/ar/LC_MESSAGES/errors.po +++ b/priv/gettext/ar/LC_MESSAGES/errors.po @@ -135,7 +135,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -167,12 +167,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -185,43 +185,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -231,17 +231,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -266,12 +266,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -281,7 +281,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -306,12 +306,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -865,7 +865,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -891,7 +891,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -906,7 +906,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -926,12 +926,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -951,7 +951,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -991,7 +991,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -1006,12 +1006,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1049,3 +1049,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/be/LC_MESSAGES/activity.po b/priv/gettext/be/LC_MESSAGES/activity.po index 720cd7c1d..c530d01cf 100644 --- a/priv/gettext/be/LC_MESSAGES/activity.po +++ b/priv/gettext/be/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=3\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -245,11 +245,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -320,11 +315,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/be/LC_MESSAGES/default.po b/priv/gettext/be/LC_MESSAGES/default.po index 765e28688..a56e22ddd 100644 --- a/priv/gettext/be/LC_MESSAGES/default.po +++ b/priv/gettext/be/LC_MESSAGES/default.po @@ -1371,12 +1371,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1670,7 +1670,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/be/LC_MESSAGES/errors.po b/priv/gettext/be/LC_MESSAGES/errors.po index 684216ca0..3d51a9777 100644 --- a/priv/gettext/be/LC_MESSAGES/errors.po +++ b/priv/gettext/be/LC_MESSAGES/errors.po @@ -109,7 +109,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -141,12 +141,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -159,43 +159,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -205,17 +205,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -240,12 +240,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -255,7 +255,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -280,12 +280,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -839,7 +839,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -865,7 +865,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -880,7 +880,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -900,12 +900,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -925,7 +925,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -965,7 +965,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -980,12 +980,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1023,3 +1023,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/ca/LC_MESSAGES/activity.po b/priv/gettext/ca/LC_MESSAGES/activity.po index b091e4f71..c7d152aa2 100644 --- a/priv/gettext/ca/LC_MESSAGES/activity.po +++ b/priv/gettext/ca/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -243,11 +243,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -318,11 +313,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/ca/LC_MESSAGES/default.po b/priv/gettext/ca/LC_MESSAGES/default.po index 0e72a463c..39ba21b99 100644 --- a/priv/gettext/ca/LC_MESSAGES/default.po +++ b/priv/gettext/ca/LC_MESSAGES/default.po @@ -1622,12 +1622,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1925,7 +1925,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/ca/LC_MESSAGES/errors.po b/priv/gettext/ca/LC_MESSAGES/errors.po index 93886fba3..e891faa7f 100644 --- a/priv/gettext/ca/LC_MESSAGES/errors.po +++ b/priv/gettext/ca/LC_MESSAGES/errors.po @@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "El perfil actual no administra el grup seleccionat" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "No s'han pogut desar les preferències" @@ -142,12 +142,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -160,43 +160,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -206,17 +206,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -241,12 +241,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -256,7 +256,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -281,12 +281,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -840,7 +840,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -866,7 +866,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -881,7 +881,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -901,12 +901,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -926,7 +926,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -966,7 +966,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -981,12 +981,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1024,3 +1024,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/cs/LC_MESSAGES/activity.po b/priv/gettext/cs/LC_MESSAGES/activity.po index 125645190..89f4b396c 100644 --- a/priv/gettext/cs/LC_MESSAGES/activity.po +++ b/priv/gettext/cs/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=3\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -245,11 +245,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -320,11 +315,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/cs/LC_MESSAGES/default.po b/priv/gettext/cs/LC_MESSAGES/default.po index b3b85bd6d..81e01b012 100644 --- a/priv/gettext/cs/LC_MESSAGES/default.po +++ b/priv/gettext/cs/LC_MESSAGES/default.po @@ -1371,12 +1371,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1670,7 +1670,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/cs/LC_MESSAGES/errors.po b/priv/gettext/cs/LC_MESSAGES/errors.po index 3cb79def0..faa278af3 100644 --- a/priv/gettext/cs/LC_MESSAGES/errors.po +++ b/priv/gettext/cs/LC_MESSAGES/errors.po @@ -109,7 +109,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -141,12 +141,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -159,43 +159,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -205,17 +205,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -240,12 +240,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -255,7 +255,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -280,12 +280,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -839,7 +839,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -865,7 +865,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -880,7 +880,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -900,12 +900,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -925,7 +925,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -965,7 +965,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -980,12 +980,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1023,3 +1023,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/activity.po b/priv/gettext/de/LC_MESSAGES/activity.po index d790f81ba..d34c8b1cd 100644 --- a/priv/gettext/de/LC_MESSAGES/activity.po +++ b/priv/gettext/de/LC_MESSAGES/activity.po @@ -19,50 +19,50 @@ msgstr "" "X-Generator: Weblate 4.6.2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "%{member} hat die Einladung in die Gruppe angenommen." #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "%{member} hat die Einladung in die Gruppe abgelehnt." #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "%{member} hat den Eintritt in die Gruppe beantragt." #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "%{member} wurde von %{profile} eingeladen." #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "%{profile} hat das Mitglied %{member} hinzugefügt." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "%{profile} hat die Diskussion %{discussion} archiviert." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "%{profile} hat die Diskussion %{discussion} erstellt." #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "%{profile} hat den Folder %{resource} erstellt." @@ -73,76 +73,76 @@ msgid "%{profile} created the group %{group}." msgstr "%{profile} hat die Gruppe %{group} erstellt." #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "%{profile} hat die Ressource %{resource} erstellt." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "%{profile} hat die Diskussion %{discussion} gelöscht." #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "%{profile} hat den Folder %{resource} gelöscht." #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "%{profile} hat die Ressource %{resource} gelöscht." #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "%{profile} hat das Mitglied %{member} ausgeschlossen." #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "%{profile} hat die Gruppe verlassen." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "%{profile} hat die Diskussion %{discussion} umbenannt." #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" "%{profile} hat den Folder %{old_resource_title} in %{resource} umbenannt." #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" "{profile} hat die Ressource %{old_resource_title} in %{resource} umbenannt." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "%{profile} hat auf die Diskussion %{discussion} geantwortet." @@ -153,8 +153,8 @@ msgid "%{profile} updated the group %{group}." msgstr "%{profile} hat die Gruppe %{group} aktualisiert." #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "%{profile} hat das Mitglied %{member} aktualisiert." @@ -195,8 +195,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "Der Beitrag %{post} wurde von %{profile} aktualisiert." #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "%{member} ist der Gruppe beigetreten." @@ -253,11 +253,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -328,11 +323,128 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." +msgstr "%{member} hat die Einladung in die Gruppe angenommen." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "%{member} ist der Gruppe beigetreten." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "%{member} hat die Einladung in die Gruppe abgelehnt." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "%{member} hat den Eintritt in die Gruppe beantragt." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "%{member} wurde von %{profile} eingeladen." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "%{profile} hat das Mitglied %{member} hinzugefügt." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." msgstr "%{profile} hat das Mitglied %{member} aktualisiert." #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "%{profile} hat die Diskussion %{discussion} archiviert." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "%{profile} hat die Diskussion %{discussion} erstellt." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "%{profile} hat den Folder %{resource} erstellt." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "%{profile} hat die Diskussion %{discussion} gelöscht." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "%{profile} hat den Folder %{resource} gelöscht." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "%{profile} hat die Ressource %{resource} gelöscht." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "%{profile} hat das Mitglied %{member} ausgeschlossen." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "%{profile} hat die Gruppe verlassen." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "%{profile} hat die Diskussion %{discussion} umbenannt." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" +"%{profile} hat den Folder %{old_resource_title} in %{resource} umbenannt." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" +"{profile} hat die Ressource %{old_resource_title} in %{resource} umbenannt." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "%{profile} hat auf die Diskussion %{discussion} geantwortet." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "%{profile} hat das Mitglied %{member} aktualisiert." + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." +msgstr "%{profile} hat die Ressource %{resource} erstellt." diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index b74e00bd3..f9689aa5b 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -1734,12 +1734,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -2039,7 +2039,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/de/LC_MESSAGES/errors.po b/priv/gettext/de/LC_MESSAGES/errors.po index 378600043..0c5d6ab51 100644 --- a/priv/gettext/de/LC_MESSAGES/errors.po +++ b/priv/gettext/de/LC_MESSAGES/errors.po @@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "Aktuelles Profil ist kein Administrator der ausgewählten Gruppe" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Fehler beim Speichern von Benutzereinstellungen" @@ -144,13 +144,13 @@ msgid "No profile found for the moderator user" msgstr "Kein Profil für den Moderator-Benutzer gefunden" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" "Es wurde kein Benutzer gefunden, der mit dieser E-Mail validiert werden kann" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "Es wurde kein Benutzer mit dieser E-Mail gefunden" @@ -163,45 +163,45 @@ msgid "Profile is not owned by authenticated user" msgstr "Profil ist nicht im Besitz des authentifizierten Benutzers" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "Registrierungen sind nicht geöffnet" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "Das aktuelle Passwort ist ungültig" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "Die neue E-Mail scheint nicht gültig zu sein" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "Die neue E-Mail muss anders lauten" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "Das neue Passwort muss anders lauten" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "Das angegebene Passwort ist ungültig" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" "Das von Ihnen gewählte Passwort ist zu kurz. Bitte stellen Sie sicher, dass " "Ihr Passwort mindestens 6 Zeichen enthält." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Dieser Benutzer kann sein Passwort nicht zurücksetzen" @@ -211,17 +211,17 @@ msgid "This user has been disabled" msgstr "Dieser Benutzer wurde deaktiviert" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "Benutzer kann nicht validiert werden" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "Benutzer bereits deaktiviert" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "Angeforderter Benutzer ist nicht eingeloggt" @@ -248,12 +248,12 @@ msgid "You may not list groups unless moderator." msgstr "Sie dürfen keine Gruppen auflisten, es sei denn, Sie sind Moderator." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "Sie müssen eingeloggt sein, um Ihre E-Mail zu ändern" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "Sie müssen eingeloggt sein, um Ihr Passwort zu ändern" @@ -263,7 +263,7 @@ msgid "You need to be logged-in to delete a group" msgstr "Sie müssen eingeloggt sein, um eine Gruppe zu löschen" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "Sie müssen eingeloggt sein, um Ihr Konto zu löschen" @@ -289,12 +289,12 @@ msgstr "" "Sie müssen ein bestehendes Token haben, um ein Refresh-Token zu erhalten" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "Sie haben erneut eine Bestätigungs-E-Mail zu früh angefordert" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "Ihre E-Mail ist nicht in der Zulassungsliste enthalten" @@ -869,7 +869,7 @@ msgid "Error while creating resource" msgstr "Fehler beim Speichern des Reports" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -895,7 +895,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -910,7 +910,7 @@ msgid "Error while creating a discussion" msgstr "Fehler beim Speichern des Reports" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "Fehler beim Aktualisieren des Reports" @@ -930,12 +930,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "Benutzer kann nicht validiert werden" @@ -955,7 +955,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -995,7 +995,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -1010,12 +1010,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "Person mit Benutzernamen %{username} nicht gefunden" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1053,3 +1053,8 @@ msgstr "Sie haben nicht das Recht, dieses Mitglied zu entfernen." #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 19b1e8079..66a18fe1d 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -1351,12 +1351,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/activity.po b/priv/gettext/en/LC_MESSAGES/activity.po index 36f814711..c22948dec 100644 --- a/priv/gettext/en/LC_MESSAGES/activity.po +++ b/priv/gettext/en/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -243,11 +243,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -318,11 +313,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 956af4305..cb05259df 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -1404,12 +1404,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1703,7 +1703,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po index 9bb8d2c64..abdc326d1 100644 --- a/priv/gettext/en/LC_MESSAGES/errors.po +++ b/priv/gettext/en/LC_MESSAGES/errors.po @@ -113,7 +113,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -145,12 +145,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -163,43 +163,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -209,17 +209,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -244,12 +244,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -259,7 +259,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -284,12 +284,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -843,7 +843,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -869,7 +869,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -884,7 +884,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -904,12 +904,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -929,7 +929,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -969,7 +969,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -984,12 +984,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1027,3 +1027,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot index 56ad423bb..38c70fc2d 100644 --- a/priv/gettext/errors.pot +++ b/priv/gettext/errors.pot @@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -142,12 +142,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -160,43 +160,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -206,17 +206,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -241,12 +241,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -256,7 +256,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -281,12 +281,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -840,7 +840,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -866,7 +866,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -881,7 +881,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -901,12 +901,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -926,7 +926,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -966,7 +966,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -981,12 +981,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1024,3 +1024,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/activity.po b/priv/gettext/es/LC_MESSAGES/activity.po index 28526f943..09360f7ed 100644 --- a/priv/gettext/es/LC_MESSAGES/activity.po +++ b/priv/gettext/es/LC_MESSAGES/activity.po @@ -19,50 +19,50 @@ msgstr "" "X-Generator: Weblate 4.8.1\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "%{member} aceptó la invitación para unirse al grupo." #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "%{member} rechazó la invitación para unirse al grupo." #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "%{member} solicitó unirse al grupo." #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "%{member} fue invitado por %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "%{profile} agregó el miembro %{member}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "%{profile} archivó la discusión %{discussion}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "%{profile} creó la discusión %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "%{profile} creó la carpeta %{resource}." @@ -73,76 +73,76 @@ msgid "%{profile} created the group %{group}." msgstr "%{profile} crfeó el grupo %{group}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "%{profile} creó el recurso %{resource}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "%{profile} eliminó la discusión %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "%{profile} borró la carpeta %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "%{profile} eliminado el recurso %{resource}." #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "%{profile }miembro excluido %{member}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "%{profile} movió la carpeta %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "%{profile} movió el recurso %{resource}." #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "%{profile} abandona el grupo." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "%{profile} renombrado la discusión %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" "%{profile} ha renombrado la carpeta de %{old_resource_title} a %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" "%{profile} ha renombrado el recurso de %{old_resource_title} a %{resource}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "%{profile} respondió a la discusión %{discussion}." @@ -153,8 +153,8 @@ msgid "%{profile} updated the group %{group}." msgstr "%{profile} actualizó el grupo %{group}." #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "%{profile} actualizado el miembro %{member}." @@ -195,8 +195,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "El post %{post} fue actualizado por %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "%{member} se unió al grupo." @@ -254,11 +254,6 @@ msgstr "%{profile} ha publicado un anuncio en el evento %{event}." msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "%{profile} te mencionó en un comentario en el evento %{event}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "%{profile}te mencioné en la discusión %{discussion}." - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -331,11 +326,128 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "El post %{post} del grupo %{group} fue actualizado por %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." +msgstr "%{member} aceptó la invitación para unirse al grupo." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "%{member} se unió al grupo." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "%{member} rechazó la invitación para unirse al grupo." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "%{member} solicitó unirse al grupo." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "%{member} fue invitado por %{profile}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "%{profile} agregó el miembro %{member}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." msgstr "%{profile} actualizado el miembro %{member}." #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "%{profile} archivó la discusión %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "%{profile} creó la discusión %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "%{profile} creó la carpeta %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "%{profile} eliminó la discusión %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "%{profile} borró la carpeta %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "%{profile} eliminado el recurso %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "%{profile }miembro excluido %{member}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "%{profile}te mencioné en la discusión %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "%{profile} movió la carpeta %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "%{profile} movió el recurso %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "%{profile} abandona el grupo." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." msgstr "%{profile} rechazó la solicitud de inscripción de %{member}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "%{profile} renombrado la discusión %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" +"%{profile} ha renombrado la carpeta de %{old_resource_title} a %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" +"%{profile} ha renombrado el recurso de %{old_resource_title} a %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "%{profile} respondió a la discusión %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "%{profile} actualizado el miembro %{member}." + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." +msgstr "%{profile} creó el recurso %{resource}." diff --git a/priv/gettext/es/LC_MESSAGES/default.po b/priv/gettext/es/LC_MESSAGES/default.po index 1e9c946d2..0b7b11a64 100644 --- a/priv/gettext/es/LC_MESSAGES/default.po +++ b/priv/gettext/es/LC_MESSAGES/default.po @@ -1688,14 +1688,14 @@ msgid "Public feed for %{instance}" msgstr "Flujo público para %{instance}" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" "La contraseña que ha elegido es demasiado corta. Asegúrese de que su " "contraseña contenga al menos 6 caracteres." #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" "El token que proporcionaste no es válido. Asegúrese de que la URL sea " @@ -2000,7 +2000,7 @@ msgstr "" "Su solicitud de adesión para el grupo %{link_start}%{group}%{link_end}" " ha sido aprobada." -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/es/LC_MESSAGES/errors.po b/priv/gettext/es/LC_MESSAGES/errors.po index e546bcb6a..5bda1918b 100644 --- a/priv/gettext/es/LC_MESSAGES/errors.po +++ b/priv/gettext/es/LC_MESSAGES/errors.po @@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "El perfil actual no es un administrador del grupo seleccionado" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Error al guardar los parámetros del usuario" @@ -143,12 +143,12 @@ msgid "No profile found for the moderator user" msgstr "No se encontró el perfil del usuario moderador" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "No se encontró ningún usuario para validar con este correo electrónico" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "No se encontró ningún usuario con este correo electrónico" @@ -161,45 +161,45 @@ msgid "Profile is not owned by authenticated user" msgstr "El perfil no es propiedad del usuario autenticado" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "Las inscripciones no están abiertas" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "La contraseña actual no es válida" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "El nuevo correo electrónico no parece ser válido" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "El nuevo correo electrónico debe ser diferente" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "La nueva contraseña debe ser diferente" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "La contraseña proporcionada no es válida" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" "La contraseña que ha elegido es demasiado corta. Asegúrese de que su " "contraseña contenga al menos 6 caracteres." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Este usuario no puede restablecer su contraseña" @@ -209,17 +209,17 @@ msgid "This user has been disabled" msgstr "Este usuario ha sido inhabilitado" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "No se puede validar al usuario" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "El usuario ya está inhabilitado" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "El usuario solicitado no ha iniciado sesión" @@ -244,12 +244,12 @@ msgid "You may not list groups unless moderator." msgstr "No puedes enumerar grupos a menos que seas moderador." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "Debes iniciar sesión para cambiar tu correo electrónico" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "Debes iniciar sesión para cambiar tu contraseña" @@ -259,7 +259,7 @@ msgid "You need to be logged-in to delete a group" msgstr "Debes iniciar sesión para eliminar un grupo" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "Debes iniciar sesión para eliminar su cuenta" @@ -284,13 +284,13 @@ msgid "You need to have an existing token to get a refresh token" msgstr "Debes tener un token existente para obtener un token de actualización" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" "Solicitó de nuevo un correo electrónico de confirmación demasiado pronto" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "Tu correo electrónico no está en la lista de permitidos" @@ -860,7 +860,7 @@ msgid "Error while creating resource" msgstr "Error al crear el recurso" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "Token de activación no válido" @@ -890,7 +890,7 @@ msgstr "" "grupo" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" "A su correo electrónico se le ha denegado el registro o utiliza un proveedor " @@ -907,7 +907,7 @@ msgid "Error while creating a discussion" msgstr "Error al crear el recurso" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "Error al actualizar el informe" @@ -927,12 +927,12 @@ msgid "Failed to update the group" msgstr "No se pudo actualizar el grupo" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "No se pudo actualizar el correo electrónico del usuario" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "No se puede validar al usuario" @@ -952,7 +952,7 @@ msgid "You are not the comment creator" msgstr "No eres el creador de comentarios" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "No puede cambiar su contraseña." @@ -993,7 +993,7 @@ msgid "Unknown error while creating event" msgstr "Error desconocido al crear el evevento" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "El usuario no puede cambiar el correo electrónico" @@ -1008,12 +1008,12 @@ msgid "Follow not found" msgstr "Seguimiento no encontrado" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "Persona con nombre de usuario %{username} no encontrada" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "Este perfil no te pertenece" @@ -1051,3 +1051,8 @@ msgstr "No tiene derecho a eliminar este miembro." #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "Debes iniciar sesión para eliminar un miembro" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/fi/LC_MESSAGES/activity.po b/priv/gettext/fi/LC_MESSAGES/activity.po index 0520cf901..8597bb6ee 100644 --- a/priv/gettext/fi/LC_MESSAGES/activity.po +++ b/priv/gettext/fi/LC_MESSAGES/activity.po @@ -19,50 +19,50 @@ msgstr "" "X-Generator: Weblate 4.6.2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "%{member} hyväksyi kutsun liittyä ryhmään." #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "%{member} hylkäsi kutsun liittyä ryhmään." #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "%{member} haluaa liittyä ryhmään." #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "%{profile} kutsui jäsenen %{member}." #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "%{profile} lisäsi jäsenen %{member}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "%{profile} arkistoi keskustelun %{discussion}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "%{profile} loi keskustelun %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "%{profile} loi kansion %{resource}." @@ -73,74 +73,74 @@ msgid "%{profile} created the group %{group}." msgstr "%{profile} loi ryhmän %{group}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "%{profile} loi resurssin %{resource}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "%{profile} poisti keskustelun %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "%{profile} poisti kansion %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "%{profile} poisti resurssin %{resource}." #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "%{profile} hylkäsi jäsenen %{member}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "%{profile} siirsi kansion %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "%{profile} siirsi resurssin %{resource}." #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "%{profile} poistui ryhmästä." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "%{profile} muutti keskustelun %{discussion} nimer." #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "%{profile} muutti kansion %{old_resource_title} nimeksi %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "%{profile} muutti resurssin %{old_resource_title} nimeksi %{resource}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "%{profile} vastasi keskusteluun %{discussion}." @@ -151,8 +151,8 @@ msgid "%{profile} updated the group %{group}." msgstr "%{profile} päivitti ryhmää %{group}." #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "%{profile} päivitti jäsentä %{member}." @@ -193,8 +193,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "%{profile} päivitti julkaisun %{post}." #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "%{member} liittyi ryhmään." @@ -252,11 +252,6 @@ msgstr "%{profile} on julkaissut ilmoituksen tapahtumassa %{event}." msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "%{profile} mainitsi sinut tapahtuman %{event} kommentissa." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "%{profile} mainitsi sinut keskustelussa %{discussion}." - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -329,11 +324,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "Viestin %{post} ryhmästä %{group} päivitti %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." +msgstr "%{member} hyväksyi kutsun liittyä ryhmään." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "%{member} liittyi ryhmään." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "%{member} hylkäsi kutsun liittyä ryhmään." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "%{member} haluaa liittyä ryhmään." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "%{profile} kutsui jäsenen %{member}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "%{profile} lisäsi jäsenen %{member}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." msgstr "%{profile} päivitti jäsentä %{member}." #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "%{profile} arkistoi keskustelun %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "%{profile} loi keskustelun %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "%{profile} loi kansion %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "%{profile} poisti keskustelun %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "%{profile} poisti kansion %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "%{profile} poisti resurssin %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "%{profile} hylkäsi jäsenen %{member}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "%{profile} mainitsi sinut keskustelussa %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "%{profile} siirsi kansion %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "%{profile} siirsi resurssin %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "%{profile} poistui ryhmästä." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "%{profile} muutti keskustelun %{discussion} nimer." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "%{profile} muutti kansion %{old_resource_title} nimeksi %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "%{profile} muutti resurssin %{old_resource_title} nimeksi %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "%{profile} vastasi keskusteluun %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "%{profile} päivitti jäsentä %{member}." + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." +msgstr "%{profile} loi resurssin %{resource}." diff --git a/priv/gettext/fi/LC_MESSAGES/default.po b/priv/gettext/fi/LC_MESSAGES/default.po index 28e559138..c7041d193 100644 --- a/priv/gettext/fi/LC_MESSAGES/default.po +++ b/priv/gettext/fi/LC_MESSAGES/default.po @@ -1661,12 +1661,12 @@ msgid "Public feed for %{instance}" msgstr "Palvelimen %{instance} julkinen syöte" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1964,7 +1964,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/fi/LC_MESSAGES/errors.po b/priv/gettext/fi/LC_MESSAGES/errors.po index 76553dba5..93195fea2 100644 --- a/priv/gettext/fi/LC_MESSAGES/errors.po +++ b/priv/gettext/fi/LC_MESSAGES/errors.po @@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "Nykyinen profiili ei ole valitun ryhmän ylläpitäjä" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Käyttäjän asetusten tallennuksessa tapahtui virhe" @@ -143,12 +143,12 @@ msgid "No profile found for the moderator user" msgstr "Moderaattorikäyttäjän profiilia ei löydy" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "Käyttäjää tämän sähköpostin vahvistamiseksi ei löydy" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "Käyttäjää, jolla on tämä sähköpostiosoite ei löydy" @@ -161,45 +161,45 @@ msgid "Profile is not owned by authenticated user" msgstr "Profiili ei ole tunnistautuneen käyttäjän omistuksessa" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "Ei voi rekisteröityä" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "Nykyinen salasana ei kelpaa" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "Uusi sähköpostiosoite ei vaikuta kelvolliselta" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "Uuden sähköpostiosoitteen on poikettava vanhasta" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "Uuden salasanan on poikettava vanhasta" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "Annettu salasana on epäkelpo" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" "Valitsemasi salasana on liian lyhyt. Käytä vähintään kuuden merkin mittaista " "salasanaa." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Käyttäjä ei voi palauttaa salasanaansa" @@ -209,17 +209,17 @@ msgid "This user has been disabled" msgstr "Käyttäjä on poistettu käytöstä" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "Käyttäjää ei voi vahvistaa" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "Käyttäjä on jo poistettu käytöstä" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "Pyydetty käyttäjä ei ole kirjautuneena sisään" @@ -244,12 +244,12 @@ msgid "You may not list groups unless moderator." msgstr "Voit nähdä ryhmäluettelon vain, jos olet moderaattori." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "Sähköpostiosoitteen voi vaihtaa vain sisäänkirjautuneena" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "Salasanan voi vaihtaa vain sisäänkirjautuneena" @@ -259,7 +259,7 @@ msgid "You need to be logged-in to delete a group" msgstr "Ryhmän voi poistaa vain sisäänkirjautuneena" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "Voit poistaa tilisi vain sisäänkirjautuneena" @@ -284,12 +284,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "Voit saada uuden merkin vain, jos sinulla on jo merkki" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "Pyysit uutta vahvistussähköpostia liian aikaisin" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "Sähköpostiosoitteesi ei ole sallittujen luettelossa" @@ -846,7 +846,7 @@ msgid "Error while creating resource" msgstr "Virhe raporttia tallennettaessa" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "Virheellinen aktivointimerkki" @@ -872,7 +872,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -887,7 +887,7 @@ msgid "Error while creating a discussion" msgstr "Virhe raporttia tallennettaessa" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "Virhe raporttia päivitettäessä" @@ -907,12 +907,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "Käyttäjää ei voi vahvistaa" @@ -932,7 +932,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -972,7 +972,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -987,12 +987,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "Käyttäjänimellä %{username} ei löydy henkilöä" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1030,3 +1030,8 @@ msgstr "Sinulla ei ole oikeutta poistaa jäsentä." #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/fr/LC_MESSAGES/activity.po b/priv/gettext/fr/LC_MESSAGES/activity.po index d26be56b0..8d3bcc914 100644 --- a/priv/gettext/fr/LC_MESSAGES/activity.po +++ b/priv/gettext/fr/LC_MESSAGES/activity.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-11-12 17:15+0100\n" +"PO-Revision-Date: 2021-11-17 16:25+0100\n" "Last-Translator: Thomas Citharel \n" "Language-Team: French \n" "Language: fr\n" @@ -20,320 +20,323 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Poedit 3.0\n" -#, elixir-format -#: lib/service/activity/renderer/member.ex:38 #: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "%{member} a accepté l'invitation à rejoindre le groupe." -#, elixir-format -#: lib/service/activity/renderer/member.ex:42 #: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "%{member} a refusé l'invitation à rejoindre le groupe." -#, elixir-format -#: lib/service/activity/renderer/member.ex:30 #: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "%{member} a demandé à rejoindre le groupe." -#, elixir-format -#: lib/service/activity/renderer/member.ex:34 #: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "%{member} a été invité⋅e par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:50 #: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "%{profile} a ajouté le ou la membre %{member}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 #: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "%{profile} a archivé la discussion %{discussion}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 #: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "%{profile} a créé la discussion %{discussion}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:24 #: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "%{profile} a créé le dossier %{resource}." -#, elixir-format -#: lib/web/templates/email/activity/_group_activity_item.html.heex:4 -#: lib/web/templates/email/activity/_group_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_group_activity_item.html.heex:4 lib/web/templates/email/activity/_group_activity_item.text.eex:1 msgid "%{profile} created the group %{group}." msgstr "%{profile} a créé le groupe %{group}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:33 #: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "%{profile} a créé la resource %{resource}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 #: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "%{profile} a créé la discussion %{discussion}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:97 #: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "%{profile} a supprimé le dossier %{resource}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:106 #: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "%{profile} a supprimé la resource %{resource}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:66 #: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "%{profile} a exclu le ou la membre %{member}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:76 #: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "%{profile} a déplacé le dossier %{resource}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:85 #: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "%{profile} a déplacé la ressource %{resource}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:70 #: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "%{profile} a quitté le groupe." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 #: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "%{profile} a renommé la discussion %{discussion}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:45 #: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "%{profile} a renommé le dossier %{old_resource_title} en %{resource}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:59 #: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "%{profile} a renommé la resource %{old_resource_title} en %{resource}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 #: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "%{profile} a répondu à la discussion %{discussion}." -#, elixir-format -#: lib/web/templates/email/activity/_group_activity_item.html.heex:19 -#: lib/web/templates/email/activity/_group_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_group_activity_item.html.heex:19 lib/web/templates/email/activity/_group_activity_item.text.eex:7 msgid "%{profile} updated the group %{group}." msgstr "%{profile} a mis à jour le groupe %{group}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:62 #: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "%{profile} a mis à jour le membre %{member}." -#, elixir-format -#: lib/service/activity/renderer/event.ex:23 -#: lib/web/templates/email/activity/_event_activity_item.html.heex:4 lib/web/templates/email/activity/_event_activity_item.text.eex:1 +#: lib/service/activity/renderer/event.ex:23 lib/web/templates/email/activity/_event_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_event_activity_item.text.eex:1 msgid "The event %{event} was created by %{profile}." msgstr "L'événement %{event} a été créé par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/event.ex:43 -#: lib/web/templates/email/activity/_event_activity_item.html.heex:34 lib/web/templates/email/activity/_event_activity_item.text.eex:13 +#: lib/service/activity/renderer/event.ex:43 lib/web/templates/email/activity/_event_activity_item.html.heex:34 +#: lib/web/templates/email/activity/_event_activity_item.text.eex:13 msgid "The event %{event} was deleted by %{profile}." msgstr "L'événement %{event} a été supprimé par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/event.ex:33 -#: lib/web/templates/email/activity/_event_activity_item.html.heex:19 lib/web/templates/email/activity/_event_activity_item.text.eex:7 +#: lib/service/activity/renderer/event.ex:33 lib/web/templates/email/activity/_event_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_event_activity_item.text.eex:7 msgid "The event %{event} was updated by %{profile}." msgstr "L'événement %{event} a été mis à jour par %{profile}." -#, elixir-format -#: lib/web/templates/email/activity/_post_activity_item.html.heex:4 -#: lib/web/templates/email/activity/_post_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_post_activity_item.html.heex:4 lib/web/templates/email/activity/_post_activity_item.text.eex:1 msgid "The post %{post} was created by %{profile}." msgstr "Le billet %{post} a été créé par %{profile}." -#, elixir-format -#: lib/web/templates/email/activity/_post_activity_item.html.heex:34 -#: lib/web/templates/email/activity/_post_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_post_activity_item.html.heex:34 lib/web/templates/email/activity/_post_activity_item.text.eex:13 msgid "The post %{post} was deleted by %{profile}." msgstr "Le billet %{post} a été supprimé par %{profile}." -#, elixir-format -#: lib/web/templates/email/activity/_post_activity_item.html.heex:19 -#: lib/web/templates/email/activity/_post_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_post_activity_item.html.heex:19 lib/web/templates/email/activity/_post_activity_item.text.eex:7 msgid "The post %{post} was updated by %{profile}." msgstr "Le billet %{post} a été mis à jour par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:46 #: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "%{member} a rejoint le groupe." -#, elixir-format -#: lib/service/activity/renderer/event.ex:63 -#: lib/web/templates/email/activity/_event_activity_item.html.heex:58 lib/web/templates/email/activity/_event_activity_item.text.eex:25 +#: lib/service/activity/renderer/event.ex:63 lib/web/templates/email/activity/_event_activity_item.html.heex:58 +#: lib/web/templates/email/activity/_event_activity_item.text.eex:25 msgid "%{profile} posted a comment on the event %{event}." msgstr "%{profile} a posté un commentaire sur l'événement %{event}." -#, elixir-format -#: lib/service/activity/renderer/event.ex:54 -#: lib/web/templates/email/activity/_event_activity_item.html.heex:43 lib/web/templates/email/activity/_event_activity_item.text.eex:19 +#: lib/service/activity/renderer/event.ex:54 lib/web/templates/email/activity/_event_activity_item.html.heex:43 +#: lib/web/templates/email/activity/_event_activity_item.text.eex:19 msgid "%{profile} replied to a comment on the event %{event}." msgstr "%{profile} a répondu à un commentaire sur l'événement %{event}." -#, elixir-format #: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "Vous ne voulez pas recevoir de notifications d'activité ? Vous pouvez changer leur fréquence ou les désactiver dans vos préférences." -#, elixir-format -#: lib/web/templates/email/email_direct_activity.html.heex:135 -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.html.heex:135 lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "Voir une activité de plus" msgstr[1] "Voir %{count} activités de plus" -#, elixir-format -#: lib/web/templates/email/email_direct_activity.html.heex:44 -#: lib/web/templates/email/email_direct_activity.html.heex:46 lib/web/templates/email/email_direct_activity.text.eex:6 -#: lib/web/templates/email/email_direct_activity.text.eex:7 +#: lib/web/templates/email/email_direct_activity.html.heex:44 lib/web/templates/email/email_direct_activity.html.heex:46 +#: lib/web/templates/email/email_direct_activity.text.eex:6 lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "Il y a eu une activité !" msgstr[1] "Il y a eu de l'activité !" -#, elixir-format #: lib/service/activity/renderer/renderer.ex:46 msgid "Activity on %{instance}" msgstr "Activité sur %{instance}" -#, elixir-format -#: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.heex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/email_anonymous_activity.html.heex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 +#: lib/service/activity/renderer/comment.ex:38 lib/web/templates/email/activity/_comment_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_comment_activity_item.text.eex:7 lib/web/templates/email/email_anonymous_activity.html.heex:41 +#: lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "%{profile} a posté une annonce sous l'événement %{event}." -#, elixir-format -#: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.heex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 +#: lib/service/activity/renderer/comment.ex:24 lib/web/templates/email/activity/_comment_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "%{profile} vous a mentionné dans un commentaire sous l'événement %{event}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "%{profile} vous a mentionné dans la discussion %{discussion}." - -#, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" "Vous ne voulez pas recevoir de notifications d'activité ? Vous pouvez changer leur fréquence ou les désactiver dans %{tag_start}vos préférences" "%{tag_end}." -#, elixir-format -#: lib/web/templates/email/email_direct_activity.html.heex:42 -#: lib/web/templates/email/email_direct_activity.text.eex:5 +#: lib/web/templates/email/email_direct_activity.html.heex:42 lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "Voici votre récapitulatif hebdomadaire d'activité" -#, elixir-format #: lib/web/email/activity.ex:119 lib/web/email/activity.ex:140 msgid "Activity notification for %{instance}" msgstr "Notification d'activité sur %{instance}" -#, elixir-format #: lib/web/email/activity.ex:126 msgid "Daily activity recap for %{instance}" msgstr "Récapitulatif quotidien d'activité sur %{instance}" -#, elixir-format -#: lib/web/templates/email/email_direct_activity.html.heex:40 -#: lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.heex:40 lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "Voici votre récapitulatif quotidien d'activité" -#, elixir-format #: lib/web/email/activity.ex:133 msgid "Weekly activity recap for %{instance}" msgstr "Récapitulatif hebdomadaire d'activité sur %{instance}" -#, elixir-format -#: lib/service/activity/renderer/comment.ex:66 -#: lib/web/templates/email/activity/_comment_activity_item.html.heex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +#: lib/service/activity/renderer/comment.ex:66 lib/web/templates/email/activity/_comment_activity_item.html.heex:51 +#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 msgid "%{profile} has posted a new comment under your event %{event}." msgstr "%{profile} a posté un nouveau commentaire sous votre événement %{event}." -#, elixir-format -#: lib/service/activity/renderer/comment.ex:53 -#: lib/web/templates/email/activity/_comment_activity_item.html.heex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +#: lib/service/activity/renderer/comment.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.heex:36 +#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 msgid "%{profile} has posted a new reply under your event %{event}." msgstr "%{profile} a posté une nouvelle réponse sous votre événement %{event}." -#, elixir-format #: lib/web/email/activity.ex:46 msgid "Announcement for your event %{event}" msgstr "Annonce pour votre événement %{event}" -#, elixir-format #: lib/service/activity/renderer/group.ex:23 msgid "The group %{group} was updated by %{profile}." msgstr "Le groupe %{group} a été mis à jour par %{profile}." -#, elixir-format #: lib/service/activity/renderer/post.ex:47 msgid "The post %{post} from group %{group} was deleted by %{profile}." msgstr "Le billet %{post} du groupe %{group} a été supprimé par %{profile}." -#, elixir-format #: lib/service/activity/renderer/post.ex:31 msgid "The post %{post} from group %{group} was published by %{profile}." msgstr "Le billet %{post} du groupe %{group} a été publié par %{profile}." -#, elixir-format #: lib/service/activity/renderer/post.ex:39 msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "Le billet %{post} du groupe %{group} a été mis à jour par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." -msgstr "%{profile} a approuvé la demande d'adhésion de %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." +msgstr "%{member} a accepté l'invitation à rejoindre le groupe %{group}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." -msgstr "%{profile} a rejeté la demande d'adhésion de %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "%{member} a rejoint le groupe %{group}." + +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "%{member} a refusé l'invitation à rejoindre le groupe %{group}." + +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "%{member} a demandé à rejoindre le groupe %{group}." + +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "%{member} a été invité⋅e par %{profile} au groupe %{group}." + +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "%{profile} a ajouté le ou la membre %{member} au groupe %{group}." + +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "%{profile} a approuvé la demande d'adhésion de %{member} au groupe %{group}." + +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "%{profile} a archivé la discussion %{discussion} du groupe %{group}." + +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "%{profile} a créé la discussion %{discussion} du groupe %{group}." + +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "%{profile} a créé le dossier %{resource} du groupe %{group}." + +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "%{profile} a créé la discussion %{discussion} dans le groupe %{group}." + +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "%{profile} a supprimé le dossier %{resource} du groupe %{group}." + +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "%{profile} a supprimé la ressource %{resource} du groupe %{group}." + +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "%{profile} a exclu le ou la membre %{member} du groupe %{group}." + +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "%{profile} vous a mentionné dans la discussion %{discussion} du groupe %{group}." + +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "%{profile} a déplacé le dossier %{resource} du groupe %{group}." + +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "%{profile} a déplacé la ressource %{resource} du groupe %{group}." + +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "%{profile} a quitté le groupe %{group}." + +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "%{profile} a rejeté la demande d'adhésion de %{member} pour le groupe %{group}." + +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "%{profile} a renommé la discussion %{discussion} du groupe %{group}." + +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "%{profile} a renommé le dossier %{old_resource_title} en %{resource} dans le groupe %{group}." + +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "%{profile} a renommé la ressource %{old_resource_title} en %{resource} dans le groupe %{group}." + +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "%{profile} a répondu à la discussion %{discussion} du groupe %{group}." + +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "%{profile} a mis à jour le membre %{member} dans le groupe %{group}." + +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." +msgstr "%{profile} a créé la ressource %{resource} dans le groupe %{group}." diff --git a/priv/gettext/fr/LC_MESSAGES/default.po b/priv/gettext/fr/LC_MESSAGES/default.po index 5c144ca94..9f13e94e2 100644 --- a/priv/gettext/fr/LC_MESSAGES/default.po +++ b/priv/gettext/fr/LC_MESSAGES/default.po @@ -20,901 +20,1138 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Poedit 3.0\n" +#, elixir-format #: lib/web/templates/email/password_reset.html.heex:48 msgid "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one." msgstr "Si vous n'avez pas demandé ceci, vous pouvez ignorer cet email. Votre mot de passe ne changera pas tant que vous n'en créerez pas un nouveau en cliquant sur le lien ci-dessous." +#, elixir-format #: lib/web/templates/email/report.html.heex:74 msgid "%{title} by %{creator}" msgstr "%{title} par %{creator}" +#, elixir-format #: lib/web/templates/email/registration_confirmation.html.heex:58 msgid "Activate my account" msgstr "Activer mon compte" -#: lib/web/templates/email/email.html.heex:120 lib/web/templates/email/email.text.eex:9 +#, elixir-format +#: lib/web/templates/email/email.html.heex:120 +#: lib/web/templates/email/email.text.eex:9 msgid "Ask the community on Framacolibri" msgstr "Demander à la communauté sur Framacolibri" +#, elixir-format #: lib/web/templates/email/report.text.eex:15 msgid "Comments" msgstr "Commentaires" -#: lib/web/templates/email/report.html.heex:72 lib/web/templates/email/report.text.eex:11 +#, elixir-format +#: lib/web/templates/email/report.html.heex:72 +#: lib/web/templates/email/report.text.eex:11 msgid "Event" msgstr "Événement" +#, elixir-format #: lib/web/email/user.ex:49 msgid "Instructions to reset your password on %{instance}" msgstr "Instructions pour réinitialiser votre mot de passe sur %{instance}" +#, elixir-format #: lib/web/templates/email/report.text.eex:21 msgid "Reason" msgstr "Raison" +#, elixir-format #: lib/web/templates/email/password_reset.html.heex:61 msgid "Reset Password" msgstr "Réinitialiser mon mot de passe" +#, elixir-format #: lib/web/templates/email/password_reset.html.heex:41 msgid "Resetting your password is easy. Just press the button below and follow the instructions. We'll have you up and running in no time." msgstr "Réinitialiser votre mot de passe est facile. Cliquez simplement sur le bouton et suivez les inscriptions. Vous serez opérationnel en un rien de temps." +#, elixir-format #: lib/web/email/user.ex:28 msgid "Instructions to confirm your Mobilizon account on %{instance}" msgstr "Instructions pour confirmer votre compte Mobilizon sur %{instance}" +#, elixir-format #: lib/web/email/admin.ex:24 msgid "New report on Mobilizon instance %{instance}" msgstr "Nouveau signalement sur l'instance Mobilizon %{instance}" -#: lib/web/templates/email/before_event_notification.html.heex:51 lib/web/templates/email/before_event_notification.text.eex:4 +#, elixir-format +#: lib/web/templates/email/before_event_notification.html.heex:51 +#: lib/web/templates/email/before_event_notification.text.eex:4 msgid "Go to event page" msgstr "Aller à la page de l'événement" +#, elixir-format #: lib/web/templates/email/report.text.eex:1 msgid "New report from %{reporter} on %{instance}" msgstr "Nouveau signalement sur %{instance}" +#, elixir-format #: lib/web/templates/email/event_participation_approved.text.eex:1 msgid "Participation approved" msgstr "Participation approuvée" -#: lib/web/templates/email/password_reset.html.heex:13 lib/web/templates/email/password_reset.text.eex:1 +#, elixir-format +#: lib/web/templates/email/password_reset.html.heex:13 +#: lib/web/templates/email/password_reset.text.eex:1 msgid "Password reset" msgstr "Réinitialisation du mot de passe" +#, elixir-format #: lib/web/templates/email/password_reset.text.eex:7 msgid "Resetting your password is easy. Just click the link below and follow the instructions. We'll have you up and running in no time." msgstr "Réinitialiser votre mot de passe est facile. Cliquez simplement sur le bouton et suivez les instructions. Vous serez opérationnel en un rien de temps." +#, elixir-format #: lib/web/templates/email/registration_confirmation.text.eex:5 msgid "You created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email." msgstr "Vous avez créé un compte sur %{host} avec cette adresse email. Vous êtes à un clic de l'activer." +#, elixir-format #: lib/web/email/participation.ex:111 msgid "Your participation to event %{title} has been approved" msgstr "Votre participation à l'événement %{title} a été approuvée" +#, elixir-format #: lib/web/email/participation.ex:68 msgid "Your participation to event %{title} has been rejected" msgstr "Votre participation à l'événement %{title} a été rejetée" +#, elixir-format #: lib/web/email/event.ex:46 msgid "Event %{title} has been updated" msgstr "L'événement %{title} a été mis à jour" +#, elixir-format #: lib/web/templates/email/event_updated.text.eex:7 msgid "New title: %{title}" msgstr "Nouveau titre : %{title}" +#, elixir-format #: lib/web/templates/email/password_reset.text.eex:5 msgid "You requested a new password for your account on %{instance}." msgstr "Vous avez demandé un nouveau mot de passe pour votre compte sur %{instance}." +#, elixir-format #: lib/web/templates/email/email.html.heex:88 msgid "Warning" msgstr "Attention" +#, elixir-format #: lib/web/email/participation.ex:135 msgid "Confirm your participation to event %{title}" msgstr "Confirmer ma participation à l'événement %{title}" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:75 msgctxt "terms" msgid "An internal ID for your current selected identity" msgstr "Une identité interne pour l'identité sélectionnée actuellement" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:74 msgctxt "terms" msgid "An internal user ID" msgstr "Une identité utilisateur·ice interne" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:37 msgctxt "terms" msgid "Any of the information we collect from you may be used in the following ways:" msgstr "Les informations que nous vous nous fournissez pourront être utilisées ainsi :" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:9 msgctxt "terms" msgid "Basic account information" msgstr "Informations basiques du compte" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:25 msgctxt "terms" msgid "Do not share any dangerous information over Mobilizon." msgstr "Ne partagez aucune information sensible à l'aide de Mobilizon." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:90 msgctxt "terms" msgid "Do we disclose any information to outside parties?" msgstr "Partageons-nous des informations à des tiers ?" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:68 msgctxt "terms" msgid "Do we use cookies?" msgstr "Utilisons-nous des cookies ?" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:51 msgctxt "terms" msgid "How do we protect your information?" msgstr "Comment protégeons-nous vos informations ?" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:29 msgctxt "terms" msgid "IPs and other metadata" msgstr "Adresses IP et autres métadonnées" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:17 msgctxt "terms" msgid "Published events and comments" msgstr "Événements publiés et commentaires" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:64 msgctxt "terms" msgid "Retain the IP addresses associated with registered users no more than 12 months." msgstr "Ne pas conserver les adresses IP associées aux utilisateur·ices enregistrés pas plus de 12 mois." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:76 msgctxt "terms" msgid "Tokens to authenticate you" msgstr "Jetons pour vous identifier" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:31 msgctxt "terms" msgid "We also may retain server logs which include the IP address of every request to our server." msgstr "Nous pouvons également conserver les données d'authentification y compris les adresses IP de toutes les requêtes de notre serveur." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:70 msgctxt "terms" msgid "We store the following information on your device when you connect:" msgstr "Nous conservons les informations suivantes sur votre appareil lorsque vous vous connectez :" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:58 msgctxt "terms" msgid "We will make a good faith effort to:" msgstr "Nous mettrons tout en possible pour :" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:35 msgctxt "terms" msgid "What do we use your information for?" msgstr "Comment utilisons-nous vos informations ?" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:57 msgctxt "terms" msgid "What is our data retention policy?" msgstr "Quelle est notre politique de conservation des données ?" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:67 msgctxt "terms" msgid "You may irreversibly delete your account at any time." msgstr "Vous pouvez supprimer votre compte à tout moment de façon irréversible." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:115 msgctxt "terms" msgid "Changes to our Privacy Policy" msgstr "Modifications de notre politique de confidentialité" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:106 msgctxt "terms" msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (General Data Protection Regulation) do not use this site." msgstr "Si ce serveur est dans l'Union Européenne ou dans l'Espace Economique Européen : nos sites, produits et services sont tous destinés aux personnes âgées de plus de 16 ans. Si vous avez moins de 16 ans, suivant le RGPD (Règlement général sur la protection des données), n'utilisez pas ce site." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:109 msgctxt "terms" msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site." msgstr "Si le serveur est situé aux Etats-Unis : Notre site, nos produits et services sont tous à destination de personnes agées d'au moins 13 ans. Si vous avez moins de 13 ans, d'après les recommandations de COOPA (Children's Online Privacy Protection Act) n'utilisez pas ce site." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:117 msgctxt "terms" msgid "If we decide to change our privacy policy, we will post those changes on this page." msgstr "Si nous décidons de changer notre politique de confidentialité, nous présenterons ces changements sur cette page." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:112 msgctxt "terms" msgid "Law requirements can be different if this server is in another jurisdiction." msgstr "Les conditions juridiques peuvent différer si le serveur est sous une autre juridiction." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:103 msgctxt "terms" msgid "Site usage by children" msgstr "Utilisation du site par des mineurs" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:47 msgctxt "terms" -msgid "" -"The email address you provide may be used to send you information, updates and notifications about other people\n" -" interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n" -" questions." +msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions." msgstr "" "L'adresse électronique que vous nous fournissez peut être utilisée pour vous envoyer des informations, des mises à jour et des notifications concernant d'autres personnes\n" "qui interagissent avec vos contenus ou vous envoient des messages et pour répondre à des demandes,\n" "et/ou à d'autres requêtes ou questions." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:45 msgctxt "terms" -msgid "" -"To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n" -" evasion or other violations." +msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations." msgstr "" "Afin d'aider à la modération de la communauté, par exemple en comparant votre adresse IP avec d'autres adresses connues\n" "dans le but de détecter des tentatives de contournement d'un bannissement ou d'autres violations." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:43 msgctxt "terms" -msgid "" -"To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n" -" interact with other people's content and post your own content if you are logged in." +msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in." msgstr "" "Fournir la fonctionnalité de base de Mobilizon. Selon la politique de cette instance, vous ne pourrez interagir\n" "avec le contenu d'autres personnes et publier votre propre contenu que si vous êtes connecté." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:6 msgctxt "terms" msgid "What information do we collect?" msgstr "Quelles informations collectons-nous ?" +#, elixir-format #: lib/web/email/user.ex:178 msgid "Mobilizon on %{instance}: confirm your email address" msgstr "Mobilizon sur %{instance} : confirmez votre adresse email" +#, elixir-format #: lib/web/email/user.ex:157 msgid "Mobilizon on %{instance}: email changed" msgstr "Mobilizon sur %{instance} : adresse email modifiée" +#, elixir-format #: lib/web/email/notification.ex:51 msgid "One event planned today" msgid_plural "%{nb_events} events planned today" msgstr[0] "Un événement prévu aujourd'hui" msgstr[1] "%{nb_events} événements prévus aujourd'hui" -#: lib/web/templates/email/on_day_notification.html.heex:38 lib/web/templates/email/on_day_notification.text.eex:3 +#, elixir-format +#: lib/web/templates/email/on_day_notification.html.heex:38 +#: lib/web/templates/email/on_day_notification.text.eex:3 msgid "You have one event today:" msgid_plural "You have %{total} events today:" msgstr[0] "Vous avez un événement aujourd'hui :" msgstr[1] "Vous avez %{total} événements aujourd'hui :" +#, elixir-format #: lib/web/templates/email/group_invite.text.eex:3 msgid "%{inviter} just invited you to join their group %{group}" msgstr "%{inviter} vient de vous inviter à rejoindre son groupe %{group}" -#: lib/web/templates/email/group_invite.html.heex:13 lib/web/templates/email/group_invite.text.eex:1 +#, elixir-format +#: lib/web/templates/email/group_invite.html.heex:13 +#: lib/web/templates/email/group_invite.text.eex:1 msgid "Come along!" msgstr "Rejoignez-nous !" +#, elixir-format #: lib/web/email/notification.ex:25 msgid "Don't forget to go to %{title}" msgstr "N'oubliez pas de vous rendre à %{title}" -#: lib/web/templates/email/before_event_notification.html.heex:38 lib/web/templates/email/before_event_notification.text.eex:3 +#, elixir-format +#: lib/web/templates/email/before_event_notification.html.heex:38 +#: lib/web/templates/email/before_event_notification.text.eex:3 msgid "Get ready for %{title}" msgstr "Préparez vous pour %{title}" +#, elixir-format #: lib/web/templates/email/group_invite.html.heex:59 msgid "See my groups" msgstr "Voir mes groupes" -#: lib/web/templates/email/group_invite.html.heex:45 lib/web/templates/email/group_invite.text.eex:5 +#, elixir-format +#: lib/web/templates/email/group_invite.html.heex:45 +#: lib/web/templates/email/group_invite.text.eex:5 msgid "To accept this invitation, head over to your groups." msgstr "Pour accepter cette invitation, rendez-vous dans vos groupes." +#, elixir-format #: lib/web/templates/email/before_event_notification.text.eex:5 msgid "View the event on: %{link}" msgstr "Voir l'événement mis à jour sur : %{link}" +#, elixir-format #: lib/web/email/member.ex:31 msgid "You have been invited by %{inviter} to join group %{group}" msgstr "Vous avez été invité par %{inviter} à rejoindre le groupe %{group}" +#, elixir-format #: lib/web/email/notification.ex:78 msgid "One event planned this week" msgid_plural "%{nb_events} events planned this week" msgstr[0] "Un événement prévu cette semaine" msgstr[1] "%{nb_events} événements prévus cette semaine" +#, elixir-format #: lib/web/email/notification.ex:102 msgid "One participation request for event %{title} to process" msgid_plural "%{number_participation_requests} participation requests for event %{title} to process" msgstr[0] "Une demande de participation à l'événement %{title} à traiter" msgstr[1] "%{number_participation_requests} demandes de participation à l'événement %{title} à traiter" -#: lib/web/templates/email/notification_each_week.html.heex:38 lib/web/templates/email/notification_each_week.text.eex:3 +#, elixir-format +#: lib/web/templates/email/notification_each_week.html.heex:38 +#: lib/web/templates/email/notification_each_week.text.eex:3 msgid "You have one event this week:" msgid_plural "You have %{total} events this week:" msgstr[0] "Vous avez un événement aujourd'hui :" msgstr[1] "Vous avez %{total} événements aujourd'hui :" +#, elixir-format #: lib/service/metadata/utils.ex:53 msgid "The event organizer didn't add any description." msgstr "L'organisateur·ice de l'événement n'a pas ajouté de description." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:54 msgctxt "terms" msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm." msgstr "Nous utilisons plusieurs mesures de sécurité pour assurer la confidentialité de vos informations personnelles lorsque vous soumettez ou accédez à vos informations. Entre autres, votre session de navigateur et la connexion entre vos applications et l'API sont sécurisés par SSL/TLS, et votre mot de passe est haché avec un algorithme fort à sens unique." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:94 msgctxt "terms" msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety." msgstr "Non. Nous ne vendons, n’échangeons ou ne transférons d’une quelque manière que soit des informations permettant de vous identifier personnellement. Cela n’inclut pas les tierces parties de confiance qui nous aident à opérer ce site, à conduire nos activités commerciales ou à vous servir, tant qu’elles acceptent de garder ces informations confidentielles. Nous sommes également susceptibles de partager vos informations quand nous pensons que c’est nécessaire pour nous conformer à la loi, pour appliquer les politiques de notre site ainsi que pour défendre nos droits, notre propriété, notre sécurité et celles et ceux d’autres personnes." +#, elixir-format #: lib/web/templates/api/terms.html.heex:23 msgctxt "terms" msgid "Accepting these Terms" msgstr "Acceptation de ces Conditions" +#, elixir-format #: lib/web/templates/api/terms.html.heex:27 msgctxt "terms" msgid "Changes to these Terms" msgstr "Modifications de ces Conditions d'Utilisation" +#, elixir-format #: lib/web/templates/api/terms.html.heex:85 msgctxt "terms" msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content." msgstr "Une grande partie du contenu du Service provient de vous et d'autres personnes, et nous ne l'examinons, ne le vérifions ni ne l'authentifions, et il peut contenir des inexactitudes ou de fausses informations. Nous ne faisons aucune déclaration, garantie ou assurance concernant la qualité, la pertinence, la véracité, l'exactitude ou l'exhaustivité de tout contenu du Service. Vous reconnaissez être seul responsable et assumez tous les risques découlant de votre utilisation ou de votre confiance dans tout contenu." +#, elixir-format #: lib/web/templates/api/terms.html.heex:60 msgctxt "terms" msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:" msgstr "De plus, vous acceptez de ne pas faire ce qui suit en relation avec le Service ou les autres utilisateur·ices :" +#, elixir-format #: lib/web/templates/api/terms.html.heex:65 msgctxt "terms" msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties." msgstr "Contourner ou tenter de contourner tout filtrage, mesures de sécurité, limites d'accès ou autres caractéristiques destinées à protéger le Service, les utilisateur·ices du Service ou des tiers." +#, elixir-format #: lib/web/templates/api/terms.html.heex:64 msgctxt "terms" msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;" msgstr "Recueillir des informations personnelles sur les autres utilisateur·ices, ou intimider, menacer, traquer ou harceler de toute autre manière les autres utilisateurs du Service ;" +#, elixir-format #: lib/web/templates/api/terms.html.heex:55 msgctxt "terms" msgid "Content that is illegal or unlawful, that would otherwise create liability;" msgstr "Du contenu qui est illégal ou illicite, qui autrement entraînerait une responsabilité ;" +#, elixir-format #: lib/web/templates/api/terms.html.heex:56 msgctxt "terms" msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;" msgstr "Du contenu susceptible d'enfreindre ou de violer un brevet, une marque de commerce, un secret commercial, un droit d'auteur, un droit à la vie privée, un droit de publicité ou tout autre droit intellectuel ou autre de toute partie ;" +#, elixir-format #: lib/web/templates/api/terms.html.heex:42 msgctxt "terms" msgid "Creating Accounts" msgstr "Création de compte" +#, elixir-format #: lib/web/templates/api/terms.html.heex:89 msgctxt "terms" msgid "Entire Agreement" msgstr "Accord complet" +#, elixir-format #: lib/web/templates/api/terms.html.heex:92 msgctxt "terms" msgid "Feedback" msgstr "Commentaires" +#, elixir-format #: lib/web/templates/api/terms.html.heex:83 msgctxt "terms" msgid "Hyperlinks and Third Party Content" msgstr "Liens hypertexte et contenu tiers" +#, elixir-format #: lib/web/templates/api/terms.html.heex:88 msgctxt "terms" msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service." msgstr "Si vous enfreignez l'une de ces Conditions, nous avons le droit de suspendre ou de désactiver votre accès ou votre utilisation du Service." +#, elixir-format #: lib/web/templates/api/terms.html.heex:63 msgctxt "terms" msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;" msgstr "Usurper l'identité d'une personne ou d'une entité ou afficher au nom d'une personne ou d'une entité, ou encore présenter de manière inexacte votre affiliation à une personne ou une entité ;" +#, elixir-format #: lib/web/templates/api/terms.html.heex:48 msgctxt "terms" msgid "Our Service allows you and other users to post, link and otherwise make available content. You are responsible for the content that you make available to the Service, including its legality, reliability, and appropriateness." msgstr "Notre Service vous permet, ainsi qu'à d'autres utilisateur·ices, de publier, d'établir des liens et de mettre à disposition du contenu. Vous êtes responsable du contenu que vous mettez à la disposition du service, y compris de sa légalité, de sa fiabilité et de sa pertinence." +#, elixir-format #: lib/web/templates/api/terms.html.heex:39 msgctxt "terms" msgid "Privacy Policy" msgstr "Politique de confidentialité" +#, elixir-format #: lib/web/templates/api/terms.html.heex:95 msgctxt "terms" msgid "Questions & Contact Information" msgstr "Questions et coordonnées" +#, elixir-format #: lib/web/templates/api/terms.html.heex:87 msgctxt "terms" msgid "Termination" msgstr "Résiliation" +#, elixir-format #: lib/web/templates/api/terms.html.heex:62 msgctxt "terms" msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;" msgstr "Utiliser le Service de toute manière qui pourrait interférer, perturber, affecter négativement ou empêcher d'autres utilisateur·ices de profiter pleinement du Service ou qui pourrait endommager, désactiver, surcharger ou altérer le fonctionnement du Service ;" +#, elixir-format #: lib/web/templates/api/terms.html.heex:47 msgctxt "terms" msgid "Your Content & Conduct" msgstr "Votre contenu et votre conduite" +#, elixir-format #: lib/web/templates/api/terms.html.heex:84 msgctxt "terms" msgid "%{instance_name} makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by %{instance_name} of the site. Use of any such linked website is at the user's own risk." msgstr "%{instance_name} ne fait aucune revendication et n'accepte aucune responsabilité concernant les sites web de tiers accessibles par lien hypertexte depuis le Service ou les sites web liés au Service. Lorsque vous quittez le Service, vous devez savoir que les présentes Conditions et nos politiques de confidentialité ne sont plus applicables. L'inclusion d'un lien n'implique pas l'approbation par %{instance_name} du site. L'utilisation de tout site web lié est aux risques et périls de l'utilisateur·ice." +#, elixir-format #: lib/web/templates/api/terms.html.heex:68 msgctxt "terms" msgid "Finally, your use of the Service is also subject to acceptance of the instance's own specific rules regarding the code of conduct and moderation rules. Breaking those rules may also result in your account being disabled or suspended." msgstr "Enfin, votre utilisation du Service est également soumise à l'acceptation des règles spécifiques de l'instance concernant le code de conduite et les règles de modération. Le non-respect de ces règles peut également entraîner la désactivation ou la suspension de votre compte." +#, elixir-format #: lib/web/templates/api/terms.html.heex:81 msgctxt "terms" msgid "For full details about the Mobilizon software see here." msgstr "Pour plus de détails sur le logiciel Mobilizon voir ici." +#, elixir-format #: lib/web/templates/api/terms.html.heex:18 msgctxt "terms" msgid "Here are the important things you need to know about accessing and using the %{instance_name} (%{instance_url}) website and service (collectively, \"Service\"). These are our terms of service (\"Terms\"). Please read them carefully." msgstr "Voici les points importants que vous devez savoir sur l'accès et l'utilisation du site web et du Service %{instance_name} (%{instance_url}) (conjointement, \"Service\"). Ce sont nos conditions de service (\"Conditions\"). Veuillez les lire attentivement." +#, elixir-format #: lib/web/templates/api/terms.html.heex:33 msgctxt "terms" msgid "If we make major changes, we will notify our users in a clear and prominent manner. Minor changes may only be highlighted in the footer of our website. It is your responsibility to check the website regularly for changes to these Terms." msgstr "Si nous apportons des changements majeurs, nous en informerons nos utilisateur·ices de manière claire et visible. Il est possible que les changements mineurs ne soient mis en évidence que dans le pied de page de cette page. Il est de votre responsabilité de vérifier régulièrement sur le site web si des modifications ont été apportées aux présentes Conditions." +#, elixir-format #: lib/web/templates/api/terms.html.heex:53 msgctxt "terms" msgid "In order to make %{instance_name} a great place for all of us, please do not post, link and otherwise make available on or through the Service any of the following:" msgstr "Afin de faire de %{instance_name} un endroit idéal pour nous toutes et tous, nous vous prions de ne pas publier, relier ou rendre disponible sur ou par le biais du Service l'un des éléments suivants :" +#, elixir-format #: lib/web/templates/api/terms.html.heex:57 msgctxt "terms" msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and" msgstr "Les informations privées de toute personne tierce (par exemple, les adresses, les numéros de téléphone, les adresses électroniques, les numéros de sécurité sociale et les numéros de carte de crédit) ; et" +#, elixir-format #: lib/web/templates/api/terms.html.heex:52 msgctxt "terms" msgid "Since Mobilizon is a distributed network, it is possible, depending on the visibility rules set to your content, that your content has been distributed to other Mobilizon instances. When you delete your content, we will request those other instances to also delete the content. Our responsibility on the content being deleted from those other instances ends here. If for some reason, some other instance does not delete the content, we cannot be held responsible." msgstr "Mobilizon étant un réseau distribué, il est possible, en fonction des règles de visibilité définies pour votre contenu, que celui-ci ait été distribué à d'autres instances de Mobilizon. Lorsque vous supprimez votre contenu, nous demandons à ces autres instances de supprimer également le contenu. Notre responsabilité quant au contenu supprimé de ces autres instances s'arrête ici. Si, pour une raison quelconque, une autre instance ne supprime pas le contenu, nous ne pouvons être tenus responsables." +#, elixir-format #: lib/web/templates/api/terms.html.heex:90 msgctxt "terms" msgid "These Terms constitute the entire agreement between you and %{instance_name} regarding the use of the Service, superseding any prior agreements between you and %{instance_name} relating to your use of the Service." msgstr "Les présentes Conditions constituent l'intégralité de l'accord entre vous et %{instance_name} concernant l'utilisation du Service, remplaçant tout accord préalable entre vous et %{instance_name} relatif à votre utilisation du Service." +#, elixir-format #: lib/web/templates/api/terms.html.heex:80 msgctxt "terms" msgid "This Service runs on a Mobilizon instance. This source code is licensed under an AGPLv3 license which means you are allowed to and even encouraged to take the source code, modify it and use it." msgstr "Ce Service fonctionne sur une instance de Mobilizon. Ce code source est sous licence AGPLv3 ce qui signifie que vous êtes autorisé et même encouragé à prendre le code source, le modifier et l'utiliser." +#, elixir-format #: lib/web/templates/api/terms.html.heex:58 msgctxt "terms" msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code." msgstr "Virus, données corrompues ou autres fichiers ou codes nuisibles, perturbateurs ou destructeurs." +#, elixir-format #: lib/web/templates/api/terms.html.heex:51 msgctxt "terms" msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system." msgstr "Vous pouvez supprimer le contenu que vous avez publié en le supprimant. Une fois que vous avez supprimé votre contenu, il n'apparaîtra plus sur le Service, mais des copies de votre contenu supprimé peuvent rester dans notre système ou des sauvegardes pendant un certain temps. Les journaux d'accès au serveur web peuvent également être stockés pendant un certain temps dans le système." +#, elixir-format #: lib/web/templates/api/terms.html.heex:96 msgctxt "terms" msgid "Questions or comments about the Service may be directed to us at %{contact}" msgstr "Les questions ou commentaires concernant le Service peuvent nous être adressés à %{contact}" +#, elixir-format #: lib/web/templates/api/terms.html.heex:79 msgctxt "terms" msgid "Source code" msgstr "Code source" +#, elixir-format #: lib/web/templates/api/terms.html.heex:93 msgctxt "terms" msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, %{instance_name}." msgstr "Nous aimons les retours d'information. N'hésitez pas à nous faire savoir ce que vous pensez du Service, des présentes Conditions et, en général, de %{instance_name}." +#, elixir-format #: lib/web/templates/api/terms.html.heex:74 msgctxt "terms" msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful." msgstr "Les administrateurs d'instance (et les modérateurs de la communauté, sous réserve d'un accès approprié) sont chargés de surveiller et d'agir sur les contenus signalés et autres rapports d'utilisateur·ices, et ont le droit et la responsabilité de supprimer ou de modifier les contenus qui ne sont pas conformes aux règles de cette d'instance, ou de suspendre, bloquer ou interdire (temporairement ou définitivement) tout compte, communauté ou instance pour violation de ces conditions, ou pour d'autres comportements qu'ils jugent inappropriés, menaçants, offensants ou nuisibles." +#, elixir-format #: lib/web/templates/api/terms.html.heex:6 msgctxt "terms" msgid "%{instance_name} will not use or transmit or resell your personal data" msgstr "%{instance_name} n'utilisera pas ni ne transmettra ou revendra vos données" +#, elixir-format #: lib/web/templates/api/terms.html.heex:44 msgctxt "terms" msgid "If you discover or suspect any Service security breaches, please let us know as soon as possible. For security holes in the Mobilizon software itself, please contact its contributors directly." msgstr "Si vous découvrez ou soupçonnez des failles de sécurité du Service, veuillez nous en informer dès que possible. Pour les failles de sécurité dans le logiciel Mobilizon lui-même, veuillez contacter directement ses contributeur·ices." +#, elixir-format #: lib/web/templates/api/terms.html.heex:77 msgctxt "terms" msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules." msgstr "Les administrateur·ices d'instance doivent s'assurer que chaque communauté hébergée sur l'instance est correctement modérée conformément aux règles définies." +#, elixir-format #: lib/web/templates/api/terms.html.heex:98 msgctxt "terms" msgid "Originally adapted from the Diaspora* and App.net privacy policies, also licensed under CC BY-SA." msgstr "Adaptée à l'origine des politiques de confidentialité de Diaspora* et App.net, aussi sous licence CC BY-SA." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:119 msgctxt "terms" msgid "Originally adapted from the Mastodon and Discourse privacy policies, also licensed under CC BY-SA." msgstr "Adaptée à l'origine des politiques de confidentialité de Mastodon et Discourse, aussi sous licence CC BY-SA." +#, elixir-format #: lib/web/templates/api/terms.html.heex:3 msgctxt "terms" msgid "Short version" msgstr "Version courte" +#, elixir-format #: lib/web/templates/api/terms.html.heex:9 msgctxt "terms" msgid "The service is provided without warranties and these terms may change in the future" msgstr "Le service est fourni sans garanties et ces conditions peuvent changer dans le futur" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:118 msgctxt "terms" msgid "This document is licensed under CC BY-SA. It was last updated June 18, 2020." msgstr "Ce document est sous licence CC BY-SA. La dernière mise à jour date du 18 juin 2020." +#, elixir-format #: lib/web/templates/api/terms.html.heex:97 msgctxt "terms" msgid "This document is licensed under CC BY-SA. It was last updated June 22, 2020." msgstr "Ce document est sous licence CC BY-SA. La dernière mise à jour date du 22 juin 2020." +#, elixir-format #: lib/web/templates/api/terms.html.heex:8 msgctxt "terms" msgid "You must respect other people and %{instance_name}'s rules when using the service" msgstr "Vous devez respecter les autres et les règles de %{instance_name} lorsque vous utilisez le service" +#, elixir-format #: lib/web/templates/api/terms.html.heex:7 msgctxt "terms" msgid "You must respect the law when using %{instance_name}" msgstr "Vous devez respecter la loi lorsque vous utilisez %{instance_name}" +#, elixir-format #: lib/web/templates/api/terms.html.heex:5 msgctxt "terms" msgid "Your content is yours" msgstr "Votre contenu vous appartient" +#, elixir-format #: lib/web/templates/email/anonymous_participation_confirmation.html.heex:51 msgid "Confirm my e-mail address" msgstr "Confirmer mon adresse email" -#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:13 lib/web/templates/email/anonymous_participation_confirmation.text.eex:1 +#, elixir-format +#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:13 +#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:1 msgid "Confirm your e-mail" msgstr "Confirmez votre adresse email" +#, elixir-format #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:3 msgid "Hi there! You just registered to join this event: « %{title} ». Please confirm the e-mail address you provided:" msgstr "Salut ! Vous venez de vous enregistrer pour rejoindre cet événement : « %{title} ». Merci de confirmer l'adresse email que vous avez fournie :" -#: lib/web/templates/email/email.html.heex:117 lib/web/templates/email/email.text.eex:8 +#, elixir-format +#: lib/web/templates/email/email.html.heex:117 +#: lib/web/templates/email/email.text.eex:8 msgid "Need help? Is something not working as expected?" msgstr "Besoin d'aide ? Quelque chose ne fonctionne pas correctement ?" +#, elixir-format #: lib/web/templates/email/registration_confirmation.html.heex:38 msgid "You created an account on %{host} with this email address. You are one click away from activating it." msgstr "Vous avez créé un compte sur %{host} avec cette adresse email. Vous êtes à un clic de l'activer." +#, elixir-format #: lib/web/templates/email/report.html.heex:13 msgid "New report on %{instance}" msgstr "Nouveau signalement sur %{instance}" +#, elixir-format #: lib/web/templates/email/email_changed_old.html.heex:38 msgid "The email address for your account on %{host} is being changed to:" msgstr "L'adresse email pour votre compte sur %{host} est en train d'être changée pour :" +#, elixir-format #: lib/web/templates/email/password_reset.html.heex:38 msgid "You requested a new password for your account on %{instance}." msgstr "Vous avez demandé un nouveau mot de passe pour votre compte sur %{instance}." +#, elixir-format #: lib/web/templates/email/email.text.eex:5 msgid "Please do not use it for real purposes." msgstr "Veuillez ne pas l'utiliser pour un cas réel." -#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:63 lib/web/templates/email/anonymous_participation_confirmation.text.eex:6 lib/web/templates/email/event_updated.html.heex:133 lib/web/templates/email/event_updated.text.eex:14 lib/web/templates/email/notification_each_week.html.heex:60 lib/web/templates/email/notification_each_week.text.eex:11 lib/web/templates/email/on_day_notification.html.heex:60 lib/web/templates/email/on_day_notification.text.eex:11 +#, elixir-format +#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:63 +#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:6 lib/web/templates/email/event_updated.html.heex:133 +#: lib/web/templates/email/event_updated.text.eex:14 lib/web/templates/email/notification_each_week.html.heex:60 +#: lib/web/templates/email/notification_each_week.text.eex:11 lib/web/templates/email/on_day_notification.html.heex:60 +#: lib/web/templates/email/on_day_notification.text.eex:11 msgid "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button." msgid_plural "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button." msgstr[0] "Si vous avez besoin d'annuler votre participation, il suffit d'accéder à la page de l'événement à partir du lien ci-dessus et de cliquer sur le bouton « Je participe »." msgstr[1] "Si vous avez besoin d'annuler votre participation à un ou plusieurs événements, il suffit d'accéder aux pages des événement grâce aux liens ci-dessus et de cliquer sur le bouton « Je participe »." +#, elixir-format #: lib/web/templates/email/email.text.eex:11 msgid "%{instance} is powered by Mobilizon." msgstr "%{instance} est une instance Mobilizon." +#, elixir-format #: lib/web/templates/email/email.html.heex:152 msgid "%{instance} is powered by Mobilizon." msgstr "%{instance} est une instance Mobilizon." -#: lib/web/templates/email/pending_participation_notification.html.heex:13 lib/web/templates/email/pending_participation_notification.text.eex:1 +#, elixir-format +#: lib/web/templates/email/pending_participation_notification.html.heex:13 +#: lib/web/templates/email/pending_participation_notification.text.eex:1 msgid "A request is pending!" msgstr "Une demande est en attente !" -#: lib/web/templates/email/before_event_notification.html.heex:13 lib/web/templates/email/before_event_notification.text.eex:1 +#, elixir-format +#: lib/web/templates/email/before_event_notification.html.heex:13 +#: lib/web/templates/email/before_event_notification.text.eex:1 msgid "An event is upcoming!" msgstr "Un événement est à venir !" -#: lib/web/templates/email/email_changed_new.html.heex:13 lib/web/templates/email/email_changed_new.text.eex:1 +#, elixir-format +#: lib/web/templates/email/email_changed_new.html.heex:13 +#: lib/web/templates/email/email_changed_new.text.eex:1 msgid "Confirm new email" msgstr "Confirmez votre adresse email" +#, elixir-format #: lib/web/templates/email/event_updated.html.heex:84 msgid "End" msgstr "Fin" -#: lib/web/templates/email/event_updated.html.heex:13 lib/web/templates/email/event_updated.text.eex:1 +#, elixir-format +#: lib/web/templates/email/event_updated.html.heex:13 +#: lib/web/templates/email/event_updated.text.eex:1 msgid "Event update!" msgstr "Événement mis à jour !" +#, elixir-format #: lib/web/templates/email/report.html.heex:88 msgid "Flagged comments" msgstr "Commentaires signalés" -#: lib/web/templates/email/event_participation_approved.html.heex:45 lib/web/templates/email/event_participation_approved.text.eex:7 +#, elixir-format +#: lib/web/templates/email/event_participation_approved.html.heex:45 +#: lib/web/templates/email/event_participation_approved.text.eex:7 msgid "Good news: one of the event organizers just approved your request. Update your calendar, because you're on the guest list now!" msgstr "Bonne nouvelle : un·e des organisateur·ices de l'événement vient d'approuver votre demande. Mettez à jour votre agenda, car vous êtes maintenant un·e participant·e !" -#: lib/web/templates/email/email_changed_new.html.heex:38 lib/web/templates/email/email_changed_new.text.eex:3 +#, elixir-format +#: lib/web/templates/email/email_changed_new.html.heex:38 +#: lib/web/templates/email/email_changed_new.text.eex:3 msgid "Hi there! It seems like you wanted to change the email address linked to your account on %{instance}. If you still wish to do so, please click the button below to confirm the change. You will then be able to log in to %{instance} with this new email address." msgstr "Salut ! Il semblerait que vous avez demandé la modification de l'adresse e-mail liée à votre compte sur %{instance}. Si vous voulez toujours effectuer ce changement, merci de cliquer sur le bouton ci-dessous pour confirmer la modification. Vous pourrez alors vous connecter à %{instance} avec cette nouvelle adresse." +#, elixir-format #: lib/web/templates/email/email_changed_old.text.eex:3 msgid "Hi there! Just a quick note to confirm that the email address linked to your account on %{host} has been changed from this one to:" msgstr "Salut ! Juste un petite note pour confirmer que l'adresse e-mail liée à votre compte sur %{host} a été changée depuis celle-ci à :" -#: lib/web/templates/email/email_changed_old.html.heex:62 lib/web/templates/email/email_changed_old.text.eex:5 +#, elixir-format +#: lib/web/templates/email/email_changed_old.html.heex:62 +#: lib/web/templates/email/email_changed_old.text.eex:5 msgid "If you did not trigger this change yourself, it is likely that someone has gained access to your %{host} account. Please log in and change your password immediately. If you cannot login, contact the admin on %{host}." msgstr "Si vous n'avez pas effectué cette modification vous-même, il est probable que quelqu'un ait eu accès à votre compte %{host}. Veuillez vous connecter et changer immédiatement votre mot de passe. Si vous ne pouvez pas vous connecter, contactez l'administrateur·ice sur %{host}." +#, elixir-format #: lib/web/templates/email/password_reset.text.eex:12 msgid "If you didn't trigger the change yourself, please ignore this message. Your password won't be changed until you click the link above." msgstr "Si vous n'êtes pas à l'origine de cette modification, merci d'ignorer ce message. Votre mot de passe ne sera pas modifié tant que vous ne cliquerez pas le lien ci-dessus." -#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:70 lib/web/templates/email/anonymous_participation_confirmation.text.eex:4 lib/web/templates/email/registration_confirmation.html.heex:45 +#, elixir-format +#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:70 +#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:4 lib/web/templates/email/registration_confirmation.html.heex:45 msgid "If you didn't trigger this email, you may safely ignore it." msgstr "Si vous n'avez pas déclenché cette alerte, vous pouvez ignorer cet e-mail sans souci." -#: lib/web/templates/email/before_event_notification.html.heex:63 lib/web/templates/email/before_event_notification.text.eex:6 +#, elixir-format +#: lib/web/templates/email/before_event_notification.html.heex:63 +#: lib/web/templates/email/before_event_notification.text.eex:6 msgid "If you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button." msgstr "Si vous avez besoin d'annuler votre participation, il suffit d'accéder à la page de l'événement à partir du lien ci-dessus et de cliquer sur le bouton « Je participe »." -#: lib/web/templates/email/email.html.heex:153 lib/web/templates/email/email.text.eex:11 +#, elixir-format +#: lib/web/templates/email/email.html.heex:153 +#: lib/web/templates/email/email.text.eex:11 msgid "Learn more about Mobilizon here!" msgstr "En apprendre plus à propos de Mobilizon ici !" -#: lib/web/templates/email/event_updated.html.heex:94 lib/web/templates/export/event_participants.html.heex:129 +#, elixir-format +#: lib/web/templates/email/event_updated.html.heex:94 +#: lib/web/templates/export/event_participants.html.heex:129 msgid "Location" msgstr "Localisation" +#, elixir-format #: lib/web/templates/email/event_updated.html.heex:104 msgid "Location address was removed" msgstr "L'adresse physique a été enlevée" -#: lib/web/templates/email/pending_participation_notification.html.heex:56 lib/web/templates/email/pending_participation_notification.text.eex:8 +#, elixir-format +#: lib/web/templates/email/pending_participation_notification.html.heex:56 +#: lib/web/templates/email/pending_participation_notification.text.eex:8 msgid "Manage pending requests" msgstr "Gérer les demandes de participation en attente" -#: lib/web/templates/email/registration_confirmation.html.heex:13 lib/web/templates/email/registration_confirmation.text.eex:1 +#, elixir-format +#: lib/web/templates/email/registration_confirmation.html.heex:13 +#: lib/web/templates/email/registration_confirmation.text.eex:1 msgid "Nearly there!" msgstr "Vous y êtes presque !" -#: lib/web/templates/email/email_changed_old.html.heex:13 lib/web/templates/email/email_changed_old.text.eex:1 +#, elixir-format +#: lib/web/templates/email/email_changed_old.html.heex:13 +#: lib/web/templates/email/email_changed_old.text.eex:1 msgid "New email confirmation" msgstr "Confirmation de nouvel e-mail" +#, elixir-format #: lib/web/templates/email/report.html.heex:106 msgid "Reasons for report" msgstr "Raisons du signalement" +#, elixir-format #: lib/web/templates/email/report.html.heex:39 msgid "Someone on %{instance} reported the following content for you to analyze:" msgstr "Une personne de %{instance} a signalé le contenu suivant :" -#: lib/web/templates/email/event_participation_rejected.html.heex:13 lib/web/templates/email/event_participation_rejected.text.eex:1 +#, elixir-format +#: lib/web/templates/email/event_participation_rejected.html.heex:13 +#: lib/web/templates/email/event_participation_rejected.text.eex:1 msgid "Sorry! You're not going." msgstr "Désolé ! Vous n'y allez pas." +#, elixir-format #: lib/web/templates/email/event_updated.html.heex:74 msgid "Start" msgstr "Début" +#, elixir-format #: lib/web/templates/email/event_updated.text.eex:3 msgid "There have been changes for %{title} so we'd thought we'd let you know." msgstr "Il y a eu des changements pour %{title} donc nous avons pensé que nous vous le ferions savoir." -#: lib/web/templates/email/event_updated.html.heex:55 lib/web/templates/email/event_updated.text.eex:6 +#, elixir-format +#: lib/web/templates/email/event_updated.html.heex:55 +#: lib/web/templates/email/event_updated.text.eex:6 msgid "This event has been cancelled by its organizers. Sorry!" msgstr "Cet événement a été annulé par ses organisateur·ices. Désolé !" -#: lib/web/templates/email/event_updated.html.heex:51 lib/web/templates/email/event_updated.text.eex:4 +#, elixir-format +#: lib/web/templates/email/event_updated.html.heex:51 +#: lib/web/templates/email/event_updated.text.eex:4 msgid "This event has been confirmed" msgstr "L'événement a été confirmé" -#: lib/web/templates/email/event_updated.html.heex:53 lib/web/templates/email/event_updated.text.eex:5 +#, elixir-format +#: lib/web/templates/email/event_updated.html.heex:53 +#: lib/web/templates/email/event_updated.text.eex:5 msgid "This event has yet to be confirmed: organizers will let you know if they do confirm it." msgstr "Cet événement doit encore être confirmé : les organisateur·ices vous feront savoir si l'événement est confirmé." -#: lib/web/templates/email/event_participation_rejected.html.heex:45 lib/web/templates/email/event_participation_rejected.text.eex:7 +#, elixir-format +#: lib/web/templates/email/event_participation_rejected.html.heex:45 +#: lib/web/templates/email/event_participation_rejected.text.eex:7 msgid "Unfortunately, the organizers rejected your request." msgstr "Malheureusement, les organisateur⋅ices ont rejeté votre demande de participation." +#, elixir-format #: lib/web/templates/email/email_changed_new.html.heex:51 msgid "Verify your email address" msgstr "Vérifier l'adresse email" +#, elixir-format #: lib/web/templates/email/report.html.heex:126 msgid "View report" msgstr "Voir le signalement" +#, elixir-format #: lib/web/templates/email/report.text.eex:24 msgid "View report:" msgstr "Voir le signalement :" -#: lib/web/templates/email/email_anonymous_activity.html.heex:67 lib/web/templates/email/event_participation_approved.html.heex:58 lib/web/templates/email/event_participation_confirmed.html.heex:58 +#, elixir-format +#: lib/web/templates/email/email_anonymous_activity.html.heex:67 +#: lib/web/templates/email/event_participation_approved.html.heex:58 lib/web/templates/email/event_participation_confirmed.html.heex:58 msgid "Visit event page" msgstr "Voir la page de l'événement" +#, elixir-format #: lib/web/templates/email/event_updated.html.heex:121 msgid "Visit the updated event page" msgstr "Voir la page de l'événement mis à jour" +#, elixir-format #: lib/web/templates/email/event_updated.text.eex:12 msgid "Visit the updated event page: %{link}" msgstr "Voir l'événement mis à jour sur : %{link}" -#: lib/web/templates/email/on_day_notification.html.heex:13 lib/web/templates/email/on_day_notification.text.eex:1 +#, elixir-format +#: lib/web/templates/email/on_day_notification.html.heex:13 +#: lib/web/templates/email/on_day_notification.text.eex:1 msgid "What's up today?" msgstr "Quoi de neuf aujourd'hui ?" -#: lib/web/templates/email/event_participation_approved.html.heex:70 lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.heex:70 lib/web/templates/email/event_participation_confirmed.text.eex:6 +#, elixir-format +#: lib/web/templates/email/event_participation_approved.html.heex:70 +#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.heex:70 +#: lib/web/templates/email/event_participation_confirmed.text.eex:6 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button." msgstr "Si vous souhaitez mettre à jour ou annuler votre participation, il vous suffit d'accéder à la page de l'événement par le lien ci-dessus et de cliquer sur le bouton Participer." -#: lib/web/templates/email/pending_participation_notification.html.heex:69 lib/web/templates/email/pending_participation_notification.text.eex:10 +#, elixir-format +#: lib/web/templates/email/pending_participation_notification.html.heex:69 +#: lib/web/templates/email/pending_participation_notification.text.eex:10 msgid "You are receiving this email because you chose to get notifications for pending attendance requests to your events. You can disable or change your notification settings in your user account settings under « Notifications »." msgstr "Vous recevez ce courriel parce que vous avez choisi de recevoir des notifications pour les demandes de participation en attente à vos événements. Vous pouvez désactiver ou modifier vos paramètres de notification dans les paramètres de votre compte utilisateur dans « Notifications »." +#, elixir-format #: lib/web/templates/email/event_participation_rejected.text.eex:5 msgid "You issued a request to attend %{title}." msgstr "Vous avez effectué une demande de participation à %{title}." -#: lib/web/templates/email/event_participation_approved.text.eex:5 lib/web/templates/email/event_participation_confirmed.text.eex:3 +#, elixir-format +#: lib/web/templates/email/event_participation_approved.text.eex:5 +#: lib/web/templates/email/event_participation_confirmed.text.eex:3 msgid "You recently requested to attend %{title}." msgstr "Vous avez demandé à participer à l'événement %{title}." -#: lib/web/templates/email/event_participation_approved.html.heex:13 lib/web/templates/email/event_participation_confirmed.html.heex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1 +#, elixir-format +#: lib/web/templates/email/event_participation_approved.html.heex:13 +#: lib/web/templates/email/event_participation_confirmed.html.heex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1 msgid "You're going!" msgstr "Vous y allez !" -#: lib/web/templates/email/email_changed_new.html.heex:64 lib/web/templates/email/email_changed_new.text.eex:5 +#, elixir-format +#: lib/web/templates/email/email_changed_new.html.heex:64 +#: lib/web/templates/email/email_changed_new.text.eex:5 msgid "If you didn't trigger the change yourself, please ignore this message." msgstr "Si vous n'êtes pas à l'origine de cette modification, merci d'ignorer ce message." +#, elixir-format #: lib/web/templates/email/email.html.heex:92 msgid "Please do not use it for real purposes." msgstr "Veuillez ne pas l'utiliser pour un cas réel." -#: lib/web/templates/email/group_member_removal.html.heex:45 lib/web/templates/email/group_member_removal.text.eex:5 +#, elixir-format +#: lib/web/templates/email/group_member_removal.html.heex:45 +#: lib/web/templates/email/group_member_removal.text.eex:5 msgid "If you feel this is an error, you may contact the group's administrators so that they can add you back." msgstr "Si vous pensez qu'il s'agit d'une erreur, vous pouvez contacter les administrateurs du groupe afin qu'ils vous réintègrent." -#: lib/web/templates/email/group_member_removal.html.heex:13 lib/web/templates/email/group_member_removal.text.eex:1 +#, elixir-format +#: lib/web/templates/email/group_member_removal.html.heex:13 +#: lib/web/templates/email/group_member_removal.text.eex:1 msgid "So long, and thanks for the fish!" msgstr "Salut, et encore merci pour le poisson !" +#, elixir-format #: lib/web/email/member.ex:113 msgid "You have been removed from group %{group}" msgstr "Vous avez été enlevé du groupe %{group}" +#, elixir-format #: lib/web/templates/email/group_member_removal.text.eex:3 msgid "You have been removed from group %{group}. You will not be able to access this group's private content anymore." msgstr "Vous avez été enlevé du groupe %{group}. Vous ne serez plus en mesure d'accéder au contenu privé du groupe." +#, elixir-format #: lib/web/templates/email/group_invite.html.heex:38 msgid "%{inviter} just invited you to join their group %{link_start}%{group}%{link_end}" msgstr "%{inviter} vient de vous inviter à rejoindre son groupe %{link_start}%{group}%{link_end}" +#, elixir-format #: lib/web/templates/email/group_member_removal.html.heex:38 msgid "You have been removed from group %{link_start}%{group}%{link_end}. You will not be able to access this group's private content anymore." msgstr "Vous avez été enlevé du groupe %{link_start}%{group}%{link_end}. Vous ne serez plus en mesure d'accéder au contenu privé du groupe." -#: lib/web/templates/email/group_suspension.html.heex:54 lib/web/templates/email/group_suspension.text.eex:7 +#, elixir-format +#: lib/web/templates/email/group_suspension.html.heex:54 +#: lib/web/templates/email/group_suspension.text.eex:7 msgid "As this group was located on another instance, it will continue to work for other instances than this one." msgstr "Comme ce groupe était originaire d'une autre instance, il continuera à fonctionner pour d'autres instances que celle-ci." -#: lib/web/templates/email/group_suspension.html.heex:46 lib/web/templates/email/group_suspension.text.eex:5 +#, elixir-format +#: lib/web/templates/email/group_suspension.html.heex:46 +#: lib/web/templates/email/group_suspension.text.eex:5 msgid "As this group was located on this instance, all of it's data has been irretrievably deleted." msgstr "Comme ce groupe était originaire de cette instance, toutes ses données ont été irrémédiablement détruites." -#: lib/web/templates/email/group_suspension.html.heex:13 lib/web/templates/email/group_suspension.text.eex:1 +#, elixir-format +#: lib/web/templates/email/group_suspension.html.heex:13 +#: lib/web/templates/email/group_suspension.text.eex:1 msgid "The group %{group} has been suspended on %{instance}!" msgstr "Le groupe %{group} a été suspendu sur %{instance} !" +#, elixir-format #: lib/web/templates/email/group_suspension.text.eex:3 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group." msgstr "L'équipe de modération de votre instance a décidé de suspendre %{group_name} (%{group_address}). Vous n'êtes désormais plus membre de ce groupe." +#, elixir-format #: lib/web/email/group.ex:89 msgid "The group %{group} has been suspended on %{instance}" msgstr "Le groupe %{group} a été suspendu sur %{instance}" +#, elixir-format #: lib/web/templates/api/terms.html.heex:24 msgctxt "terms" msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}." msgstr "Si vous accédez au Service ou utilisez le Service, cela signifie que vous acceptez d'être lié·e par toutes les Conditions ci-dessous. Si une condition n'a pas de sens pour vous, veuillez nous le faire savoir en contactant %{contact}." +#, elixir-format #: lib/web/templates/api/terms.html.heex:40 msgctxt "terms" msgid "For information about how we collect and use information about users of the Service, please check our privacy policy." msgstr "Pour savoir comment nous recueillons et utilisons les informations sur les utilisateur·ice·s du Service, veuillez consulter notre politique de confidentialité." +#, elixir-format #: lib/web/templates/api/terms.html.heex:36 msgctxt "terms" msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms." msgstr "Si vous continuez à utiliser le Service après l'entrée en vigueur des Conditions révisées, vous acceptez les conditions révisées." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:78 msgctxt "terms" msgid "If you delete this information, you need to login again." msgstr "Si vous supprimez ces informations, vous devrez vous connecter de nouveau." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:80 msgctxt "terms" msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser." msgstr "Si vous n'êtes pas connecté·e, nous ne conserverons aucune information sur votre appareil, sauf si vous participez anonymement à un événement. Dans ce cas spécifique nous conservons le hash d'un identifiant unique pour l'événement et les statuts de participation dans votre navigateur pour pouvoir les afficher. Supprimer ces informations aura pour seule conséquence que votre participation ne sera plus affichée dans votre navigateur." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:87 msgctxt "terms" msgid "Note: This information is stored in your localStorage and not your cookies." msgstr "Attention : Ces informations sont conservées dans votre stockage local et non vos cookies." +#, elixir-format #: lib/web/templates/api/terms.html.heex:71 msgctxt "terms" msgid "Our responsibility" msgstr "Notre responsabilité" +#, elixir-format #: lib/web/templates/api/privacy.html.heex:61 msgctxt "terms" msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days." msgstr "Conserver les journaux du serveur contenant l'adresse IP de toutes les demandes adressées à ce serveur, dans la mesure où ces journaux sont conservés, pas plus de 90 jours." -#: lib/web/templates/api/privacy.html.heex:3 lib/web/templates/api/terms.html.heex:15 +#, elixir-format +#: lib/web/templates/api/privacy.html.heex:3 +#: lib/web/templates/api/terms.html.heex:15 msgctxt "terms" msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided a glossary to help you understand them better." msgstr "Certains termes, techniques ou non, utilisés dans le texte ci-dessous peuvent recouvrir des concepts difficiles à appréhender. Nous vous proposons un glossaire qui pourra vous aider à mieux les comprendre." +#, elixir-format #: lib/web/templates/api/terms.html.heex:45 msgctxt "terms" msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge." msgstr "Nous ne sommes pas responsables des pertes que vous pourriez subir si quelqu'un d'autre utilise votre adresse électronique ou votre mot de passe, à votre insu ou non." +#, elixir-format #: lib/web/templates/api/terms.html.heex:50 msgctxt "terms" msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service." msgstr "Nous ne pouvons être tenus responsables si une erreur de programmation ou d'administration rend votre contenu visible à un public plus large que celui que vous aviez prévu. Outre notre droit limité sur votre contenu, vous conservez tous vos droits sur le contenu que vous publiez, mettez en lien et rendez disponible sur ou via le Service." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:10 msgctxt "terms" msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter an email address, a password (hashed) and at least an username. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly. You may however visit this instance without registering." @@ -922,412 +1159,531 @@ msgstr "" "Nous collectons des informations sur vous lorsque vous vous inscrivez sur cette instance et récupérons des données lorsque vous utilisez la plateforme en lisant, écrivant, et en interagissant avec les contenus partagés. Si vous vous inscrivez sur cette instance, nous vous demanderons une adresse courriel, un mot de passe (haché) et au moins un nom d'utilisateur.ice. Votre adresse courriel sera vérifiée par l'envoi d'un courriel de confirmation contenant un lien unique. Si ce lien est activé, nous saurons que vous contrôlez cette adresse courriel. Vous pouvez également entrer des informations supplémentaires au profil, comme un pseudonyme, une biographie, une image de profil et une image d'en-tête. Le nom d'utilisateur, le pseudonyme affiché, la " "biographie, les images de profil et d'en-tête sont toujours publiques. Vous pouvez toutefois utiliser ce serveur sans vous inscrire." +#, elixir-format #: lib/web/templates/api/terms.html.heex:30 msgctxt "terms" msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature." msgstr "Nous nous réservons le droit de modifier ces Conditions à tout moment. Par exemple, nous pouvons être amenés à modifier ces Conditions si nous proposons une nouvelle fonctionnalité." +#, elixir-format #: lib/web/templates/api/terms.html.heex:20 msgctxt "terms" msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by Framasoft, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the \"About this instance\" page." msgstr "Lorsque nous disons « nous », « notre » ou « nos » dans ce document, nous faisons référence aux propriétaires, opérateur·ices et administrateur·ices de cette instance de Mobilizon. Le logiciel Mobilizon est fourni par l'équipe des contributeur·ices de Mobilizon, soutenue par Framasoft, une organisation française d'éducation populaire à but non lucratif qui défend les logiciels libres. Sauf mention explicite, cette instance de Mobilizon est un service indépendant utilisant le code source de Mobilizon. Vous pouvez trouver plus d'informations sur cette instance sur la page « A propos de cette instance »." +#, elixir-format #: lib/web/templates/api/terms.html.heex:43 msgctxt "terms" msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to %{instance_name}." msgstr "Lorsque vous créez un compte, vous acceptez également de maintenir la sécurité et la confidentialité de votre mot de passe et vous acceptez tous les risques d'accès non autorisé aux données de votre compte et à toute autre information que vous fournissez à %{instance_name}." +#, elixir-format #: lib/web/templates/api/terms.html.heex:49 msgctxt "terms" msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set." msgstr "Lorsque vous publiez, liez ou mettez à disposition un contenu sur le Service, vous nous accordez le droit et la licence d'afficher et de distribuer votre contenu sur ou via le Service (y compris via des applications). Nous pouvons formater votre contenu pour l'afficher dans le Service, mais nous ne modifierons pas ou ne réviserons pas la substance de votre contenu lui-même. L'affichage et la distribution de votre contenu se fait strictement selon les règles de visibilité que vous avez définies pour le contenu. Nous ne modifierons pas la visibilité du contenu que vous avez défini." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:19 msgctxt "terms" msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them." msgstr "Vos événements et commentaires sont transmis aux instances qui suivent la vôtre, ce qui signifie que d'autres instances posséderont des copies de ces contenus. Lorsque vous supprimez un événement ou un commentaire, ceci est transmis de la même façon aux autres instances. Toutes les interactions liées aux fonctionnalités des événements - comme rejoindre un événement - ou bien aux fonctionnalités de groupes - comme gérer ses ressources - sont également fédérées. Veuillez noter que les administrateur·ices de cette instance et de toutes les instances fédérées peuvent voir ces messages, et que les destinataires peuvent les copier, en faire des captures d'écran et les repartager de différentes façons." +#, elixir-format #: lib/web/templates/api/privacy.html.heex:99 msgctxt "terms" msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one." msgstr "Votre contenu peut être téléchargé par d'autres instances du réseau. Vos événements publics et commentaires sont transmis aux instances abonnées à votre instance. Le contenu créé à travers un groupe est transmis à toutes les instances de tous les membres du groupe, si celleux-ci sont inscrit·e·s sur une autre instance que la vôtre." +#, elixir-format #: lib/web/templates/email/event_participation_confirmed.text.eex:4 msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!" msgstr "Vous avez confirmé votre participation. Mettez à jour votre agenda, car vous êtes maintenant sur la liste des invités !" -#: lib/web/templates/email/event_participation_approved.html.heex:38 lib/web/templates/email/event_participation_confirmed.html.heex:38 +#, elixir-format +#: lib/web/templates/email/event_participation_approved.html.heex:38 +#: lib/web/templates/email/event_participation_confirmed.html.heex:38 msgid "You recently requested to attend %{title}." msgstr "Vous avez demandé à participer à l'événement %{title}." +#, elixir-format #: lib/web/email/participation.ex:90 msgid "Your participation to event %{title} has been confirmed" msgstr "Votre participation à l'événement %{title} a été approuvée" +#, elixir-format #: lib/web/templates/email/report.html.heex:41 msgid "%{reporter} reported the following content." msgstr "%{reporter} a signalé le contenu suivant." +#, elixir-format #: lib/web/templates/email/report.text.eex:5 msgid "Group %{group} was reported" msgstr "Le groupe %{group} a été signalé" +#, elixir-format #: lib/web/templates/email/report.html.heex:51 msgid "Group reported" msgstr "Groupe signalé" +#, elixir-format #: lib/web/templates/email/report.text.eex:7 msgid "Profile %{profile} was reported" msgstr "Le profil %{profile} a été signalé" +#, elixir-format #: lib/web/templates/email/report.html.heex:56 msgid "Profile reported" msgstr "Profil signalé" +#, elixir-format #: lib/web/templates/email/event_participation_confirmed.html.heex:45 msgid "You have now confirmed your participation. Update your calendar, because you're on the guest list now!" msgstr "Vous avez maintenant confirmé votre participation. Mettez à jour votre agenda, car vous êtes maintenant sur la liste des invités !" +#, elixir-format #: lib/mobilizon/posts/post.ex:99 msgid "A text is required for the post" msgstr "Un texte est requis pour le billet" +#, elixir-format #: lib/mobilizon/posts/post.ex:98 msgid "A title is required for the post" msgstr "Un titre est requis pour le billet" +#, elixir-format #: lib/web/templates/email/instance_follow.text.eex:3 msgid "%{name} (%{domain}) just requested to follow your instance." msgstr "%{name} (%{domain}) vient de demander à suivre votre instance." +#, elixir-format #: lib/web/email/follow.ex:54 msgid "%{name} requests to follow your instance" msgstr "%{name} demande à suivre votre instance" +#, elixir-format #: lib/web/templates/email/instance_follow.html.heex:38 msgid "%{name} (%{domain}) just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." msgstr "%{name} (%{domain}) vient de demander à suivre votre instance. Si vous acceptez, leur instance recevra tous les événements publics de votre 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." msgstr "Si vous acceptez, leur instance recevra tous les événements publics de votre instance." +#, elixir-format #: lib/web/email/follow.ex:48 msgid "Instance %{name} (%{domain}) requests to follow your instance" msgstr "L'instance %{name} (%{domain}) demande à suivre votre instance" +#, elixir-format #: lib/web/templates/email/instance_follow.html.heex:66 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 +#, 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." msgstr "Pour accepter cette invitation, rendez-vous dans vos groupes." -#: lib/web/templates/email/instance_follow.html.heex:13 lib/web/templates/email/instance_follow.text.eex:1 +#, elixir-format +#: lib/web/templates/email/instance_follow.html.heex:13 +#: lib/web/templates/email/instance_follow.text.eex:1 msgid "Want to connect?" msgstr "Voulez-vous vous connecter ?" -#: lib/web/templates/email/instance_follow.html.heex:45 lib/web/templates/email/instance_follow.text.eex:5 +#, elixir-format +#: lib/web/templates/email/instance_follow.html.heex:45 +#: lib/web/templates/email/instance_follow.text.eex:5 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." +#, elixir-format #: lib/web/templates/email/anonymous_participation_confirmation.html.heex:38 msgid "Hi there! You just registered to join this event: « %{title} ». Please confirm the e-mail address you provided:" msgstr "Salut ! Vous venez de vous enregistrer pour rejoindre cet événement : « %{title} ». Merci de confirmer l'adresse email que vous avez fournie :" +#, elixir-format #: lib/web/templates/email/event_participation_rejected.html.heex:38 msgid "You issued a request to attend %{title}." msgstr "Vous avez effectué une demande de participation à %{title}." +#, elixir-format #: lib/web/templates/email/event_updated.html.heex:64 msgid "Event title" msgstr "Titre de l'événement" +#, elixir-format #: lib/web/templates/email/event_updated.html.heex:38 msgid "There have been changes for %{title} so we'd thought we'd let you know." msgstr "Il y a eu des changements pour %{title} donc nous avons pensé que nous vous le ferions savoir." +#, elixir-format #: lib/web/templates/error/500_page.html.heex:7 msgid "This page is not correct" msgstr "Cette page n’est pas correcte" +#, elixir-format #: lib/web/templates/error/500_page.html.heex:50 msgid "We're sorry, but something went wrong on our end." msgstr "Nous sommes désolé·e·s, mais quelque chose s’est mal passé de notre côté." -#: lib/web/templates/email/email.html.heex:91 lib/web/templates/email/email.text.eex:4 +#, elixir-format +#: lib/web/templates/email/email.html.heex:91 +#: lib/web/templates/email/email.text.eex:4 msgid "This is a demonstration site to test Mobilizon." msgstr "Ceci est un site de démonstration permettant de tester Mobilizon." -#: lib/service/metadata/actor.ex:91 lib/service/metadata/actor.ex:99 lib/service/metadata/instance.ex:56 lib/service/metadata/instance.ex:62 +#, elixir-format +#: lib/service/metadata/actor.ex:91 lib/service/metadata/actor.ex:99 +#: lib/service/metadata/instance.ex:56 lib/service/metadata/instance.ex:62 msgid "%{name}'s feed" msgstr "Flux de %{name}" +#, elixir-format #: lib/service/export/feed.ex:115 msgid "%{actor}'s private events feed on %{instance}" msgstr "Flux privé des événements de %{actor} sur %{instance}" +#, elixir-format #: lib/service/export/feed.ex:110 msgid "%{actor}'s public events feed on %{instance}" msgstr "Flux public des événements de %{actor} sur %{instance}" +#, elixir-format #: lib/service/export/feed.ex:219 msgid "Feed for %{email} on %{instance}" msgstr "Flux pour %{email} sur %{instance}" +#, elixir-format #: lib/web/templates/error/500_page.html.heex:57 msgid "If the issue persists, you may contact the server administrator at %{contact}." msgstr "Si le problème persiste, vous pouvez contacter l'administrateur⋅ice du serveur à %{contact}." +#, elixir-format #: lib/web/templates/error/500_page.html.heex:55 msgid "If the issue persists, you may try to contact the server administrator." msgstr "Si le problème persiste, vous pouvez essayer de contacter l'administrateur⋅ice du serveur." +#, elixir-format #: lib/web/templates/error/500_page.html.heex:68 msgid "Technical details" msgstr "Détails techniques" +#, elixir-format #: lib/web/templates/error/500_page.html.heex:52 msgid "The Mobilizon server %{instance} seems to be temporarily down." msgstr "Le serveur Mobilizon %{instance} semble être temporairement hors-service." +#, elixir-format #: lib/service/export/feed.ex:67 msgid "Public feed for %{instance}" msgstr "Flux public pour %{instance}" -#: lib/graphql/resolvers/user.ex:298 +#, elixir-format +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "Le mot de passe que vous avez choisi est trop court. Assurez-vous que votre mot de passe contienne au moins 6 caractères." -#: lib/graphql/resolvers/user.ex:304 +#, elixir-format +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "Le jeton que vous avez fourni est invalide. Assurez-vous que l'URL est exactement la même que celle contenue dans le message que vous avez reçu." +#, elixir-format #: lib/web/email/actor.ex:44 msgid "Your participation to %{event} has been cancelled!" msgstr "Votre participation à l'événement %{title} a été annulée !" -#: lib/web/templates/email/actor_suspension_participants.html.heex:38 lib/web/templates/email/actor_suspension_participants.text.eex:3 +#, elixir-format +#: lib/web/templates/email/actor_suspension_participants.html.heex:38 +#: lib/web/templates/email/actor_suspension_participants.text.eex:3 msgid "Your instance's moderation team has decided to suspend %{actor_name} (%{actor_address}). All of their events have been removed and your participation to event %{event} cancelled." msgstr "L'équipe de modération de votre instance a décidé de suspendre %{actor_name} (%{actor_address}). Tous leurs événements ont été supprimés et votre participation à %{event} annulée." +#, elixir-format #: lib/web/templates/email/group_suspension.html.heex:38 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group." msgstr "L'équipe de modération de votre instance a décidé de suspendre %{group_name} (%{group_address}). Vous n'êtes désormais plus membre de ce groupe." -#: lib/web/templates/email/actor_suspension_participants.html.heex:13 lib/web/templates/email/actor_suspension_participants.text.eex:1 +#, elixir-format +#: lib/web/templates/email/actor_suspension_participants.html.heex:13 +#: lib/web/templates/email/actor_suspension_participants.text.eex:1 msgid "Your participation to %{event} on %{instance} has been cancelled!" msgstr "Votre participation à l'événement %{event} sur %{instance} a été annulée !" #. File name template for exported list of participants. Should NOT contain spaces. Make sure the output is going to be something standardized that is acceptable as a file name on most systems. #. File name template for exported list of participants. Should NOT contain spaces. Make sure the output is going to be something standardized that is acceptable as a file name on most systems. #. File name template for exported list of participants. Should NOT contain spaces. Make sure the output is going to be something standardized that is acceptable as a file name on most systems. -#: lib/service/export/participants/csv.ex:73 lib/service/export/participants/ods.ex:77 lib/service/export/participants/pdf.ex:91 +#, elixir-format +#: lib/service/export/participants/csv.ex:73 +#: lib/service/export/participants/ods.ex:77 lib/service/export/participants/pdf.ex:91 msgid "%{event}_participants" msgstr "%{event}_participants" +#, elixir-format #: lib/service/export/participants/common.ex:61 msgid "Participant message" msgstr "Message du participant" +#, elixir-format #: lib/service/export/participants/common.ex:61 msgid "Participant name" msgstr "Nom du participant" +#, elixir-format #: lib/service/export/participants/common.ex:61 msgid "Participant status" msgstr "Statut du participant" +#, elixir-format #: lib/service/export/participants/common.ex:52 msgid "Administrator" msgstr "Administrateur⋅ice" +#, elixir-format #: lib/service/export/participants/common.ex:55 msgid "Creator" msgstr "Créateur⋅ice" +#, elixir-format #: lib/service/export/participants/common.ex:49 msgid "Moderator" msgstr "Modérateur⋅ice" +#, elixir-format #: lib/service/export/participants/common.ex:37 msgid "Not approved" msgstr "Non approuvé⋅e" +#, elixir-format #: lib/service/export/participants/common.ex:40 msgid "Not confirmed" msgstr "Non confirmé⋅e" +#, elixir-format #: lib/service/export/participants/common.ex:46 msgid "Participant" msgstr "Participant⋅e" +#, elixir-format #: lib/service/export/participants/common.ex:43 msgid "Rejected" msgstr "Rejeté⋅e" +#, elixir-format #: lib/web/templates/export/event_participants.html.heex:122 msgid "Begins on" msgstr "Débute le" +#, elixir-format #: lib/web/templates/export/event_participants.html.heex:125 msgid "Ends on" msgstr "Finit le" +#, elixir-format #: lib/web/templates/export/event_participants.html.heex:132 msgid "Number of participants" msgstr "Nombre de participant⋅es" +#, elixir-format #: lib/web/templates/export/event_participants.html.heex:120 msgid "Participants for %{event}" msgstr "Participant⋅es pour %{event}" +#, elixir-format #: lib/service/export/participants/common.ex:88 msgid "Anonymous participant" msgstr "Participant⋅e anonyme" -#: lib/web/templates/email/date/event_tz_date.html.heex:6 lib/web/templates/email/date/event_tz_date_range.html.heex:7 lib/web/templates/email/date/event_tz_date_range.html.heex:12 lib/web/templates/email/date/event_tz_date_range.text.eex:1 +#, elixir-format +#: lib/web/templates/email/date/event_tz_date.html.heex:6 +#: lib/web/templates/email/date/event_tz_date_range.html.heex:7 lib/web/templates/email/date/event_tz_date_range.html.heex:12 +#: lib/web/templates/email/date/event_tz_date_range.text.eex:1 lib/web/templates/email/date/event_tz_date_range.text.eex:1 msgid "🌐 %{timezone} %{offset}" msgstr "🌐 %{timezone} %{offset}" +#, elixir-format #: lib/web/templates/email/date/event_tz_date.text.eex:1 msgid "%{date_time} (%{timezone} %{offset})" msgstr "%{date_time} (%{timezone} %{offset})" +#, elixir-format #: lib/web/templates/email/date/event_tz_date.text.eex:1 msgid "%{date_time} (in your timezone %{timezone} %{offset})" msgstr "%{date_time} (dans votre fuseau horaire %{timezone} %{offset})" -#: lib/web/templates/email/notification_each_week.html.heex:13 lib/web/templates/email/notification_each_week.text.eex:1 +#, elixir-format +#: lib/web/templates/email/notification_each_week.html.heex:13 +#: lib/web/templates/email/notification_each_week.text.eex:1 msgid "On the agenda this week" msgstr "Au programme cette semaine" +#, elixir-format #: lib/web/templates/email/participation/event_card.html.heex:58 msgid "Details" msgstr "Détails" -#: lib/web/templates/email/date/event_tz_date_range.html.heex:10 lib/web/templates/email/date/event_tz_date_range.text.eex:1 +#, elixir-format +#: lib/web/templates/email/date/event_tz_date_range.html.heex:10 +#: lib/web/templates/email/date/event_tz_date_range.text.eex:1 msgid "From the %{start} to the %{end}" msgstr "Du %{start} au %{end}" +#, elixir-format #: lib/web/templates/email/participation/event_card.html.heex:20 msgid "Manage your participation" msgstr "Gérer votre participation" -#: lib/web/templates/email/date/event_tz_date_range.html.heex:5 lib/web/templates/email/date/event_tz_date_range.text.eex:1 +#, elixir-format +#: lib/web/templates/email/date/event_tz_date_range.html.heex:5 +#: lib/web/templates/email/date/event_tz_date_range.text.eex:1 msgid "On %{date} from %{start_time} to %{end_time}" msgstr "Le %{date} de %{start_time} à %{end_time}" +#, elixir-format #: lib/web/templates/email/participation/event_card.html.heex:66 msgid "Read more" msgstr "Lire plus" -#: lib/web/templates/email/participation/card/_metadata.html.heex:50 lib/web/templates/email/participation/card/_metadata.text.eex:2 +#, elixir-format +#: lib/web/templates/email/participation/card/_metadata.html.heex:50 +#: lib/web/templates/email/participation/card/_metadata.text.eex:2 msgid "Online event" msgstr "Événement en ligne" +#, elixir-format #: lib/web/templates/email/event_group_follower_notification.html.heex:13 msgid "%{group} scheduled a new event" msgstr "%{group} a programmé un nouvel événement" +#, elixir-format #: lib/web/templates/email/event_group_follower_notification.text.eex:1 msgid "%{group} scheduled a new event:" msgstr "%{group} a programmé un nouvel événement :" +#, elixir-format #: lib/web/templates/email/participation/card/_metadata.text.eex:2 msgid "Address:" msgstr "Adresse :" +#, elixir-format #: lib/web/templates/email/participation/card/_metadata.text.eex:1 msgid "Date:" msgstr "Date :" +#, elixir-format #: lib/web/templates/email/participation/event_card.text.eex:7 msgid "Details:" msgstr "Détails :" +#, elixir-format #: lib/web/templates/email/email.html.heex:147 msgid "Manage your notification settings" msgstr "Gérer vos paramètres de notification" +#, elixir-format #: lib/web/templates/email/participation/event_card.text.eex:5 msgid "Manage your participation:" msgstr "Gérer votre participation :" +#, elixir-format +#: lib/web/templates/email/participation/card/_title.text.eex:3 #: lib/web/templates/email/participation/card/_title.text.eex:3 msgid "Organizer: %{organizer}" msgstr "Organisateur : %{organizer}" +#, elixir-format #: lib/web/templates/email/participation/event_card.html.heex:42 msgid "Participate" msgstr "Participer" +#, elixir-format #: lib/web/templates/email/participation/event_card.text.eex:5 msgid "Participate:" msgstr "Participer :" +#, elixir-format #: lib/web/templates/email/participation/event_card.text.eex:9 msgid "Read more : %{url}" msgstr "Lire plus : %{url}" +#, elixir-format #: lib/web/templates/email/participation/card/_title.text.eex:1 msgid "Title: %{title}" msgstr "Titre : %{title}" +#, elixir-format #: lib/web/email/group.ex:44 msgid "📅 Just scheduled by %{group}: %{event}" msgstr "📅 Programmé à l'instant par %{group}: %{event}" +#, elixir-format #: lib/web/templates/email/event_updated.text.eex:9 msgid "New end date:" msgstr "Nouvelle date de fin :" +#, elixir-format #: lib/web/templates/email/event_updated.text.eex:10 msgid "New location:" msgstr "Nouvelle localisation :" +#, elixir-format #: lib/web/templates/email/event_updated.text.eex:8 msgid "New start date:" msgstr "Nouvelle date de début :" -#: lib/web/templates/email/group_membership_rejection.html.heex:13 lib/web/templates/email/group_membership_rejection.text.eex:1 +#, elixir-format +#: lib/web/templates/email/group_membership_rejection.html.heex:13 +#: lib/web/templates/email/group_membership_rejection.text.eex:1 msgid "Sorry, not this time!" msgstr "Désolé, pas cette fois !" +#, elixir-format #: lib/web/templates/email/group_membership_approval.html.heex:52 msgid "View the group" msgstr "Voir le groupe" -#: lib/web/templates/email/group_membership_approval.html.heex:13 lib/web/templates/email/group_membership_approval.text.eex:1 +#, elixir-format +#: lib/web/templates/email/group_membership_approval.html.heex:13 +#: lib/web/templates/email/group_membership_approval.text.eex:1 msgid "You're in!" msgstr "Vous en êtes !" +#, elixir-format #: lib/web/email/member.ex:60 msgid "Your membership request for group %{group} has been approved" msgstr "Votre demande d'adhésion pour le groupe %{group} a été acceptée" +#, elixir-format #: lib/web/email/member.ex:89 msgid "Your membership request for group %{group} has been rejected" msgstr "Votre demande d'adhésion pour le groupe %{group} a été rejetée" +#, elixir-format #: lib/web/templates/email/group_membership_rejection.text.eex:3 msgid "Your membership request for group %{group} has been rejected." msgstr "Votre demande d'adhésion pour le groupe %{group} a été rejetée." +#, elixir-format #: lib/web/templates/email/group_membership_rejection.html.heex:38 msgid "Your membership request for group %{link_start}%{group}%{link_end} has been rejected." msgstr "Votre demande d'adhésion pour le groupe %{link_start}%{group}%{link_end} a été rejetée." +#, elixir-format #: lib/web/templates/email/group_membership_approval.text.eex:3 msgid "Your membership request for group %{group} has been approved." msgstr "Votre demande d'adhésion pour le groupe %{group} a été approuvée." +#, elixir-format #: lib/web/templates/email/group_membership_approval.html.heex:38 msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "Votre demande d'adhésion pour le groupe %{link_start}%{group}%{link_end} a été approuvée." -#: lib/web/templates/email/pending_participation_notification.html.heex:38 lib/web/templates/email/pending_participation_notification.text.eex:4 +#, elixir-format +#: lib/web/templates/email/pending_participation_notification.html.heex:38 +#: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" msgid_plural "You have %{number_participation_requests} attendance requests to process for the following event:" msgstr[0] "Vous avez une demande de participation en attente à traiter pour l'événement suivant :" diff --git a/priv/gettext/fr/LC_MESSAGES/errors.po b/priv/gettext/fr/LC_MESSAGES/errors.po index e1e9a8874..3686af127 100644 --- a/priv/gettext/fr/LC_MESSAGES/errors.po +++ b/priv/gettext/fr/LC_MESSAGES/errors.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-11-12 17:14+0100\n" +"PO-Revision-Date: 2021-11-17 16:17+0100\n" "Last-Translator: Vincent Finance \n" "Language-Team: French \n" "Language: fr\n" @@ -112,7 +112,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "Le profil actuel n'est pas un·e administrateur·ice du groupe sélectionné" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Erreur lors de la sauvegarde des paramètres utilisateur" @@ -144,12 +144,12 @@ msgid "No profile found for the moderator user" msgstr "Aucun profil trouvé pour l'utilisateur modérateur" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "Aucun·e utilisateur·ice à valider avec cet email n'a été trouvé·e" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "Aucun·e utilisateur·ice avec cette adresse e-mail n'a été trouvé·e" @@ -162,45 +162,45 @@ msgid "Profile is not owned by authenticated user" msgstr "Le profil n'est pas possédé par l'utilisateur connecté" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "Les inscriptions ne sont pas ouvertes" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "Le mot de passe actuel est invalid" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "La nouvelle adresse e-mail ne semble pas être valide" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "La nouvelle adresse e-mail doit être différente" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "Le nouveau mot de passe doit être différent" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "Le mot de passe fourni est invalide" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" "Le mot de passe que vous avez choisi est trop court. Merci de vous assurer que votre mot de passe contienne au moins " "6 caractères." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Cet·te utilisateur·ice ne peut pas réinitialiser son mot de passe" @@ -210,17 +210,17 @@ msgid "This user has been disabled" msgstr "Cet·te utilisateur·ice a été désactivé·e" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "Impossible de valider l'utilisateur·ice" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "L'utilisateur·ice est déjà désactivé·e" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "L'utilisateur·ice demandé·e n'est pas connecté·e" @@ -245,12 +245,12 @@ msgid "You may not list groups unless moderator." msgstr "Vous ne pouvez pas lister les groupes sauf à être modérateur·ice." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "Vous devez être connecté·e pour changer votre adresse e-mail" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "Vous devez être connecté·e pour changer votre mot de passe" @@ -260,7 +260,7 @@ msgid "You need to be logged-in to delete a group" msgstr "Vous devez être connecté·e pour supprimer un groupe" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "Vous devez être connecté·e pour supprimer votre compte" @@ -285,12 +285,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "Vous devez avoir un jeton existant pour obtenir un jeton de rafraîchissement" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "Vous avez à nouveau demandé un email de confirmation trop vite" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "Votre adresse e-mail n'est pas sur la liste d'autorisations" @@ -846,7 +846,7 @@ msgid "Error while creating resource" msgstr "Erreur lors de la création de la resource" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "Jeton d'activation invalide" @@ -872,7 +872,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "Ce profil n'a pas la permission de mettre à jour un événement au nom du groupe" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "Votre adresse e-mail a été refusée à l'inscription ou bien utilise un fournisseur d'e-mail interdit" @@ -887,7 +887,7 @@ msgid "Error while creating a discussion" msgstr "Erreur lors de la création de la discussion" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "Erreur lors de la mise à jour des options linguistiques" @@ -907,12 +907,12 @@ msgid "Failed to update the group" msgstr "Impossible de mettre à jour le groupe" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "Impossible de mettre à jour l'adresse e-mail de utilisateur" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "Impossible de valider l'adresse e-mail de l'utilisateur·ice" @@ -932,7 +932,7 @@ msgid "You are not the comment creator" msgstr "Vous n'êtes pas le ou la createur⋅ice du commentaire" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "Vous ne pouvez pas changer votre mot de passe." @@ -972,7 +972,7 @@ msgid "Unknown error while creating event" msgstr "Erreur inconnue lors de la création de l'événement" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "L'utilisateur ne peut changer son adresse e-mail" @@ -987,12 +987,12 @@ msgid "Follow not found" msgstr "Abonnement non trouvé" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "Personne avec le nom %{name} non trouvé" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "Ce profil ne vous appartient pas" @@ -1030,3 +1030,8 @@ msgstr "Vous n'avez pas les droits pour supprimer ce·tte membre." #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "Vous devez être connecté⋅e pour supprimer un⋅e membre" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "Votre email semble utiliser un format invalide" diff --git a/priv/gettext/gd/LC_MESSAGES/activity.po b/priv/gettext/gd/LC_MESSAGES/activity.po index 5ae3f2a6e..a8ee5a3d8 100644 --- a/priv/gettext/gd/LC_MESSAGES/activity.po +++ b/priv/gettext/gd/LC_MESSAGES/activity.po @@ -25,50 +25,50 @@ msgstr "" ## date. Leave "msgstr"s empty as changing them here as no ## effect: edit them in PO (.po) files instead. #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "Ghabh %{member} ris a’ bhallrachd sa bhuidheann." #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "Dhiùlt %{member} a’ bhallrachd sa bhuidheann." #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "Dh’iarr %{member} ballrachd sa bhuidheann." #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "Fhuair %{member} cuireadh o %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "Chuir %{profile} am ball %{member} ris." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "Chuir %{profile} an deasbad %{discussion} san tasg-lann." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "Chruthaich %{profile} an deasbad %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "Chruthaich %{profile} am pasgan %{resource}." @@ -79,74 +79,74 @@ msgid "%{profile} created the group %{group}." msgstr "Chruthaich %{profile} am buidheann %{group}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "Chruthaich %{profile} an goireas %{resource}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "Sguab %{profile} às an deasbad %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "Sguab %{profile} às am pasgan %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "Sguab %{profile} às an goireas %{resource}." #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "Dhùin %{profile} am ball %{member} a-mach." #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "Ghluais %{profile} am pasgan %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "Ghluais %{profile} an goireas %{resource}." #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "Dh’fhàg %{profile} am buidheann." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "Thug %{profile} ainm ùr air %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "Thug %{profile} %{resource} air a’ phasgan %{old_resource_title}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "Thug %{profile} %{resource} air a’ ghoireas %{old_resource_title}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "Fhreagair %{profile} san deasbad %{discussion}." @@ -157,8 +157,8 @@ msgid "%{profile} updated the group %{group}." msgstr "Dh’ùraich %{profile} am buidheann %{group}." #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "Dh’ùraich %{profile} am ball %{member}." @@ -199,8 +199,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "Chaidh am post %{post} ùrachadh le %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "Fhuair %{member} ballrachd sa bhuidheann." @@ -263,11 +263,6 @@ msgstr "Chuir %{profile} brath-fios ris an tachartas %{event}." msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "Thug %{profile} iomradh ort ann am beachd san tachartas %{event}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "Thug %{profile} iomradh ort san deasbad %{discussion}." - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -342,12 +337,136 @@ msgstr "" msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "Chaidh am post %{post} on bhuidheann %{group} ùrachadh le %{profile}." +## This file is a PO Template file. +## +## "msgid"s here are often extracted from source code. +## Add new translations manually only if they're dynamic +## translations that can't be statically extracted. +## +## Run "mix gettext.extract" to bring this file up to +## date. Leave "msgstr"s empty as changing them here as no +## effect: edit them in PO (.po) files instead. #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." +msgstr "Ghabh %{member} ris a’ bhallrachd sa bhuidheann." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "Fhuair %{member} ballrachd sa bhuidheann." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "Dhiùlt %{member} a’ bhallrachd sa bhuidheann." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "Dh’iarr %{member} ballrachd sa bhuidheann." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "Fhuair %{member} cuireadh o %{profile}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "Chuir %{profile} am ball %{member} ris." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." msgstr "Dh’ùraich %{profile} am ball %{member}." #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "Chuir %{profile} an deasbad %{discussion} san tasg-lann." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "Chruthaich %{profile} an deasbad %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "Chruthaich %{profile} am pasgan %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "Sguab %{profile} às an deasbad %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "Sguab %{profile} às am pasgan %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "Sguab %{profile} às an goireas %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "Dhùin %{profile} am ball %{member} a-mach." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "Thug %{profile} iomradh ort san deasbad %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "Ghluais %{profile} am pasgan %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "Ghluais %{profile} an goireas %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "Dh’fhàg %{profile} am buidheann." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "Thug %{profile} ainm ùr air %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "Thug %{profile} %{resource} air a’ phasgan %{old_resource_title}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "Thug %{profile} %{resource} air a’ ghoireas %{old_resource_title}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "Fhreagair %{profile} san deasbad %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "Dh’ùraich %{profile} am ball %{member}." + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." +msgstr "Chruthaich %{profile} an goireas %{resource}." diff --git a/priv/gettext/gd/LC_MESSAGES/default.po b/priv/gettext/gd/LC_MESSAGES/default.po index d8178e09c..8c09dd1fb 100644 --- a/priv/gettext/gd/LC_MESSAGES/default.po +++ b/priv/gettext/gd/LC_MESSAGES/default.po @@ -1376,12 +1376,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1675,7 +1675,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/gd/LC_MESSAGES/errors.po b/priv/gettext/gd/LC_MESSAGES/errors.po index e7696a38a..717bb375a 100644 --- a/priv/gettext/gd/LC_MESSAGES/errors.po +++ b/priv/gettext/gd/LC_MESSAGES/errors.po @@ -115,7 +115,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -147,12 +147,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -165,43 +165,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -211,17 +211,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -246,12 +246,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -261,7 +261,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -286,12 +286,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -845,7 +845,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -871,7 +871,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -886,7 +886,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -906,12 +906,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -931,7 +931,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -971,7 +971,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -986,12 +986,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1029,3 +1029,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/gl/LC_MESSAGES/activity.po b/priv/gettext/gl/LC_MESSAGES/activity.po index d2c4d672b..f86eea16f 100644 --- a/priv/gettext/gl/LC_MESSAGES/activity.po +++ b/priv/gettext/gl/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -243,11 +243,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -318,11 +313,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/gl/LC_MESSAGES/default.po b/priv/gettext/gl/LC_MESSAGES/default.po index 209072e05..b3306a3f0 100644 --- a/priv/gettext/gl/LC_MESSAGES/default.po +++ b/priv/gettext/gl/LC_MESSAGES/default.po @@ -1656,14 +1656,14 @@ msgid "Public feed for %{instance}" msgstr "Fonte pública de %{instance}" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" "O contrasinal escollido é demasiado curto. Comproba que o teu contrasinal " "teña polo menos 6 caracteres." #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" "O token proporcionado non é válido. Asegúrate de que o URL é exactamente o " @@ -1963,7 +1963,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/gl/LC_MESSAGES/errors.po b/priv/gettext/gl/LC_MESSAGES/errors.po index ed1ce38df..6483e4a62 100644 --- a/priv/gettext/gl/LC_MESSAGES/errors.po +++ b/priv/gettext/gl/LC_MESSAGES/errors.po @@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "O perfil actual non é administrador do grupo seleccionado" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Erro ó gardar os axustes de usuaria" @@ -143,12 +143,12 @@ msgid "No profile found for the moderator user" msgstr "Non se atopou o perfil para a usuaria moderadora" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "Non se atopou unha usuaria con este email para validar" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "Non se atopa ningunha usuaria con este email" @@ -161,45 +161,45 @@ msgid "Profile is not owned by authenticated user" msgstr "O perfil non pertence a unha usuaria autenticada" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "O rexistro está pechado" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "O contrasinal actual non é válido" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "O novo email non semella ser válido" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "O novo email ten que ser diferente" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "O novo contrasinal ten que ser diferente" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "O contrasinal escrito non é válido" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" "O contrasinal escollido é demasiado curto, ten que ter 6 caracteres polo " "menos." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Esta usuaria non pode restablecer o seu contrasinal" @@ -209,17 +209,17 @@ msgid "This user has been disabled" msgstr "Estab usuaria foi desactivada" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "Non se puido validar a usuaria" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "A usuaria xa está desactivada" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "A usuaria solicitada non está conectada" @@ -244,12 +244,12 @@ msgid "You may not list groups unless moderator." msgstr "Non podes facer listas de grupos porque non es moderadora." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "Tes que estar conectada para poder cambiar o email" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "Tes que estar conectada para poder cambiar o contrasinal" @@ -259,7 +259,7 @@ msgid "You need to be logged-in to delete a group" msgstr "Tes que estar conectada para poder eleminar un grupo" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "Tes que estar conectada para poder eliminar a conta" @@ -284,12 +284,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "Tes que ter un token existente para obter un token actualizado" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "Solicitaches demasiado pronto un email de confirmación" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "O teu email non está na lista dos permitidos" @@ -855,7 +855,7 @@ msgid "Error while creating resource" msgstr "Erro ao crear o recurso" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "O token de activación non é válido" @@ -884,7 +884,7 @@ msgstr "" "Este perfil non ten permiso para actualizar un evento en nome deste grupo" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" "Foi denegado o teu email para rexistrarte ou utiliza un provedor de email " @@ -901,7 +901,7 @@ msgid "Error while creating a discussion" msgstr "Erro ao crear o recurso" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "Erro ó actualizar a denuncia" @@ -921,12 +921,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "Non se puido validar a usuaria" @@ -946,7 +946,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -986,7 +986,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -1001,12 +1001,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "Non se atopa a persoa con nome de usuaria %{username}" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1044,3 +1044,8 @@ msgstr "Non tes permiso para eliminar este membro." #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/hu/LC_MESSAGES/activity.po b/priv/gettext/hu/LC_MESSAGES/activity.po index 19f0bdc8c..d27b75001 100644 --- a/priv/gettext/hu/LC_MESSAGES/activity.po +++ b/priv/gettext/hu/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -243,11 +243,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -318,11 +313,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/hu/LC_MESSAGES/default.po b/priv/gettext/hu/LC_MESSAGES/default.po index 417942c0a..8879d3588 100644 --- a/priv/gettext/hu/LC_MESSAGES/default.po +++ b/priv/gettext/hu/LC_MESSAGES/default.po @@ -1417,12 +1417,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1716,7 +1716,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/hu/LC_MESSAGES/errors.po b/priv/gettext/hu/LC_MESSAGES/errors.po index 9ce08682a..d632adad5 100644 --- a/priv/gettext/hu/LC_MESSAGES/errors.po +++ b/priv/gettext/hu/LC_MESSAGES/errors.po @@ -126,7 +126,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "A jelenlegi profil nem adminisztrátora a kijelölt csoportnak" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Hiba a felhasználói beállítások mentésekor" @@ -158,12 +158,12 @@ msgid "No profile found for the moderator user" msgstr "Nem található profil a moderátor felhasználóhoz" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "Nem található ezzel az e-mail-címmel ellenőrzendő felhasználó" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "Nem található ezzel az e-mail-címmel rendelkező felhasználó" @@ -176,45 +176,45 @@ msgid "Profile is not owned by authenticated user" msgstr "A profilt nem hitelesített felhasználó birtokolja" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "A regisztrációk nincsenek nyitva" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "A jelenlegi jelszó érvénytelen" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "Az új e-mail-cím nem tűnik érvényesnek" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "Az új e-mail-címnek eltérőnek kell lennie" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "Az új jelszónak eltérőnek kell lennie" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "A megadott jelszó érvénytelen" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" "A választott jelszó túl rövid. Győződjön meg arról, hogy a jelszava " "tartalmazzon legalább 6 karaktert." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Ez a felhasználó nem tudja visszaállítani a jelszavát" @@ -224,17 +224,17 @@ msgid "This user has been disabled" msgstr "Ez a felhasználó le lett tiltva" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "Nem lehet ellenőrizni a felhasználót" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "A felhasználó már le van tiltva" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "A kért felhasználó nincs bejelentkezve" @@ -259,12 +259,12 @@ msgid "You may not list groups unless moderator." msgstr "Lehet, hogy nem sorolhatja fel a csoportokat, hacsak nem moderátor." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "Bejelentkezve kell lennie az e-mail-címe megváltoztatásához" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "Bejelentkezve kell lennie a jelszava megváltoztatásához" @@ -274,7 +274,7 @@ msgid "You need to be logged-in to delete a group" msgstr "Bejelentkezve kell lennie egy csoport törléséhez" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "Bejelentkezve kell lennie a fiókja törléséhez" @@ -299,12 +299,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "Szüksége van egy meglévő tokenre egy frissítési token beszerzéséhez" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "Túl hamar kért újra egy megerősítő e-mailt" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "Az e-mail-címe nincs rajta az engedélyezési listán" @@ -880,7 +880,7 @@ msgid "Error while creating resource" msgstr "Hiba az erőforrás létrehozáskor" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "Érvénytelen aktiválási token" @@ -906,7 +906,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -921,7 +921,7 @@ msgid "Error while creating a discussion" msgstr "Hiba az erőforrás létrehozáskor" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "Hiba a jelentés frissítésekor" @@ -941,12 +941,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "Nem lehet ellenőrizni a felhasználót" @@ -966,7 +966,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -1006,7 +1006,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -1021,12 +1021,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "Nem található %{username} felhasználónévvel rendelkező személy" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1064,3 +1064,8 @@ msgstr "Nincs meg a jogosultsága a tag eltávolításához." #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/id/LC_MESSAGES/activity.po b/priv/gettext/id/LC_MESSAGES/activity.po index 91ba56c36..641164dd4 100644 --- a/priv/gettext/id/LC_MESSAGES/activity.po +++ b/priv/gettext/id/LC_MESSAGES/activity.po @@ -24,50 +24,50 @@ msgstr "" ## date. Leave "msgstr"s empty as changing them here as no ## effect: edit them in PO (.po) files instead. #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "%{member} menolak undangan untuk bergabung ke kelompok." #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "%{member} ingin bergabung ke kelompok." #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "%{member} diundang oleh %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "%{profile} menambahkan anggota %{member}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -78,74 +78,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "%{profile} keluar dari kelompok." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -156,8 +156,8 @@ msgid "%{profile} updated the group %{group}." msgstr "%{profile} memperbarui kelompok %{group}." #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -198,8 +198,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "Postingan %{post} diperbarui oleh %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "%{member} bergabung ke kelompok." @@ -253,11 +253,6 @@ msgstr "%{profile} memposting sebuah pengumuman di acara %{event}." msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -327,12 +322,136 @@ msgstr "" msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "Postingan %{post} dari kelompok %{group} diperbarui oleh %{profile}." +## This file is a PO Template file. +## +## "msgid"s here are often extracted from source code. +## Add new translations manually only if they're dynamic +## translations that can't be statically extracted. +## +## Run "mix gettext.extract" to bring this file up to +## date. Leave "msgstr"s empty as changing them here as no +## effect: edit them in PO (.po) files instead. #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "%{member} bergabung ke kelompok." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "%{member} menolak undangan untuk bergabung ke kelompok." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "%{member} ingin bergabung ke kelompok." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "%{member} diundang oleh %{profile}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "%{profile} menambahkan anggota %{member}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "%{profile} keluar dari kelompok." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/id/LC_MESSAGES/default.po b/priv/gettext/id/LC_MESSAGES/default.po index 66cf03636..06884b8e3 100644 --- a/priv/gettext/id/LC_MESSAGES/default.po +++ b/priv/gettext/id/LC_MESSAGES/default.po @@ -1401,12 +1401,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1700,7 +1700,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/id/LC_MESSAGES/errors.po b/priv/gettext/id/LC_MESSAGES/errors.po index dd1227e35..69fb2de1f 100644 --- a/priv/gettext/id/LC_MESSAGES/errors.po +++ b/priv/gettext/id/LC_MESSAGES/errors.po @@ -104,7 +104,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -136,12 +136,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -154,43 +154,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -200,17 +200,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -235,12 +235,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -250,7 +250,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -275,12 +275,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -834,7 +834,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -860,7 +860,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -875,7 +875,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -895,12 +895,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -920,7 +920,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -960,7 +960,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -975,12 +975,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1018,3 +1018,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/it/LC_MESSAGES/activity.po b/priv/gettext/it/LC_MESSAGES/activity.po index f298415c7..6a9ff86b3 100644 --- a/priv/gettext/it/LC_MESSAGES/activity.po +++ b/priv/gettext/it/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -243,11 +243,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -318,11 +313,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/it/LC_MESSAGES/default.po b/priv/gettext/it/LC_MESSAGES/default.po index 07ae8bee0..2c3c21ff8 100644 --- a/priv/gettext/it/LC_MESSAGES/default.po +++ b/priv/gettext/it/LC_MESSAGES/default.po @@ -1701,12 +1701,12 @@ msgid "Public feed for %{instance}" msgstr "Feed pubblico per %{instance}" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -2004,7 +2004,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/it/LC_MESSAGES/errors.po b/priv/gettext/it/LC_MESSAGES/errors.po index c476ade6e..7ec2e091c 100644 --- a/priv/gettext/it/LC_MESSAGES/errors.po +++ b/priv/gettext/it/LC_MESSAGES/errors.po @@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "Il profilo corrente non è amministratore del gruppo selezionato" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Errore nel salvare le preferenze utente" @@ -142,12 +142,12 @@ msgid "No profile found for the moderator user" msgstr "Nessun profilo trovato per l'utente moderatore" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "Nessun utente da convalidare trovato con questa email" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "Nessun utente con questa email" @@ -160,43 +160,43 @@ msgid "Profile is not owned by authenticated user" msgstr "L'utente autenticato non è propietario di questo profilo" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "Le registrazioni non sono aperte" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "la password corrente non è valida" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "La nuova email sembra non valida" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "La nuova email dev'essere diversa" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "La nuova password deve essere diversa" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "La password assegnata non è valida" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "la password scelta è troppo corta, deve avere almeno 6 caratteri." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Questo utente non può resettare la password" @@ -206,17 +206,17 @@ msgid "This user has been disabled" msgstr "L'utente è stato disabilitato" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "Impossibile convalidare l'utente" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "Utente già disabilitato" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "L'utente richiesto non è loggato" @@ -241,12 +241,12 @@ msgid "You may not list groups unless moderator." msgstr "Non è possibile elencare i gruppi a meno che non sia un moderatore." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "È necessario effettuare il login per modificare la tua email" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "È necessario effettuare il login per modificare la tua password" @@ -256,7 +256,7 @@ msgid "You need to be logged-in to delete a group" msgstr "È necessario effettuare il login per eliminare un gruppo" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "È necessario effettuare il login per eliminare il tuo account" @@ -283,12 +283,12 @@ msgstr "" "aggiornamento" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "Hai richiesto di nuovo un'e-mail di conferma troppo presto" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "La tua mail non è nella lista delle autorizzazioni" @@ -855,7 +855,7 @@ msgid "Error while creating resource" msgstr "Errore durante la creazione della risorsa" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "Token di attivazione non valido" @@ -883,7 +883,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -898,7 +898,7 @@ msgid "Error while creating a discussion" msgstr "Errore durante la creazione della risorsa" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "Errore durante l'aggiornamento del rapporto" @@ -918,12 +918,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "Impossibile convalidare l'utente" @@ -943,7 +943,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -983,7 +983,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -998,12 +998,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "La persona con il nome utente %{username} non è stata trovata" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1041,3 +1041,8 @@ msgstr "Non hai il diritto di rimuovere questo membro." #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/ja/LC_MESSAGES/activity.po b/priv/gettext/ja/LC_MESSAGES/activity.po index 2537b6100..78283bccb 100644 --- a/priv/gettext/ja/LC_MESSAGES/activity.po +++ b/priv/gettext/ja/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=1\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -241,11 +241,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -316,11 +311,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/ja/LC_MESSAGES/default.po b/priv/gettext/ja/LC_MESSAGES/default.po index da55cad49..9594d2901 100644 --- a/priv/gettext/ja/LC_MESSAGES/default.po +++ b/priv/gettext/ja/LC_MESSAGES/default.po @@ -1361,12 +1361,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1660,7 +1660,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/ja/LC_MESSAGES/errors.po b/priv/gettext/ja/LC_MESSAGES/errors.po index 165526d8f..e945d3d80 100644 --- a/priv/gettext/ja/LC_MESSAGES/errors.po +++ b/priv/gettext/ja/LC_MESSAGES/errors.po @@ -97,7 +97,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -129,12 +129,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -147,43 +147,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -193,17 +193,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -228,12 +228,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -243,7 +243,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -268,12 +268,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -827,7 +827,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -853,7 +853,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -868,7 +868,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -888,12 +888,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -913,7 +913,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -953,7 +953,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -968,12 +968,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1011,3 +1011,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/nl/LC_MESSAGES/activity.po b/priv/gettext/nl/LC_MESSAGES/activity.po index adf5c5f42..5a237441e 100644 --- a/priv/gettext/nl/LC_MESSAGES/activity.po +++ b/priv/gettext/nl/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -243,11 +243,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -318,11 +313,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/nl/LC_MESSAGES/default.po b/priv/gettext/nl/LC_MESSAGES/default.po index 740c0c6e4..18cd84565 100644 --- a/priv/gettext/nl/LC_MESSAGES/default.po +++ b/priv/gettext/nl/LC_MESSAGES/default.po @@ -1385,12 +1385,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1684,7 +1684,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/nl/LC_MESSAGES/errors.po b/priv/gettext/nl/LC_MESSAGES/errors.po index 89759f2ce..d2a1f28ae 100644 --- a/priv/gettext/nl/LC_MESSAGES/errors.po +++ b/priv/gettext/nl/LC_MESSAGES/errors.po @@ -103,7 +103,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -135,12 +135,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -153,43 +153,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -199,17 +199,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -234,12 +234,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -249,7 +249,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -274,12 +274,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -833,7 +833,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -859,7 +859,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -874,7 +874,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -894,12 +894,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -919,7 +919,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -959,7 +959,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -974,12 +974,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1017,3 +1017,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/nn/LC_MESSAGES/activity.po b/priv/gettext/nn/LC_MESSAGES/activity.po index 6320ab4f5..bb07a0850 100644 --- a/priv/gettext/nn/LC_MESSAGES/activity.po +++ b/priv/gettext/nn/LC_MESSAGES/activity.po @@ -19,50 +19,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "%{member} godtok invitasjonen til å bli med i gruppa." #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "%{member} avslo invitasjonen til å bli med i gruppa." #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "%{member} spurde om å bli med i gruppa." #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "%{profile} inviterte %{member}." #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "%{profile} la til medlemen %{member}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "%{profile} arkiverte diskusjonen %{discussion}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "%{profile} laga diskusjonen %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "%{profile} laga mappa %{resource}." @@ -73,75 +73,75 @@ msgid "%{profile} created the group %{group}." msgstr "%{profile} laga gruppa %{group}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "%{profile} laga ressursen %{resource}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "%{profile} sletta diskusjonen %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "%{profile} sletta mappa %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "%{profile} sletta ressursen %{resource}." #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "%{profile} kasta ut medlemen %{member}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "%{profile} flytta mappa %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "%{profile} flytta ressursen %{resource}." #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "%{profile} forlét gruppa." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "%{profile} ga nytt namn til diskusjonen %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "%{profile} døypte om mappa frå %{old_resource_title} til %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" "%{profile} døypte om ressursen frå %{old_resource_title} til %{resource}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "%{profile} svara på diskusjonen %{discussion}." @@ -152,8 +152,8 @@ msgid "%{profile} updated the group %{group}." msgstr "%{profile} oppdaterte gruppa %{group}." #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "%{profile} oppdaterte medlemen %{member}." @@ -194,8 +194,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "%{profile} oppdaterte innlegget %{post}." #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "%{member} vart med i gruppa." @@ -253,11 +253,6 @@ msgstr "%{profile} la ut ei kunngjering til hendinga %{event}." msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "%{profile} nemnde deg i ein kommentar til hendinga %{event}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "%{profile} nemnde deg i diskusjonen %{discussion}." - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -330,11 +325,127 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "%{profile} oppdaterte innlegget %{post} i gruppa %{group}." #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." +msgstr "%{member} godtok invitasjonen til å bli med i gruppa." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "%{member} vart med i gruppa." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "%{member} avslo invitasjonen til å bli med i gruppa." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "%{member} spurde om å bli med i gruppa." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "%{profile} inviterte %{member}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "%{profile} la til medlemen %{member}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." msgstr "%{profile} oppdaterte medlemen %{member}." #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "%{profile} arkiverte diskusjonen %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "%{profile} laga diskusjonen %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "%{profile} laga mappa %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "%{profile} sletta diskusjonen %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "%{profile} sletta mappa %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "%{profile} sletta ressursen %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "%{profile} kasta ut medlemen %{member}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "%{profile} nemnde deg i diskusjonen %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "%{profile} flytta mappa %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "%{profile} flytta ressursen %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "%{profile} forlét gruppa." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "%{profile} ga nytt namn til diskusjonen %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "%{profile} døypte om mappa frå %{old_resource_title} til %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" +"%{profile} døypte om ressursen frå %{old_resource_title} til %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "%{profile} svara på diskusjonen %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "%{profile} oppdaterte medlemen %{member}." + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." +msgstr "%{profile} laga ressursen %{resource}." diff --git a/priv/gettext/nn/LC_MESSAGES/default.po b/priv/gettext/nn/LC_MESSAGES/default.po index 7cf119772..14391cdcc 100644 --- a/priv/gettext/nn/LC_MESSAGES/default.po +++ b/priv/gettext/nn/LC_MESSAGES/default.po @@ -1657,12 +1657,12 @@ msgid "Public feed for %{instance}" msgstr "Offentleg straum for %{instance}" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "Passordet er for kort. Det må ha minst 6 teikn." #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" "Godkjenningsteiknet er ugyldig. Pass på at adressa er heilt lik den du fekk " @@ -1962,7 +1962,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/nn/LC_MESSAGES/errors.po b/priv/gettext/nn/LC_MESSAGES/errors.po index f32d05f15..2ed7b8516 100644 --- a/priv/gettext/nn/LC_MESSAGES/errors.po +++ b/priv/gettext/nn/LC_MESSAGES/errors.po @@ -126,7 +126,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "Denne brukaren er ikkje styrar av gruppa" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Greidde ikkje lagra brukarinnstillingane" @@ -158,12 +158,12 @@ msgid "No profile found for the moderator user" msgstr "Fann ingen profil for moderator-brukaren" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "Fann ingen brukar med denne eposten å godkjenna" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "Fann ingen brukar med denne eposten" @@ -176,43 +176,43 @@ msgid "Profile is not owned by authenticated user" msgstr "Ingen godkjent brukar eig denne profilen" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "Det er ikkje opna for å registrera seg" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "Dette passordet er ugyldig" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "Den nye epostadressa ser ut til å vera feil" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "Den nye epostadressa må vera annleis" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "Det nye passordet må vera annleis" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "Dette passordet er ugyldig" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "Dette passordet er for kort. Passord må ha minst 6 teikn." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Denne brukaren kan ikkje nullstilla passordet sitt" @@ -222,17 +222,17 @@ msgid "This user has been disabled" msgstr "Denne brukaren er avskrudd" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "Greier ikkje godkjenna brukaren" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "Brukaren er allereie inaktiv" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "Den førespurte brukaren er ikkje innlogga" @@ -257,12 +257,12 @@ msgid "You may not list groups unless moderator." msgstr "Du kan ikkje lista opp grupper med mindre du er moderator." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "Du må vera innlogga for å endra epostadressa di" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "Du må vera innlogga for å endra passordet ditt" @@ -272,7 +272,7 @@ msgid "You need to be logged-in to delete a group" msgstr "Du må vera innlogga for å sletta ei gruppe" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "Du må vera innlogga for å sletta kontoen din" @@ -297,12 +297,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "Du treng eit eksisterande teikn for å få eit fornyingsteikn" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "Du ba om ny stadfestingsepost for snøgt" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "Epostadressa di er ikkje på lista over godkjende adresser" @@ -871,7 +871,7 @@ msgid "Error while creating resource" msgstr "Greidde ikkje laga ressursen" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "Ugyldig aktiveringslykjel" @@ -900,7 +900,7 @@ msgstr "" "gruppa" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" "Eposten din er nekta å registrera seg, eller bruker ein epostvert me ikkje " @@ -917,7 +917,7 @@ msgid "Error while creating a discussion" msgstr "Greidde ikkje laga ressursen" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "Greidde ikkje oppdatera rapporten" @@ -937,12 +937,12 @@ msgid "Failed to update the group" msgstr "Greidde ikkje oppdatera gruppa" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "Greidde ikkje oppdatera epostadressa til brukaren" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "Greier ikkje godkjenna brukaren" @@ -962,7 +962,7 @@ msgid "You are not the comment creator" msgstr "Du har ikkje skrive denne kommentaren" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "Du kan ikkje endra passordet ditt." @@ -1003,7 +1003,7 @@ msgid "Unknown error while creating event" msgstr "Det var ein ukjend feil då ressursen vart oppdatert" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "Brukaren kan ikkje endra epostadressa" @@ -1018,12 +1018,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "Fann ingen person med brukarnamnet %{username}" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1061,3 +1061,8 @@ msgstr "Du har ikkje løyve til å fjerna denne medlemen." #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/oc/LC_MESSAGES/activity.po b/priv/gettext/oc/LC_MESSAGES/activity.po index b143c8aff..fadbbdb5c 100644 --- a/priv/gettext/oc/LC_MESSAGES/activity.po +++ b/priv/gettext/oc/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -243,11 +243,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -318,11 +313,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/oc/LC_MESSAGES/default.po b/priv/gettext/oc/LC_MESSAGES/default.po index 3849b468c..8185ff528 100644 --- a/priv/gettext/oc/LC_MESSAGES/default.po +++ b/priv/gettext/oc/LC_MESSAGES/default.po @@ -1470,12 +1470,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1769,7 +1769,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/oc/LC_MESSAGES/errors.po b/priv/gettext/oc/LC_MESSAGES/errors.po index b7d479690..ddecb8c9d 100644 --- a/priv/gettext/oc/LC_MESSAGES/errors.po +++ b/priv/gettext/oc/LC_MESSAGES/errors.po @@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "Lo perfil actual es pas administrator del grop seleccionat" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Error en salvagardant los paramètres utilizaire" @@ -144,12 +144,12 @@ msgid "No profile found for the moderator user" msgstr "Cap de perfil pas trobat per l’utilizaire moderator" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "Cap d’utilizaire de validar amb aqueste email pas trobat" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "Degun trobat d'amb aquesta email" @@ -162,45 +162,45 @@ msgid "Profile is not owned by authenticated user" msgstr "Lo perhiu es pas proprietat del utilizator autenticat" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "Las inscripciones sèn pas obèrtas" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "Lo mòt de santa clara actuau es invalid" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "Lo email nau sèm invalid" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "Lo email nau deb esser different" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "Lo mòt de santa clara nau deb esser different" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "Lo mòt de santa clara aprovedit es invalid" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" "Lo mòt de santa clara que avetz causit es tròp cort. Merci de vos assegurar " "que vostre mòt de santa clara contienga au mèns 6 caracteres." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Aquest utilizator pod pas reinicializar lo sèn mòt de santa clara" @@ -210,17 +210,17 @@ msgid "This user has been disabled" msgstr "Aquest utilizator a essat dasactivat" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "Es impossible de validar l'utilizator" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "Utilizator déjà desactivat" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "L'utilizator demandat es pas conectat" @@ -245,12 +245,12 @@ msgid "You may not list groups unless moderator." msgstr "Podetz listar los grops sonque se essetz moderator." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "Debetz esser conectat per cambiar lo voste email" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "Debetz d'esser conectat per cambiar lo voste mòt de santa clara" @@ -260,7 +260,7 @@ msgid "You need to be logged-in to delete a group" msgstr "Debetz d'esser conectat per suprimir un grop" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "Devetz d'esser conectat per suprimir lo voste compte" @@ -285,12 +285,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "Devetz aver un senhau existant per obtiéner un senhau nau" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "Demandatz de nau un email de confirmacion tròp lèu" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "Vòstre email es pas en la lista d'autorizacions" @@ -845,7 +845,7 @@ msgid "Error while creating resource" msgstr "Error mentre que sauvant lo rapòrt" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -871,7 +871,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -886,7 +886,7 @@ msgid "Error while creating a discussion" msgstr "Error mentre que sauvant lo rapòrt" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "Error mentre la mesa a jorn dèu rapòrt" @@ -906,12 +906,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "Es impossible de validar l'utilizator" @@ -931,7 +931,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -971,7 +971,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -986,12 +986,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "Degun trobat d'amb l'utilizator %{username}" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1029,3 +1029,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/pl/LC_MESSAGES/activity.po b/priv/gettext/pl/LC_MESSAGES/activity.po index 87c6cb41c..ededf61d8 100644 --- a/priv/gettext/pl/LC_MESSAGES/activity.po +++ b/priv/gettext/pl/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=3\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -245,11 +245,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -320,11 +315,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/pl/LC_MESSAGES/default.po b/priv/gettext/pl/LC_MESSAGES/default.po index 93f56e023..2cd7595df 100644 --- a/priv/gettext/pl/LC_MESSAGES/default.po +++ b/priv/gettext/pl/LC_MESSAGES/default.po @@ -1479,12 +1479,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1778,7 +1778,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/pl/LC_MESSAGES/errors.po b/priv/gettext/pl/LC_MESSAGES/errors.po index 512f03183..a2fa661c1 100644 --- a/priv/gettext/pl/LC_MESSAGES/errors.po +++ b/priv/gettext/pl/LC_MESSAGES/errors.po @@ -117,7 +117,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "Obecny profil nie jest administratorem zaznaczonej grupy" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Błąd zapisywania ustawień użytkownika" @@ -150,13 +150,13 @@ msgid "No profile found for the moderator user" msgstr "Nie znaleziono profilu dla konta moderatora" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" "Nie znaleziono użytkownika do zatwierdzenia z użyciem tego adresu e-mail" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "Nie znaleziono użytkownika o tym adresie e-mail" @@ -169,45 +169,45 @@ msgid "Profile is not owned by authenticated user" msgstr "Profil nie należy do uwierzytelnionego użytkownika" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "Rejestracje nie są otwarte" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "Obecne hasło jest nieprawidłowe" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "Nowy adres e-mail nie wydaje się być prawidłowy" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "Nowy adres e-mail musi się różnić od obecnego" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "Nowe hasło musi różnić się od obecnego" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "Wprowadzone hasło jest nieprawidłowe" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" "Wprowadzone hasło jest zbyt krótkie. Upewnij się, że Twoje hasło składa się " "z przynajmniej 6 znaków." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Ten użytkownik nie może resetować swojego hasła" @@ -217,17 +217,17 @@ msgid "This user has been disabled" msgstr "Ten użytkownik jest wyłączony" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "Nie udało się zwalidować użytkownika" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "Użytkownik jest już wyłączony" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "Żądany użytkownik nie jest zalogowany" @@ -253,12 +253,12 @@ msgid "You may not list groups unless moderator." msgstr "Nie masz dostępu do listy grup, jeżeli nie jesteś moderatorem." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "Musisz być zalogowany(-a), aby zmienić adres e-mail" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "Musisz być zalogowany(-a), aby zmienić hasło" @@ -268,7 +268,7 @@ msgid "You need to be logged-in to delete a group" msgstr "Musisz być zalogowany(-a), aby usunąć grupę" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "Musisz być zalogowany(-a), aby usunąć konto" @@ -293,12 +293,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "Musisz mieć istniejący token, aby uzyskać token odświeżający" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "Zbyt wcześnie poprosiłeś(-aś) o nową wiadomość potwierdzającą" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "Twój adres e-mail nie jest na białej liście" @@ -862,7 +862,7 @@ msgid "Error while creating resource" msgstr "Wystąpił błąd podczas zapisywania zgłoszenia" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -888,7 +888,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -903,7 +903,7 @@ msgid "Error while creating a discussion" msgstr "Wystąpił błąd podczas zapisywania zgłoszenia" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "Wystąpił błąd podczas aktualizacji zgłoszenia" @@ -923,12 +923,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "Nie udało się zwalidować użytkownika" @@ -948,7 +948,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -988,7 +988,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -1003,12 +1003,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "Nie znaleziono osoby o nazwie użytkownika %{username}" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1046,3 +1046,8 @@ msgstr "Nie masz uprawnień do usunięcia tego członka." #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/pt/LC_MESSAGES/activity.po b/priv/gettext/pt/LC_MESSAGES/activity.po index 83e8e70d1..2ecfb73bc 100644 --- a/priv/gettext/pt/LC_MESSAGES/activity.po +++ b/priv/gettext/pt/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -243,11 +243,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -318,11 +313,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/pt/LC_MESSAGES/default.po b/priv/gettext/pt/LC_MESSAGES/default.po index 368baad49..f3686774c 100644 --- a/priv/gettext/pt/LC_MESSAGES/default.po +++ b/priv/gettext/pt/LC_MESSAGES/default.po @@ -1365,12 +1365,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1664,7 +1664,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/pt/LC_MESSAGES/errors.po b/priv/gettext/pt/LC_MESSAGES/errors.po index d77178185..c40f289dd 100644 --- a/priv/gettext/pt/LC_MESSAGES/errors.po +++ b/priv/gettext/pt/LC_MESSAGES/errors.po @@ -103,7 +103,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -135,12 +135,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -153,43 +153,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -199,17 +199,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -234,12 +234,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -249,7 +249,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -274,12 +274,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -833,7 +833,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -859,7 +859,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -874,7 +874,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -894,12 +894,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -919,7 +919,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -959,7 +959,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -974,12 +974,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1017,3 +1017,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/pt_BR/LC_MESSAGES/activity.po b/priv/gettext/pt_BR/LC_MESSAGES/activity.po index 2db94afaf..ed5e51e94 100644 --- a/priv/gettext/pt_BR/LC_MESSAGES/activity.po +++ b/priv/gettext/pt_BR/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -243,11 +243,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -318,11 +313,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/pt_BR/LC_MESSAGES/default.po b/priv/gettext/pt_BR/LC_MESSAGES/default.po index 9947a25c1..5c0988d99 100644 --- a/priv/gettext/pt_BR/LC_MESSAGES/default.po +++ b/priv/gettext/pt_BR/LC_MESSAGES/default.po @@ -1477,12 +1477,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1776,7 +1776,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/pt_BR/LC_MESSAGES/errors.po b/priv/gettext/pt_BR/LC_MESSAGES/errors.po index 5794111a7..2894615b8 100644 --- a/priv/gettext/pt_BR/LC_MESSAGES/errors.po +++ b/priv/gettext/pt_BR/LC_MESSAGES/errors.po @@ -103,7 +103,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "" @@ -135,12 +135,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -153,43 +153,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -199,17 +199,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -234,12 +234,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -249,7 +249,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -274,12 +274,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -833,7 +833,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -859,7 +859,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -874,7 +874,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -894,12 +894,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -919,7 +919,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -959,7 +959,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -974,12 +974,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1017,3 +1017,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/ru/LC_MESSAGES/activity.po b/priv/gettext/ru/LC_MESSAGES/activity.po index deb099324..89226c249 100644 --- a/priv/gettext/ru/LC_MESSAGES/activity.po +++ b/priv/gettext/ru/LC_MESSAGES/activity.po @@ -20,50 +20,50 @@ msgstr "" "X-Generator: Weblate 4.6.2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "%{member} принял приглашение присоединиться к группе." #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "%{member} отклонил приглашение присоединиться к группе." #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "%{member} попросил присоединиться к группе." #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "%{member} был приглашён %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "%{profile} добавил участника %{member}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "%{profile} заархивировал обсуждение %{discussion}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "%{profile} создал обсуждение %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "%{profile} создал папку %{resource}." @@ -74,74 +74,74 @@ msgid "%{profile} created the group %{group}." msgstr "%{profile} создал группу %{group}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "%{profile} создал ресурс %{resource}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "%{profile} удалил обсуждение %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "%{profile} удалил папку %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "%{profile} удалил ресурс %{resource}." #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "%{profile} исключил участника %{member}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "%{profile} переместил папку %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "%{profile} переместил ресурс %{resource}." #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "%{profile} вышел из группы." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "%{profile} переименовал обсуждение %{discussion}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "%{profile} переименовал папку из %{old_resource_title} в %{resource}." #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "%{profile} переименовал ресурс из %{old_resource_title} в %{resource}." #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "%{profile} ответил на обсуждение %{discussion}." @@ -152,8 +152,8 @@ msgid "%{profile} updated the group %{group}." msgstr "%{profile} обновил группу %{group}." #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "%{profile} обновил участника %{member}." @@ -194,8 +194,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "Публикация %{post} была обновлена %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "%{member} присоединился к группе." @@ -255,11 +255,6 @@ msgstr "%{profile} разместил объявление под меропри msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "%{profile} упомянул вас в комментарии под мероприятием %{event}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "%{profile} упомянул вас в обсуждении %{discussion}." - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -332,11 +327,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "Сообщение %{post} из группы %{group} было обновлено %{profile}." #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." +msgstr "%{member} принял приглашение присоединиться к группе." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "%{member} присоединился к группе." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "%{member} отклонил приглашение присоединиться к группе." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "%{member} попросил присоединиться к группе." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "%{member} был приглашён %{profile}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "%{profile} добавил участника %{member}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." msgstr "%{profile} обновил участника %{member}." #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "%{profile} заархивировал обсуждение %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "%{profile} создал обсуждение %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "%{profile} создал папку %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "%{profile} удалил обсуждение %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "%{profile} удалил папку %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "%{profile} удалил ресурс %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "%{profile} исключил участника %{member}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "%{profile} упомянул вас в обсуждении %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "%{profile} переместил папку %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "%{profile} переместил ресурс %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "%{profile} вышел из группы." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "%{profile} переименовал обсуждение %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "%{profile} переименовал папку из %{old_resource_title} в %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "%{profile} переименовал ресурс из %{old_resource_title} в %{resource}." + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "%{profile} ответил на обсуждение %{discussion}." + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "%{profile} обновил участника %{member}." + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." +msgstr "%{profile} создал ресурс %{resource}." diff --git a/priv/gettext/ru/LC_MESSAGES/default.po b/priv/gettext/ru/LC_MESSAGES/default.po index 3f9d5debd..b9cdaaf10 100644 --- a/priv/gettext/ru/LC_MESSAGES/default.po +++ b/priv/gettext/ru/LC_MESSAGES/default.po @@ -1695,14 +1695,14 @@ msgid "Public feed for %{instance}" msgstr "Публичная лента для %{instance}" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" "Выбранный вами пароль слишком короткий. Пожалуйста, убедитесь, что ваш " "пароль содержит не менее 6 символов." #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" "Предоставленный вами токен недействителен. Убедитесь, что URL-адрес - именно " @@ -2004,7 +2004,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/ru/LC_MESSAGES/errors.po b/priv/gettext/ru/LC_MESSAGES/errors.po index e1c897b7f..87a1db5c1 100644 --- a/priv/gettext/ru/LC_MESSAGES/errors.po +++ b/priv/gettext/ru/LC_MESSAGES/errors.po @@ -117,7 +117,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "Текущий профиль не является администратором выбранной группы" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Ошибка при сохранении пользовательских настроек" @@ -151,14 +151,14 @@ msgid "No profile found for the moderator user" msgstr "Профиль модератора не найден" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" "Не найдено ни одного пользователя для подтверждения с этим адресом " "электронной почты" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "Пользователя с этим адресом электронной почты не найдено" @@ -171,45 +171,45 @@ msgid "Profile is not owned by authenticated user" msgstr "Профиль не принадлежит аутентифицированному пользователю" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "Регистрация не открыта" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "Текущий пароль неверен" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "Новый адрес электронной почты недействителен" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "Новый адрес электронной почты должен отличаться от текущего" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "Новый пароль должен отличаться от текущего" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "Введён неверный пароль" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" "Введенный пароль слишком короткий. Убедитесь, что ваш пароль состоит не " "менее чем из 6 символов." #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "Этот пользователь не может сбросить свой пароль" @@ -219,17 +219,17 @@ msgid "This user has been disabled" msgstr "Этот пользователь отключен" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "Невозможно проверить пользователя" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "Пользователь уже отключен" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "Запрошенный пользователь не авторизован" @@ -255,13 +255,13 @@ msgid "You may not list groups unless moderator." msgstr "Только модератор может просматривать список групп." #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" "Вам необходимо войти в систему, чтобы изменить свой адрес электронной почты" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "Вам необходимо войти в систему, чтобы изменить свой пароль" @@ -271,7 +271,7 @@ msgid "You need to be logged-in to delete a group" msgstr "Вам необходимо войти в систему, чтобы удалить группу" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "Вам необходимо войти в систему, чтобы удалить свою учетную запись" @@ -296,12 +296,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "У вас должен быть существующий токен, чтобы получить токен обновления" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "Вы слишком рано запросили новое письмо с подтверждением" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "Ваш адрес электронной почты отсутствует в белом списке" @@ -883,7 +883,7 @@ msgid "Error while creating resource" msgstr "При создании ресурса произошла ошибка" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "Неверный токен активации" @@ -912,7 +912,7 @@ msgstr "" "У этого профиля нет разрешения на обновление мероприятия от имени этой группы" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" "Ваш адрес электронной почты был отклонен при регистрации или используется " @@ -929,7 +929,7 @@ msgid "Error while creating a discussion" msgstr "При создании ресурса произошла ошибка" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "При обновлении отчёта произошла ошибка" @@ -949,12 +949,12 @@ msgid "Failed to update the group" msgstr "Не удалось обновить группу" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "Не удалось обновить электронную почту пользователя" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "Невозможно проверить пользователя" @@ -974,7 +974,7 @@ msgid "You are not the comment creator" msgstr "Вы не автор комментария" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "Вы не можете изменить свой пароль." @@ -1014,7 +1014,7 @@ msgid "Unknown error while creating event" msgstr "Неизвестная ошибка при обновлении ресурса" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "Пользователь не может изменить адрес электронной почты" @@ -1029,12 +1029,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "Не найдено человека с именем пользователя %{username}" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1072,3 +1072,8 @@ msgstr "У вас нет прав на удаление этого участн #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr "" diff --git a/priv/gettext/sv/LC_MESSAGES/activity.po b/priv/gettext/sv/LC_MESSAGES/activity.po index b82c2ca33..05ee4d884 100644 --- a/priv/gettext/sv/LC_MESSAGES/activity.po +++ b/priv/gettext/sv/LC_MESSAGES/activity.po @@ -12,50 +12,50 @@ msgstr "" "Plural-Forms: nplurals=2\n" #, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "" @@ -66,74 +66,74 @@ msgid "%{profile} created the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:66 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:70 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/web/templates/email/activity/_resource_activity_item.html.heex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_discussion_activity_item.html.heex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -144,8 +144,8 @@ msgid "%{profile} updated the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "" @@ -186,8 +186,8 @@ msgid "The post %{post} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/web/templates/email/activity/_member_activity_item.html.heex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "" @@ -243,11 +243,6 @@ msgstr "" msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:45 -msgid "%{profile} mentionned you in the discussion %{discussion}." -msgstr "" - #, elixir-format #: lib/web/templates/email/email_direct_activity.html.heex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." @@ -318,11 +313,126 @@ msgid "The post %{post} from group %{group} was updated by %{profile}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:54 -msgid "%{profile} approved the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:39 +msgid "%{member} accepted the invitation to join the group %{group}." msgstr "" #, elixir-format -#: lib/service/activity/renderer/member.ex:58 -msgid "%{profile} rejected the membership request from %{member}." +#: lib/service/activity/renderer/member.ex:47 +msgid "%{member} joined the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:43 +msgid "%{member} rejected the invitation to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:31 +msgid "%{member} requested to join the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:35 +msgid "%{member} was invited by %{profile} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:51 +msgid "%{profile} added the member %{member} to group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:55 +msgid "%{profile} approved the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:83 +msgid "%{profile} archived the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:26 +msgid "%{profile} created the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:33 +msgid "%{profile} created the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:97 +msgid "%{profile} deleted the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:69 +msgid "%{profile} deleted the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:71 +msgid "%{profile} deleted the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:75 +msgid "%{profile} excluded member %{member} from the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:55 +msgid "%{profile} mentionned you in the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:61 +msgid "%{profile} moved the folder %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:63 +msgid "%{profile} moved the resource %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:79 +msgid "%{profile} quit the group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:63 +msgid "%{profile} rejected the membership request from %{member} for group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:69 +msgid "%{profile} renamed the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:45 +msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/resource.ex:51 +msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/discussion.ex:41 +msgid "%{profile} replied to the discussion %{discussion} in group {group}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/member.ex:71 +msgid "%{profile} updated the member %{member} in group %{group}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/resource.ex:35 +msgid "%{profile} created the resource %{resource} in group %{group}." msgstr "" diff --git a/priv/gettext/sv/LC_MESSAGES/default.po b/priv/gettext/sv/LC_MESSAGES/default.po index 3942e4b9d..395cadab3 100644 --- a/priv/gettext/sv/LC_MESSAGES/default.po +++ b/priv/gettext/sv/LC_MESSAGES/default.po @@ -1393,12 +1393,12 @@ msgid "Public feed for %{instance}" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:298 +#: lib/graphql/resolvers/user.ex:318 msgid "The password you have choosen is too short. Please make sure your password contains at least 6 charaters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:304 +#: lib/graphql/resolvers/user.ex:324 msgid "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got." msgstr "" @@ -1692,7 +1692,7 @@ msgstr "" msgid "Your membership request for group %{link_start}%{group}%{link_end} has been approved." msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/web/templates/email/pending_participation_notification.html.heex:38 #: lib/web/templates/email/pending_participation_notification.text.eex:4 msgid "You have one pending attendance request to process for the following event:" diff --git a/priv/gettext/sv/LC_MESSAGES/errors.po b/priv/gettext/sv/LC_MESSAGES/errors.po index 334c42d9f..4c24454ff 100644 --- a/priv/gettext/sv/LC_MESSAGES/errors.po +++ b/priv/gettext/sv/LC_MESSAGES/errors.po @@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:593 +#: lib/graphql/resolvers/user.ex:613 msgid "Error while saving user settings" msgstr "Ett fel uppstod när användarinställningarna skulle sparas" @@ -142,12 +142,12 @@ msgid "No profile found for the moderator user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:253 +#: lib/graphql/resolvers/user.ex:273 msgid "No user to validate with this email was found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:278 +#: lib/graphql/resolvers/person.ex:314 lib/graphql/resolvers/user.ex:298 msgid "No user with this email was found" msgstr "" @@ -160,43 +160,43 @@ msgid "Profile is not owned by authenticated user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:156 +#: lib/graphql/resolvers/user.ex:160 msgid "Registrations are not open" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:408 +#: lib/graphql/resolvers/user.ex:428 msgid "The current password is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:451 +#: lib/graphql/resolvers/user.ex:471 msgid "The new email doesn't seem to be valid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:454 +#: lib/graphql/resolvers/user.ex:474 msgid "The new email must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:411 +#: lib/graphql/resolvers/user.ex:431 msgid "The new password must be different" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:458 lib/graphql/resolvers/user.ex:520 -#: lib/graphql/resolvers/user.ex:523 +#: lib/graphql/resolvers/user.ex:478 lib/graphql/resolvers/user.ex:540 +#: lib/graphql/resolvers/user.ex:543 msgid "The password provided is invalid" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:415 +#: lib/graphql/resolvers/user.ex:435 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:274 +#: lib/graphql/resolvers/user.ex:294 msgid "This user can't reset their password" msgstr "" @@ -206,17 +206,17 @@ msgid "This user has been disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:232 lib/graphql/resolvers/user.ex:237 +#: lib/graphql/resolvers/user.ex:252 lib/graphql/resolvers/user.ex:257 msgid "Unable to validate user" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:501 +#: lib/graphql/resolvers/user.ex:521 msgid "User already disabled" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:568 +#: lib/graphql/resolvers/user.ex:588 msgid "User requested is not logged-in" msgstr "" @@ -241,12 +241,12 @@ msgid "You may not list groups unless moderator." msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:466 +#: lib/graphql/resolvers/user.ex:486 msgid "You need to be logged-in to change your email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:423 +#: lib/graphql/resolvers/user.ex:443 msgid "You need to be logged-in to change your password" msgstr "" @@ -256,7 +256,7 @@ msgid "You need to be logged-in to delete a group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:528 +#: lib/graphql/resolvers/user.ex:548 msgid "You need to be logged-in to delete your account" msgstr "" @@ -281,12 +281,12 @@ msgid "You need to have an existing token to get a refresh token" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:256 lib/graphql/resolvers/user.ex:281 +#: lib/graphql/resolvers/user.ex:276 lib/graphql/resolvers/user.ex:301 msgid "You requested again a confirmation email too soon" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:159 +#: lib/graphql/resolvers/user.ex:163 msgid "Your email is not on the allowlist" msgstr "" @@ -840,7 +840,7 @@ msgid "Error while creating resource" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:484 +#: lib/graphql/resolvers/user.ex:504 msgid "Invalid activation token" msgstr "" @@ -866,7 +866,7 @@ msgid "This profile doesn't have permission to update an event on behalf of this msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:163 +#: lib/graphql/resolvers/user.ex:167 msgid "Your e-mail has been denied registration or uses a disallowed e-mail provider" msgstr "" @@ -881,7 +881,7 @@ msgid "Error while creating a discussion" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:607 +#: lib/graphql/resolvers/user.ex:627 msgid "Error while updating locale" msgstr "" @@ -901,12 +901,12 @@ msgid "Failed to update the group" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:448 +#: lib/graphql/resolvers/user.ex:468 msgid "Failed to update user email" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:480 +#: lib/graphql/resolvers/user.ex:500 msgid "Failed to validate user email" msgstr "" @@ -926,7 +926,7 @@ msgid "You are not the comment creator" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:405 +#: lib/graphql/resolvers/user.ex:425 msgid "You cannot change your password." msgstr "" @@ -966,7 +966,7 @@ msgid "Unknown error while creating event" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:461 +#: lib/graphql/resolvers/user.ex:481 msgid "User cannot change email" msgstr "" @@ -981,12 +981,12 @@ msgid "Follow not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:327 +#: lib/graphql/resolvers/user.ex:347 msgid "Profile with username %{username} not found" msgstr "" #, elixir-format -#: lib/graphql/resolvers/user.ex:322 +#: lib/graphql/resolvers/user.ex:342 msgid "This profile does not belong to you" msgstr "" @@ -1024,3 +1024,8 @@ msgstr "" #: lib/graphql/resolvers/member.ex:250 msgid "You must be logged-in to remove a member" msgstr "" + +#, elixir-format +#: lib/graphql/resolvers/user.ex:157 +msgid "Your email seems to be using an invalid format" +msgstr ""