56 changed files with 7292 additions and 7110 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,13 +1,3 @@
-# v0.5.2
- Add "Added on" date to ammo groups
- Add "Added on" date to ammo types
- Add "Registered on" date to user information
- Add language in user settings. The `LOCALE` environment variable will continue
-  to set the default locale for the application.
- Add involvement links to home page
- Fix button text-wrapping
- Update dependencies
-
 # v0.5.1
 - Add French translation: Thank you [duponin](https://udongein.xyz/users/duponin)!

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -63,7 +63,8 @@ And as always, thank you!
  [`phx_gen_auth`](https://hexdocs.pm/phx_gen_auth/).
 - `Dockerfile` and example `docker-compose.yml`
 - Automatic migrations in `MIX_ENV=prod` or Docker image
- JS linting with [standard.js](https://standardjs.com)
+- JS linting with [standard.js](https://standardjs.com), HEEx linting with
+  [heex_formatter](https://github.com/feliperenan/heex_formatter)

 ## Docs

@ -108,7 +109,7 @@ In `dev` mode, Cannery will listen for these environment variables at runtime.
  Defaults to `false`.
 - `POOL_SIZE`: Controls the pool size to use with PostgreSQL. Defaults to `10`.
 - `REGISTRATION`: Controls if user sign-up should be invite only or set to public. Set to `public` to enable public registration. Defaults to `invite`.
- `LOCALE`: Sets a custom default locale. Defaults to `en_US`.
+- `LOCALE`: Sets a custom locale. Defaults to `en_US`.
  - Available options: `en_US`, `de`, and `fr`

 ## `MIX_ENV=test`
--- a/README.md
+++ b/README.md
@ -63,7 +63,7 @@ You can use the following environment variables to configure Cannery in
  with `docker run -it shibaobun/cannery mix phx.gen.secret` and set for server to start.
 - `REGISTRATION`: Controls if user sign-up should be invite only or set to
  public. Set to `public` to enable public registration. Defaults to `invite`.
- `LOCALE`: Sets a custom default locale. Defaults to `en_US`
+- `LOCALE`: Sets a custom locale. Defaults to `en_US`
  - Available options: `en_US`, `de`, and `fr`
 - `SMTP_HOST`: The url for your SMTP email provider. Must be set
 - `SMTP_PORT`: The port for your SMTP relay. Defaults to `587`.
--- a/assets/css/components.scss
+++ b/assets/css/components.scss
@ -25,7 +25,7 @@
  }

  .btn {
-    @apply inline-block break-words min-w-4;
+    @apply inline-block break-all min-w-4;
    @apply focus:outline-none px-4 py-2 rounded-lg;
    @apply shadow-sm focus:shadow-lg;
    @apply transition-all duration-300 ease-in-out;
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
--- a/assets/package.json
+++ b/assets/package.json
@ -9,33 +9,36 @@
    "test": "standard"
  },
  "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.1.1",
-    "alpinejs": "^3.10.2",
+    "@fortawesome/fontawesome-free": "^5.15.4",
+    "alpinejs": "^3.9.0",
    "phoenix": "file:../deps/phoenix",
    "phoenix_html": "file:../deps/phoenix_html",
    "phoenix_live_view": "file:../deps/phoenix_live_view",
-    "topbar": "^1.0.1"
+    "topbar": "^0.1.4"
  },
  "devDependencies": {
-    "@babel/core": "^7.17.10",
-    "@babel/preset-env": "^7.17.10",
-    "autoprefixer": "^10.4.7",
-    "babel-loader": "^8.2.5",
-    "copy-webpack-plugin": "^10.2.4",
-    "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^3.4.1",
+    "@babel/core": "^7.15.0",
+    "@babel/preset-env": "^7.15.0",
+    "autoprefixer": "^10.2.6",
+    "babel-loader": "^8.2.2",
+    "copy-webpack-plugin": "^9.0.0",
+    "css-loader": "^5.2.7",
+    "css-minimizer-webpack-plugin": "^3.0.1",
    "file-loader": "^6.2.0",
-    "mini-css-extract-plugin": "^2.6.0",
-    "postcss": "^8.4.13",
-    "postcss-import": "^14.1.0",
-    "postcss-loader": "^6.2.1",
-    "postcss-preset-env": "^7.5.0",
-    "sass-loader": "^12.6.0",
-    "standard": "^17.0.0",
-    "tailwindcss": "^3.0.24",
-    "terser-webpack-plugin": "^5.3.1",
-    "webpack": "^5.72.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "^4.9.0"
+    "hard-source-webpack-plugin": "^0.13.1",
+    "mini-css-extract-plugin": "^1.6.0",
+    "node-sass": "^7.0.1",
+    "postcss": "^8.3.6",
+    "postcss-import": "^14.0.2",
+    "postcss-loader": "^6.1.1",
+    "postcss-preset-env": "^7.3.1",
+    "sass-loader": "^12.1.0",
+    "standard": "^16.0.4",
+    "style-loader": "^3.2.1",
+    "tailwindcss": "^2.2.7",
+    "terser-webpack-plugin": "^5.1.3",
+    "webpack": "^5.67.0",
+    "webpack-cli": "^4.8.0",
+    "webpack-dev-server": "^4.7.4"
  }
 }
--- a/assets/tailwind.config.js
+++ b/assets/tailwind.config.js
@ -1,18 +1,24 @@
 const colors = require('tailwindcss/colors')

 module.exports = {
-  content: [
-    '../lib/**/*.{ex,heex,leex,eex}',
+  purge: [
+    '../lib/**/*.ex',
+    '../lib/**/*.heex',
+    '../lib/**/*.leex',
+    '../lib/**/*.eex',
    './js/**/*.js'
  ],
+  darkMode: 'media',
  theme: {
    colors: {
      transparent: 'transparent',
      current: 'currentColor',
+
      primary: colors.gray,
+
      black: colors.black,
      white: colors.white,
-      gray: colors.neutral,
+      gray: colors.trueGray,
      indigo: colors.indigo,
      red: colors.rose,
      yellow: colors.amber
@ -39,5 +45,11 @@ module.exports = {
      }
    }
  },
+  variants: {
+    extend: {
+      backgroundColor: ['active'],
+      borderColor: ['active']
+    }
+  },
  plugins: []
 }
--- a/assets/webpack.config.js
+++ b/assets/webpack.config.js
@ -44,14 +44,19 @@ module.exports = (env, options) => {
        },
        {
          test: /\.(woff(2)?|ttf|eot|svg|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-          type: 'asset/resource',
-          generator: { filename: 'fonts/[name][ext]' }
+          loader: 'file-loader',
+          options: {
+            name: '[name].[ext]?[hash]',
+            outputPath: '../fonts'
+          }
        }
      ]
    },
    plugins: [
      new MiniCssExtractPlugin({ filename: '../css/app.css' }),
-      new CopyWebpackPlugin({ patterns: [{ from: 'static/', to: '../' }] })
+      new CopyWebpackPlugin({
+        patterns: [{ from: 'static/', to: '../' }]
+      })
    ]
  }
 }
--- a/lib/cannery/accounts.ex
+++ b/lib/cannery/accounts.ex
@ -269,35 +269,6 @@ defmodule Cannery.Accounts do
    end
  end

-  @doc """
-  Returns an `%Changeset{}` for changing the user locale.
-
-  ## Examples
-
-      iex> change_user_locale(user)
-      %Changeset{data: %User{}}
-
-  """
-  @spec change_user_locale(User.t()) :: Changeset.t(User.t())
-  def change_user_locale(%{locale: locale} = user), do: User.locale_changeset(user, locale)
-
-  @doc """
-  Updates the user locale.
-
-  ## Examples
-
-      iex> update_user_locale(user, "valid locale")
-      {:ok, %User{}}
-
-      iex> update_user_password(user, "invalid locale")
-      {:error, %Changeset{}}
-
-  """
-  @spec update_user_locale(User.t(), locale :: String.t()) ::
-          {:ok, User.t()} | {:error, Changeset.t(User.t())}
-  def update_user_locale(user, locale),
-    do: user |> User.locale_changeset(locale) |> Repo.update()
-
  @doc """
  Deletes a user. must be performed by an admin or the same user!

--- a/lib/cannery/accounts/user.ex
+++ b/lib/cannery/accounts/user.ex
@ -18,7 +18,6 @@ defmodule Cannery.Accounts.User do
    field :hashed_password, :string
    field :confirmed_at, :naive_datetime
    field :role, Ecto.Enum, values: [:admin, :user], default: :user
-    field :locale, :string

    has_many :invites, Invite, on_delete: :delete_all

@ -32,7 +31,6 @@ defmodule Cannery.Accounts.User do
          hashed_password: String.t(),
          confirmed_at: NaiveDateTime.t(),
          role: atom(),
-          locale: String.t() | nil,
          invites: [Invite.t()],
          inserted_at: NaiveDateTime.t(),
          updated_at: NaiveDateTime.t()
@ -62,7 +60,7 @@ defmodule Cannery.Accounts.User do
          Changeset.t(t() | new_user())
  def registration_changeset(user, attrs, opts \\ []) do
    user
-    |> cast(attrs, [:email, :password, :role, :locale])
+    |> cast(attrs, [:email, :password, :role])
    |> validate_email()
    |> validate_password(opts)
  end
@ -187,14 +185,4 @@ defmodule Cannery.Accounts.User do
      do: changeset,
      else: changeset |> add_error(:current_password, dgettext("errors", "is not valid"))
  end
-
-  @doc """
-  A changeset for changing the user's locale
-  """
-  @spec locale_changeset(t() | Changeset.t(t()), locale :: String.t() | nil) :: Changeset.t(t())
-  def locale_changeset(user_or_changeset, locale) do
-    user_or_changeset
-    |> cast(%{"locale" => locale}, [:locale])
-    |> validate_required(:locale)
-  end
 end
--- a/lib/cannery/ammo/ammo_type.ex
+++ b/lib/cannery/ammo/ammo_type.ex
@ -31,10 +31,10 @@ defmodule Cannery.Ammo.AmmoType do
    field :pressure, :string
    field :primer_type, :string
    field :firing_type, :string
-    field :tracer, :boolean, default: false
-    field :incendiary, :boolean, default: false
-    field :blank, :boolean, default: false
-    field :corrosive, :boolean, default: false
+    field :tracer, :boolean, null: false, default: false
+    field :incendiary, :boolean, null: false, default: false
+    field :blank, :boolean, null: false, default: false
+    field :corrosive, :boolean, null: false, default: false

    field :manufacturer, :string
    field :upc, :string
--- a/lib/cannery_web.ex
+++ b/lib/cannery_web.ex
@ -47,7 +47,6 @@ defmodule CanneryWeb do
      use Phoenix.LiveView,
        layout: {CanneryWeb.LayoutView, "live.html"}

-      on_mount CanneryWeb.InitAssigns
      unquote(view_helpers())
    end
  end
--- a/lib/cannery_web/components/ammo_group_card.ex
+++ b/lib/cannery_web/components/ammo_group_card.ex
@ -37,11 +37,6 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
          </span>
        <% end %>

-        <span class="rounded-lg title text-lg">
-          <%= gettext("Added on:") %>
-          <%= @ammo_group.inserted_at |> display_datetime() %>
-        </span>
-
        <%= if @ammo_group.price_paid do %>
          <span class="rounded-lg title text-lg">
            <%= gettext("Price paid:") %>
--- a/lib/cannery_web/components/topbar.ex
+++ b/lib/cannery_web/components/topbar.ex
@ -89,7 +89,7 @@ defmodule CanneryWeb.Components.Topbar do
              <li class="mx-2 my-1">
                <%= live_redirect to: Routes.live_dashboard_path(Endpoint, :home),
                  class: "text-primary-600 text-white hover:underline" do %>
-                  <i class="fas fa-gauge"></i>
+                  <i class="fas fa-tachometer-alt"></i>
                <% end %>
              </li>
            <% end %>
--- a/lib/cannery_web/components/user_card.ex
+++ b/lib/cannery_web/components/user_card.ex
@ -18,18 +18,12 @@ defmodule CanneryWeb.Components.UserCard do
      </h1>

      <h3 class="px-4 py-2 rounded-lg title text-lg">
-        <p>
        <%= if @user.confirmed_at |> is_nil() do %>
          Email unconfirmed
        <% else %>
-            User was confirmed at <%= @user.confirmed_at |> display_datetime() %>
+          <p>User was confirmed at</p>
+          <%= @user.confirmed_at |> display_datetime() %>
        <% end %>
-        </p>
-
-        <p>
-          <%= gettext("User registered on") %>
-          <%= @user.inserted_at |> display_datetime() %>
-        </p>
      </h3>

      <%= if @inner_block do %>
--- a/lib/cannery_web/controllers/user_settings_controller.ex
+++ b/lib/cannery_web/controllers/user_settings_controller.ex
@ -10,11 +10,10 @@ defmodule CanneryWeb.UserSettingsController do
    render(conn, "edit.html", page_title: gettext("Settings"))
  end

-  def update(%{assigns: %{current_user: user}} = conn, %{
-        "action" => "update_email",
-        "current_password" => password,
-        "user" => user_params
-      }) do
+  def update(conn, %{"action" => "update_email"} = params) do
+    %{"current_password" => password, "user" => user_params} = params
+    user = conn.assigns.current_user
+
    case Accounts.apply_user_email(user, password, user_params) do
      {:ok, applied_user} ->
        Accounts.deliver_update_email_instructions(
@ -34,15 +33,14 @@ defmodule CanneryWeb.UserSettingsController do
        |> redirect(to: Routes.user_settings_path(conn, :edit))

      {:error, changeset} ->
-        conn |> render("edit.html", email_changeset: changeset)
+        render(conn, "edit.html", email_changeset: changeset)
    end
  end

-  def update(%{assigns: %{current_user: user}} = conn, %{
-        "action" => "update_password",
-        "current_password" => password,
-        "user" => user_params
-      }) do
+  def update(conn, %{"action" => "update_password"} = params) do
+    %{"current_password" => password, "user" => user_params} = params
+    user = conn.assigns.current_user
+
    case Accounts.update_user_password(user, password, user_params) do
      {:ok, user} ->
        conn
@ -51,27 +49,12 @@ defmodule CanneryWeb.UserSettingsController do
        |> UserAuth.log_in_user(user)

      {:error, changeset} ->
-        conn |> render("edit.html", password_changeset: changeset)
+        render(conn, "edit.html", password_changeset: changeset)
    end
  end

-  def update(
-        %{assigns: %{current_user: user}} = conn,
-        %{"action" => "update_locale", "user" => %{"locale" => locale}}
-      ) do
-    case Accounts.update_user_locale(user, locale) do
-      {:ok, _user} ->
-        conn
-        |> put_flash(:info, dgettext("prompts", "Language updated successfully."))
-        |> redirect(to: Routes.user_settings_path(conn, :edit))
-
-      {:error, changeset} ->
-        conn |> render("edit.html", locale_changeset: changeset)
-    end
-  end
-
-  def confirm_email(%{assigns: %{current_user: user}} = conn, %{"token" => token}) do
-    case Accounts.update_user_email(user, token) do
+  def confirm_email(conn, %{"token" => token}) do
+    case Accounts.update_user_email(conn.assigns.current_user, token) do
      :ok ->
        conn
        |> put_flash(:info, dgettext("prompts", "Email changed successfully."))
@ -101,10 +84,11 @@ defmodule CanneryWeb.UserSettingsController do
    end
  end

-  defp assign_email_and_password_changesets(%{assigns: %{current_user: user}} = conn, _opts) do
+  defp assign_email_and_password_changesets(conn, _opts) do
+    user = conn.assigns.current_user
+
    conn
    |> assign(:email_changeset, Accounts.change_user_email(user))
    |> assign(:password_changeset, Accounts.change_user_password(user))
-    |> assign(:locale_changeset, Accounts.change_user_locale(user))
  end
 end
--- a/lib/cannery_web/live/ammo_group_live/index.ex
+++ b/lib/cannery_web/live/ammo_group_live/index.ex
@ -8,8 +8,8 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
  alias CanneryWeb.Endpoint

  @impl true
-  def mount(_params, _session, socket) do
-    {:ok, socket |> display_ammo_groups()}
+  def mount(_params, session, socket) do
+    {:ok, socket |> assign_defaults(session) |> display_ammo_groups()}
  end

  @impl true
@ -83,7 +83,6 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
      %{label: gettext("% left"), key: "remaining"},
      %{label: gettext("Range"), key: "range"},
      %{label: gettext("Container"), key: "container"},
-      %{label: gettext("Added on"), key: "added_on"},
      %{label: nil, key: "actions", sortable: false}
    ]

@ -117,15 +116,6 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
  defp get_value_for_key("price_paid", %{price_paid: price_paid}),
    do: gettext("$%{amount}", amount: price_paid |> :erlang.float_to_binary(decimals: 2))

-  defp get_value_for_key("added_on", %{inserted_at: inserted_at}) do
-    assigns = %{inserted_at: inserted_at}
-
-    {inserted_at,
-     ~H"""
-     <%= @inserted_at |> display_datetime() %>
-     """}
-  end
-
  defp get_value_for_key("range", %{staged: staged} = ammo_group) do
    assigns = %{ammo_group: ammo_group}

--- a/lib/cannery_web/live/ammo_group_live/show.ex
+++ b/lib/cannery_web/live/ammo_group_live/show.ex
@ -10,7 +10,9 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
  alias Phoenix.LiveView.Socket

  @impl true
-  def mount(_params, _session, socket), do: {:ok, socket}
+  def mount(_params, session, socket) do
+    {:ok, socket |> assign_defaults(session)}
+  end

  @impl true
  def handle_params(
--- a/lib/cannery_web/live/ammo_group_live/show.html.heex
+++ b/lib/cannery_web/live/ammo_group_live/show.html.heex
@ -26,11 +26,6 @@
      </span>
    <% end %>

-    <span class="rounded-lg title text-lg">
-      <%= gettext("Added on:") %>
-      <%= @ammo_group.inserted_at |> display_datetime() %>
-    </span>
-
    <%= if @ammo_group.price_paid do %>
      <span class="rounded-lg title text-lg">
        <%= gettext("Original cost:") %>
--- a/lib/cannery_web/live/ammo_type_live/index.ex
+++ b/lib/cannery_web/live/ammo_type_live/index.ex
@ -9,8 +9,8 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
  alias CanneryWeb.Endpoint

  @impl true
-  def mount(_params, _session, socket) do
-    {:ok, socket |> list_ammo_types()}
+  def mount(_params, session, socket) do
+    {:ok, socket |> assign_defaults(session) |> list_ammo_types()}
  end

  @impl true
--- a/lib/cannery_web/live/ammo_type_live/show.ex
+++ b/lib/cannery_web/live/ammo_type_live/show.ex
@ -9,7 +9,9 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
  alias CanneryWeb.Endpoint

  @impl true
-  def mount(_params, _session, socket), do: {:ok, socket}
+  def mount(_params, session, socket) do
+    {:ok, socket |> assign_defaults(session)}
+  end

  @impl true
  def handle_params(%{"id" => id}, _params, %{assigns: %{current_user: current_user}} = socket) do
--- a/lib/cannery_web/live/ammo_type_live/show.html.heex
+++ b/lib/cannery_web/live/ammo_type_live/show.html.heex
@ -87,14 +87,6 @@
      <%= @ammo_type |> Ammo.get_used_count_for_ammo_type(@current_user) %>
    </span>

-    <h3 class="title text-lg">
-      <%= gettext("Added on:") %>
-    </h3>
-
-    <span class="text-primary-600">
-      <%= @ammo_type.inserted_at |> display_datetime() %>
-    </span>
-
    <%= if @avg_cost_per_round do %>
      <h3 class="title text-lg">
        <%= gettext("Average Price paid") %>:
--- a/lib/cannery_web/live/container_live/index.ex
+++ b/lib/cannery_web/live/container_live/index.ex
@ -10,7 +10,9 @@ defmodule CanneryWeb.ContainerLive.Index do
  alias Ecto.Changeset

  @impl true
-  def mount(_params, _session, socket), do: {:ok, socket}
+  def mount(_params, session, socket) do
+    {:ok, socket |> assign_defaults(session)}
+  end

  @impl true
  def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
--- a/lib/cannery_web/live/container_live/show.ex
+++ b/lib/cannery_web/live/container_live/show.ex
@ -11,7 +11,9 @@ defmodule CanneryWeb.ContainerLive.Show do
  alias Phoenix.LiveView.Socket

  @impl true
-  def mount(_params, _session, socket), do: {:ok, socket}
+  def mount(_params, session, socket) do
+    {:ok, socket |> assign_defaults(session)}
+  end

  @impl true
  def handle_params(
--- a/lib/cannery_web/live/home_live.ex
+++ b/lib/cannery_web/live/home_live.ex
@ -7,9 +7,14 @@ defmodule CanneryWeb.HomeLive do
  alias Cannery.Accounts

  @impl true
-  def mount(_params, _session, socket) do
+  def mount(_params, session, socket) do
    admins = Accounts.list_users_by_role(:admin)
-    socket = socket |> assign(page_title: "Home", query: "", results: %{}, admins: admins)
+
+    socket =
+      socket
+      |> assign_defaults(session)
+      |> assign(page_title: "Home", query: "", results: %{}, admins: admins)
+
    {:ok, socket}
  end

@ -126,47 +131,11 @@ defmodule CanneryWeb.HomeLive do
                to: "https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md",
                target: "_blank",
                rel: "noopener noreferrer" do %>
-            <p>0.5.2</p>
+            <p>0.5.1</p>
            <i class="fas fa-md fa-info-circle"></i>
          <% end %>
        </li>
      </ul>
-
-      <hr class="hr" />
-
-      <ul class="flex flex-col space-y-2 text-center justify-center">
-        <h2 class="title text-primary-600 text-lg">
-          <%= gettext("Get involved!") %>
-        </h2>
-
-        <li class="flex flex-col justify-center space-x-2">
-          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
-                to: "https://gitea.bubbletea.dev/shibao/cannery",
-                target: "_blank",
-                rel: "noopener noreferrer" do %>
-            <p><%= gettext("View the source code") %></p>
-            <i class="fas fa-md fa-code"></i>
-          <% end %>
-        </li>
-        <li class="flex flex-col justify-center space-x-2">
-          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
-              to: "https://weblate.bubbletea.dev/engage/cannery",
-              target: "_blank",
-              rel: "noopener noreferrer" do %>
-            <p><%= gettext("Help translate") %></p>
-            <i class="fas fa-md fa-language"></i>
-          <% end %>
-        </li>
-        <li class="flex flex-col justify-center space-x-2">
-          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
-              to: "https://gitea.bubbletea.dev/shibao/cannery/issues/new",
-              target: "_blank",
-              rel: "noopener noreferrer" do %>
-            <p><%= gettext("Report bugs or request features") %></p>
-            <i class="fas fa-md fa-spider"></i>
-          <% end %>
-        </li>
-      </ul>
    </div>
    """
  end
--- a/lib/cannery_web/live/init_assigns.ex
+++ b/lib/cannery_web/live/init_assigns.ex
@ -1,19 +0,0 @@
-defmodule CanneryWeb.InitAssigns do
-  @moduledoc """
-  Ensures common `assigns` are applied to all LiveViews attaching this hook.
-  """
-  import Phoenix.LiveView
-  alias Cannery.Accounts
-
-  def on_mount(:default, _params, %{"locale" => locale, "user_token" => user_token}, socket) do
-    Gettext.put_locale(locale)
-
-    socket =
-      socket
-      |> assign_new(:current_user, fn -> Accounts.get_user_by_session_token(user_token) end)
-
-    {:cont, socket}
-  end
-
-  def on_mount(:default, _params, _session, socket), do: {:cont, socket}
-end
--- a/lib/cannery_web/live/invite_live/index.ex
+++ b/lib/cannery_web/live/invite_live/index.ex
@ -10,7 +10,9 @@ defmodule CanneryWeb.InviteLive.Index do
  alias Phoenix.LiveView.JS

  @impl true
-  def mount(_params, _session, %{assigns: %{current_user: current_user}} = socket) do
+  def mount(_params, session, socket) do
+    %{assigns: %{current_user: current_user}} = socket = socket |> assign_defaults(session)
+
    socket =
      if current_user |> Map.get(:role) == :admin do
        socket |> display_invites()
--- a/lib/cannery_web/live/live_helpers.ex
+++ b/lib/cannery_web/live/live_helpers.ex
@ -3,9 +3,20 @@ defmodule CanneryWeb.LiveHelpers do
  Contains common helper functions for liveviews
  """

+  import Phoenix.LiveView
  import Phoenix.LiveView.Helpers
+  alias Cannery.Accounts
  alias Phoenix.LiveView.JS

+  def assign_defaults(socket, %{"user_token" => user_token} = _session) do
+    socket
+    |> assign_new(:current_user, fn -> Accounts.get_user_by_session_token(user_token) end)
+  end
+
+  def assign_defaults(socket, _session) do
+    socket
+  end
+
  @doc """
  Renders a live component inside a modal.

--- a/lib/cannery_web/live/range_live/index.ex
+++ b/lib/cannery_web/live/range_live/index.ex
@ -10,7 +10,9 @@ defmodule CanneryWeb.RangeLive.Index do
  alias Phoenix.LiveView.Socket

  @impl true
-  def mount(_params, _session, socket), do: {:ok, socket |> display_shot_groups()}
+  def mount(_params, session, socket) do
+    {:ok, socket |> assign_defaults(session) |> display_shot_groups()}
+  end

  @impl true
  def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
--- a/lib/cannery_web/live/tag_live/index.ex
+++ b/lib/cannery_web/live/tag_live/index.ex
@ -9,7 +9,9 @@ defmodule CanneryWeb.TagLive.Index do
  alias CanneryWeb.Endpoint

  @impl true
-  def mount(_params, _session, socket), do: {:ok, socket |> display_tags()}
+  def mount(_params, session, socket) do
+    {:ok, socket |> assign_defaults(session) |> display_tags()}
+  end

  @impl true
  def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
--- a/lib/cannery_web/router.ex
+++ b/lib/cannery_web/router.ex
@ -11,17 +11,8 @@ defmodule CanneryWeb.Router do
    plug :protect_from_forgery
    plug :put_secure_browser_headers
    plug :fetch_current_user
-    plug :put_user_locale, default: Application.get_env(:gettext, :default_locale, "en_US")
-  end

-  defp put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, default: default) do
-    Gettext.put_locale(locale || default)
-    conn |> put_session(:locale, locale || default)
-  end
-
-  defp put_user_locale(conn, default: default) do
-    Gettext.put_locale(default)
-    conn |> put_session(:locale, default)
+    Gettext.put_locale(Application.get_env(:gettext, :default_locale, "en_US"))
  end

  pipeline :require_admin do
--- a/lib/cannery_web/templates/layout/live.html.heex
+++ b/lib/cannery_web/templates/layout/live.html.heex
@ -37,7 +37,7 @@
    <%= gettext("Loading...") %>
  </h1>

-  <i class="fas fa-3x fa-spin fa-gear"></i>
+  <i class="fas fa-3x fa-spin fa-cog"></i>
 </div>

 <div
--- a/lib/cannery_web/templates/user_registration/new.html.heex
+++ b/lib/cannery_web/templates/user_registration/new.html.heex
@ -30,15 +30,6 @@
    <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
    <%= error_tag(f, :password, "col-span-3") %>

-    <%= label(f, :locale, gettext("Language"), class: "title text-lg text-primary-600") %>
-    <%= select(
-      f,
-      :locale,
-      [{gettext("English"), "en_US"}, {gettext("German"), "de"}, {gettext("French"), "fr"}],
-      class: "input input-primary col-span-2"
-    ) %>
-    <%= error_tag(f, :locale) %>
-
    <%= submit(dgettext("actions", "Register"), class: "mx-auto btn btn-primary col-span-3") %>
  <% end %>

--- a/lib/cannery_web/templates/user_settings/edit.html.heex
+++ b/lib/cannery_web/templates/user_settings/edit.html.heex
@ -1,16 +1,17 @@
-<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center text-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
  <h1 class="pb-4 title text-primary-600 text-xl">
    <%= gettext("Settings") %>
  </h1>

  <hr class="hr" />

-  <.form
-    let={f}
-    for={@email_changeset}
-    action={Routes.user_settings_path(@conn, :update)}
-    class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-  >
+  <%= form_for @email_changeset,
+           Routes.user_settings_path(@conn, :update),
+           [
+             class:
+               "flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
+           ],
+           fn f -> %>
    <h3 class="title text-primary-600 text-lg col-span-3">
      <%= dgettext("actions", "Change email") %>
    </h3>
@ -44,16 +45,17 @@
    <%= submit(dgettext("actions", "Change email"),
      class: "mx-auto btn btn-primary col-span-3"
    ) %>
-  </.form>
+  <% end %>

  <hr class="hr" />

-  <.form
-    let={f}
-    for={@password_changeset}
-    action={Routes.user_settings_path(@conn, :update)}
-    class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-  >
+  <%= form_for @password_changeset,
+           Routes.user_settings_path(@conn, :update),
+           [
+             class:
+               "flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
+           ],
+           fn f -> %>
    <h3 class="title text-primary-600 text-lg col-span-3">
      <%= dgettext("actions", "Change password") %>
    </h3>
@ -99,44 +101,8 @@
    <%= submit(dgettext("actions", "Change password"),
      class: "mx-auto btn btn-primary col-span-3"
    ) %>
-  </.form>
-
-  <hr class="hr" />
-
-  <.form
-    let={f}
-    for={@locale_changeset}
-    action={Routes.user_settings_path(@conn, :update)}
-    class="flex flex-col space-y-4 justify-center items-center"
-  >
-    <h3 class="title text-primary-600 text-lg">
-      <%= dgettext("actions", "Change Language") %>
-    </h3>
-
-    <%= if @locale_changeset.action && not @locale_changeset.valid? do %>
-      <div class="alert alert-danger">
-        <p>
-          <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-        </p>
-      </div>
  <% end %>

-    <%= hidden_input(f, :action, name: "action", value: "update_locale") %>
-
-    <%= select(
-      f,
-      :locale,
-      [{gettext("English"), "en_US"}, {gettext("German"), "de"}, {gettext("French"), "fr"}],
-      class: "mx-2 my-1 min-w-md input input-primary"
-    ) %>
-    <%= error_tag(f, :locale) %>
-
-    <%= submit(dgettext("actions", "Change language"),
-      class: "whitespace-nowrap mx-auto btn btn-primary",
-      data: [qa: dgettext("prompts", "Are you sure you want to change your language?")]
-    ) %>
-  </.form>
-
  <hr class="hr" />

  <%= link(dgettext("actions", "Delete User"),
--- a/mix.exs
+++ b/mix.exs
@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
  def project do
    [
      app: :cannery,
-      version: "0.5.2",
+      version: "0.5.1",
      elixir: "1.13.4",
      elixirc_paths: elixirc_paths(Mix.env()),
      compilers: [:gettext] ++ Mix.compilers(),
@ -13,7 +13,6 @@ defmodule Cannery.MixProject do
      deps: deps(),
      dialyzer: [plt_add_apps: [:ex_unit]],
      consolidate_protocols: Mix.env() not in [:dev, :test],
-      preferred_cli_env: [test: :test],
      # ExDoc
      name: "Cannery",
      source_url: "https://gitea.bubbletea.dev/shibao/cannery",
@ -86,19 +85,12 @@ defmodule Cannery.MixProject do
      setup: ["deps.get", "compile", "ecto.setup", "cmd npm install --prefix assets"],
      "ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
      "ecto.reset": ["ecto.drop", "ecto.setup"],
-      format: [
-        "cmd npm run format --prefix assets",
-        "format",
-        "gettext.extract --merge",
-        "gettext.merge --no-fuzzy priv/gettext"
-      ],
+      format: ["cmd npm run format --prefix assets", "format", "gettext.extract"],
      test: [
        "cmd npm run test --prefix assets",
        "dialyzer",
        "credo --strict",
        "format --check-formatted",
-        "gettext.extract --check-up-to-date",
-        "ecto.drop --quiet",
        "ecto.create --quiet",
        "ecto.migrate --quiet",
        "test"
--- a/mix.lock
+++ b/mix.lock
@ -12,13 +12,13 @@
  "decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
  "dialyxir": {:hex, :dialyxir, "1.1.0", "c5aab0d6e71e5522e77beff7ba9e08f8e02bad90dfbeffae60eaf0cb47e29488", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "07ea8e49c45f15264ebe6d5b93799d4dd56a44036cf42d0ad9c960bc266c0b9a"},
  "earmark_parser": {:hex, :earmark_parser, "1.4.25", "2024618731c55ebfcc5439d756852ec4e85978a39d0d58593763924d9a15916f", [:mix], [], "hexpm", "56749c5e1c59447f7b7a23ddb235e4b3defe276afc220a6227237f3efe83f51e"},
-  "ecto": {:hex, :ecto, "3.8.2", "7b9aca632f9da80ffed525354e4de466a66e042abcbc8509b6b600072c8d8ee0", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "afe2912cc23f61a6a8466c158331d54e0f427029dd97ca936644bc116d6599b3"},
+  "ecto": {:hex, :ecto, "3.7.2", "44c034f88e1980754983cc4400585970b4206841f6f3780967a65a9150ef09a8", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a600da5772d1c31abbf06f3e4a1ffb150e74ed3e2aa92ff3cee95901657a874e"},
  "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.7.4", "5d43fd088d39a158c860b17e8d210669587f63ec89ea122a4654861c8c6e2db4", [:mix], [{:ecto_sql, "~> 3.4", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.15.7", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "311db02f1b772e3d0dc7f56a05044b5e1499d78ed6abf38885e1ca70059449e5"},
-  "ecto_sql": {:hex, :ecto_sql, "3.8.1", "1acaaba32ca0551fd19e492fc7c80414e72fc1a7140fc9395aaa53c2e8629798", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.8.1", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0 or ~> 0.16.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ba7fc75882edce6f2ceca047315d5db27ead773cafea47f1724e35f1e7964525"},
+  "ecto_sql": {:hex, :ecto_sql, "3.7.2", "55c60aa3a06168912abf145c6df38b0295c34118c3624cf7a6977cd6ce043081", [:mix], [{:db_connection, "~> 2.2", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.4.0 or ~> 0.5.0 or ~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0 or ~> 0.16.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3c218ea62f305dcaef0b915fb56583195e7b91c91dcfb006ba1f669bfacbff2a"},
  "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
  "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
  "esbuild": {:hex, :esbuild, "0.4.0", "9f17db148aead4cf1e6e6a584214357287a93407b5fb51a031f122b61385d4c2", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}], "hexpm", "b61e4e6b92ffe45e4ee4755a22de6211a67c67987dc02afb35a425a0add1d447"},
-  "ex_doc": {:hex, :ex_doc, "0.28.4", "001a0ea6beac2f810f1abc3dbf4b123e9593eaa5f00dd13ded024eae7c523298", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bf85d003dd34911d89c8ddb8bda1a958af3471a274a4c2150a9c01c78ac3f8ed"},
+  "ex_doc": {:hex, :ex_doc, "0.28.3", "6eea2f69995f5fba94cd6dd398df369fe4e777a47cd887714a0976930615c9e6", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "05387a6a2655b5f9820f3f627450ed20b4325c25977b2ee69bed90af6688e718"},
  "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
  "floki": {:hex, :floki, "0.32.1", "dfe3b8db3b793939c264e6f785bca01753d17318d144bd44b407fb3493acaa87", [:mix], [{:html_entities, "~> 0.5.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm", "d4b91c713e4a784a3f7b1e3cc016eefc619f6b1c3898464222867cafd3c681a3"},
  "gen_smtp": {:hex, :gen_smtp, "1.2.0", "9cfc75c72a8821588b9b9fe947ae5ab2aed95a052b81237e0928633a13276fd3", [:rebar3], [{:ranch, ">= 1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"},
@ -32,8 +32,8 @@
  "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
  "mime": {:hex, :mime, "2.0.2", "0b9e1a4c840eafb68d820b0e2158ef5c49385d17fb36855ac6e7e087d4b1dcc5", [:mix], [], "hexpm", "e6a3f76b4c277739e36c2e21a2c640778ba4c3846189d5ab19f97f126df5f9b7"},
  "nimble_parsec": {:hex, :nimble_parsec, "1.2.3", "244836e6e3f1200c7f30cb56733fd808744eca61fd182f731eac4af635cc6d0b", [:mix], [], "hexpm", "c8d789e39b9131acf7b99291e93dae60ab48ef14a7ee9d58c6964f59efb570b0"},
-  "oban": {:hex, :oban, "2.12.0", "bd5a283770c6ab1284aad81e5566cfb89f4119b08f52508d92d73551283c8789", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1557b7b046b13c0b5360f55a9fb7e56975f6b5f8247e56f2c54575bd95435ca0"},
-  "phoenix": {:hex, :phoenix, "1.6.8", "9a34e5f4dd3ba959176c199fd5b2277b02e64005462428b71cf6ce9cb5e09cb4", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "9f4d616aeb9c5e019bddfc1f9078b8c06f852ffa838e67f925559cc0993e9f71"},
+  "oban": {:hex, :oban, "2.11.3", "f431f2f0c251b8490a7fa00d2cce7197a1cf4d3f04a3305e80411f083392998f", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "26529da52bfca27740c984bfc70e7f954d6411ceeae0c7c94d2c8aa7c00b513d"},
+  "phoenix": {:hex, :phoenix, "1.6.7", "f1de32418bbbcd471f4fe74d3860ee9c8e8c6c36a0ec173be8ff468a5d72ac90", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b354a4f11d9a2f3a380fb731042dae064f22d7aed8c7e7c024a2459f12994aad"},
  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.0", "0672ed4e4808b3fbed494dded89958e22fb882de47a97634c0b13e7b0b5f7720", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "09864e558ed31ee00bd48fcc1d4fc58ae9678c9e81649075431e69dbabb43cc1"},
  "phoenix_html": {:hex, :phoenix_html, "3.2.0", "1c1219d4b6cb22ac72f12f73dc5fad6c7563104d083f711c3fcd8551a1f4ae11", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "36ec97ba56d25c0136ef1992c37957e4246b649d620958a1f9fa86165f8bc54f"},
  "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.6.5", "1495bb014be12c9a9252eca04b9af54246f6b5c1e4cd1f30210cd00ec540cf8e", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.3", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.17.7", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "ef4fa50dd78364409039c99cf6f98ab5209b4c5f8796c17f4db118324f0db852"},
@ -45,10 +45,10 @@
  "plug": {:hex, :plug, "1.13.6", "187beb6b67c6cec50503e940f0434ea4692b19384d47e5fdfd701e93cadb4cc2", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02b9c6b9955bce92c829f31d6284bf53c591ca63c4fb9ff81dfd0418667a34ff"},
  "plug_cowboy": {:hex, :plug_cowboy, "2.5.2", "62894ccd601cf9597e2c23911ff12798a8a18d237e9739f58a6b04e4988899fe", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "ea6e87f774c8608d60c8d34022a7d073bd7680a0a013f049fc62bf35efea1044"},
  "plug_crypto": {:hex, :plug_crypto, "1.2.2", "05654514ac717ff3a1843204b424477d9e60c143406aa94daf2274fdd280794d", [:mix], [], "hexpm", "87631c7ad914a5a445f0a3809f99b079113ae4ed4b867348dd9eec288cecb6db"},
-  "postgrex": {:hex, :postgrex, "0.16.3", "fac79a81a9a234b11c44235a4494d8565303fa4b9147acf57e48978a074971db", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "aeaae1d2d1322da4e5fe90d241b0a564ce03a3add09d7270fb85362166194590"},
+  "postgrex": {:hex, :postgrex, "0.16.2", "0f83198d0e73a36e8d716b90f45f3bde75b5eebf4ade4f43fa1f88c90a812f74", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a9ea589754d9d4d076121090662b7afe155b374897a6550eb288f11d755acfa0"},
  "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
  "set_locale": {:hex, :set_locale, "0.2.9", "33350ba3c66f1c560dffc43019eea4b573f91c5cbe3e461fe0e5395d2d6ba2c3", [:mix], [{:gettext, "~>0.14", [hex: :gettext, repo: "hexpm", optional: false]}, {:phoenix, ">1.3.0", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "e46348b64b7c5d725d0c90a6524942a19b65e6ce27372ddf9a727dfb64ba236c"},
-  "swoosh": {:hex, :swoosh, "1.6.6", "6018c6f4659ac0b4f30684982993b7812b2bb97436d39f76fcfa8c9e3ae74f85", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e92c7206efd442f08484993676ab072afab2f2bb1e87e604230bb1183c5980de"},
+  "swoosh": {:hex, :swoosh, "1.6.4", "ce3a4bf3e5276fd114178ebc5ed072ee0c177a7b3a09e5992aa005778ac143c2", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ad4c8b534812433730b6241a1d9df38b1da75fdfa340f51887a31d7e9343fffe"},
  "table_rex": {:hex, :table_rex, "3.1.1", "0c67164d1714b5e806d5067c1e96ff098ba7ae79413cc075973e17c38a587caa", [:mix], [], "hexpm", "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"},
  "telemetry": {:hex, :telemetry, "1.1.0", "a589817034a27eab11144ad24d5c0f9fab1f58173274b1e9bae7074af9cbee51", [:rebar3], [], "hexpm", "b727b2a1f75614774cff2d7565b64d0dfa5bd52ba517f16543e6fc7efcc0df48"},
  "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
--- a/priv/gettext/actions.pot
+++ b/priv/gettext/actions.pot
@ -31,14 +31,14 @@ msgid "Add your first type!"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:44
+#: lib/cannery_web/templates/user_settings/edit.html.heex:16
+#: lib/cannery_web/templates/user_settings/edit.html.heex:45
 msgid "Change email"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:58
-#: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#: lib/cannery_web/templates/user_settings/edit.html.heex:60
+#: lib/cannery_web/templates/user_settings/edit.html.heex:101
 msgid "Change password"
 msgstr ""

@ -48,12 +48,12 @@ msgid "Create Invite"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
+#: lib/cannery_web/templates/user_settings/edit.html.heex:108
 msgid "Delete User"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:52
+#: lib/cannery_web/templates/user_registration/new.html.heex:43
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:45
 msgid "Forgot your password?"
@ -67,7 +67,7 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:106
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:48
+#: lib/cannery_web/templates/user_registration/new.html.heex:39
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
@ -104,7 +104,7 @@ msgstr ""
 #: lib/cannery_web/components/topbar.ex:99
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:25
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:42
+#: lib/cannery_web/templates/user_registration/new.html.heex:33
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:25
 #: lib/cannery_web/templates/user_session/new.html.heex:40
@ -160,14 +160,14 @@ msgid "Why not get some ready to shoot?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:144
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
+#: lib/cannery_web/live/ammo_group_live/index.ex:134
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:50
 msgid "Ammo Details"
 msgstr ""

@ -177,7 +177,7 @@ msgid "Add another container!"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:80
 msgid "Move containers"
 msgstr ""

@ -201,13 +201,3 @@ msgstr ""
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
 msgid "Create"
 msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:113
-msgid "Change Language"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
-msgid "Change language"
-msgstr ""
--- a/priv/gettext/de/LC_MESSAGES/actions.po
+++ b/priv/gettext/de/LC_MESSAGES/actions.po
@ -23,120 +23,119 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "Munition hinzufügen"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr "Fügen Sie ihre erste Box hinzu!"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:12
+#, elixir-autogen, elixir-format
 msgid "Add your first container!"
 msgstr "Fügen Sie ihren ersten Behälter hinzu!"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:12
+#, elixir-autogen, elixir-format
 msgid "Add your first type!"
 msgstr "Fügen Sie ihre erste Munitionsart hinzu!"

+#: lib/cannery_web/templates/user_settings/edit.html.heex:16
+#: lib/cannery_web/templates/user_settings/edit.html.heex:45
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:44
 msgid "Change email"
 msgstr "Mailadresse ändern"

+#: lib/cannery_web/templates/user_settings/edit.html.heex:60
+#: lib/cannery_web/templates/user_settings/edit.html.heex:101
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:58
-#: lib/cannery_web/templates/user_settings/edit.html.heex:99
 msgid "Change password"
 msgstr "Passwort ändern"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Create Invite"
 msgstr "Einladung erstellen"

+#: lib/cannery_web/templates/user_settings/edit.html.heex:108
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
 msgid "Delete User"
 msgstr "Benutzer löschen"

-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:52
+#: lib/cannery_web/templates/user_registration/new.html.heex:43
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:45
+#, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:12
+#, elixir-autogen, elixir-format
 msgid "Invite someone new!"
 msgstr "Laden Sie jemanden ein!"

-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:108
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:48
+#: lib/cannery_web/templates/user_registration/new.html.heex:39
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Einloggen"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/tag_live/index.html.heex:14
+#, elixir-autogen, elixir-format
 msgid "Make your first tag!"
 msgstr "Erstellen Sie ihren ersten Tag!"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:42
+#, elixir-autogen, elixir-format
 msgid "New Ammo group"
 msgstr "Neue Munitionsgruppe"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Ammo type"
 msgstr "Neue Munitionsart"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Container"
 msgstr "Neuer Behälter"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/tag_live/index.html.heex:19
+#, elixir-autogen, elixir-format
 msgid "New Tag"
 msgstr "Neuer Tag"

-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
+#: lib/cannery_web/components/topbar.ex:101
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:25
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:42
+#: lib/cannery_web/templates/user_registration/new.html.heex:33
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:25
 #: lib/cannery_web/templates/user_session/new.html.heex:40
+#, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrieren"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr "Bestätigungsmail erneut senden"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:46
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
@ -144,83 +143,74 @@ msgstr "Passwort zurücksetzen"
 #: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
 #: lib/cannery_web/live/tag_live/form_component.ex:66
+#, elixir-autogen, elixir-format
 msgid "Save"
 msgstr "Speichern"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr "Anleitung zum Passwort zurücksetzen zusenden"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/show.html.heex:53
+#, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr "Warum fügen Sie keine hinzu?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:52
+#, elixir-autogen, elixir-format
 msgid "Add"
 msgstr "Hinzufügen"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Stage ammo"
 msgstr "Munition markieren"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:12
+#, elixir-autogen, elixir-format
 msgid "Why not get some ready to shoot?"
 msgstr "Warum nicht einige für den Schießstand auswählen?"

-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:144
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
+#: lib/cannery_web/live/ammo_group_live/index.ex:134
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:36
+#, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"

+#: lib/cannery_web/live/ammo_group_live/show.html.heex:50
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 msgid "Ammo Details"
 msgstr "Munitionsdetails"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:89
+#, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr "Einen weiteren Behälter hinzufügen!"

+#: lib/cannery_web/live/ammo_group_live/show.html.heex:80
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
 msgid "Move containers"
 msgstr "Behälter verschieben"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:127
+#, elixir-autogen, elixir-format
 msgid "Select"
 msgstr "Markieren"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:18
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:36
+#, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr "Zuerst einen Behälter hinzufügen"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Erstellen"
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:113
-msgid "Change Language"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
-msgid "Change language"
-msgstr ""
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
--- a/priv/gettext/de/LC_MESSAGES/emails.po
+++ b/priv/gettext/de/LC_MESSAGES/emails.po
@ -23,98 +23,98 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:30
+#, elixir-autogen, elixir-format
 msgid "Confirm your %{name} account"
 msgstr "Bestätigen Sie ihr %{name} Nutzerkonto"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
 #: lib/cannery_web/templates/email/reset_password.html.eex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
 #: lib/cannery_web/templates/email/update_email.html.eex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
+#, elixir-autogen, elixir-format
 msgid "Hi %{email},"
 msgstr "Hallo %{email},"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:10
+#, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{url}, please ignore this."
 msgstr ""
 "Falls Sie dieses Nutzerkonto bei %{url} nicht erstellt haben, ignorieren Sie "
 "diese Nachricht bitte."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.txt.eex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:8
+#, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 "Falls Sie diese Änderung von %{url} nicht angefordert haben, ignorieren Sie "
 "bitte diese Nachricht."

-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format
 msgid "Reset your %{name} password"
 msgstr "Passwort für %{name} zurücksetzen"

-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format
 msgid "Update your %{name} email"
 msgstr "Aktualisieren Sie %{name} Mailadresse"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:9
+#, elixir-autogen, elixir-format
 msgid "Welcome to %{name}!"
 msgstr "Willkommen %{name}!"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "Welcome to %{name}%!"
 msgstr "Willkommen %{name}%!"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/update_email.html.eex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr "Sie können Ihre Mailadresse unter folgender URL ändern:"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
+#, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr "Sie können Ihr Nutzerkonto unter folgender URL bestätigen:"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.html.eex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr "Sie können ihr Passwort unter folgender URL zurücksetzen:"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:22
+#, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{name}, please ignore this."
 msgstr ""
 "Falls SIe dieses Nutzerkonto unter %{name}, nicht erstellt haben, ignorieren "
 "Sie diese Nachricht bitte."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.html.eex:16
 #: lib/cannery_web/templates/email/update_email.html.eex:16
+#, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{name}, please ignore this."
 msgstr ""
 "Falls Sie die Änderung von %{name} nicht angefragt haben, ignorieren Sie "
 "diese Nachricht bitte."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/layout/email.txt.eex:9
+#, elixir-autogen, elixir-format
 msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 "Diese Nachricht wurde von %{name} unter %{url} gesandt, einem selbst-"
 "gehosteten Schusswaffenmanager."

+#: lib/cannery_web/templates/layout/email.html.heex:17
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/layout/email.html.heex:13
 msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
 msgstr ""
 "Diese Nachricht wurde von %{name} gesandt, einem selbst-gehosteten "
--- a/priv/gettext/de/LC_MESSAGES/errors.po
+++ b/priv/gettext/de/LC_MESSAGES/errors.po
@ -23,165 +23,164 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#, elixir-autogen, elixir-format
 #: lib/cannery/containers.ex:122
+#, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr "Behälter muss vor dem Löschen leer sein"

+#: lib/cannery_web/live/container_live/index.ex:71
+#: lib/cannery_web/live/container_live/show.ex:73
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:71
 msgid "Could not delete %{name}: %{error}"
 msgstr "Konnte %{name} nicht löschen: %{error}"

+#: lib/cannery_web/live/container_live/index.ex:59
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:57
 msgid "Could not find that container"
 msgstr "Konnte Behälter nicht finden"

+#: lib/cannery_web/controllers/user_settings_controller.ex:67
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:84
 msgid "Email change link is invalid or it has expired."
 msgstr "Mailadressenänderungs-Link ist ungültig oder abgelaufen."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:8
+#, elixir-autogen, elixir-format
 msgid "Error"
 msgstr "Fehler"

+#: lib/cannery_web/templates/error/error.html.heex:29
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/error/error.html.heex:28
 msgid "Go back home"
 msgstr "Zur Hauptseite zurückkehren"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:11
+#, elixir-autogen, elixir-format
 msgid "Internal Server Error"
 msgstr "Interner Serverfehler"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:17
+#, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr "Ungültige Mailadresse oder Passwort"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:9
+#, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr "Nicht gefunden"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:21
-#: lib/cannery_web/templates/user_settings/edit.html.heex:64
-#: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:66
+#, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr "Oops, etwas ist schiefgegangen. Bitte beachten Sie den Fehler unten."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#, elixir-autogen, elixir-format
 msgid "Reset password link is invalid or it has expired."
 msgstr "Link zum Passwort zurücksetzen ist ungültig oder abgelaufen."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
 #: lib/cannery_web/controllers/user_registration_controller.ex:56
+#, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr "Entschuldigung, aber öffentliche Registrierung ist deaktiviert"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
 #: lib/cannery_web/controllers/user_registration_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 "Entschuldigung, aber diese Einladung wurde nicht gefunden oder ist abgelaufen"

+#: lib/cannery_web/controllers/user_settings_controller.ex:82
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:99
 msgid "Unable to delete user"
 msgstr "Dieser Nutzer konnte nicht gelöscht werden"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:10
+#, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr "Unbefugt"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen."

+#: lib/cannery_web/live/invite_live/index.ex:20
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:18
 msgid "You are not authorized to view this page"
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:177
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen."

+#: lib/cannery/accounts/user.ex:128
 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:130
 msgid "did not change"
 msgstr "hat sich nicht geändert"

+#: lib/cannery/accounts/user.ex:149
 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:151
 msgid "does not match password"
 msgstr "Passwort stimmt nicht überein"

+#: lib/cannery/accounts/user.ex:186
 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:188
 msgid "is not valid"
 msgstr "ist nicht gültig"

+#: lib/cannery/accounts/user.ex:82
 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:84
 msgid "must have the @ sign and no spaces"
 msgstr "Muss ein @ Zeichen und keine Leerzeichen haben"

-#, elixir-autogen, elixir-format
 #: lib/cannery/tags.ex:40
+#, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr "Tag nicht gefunden"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:30
+#, elixir-autogen, elixir-format
 msgid "Tag could not be added"
 msgstr "Tag konnte nicht hinzugefügt werden"

-#, elixir-autogen, elixir-format
 #: lib/cannery/activity_log.ex:125
+#, elixir-autogen, elixir-format
 msgid "Count must be at least 1"
 msgstr "Anzahl muss mindestens 1 sein"

-#, elixir-autogen, elixir-format
 #: lib/cannery/activity_log.ex:73
 #: lib/cannery/activity_log.ex:120
+#, elixir-autogen, elixir-format
 msgid "Count must be less than %{count}"
 msgstr "Anzahl muss weniger als %{count} betragen"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:39
 #: lib/cannery_web/controllers/user_auth.ex:161
+#, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
 "Sie müssen ihr Nutzerkonto bestätigen und einloggen, um diese Seite "
 "anzuzeigen."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:52
+#, elixir-autogen, elixir-format
 msgid "Tag could not be removed"
 msgstr "Tag konnte nicht gelöscht werden"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.ex:126
+#, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr "Konnte die Anzahl der Kopien nicht verstehen"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.ex:111
+#, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 "Ungültige Nummer an Kopien. Muss zwischen 1 and %{max} liegen. War "
--- a/priv/gettext/de/LC_MESSAGES/prompts.po
+++ b/priv/gettext/de/LC_MESSAGES/prompts.po
@ -23,156 +23,155 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:64
 #: lib/cannery_web/live/container_live/form_component.ex:65
 #: lib/cannery_web/live/invite_live/form_component.ex:59
 #: lib/cannery_web/live/tag_live/form_component.ex:101
+#, elixir-autogen, elixir-format
 msgid "%{name} created successfully"
 msgstr "%{name} erfolgreich erstellt"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:38
-#: lib/cannery_web/live/invite_live/index.ex:53
-#: lib/cannery_web/live/invite_live/index.ex:133
-#: lib/cannery_web/live/tag_live/index.ex:38
+#: lib/cannery_web/live/ammo_type_live/show.ex:40
+#: lib/cannery_web/live/invite_live/index.ex:55
+#: lib/cannery_web/live/invite_live/index.ex:135
+#: lib/cannery_web/live/tag_live/index.ex:40
+#, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
 msgstr "%{name} erfolgreich gelöscht"

+#: lib/cannery_web/live/invite_live/index.ex:111
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:109
 msgid "%{name} disabled succesfully"
 msgstr "%{name} erfolgreich deaktiviert"

+#: lib/cannery_web/live/invite_live/index.ex:89
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:87
 msgid "%{name} enabled succesfully"
 msgstr "%{name} erfolgreich aktiviert"

+#: lib/cannery_web/live/container_live/index.ex:64
+#: lib/cannery_web/live/container_live/show.ex:63
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:62
-#: lib/cannery_web/live/container_live/show.ex:61
 msgid "%{name} has been deleted"
 msgstr "%{name} wurde gelöscht"

+#: lib/cannery_web/live/invite_live/index.ex:69
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:67
 msgid "%{name} updated succesfully"
 msgstr "%{name} erfolgreich aktualisiert"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:46
 #: lib/cannery_web/live/container_live/form_component.ex:47
 #: lib/cannery_web/live/invite_live/form_component.ex:41
 #: lib/cannery_web/live/tag_live/form_component.ex:83
+#, elixir-autogen, elixir-format
 msgid "%{name} updated successfully"
 msgstr "%{name} erfolgreich aktualisiert"

+#: lib/cannery_web/controllers/user_settings_controller.ex:28
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:29
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr "Eine Mail zum Bestätigen ihre Mailadresse wurde Ihnen zugesandt."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:56
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#: lib/cannery_web/live/ammo_group_live/show.ex:52
+#, elixir-autogen, elixir-format
 msgid "Ammo group deleted succesfully"
 msgstr "Munitionsgruppe erfolgreich gelöscht"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.ex:88
+#, elixir-autogen, elixir-format
 msgid "Ammo group updated successfully"
 msgstr "Munitionsgruppe erfolgreich aktualisiert"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:102
 #: lib/cannery_web/live/invite_live/index.html.heex:131
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 "Sind Sie sicher, dass sie %{email} löschen möchten? Dies kann nicht "
 "zurückgenommen werden!"

-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:27
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #: lib/cannery_web/live/container_live/index.html.heex:46
 #: lib/cannery_web/live/container_live/show.html.heex:37
 #: lib/cannery_web/live/tag_live/index.html.heex:38
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:49
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr "Sind Sie sicher, dass sie die Einladung für %{name} löschen möchten?"

+#: lib/cannery_web/live/ammo_group_live/index.ex:167
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
+#: lib/cannery_web/live/ammo_type_live/index.ex:130
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:177
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:71
-#: lib/cannery_web/live/ammo_type_live/index.ex:140
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Sind Sie sicher, dass sie diese Munition löschen möchten?"

+#: lib/cannery_web/templates/user_settings/edit.html.heex:112
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:146
 msgid "Are you sure you want to delete your account?"
 msgstr "Sind Sie sicher, dass sie Ihren Account löschen möchten?"

+#: lib/cannery_web/components/topbar.ex:86
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:84
 msgid "Are you sure you want to log out?"
 msgstr "Wirklich ausloggen?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:74
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to make %{name} unlimited?"
 msgstr "Sind Sie sicher, dass sie %{name} auf unbegrenzt setzen möchten?"

+#: lib/cannery_web/controllers/user_settings_controller.ex:60
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:77
 msgid "Email changed successfully."
 msgstr "Mailadresse erfolgreich geändert."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:23
+#, elixir-autogen, elixir-format
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
 msgstr ""
 "Falls Ihre Mailadresse bereits in unserer Datenbank ist und noch nicht "
 "bestätigt wurde, erhalten Sie gleich eine Mail mit Anweisungen."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:24
+#, elixir-autogen, elixir-format
 msgid "If your email is in our system, you will receive instructions to reset your password shortly."
 msgstr ""
 "Falls Ihre Mailadresse bereits in unserer Datenbank ist, erhalten Sie gleich "
 "eine Mail mit Anweisungen zum Ändern ihres Passworts."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:23
+#, elixir-autogen, elixir-format
 msgid "Logged out successfully."
 msgstr "Erfolgreich ausgeloggt."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Password reset successfully."
 msgstr "Passwort erfolgreich zurückgesetzt."

+#: lib/cannery_web/controllers/user_settings_controller.ex:47
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:49
 msgid "Password updated successfully."
 msgstr "Passwort erfolgreich geändert."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:74
+#, elixir-autogen, elixir-format
 msgid "Please check your email to verify your account"
 msgstr "Bitte überprüfen Sie ihre Mailbox und bestätigen Sie das Nutzerkonto"

+#: lib/cannery_web/live/home_live.ex:103
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:96
 msgid "Register to setup %{name}"
 msgstr "Registrieren Sie sich, um %{name} zu bearbeiten"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:48
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
@ -180,112 +179,103 @@ msgstr "Registrieren Sie sich, um %{name} zu bearbeiten"
 #: lib/cannery_web/live/invite_live/form_component.html.heex:30
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
 #: lib/cannery_web/live/tag_live/form_component.ex:68
+#, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Speichere..."

+#: lib/cannery_web/controllers/user_settings_controller.ex:78
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:95
 msgid "Your account has been deleted"
 msgstr "Ihr Nutzerkonto wurde gelöscht"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to remove the %{tag_name} tag from %{container_name}?"
 msgstr ""
 "Sind Sie sicher, dass sie %{tag_name} Tag von %{container_name} entfernen "
 "wollen?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:36
+#, elixir-autogen, elixir-format
 msgid "%{name} added successfully"
 msgstr "%{name} erfolgreich hinzugefügt"

+#: lib/cannery_web/live/container_live/show.ex:39
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.ex:37
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr "%{tag_name} wurde von %{container_name} entfernt"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:54
+#, elixir-autogen, elixir-format
 msgid "Adding..."
 msgstr "Füge hinzu..."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.ex:68
+#, elixir-autogen, elixir-format
 msgid "Shots recorded successfully"
 msgstr "Schüsse erfolgreich dokumentiert"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:29
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to unstage this ammo?"
 msgstr "Sind sie sicher, dass Sie diese Munition demarkieren möchten?"

+#: lib/cannery_web/live/range_live/index.ex:70
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:68
 msgid "Ammo group unstaged succesfully"
 msgstr "Munition erfolgreich demarkiert"

+#: lib/cannery_web/live/ammo_group_live/show.ex:132
+#: lib/cannery_web/live/range_live/index.ex:130
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:130
-#: lib/cannery_web/live/range_live/index.ex:128
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Sind sie sicher, dass sie die Schießkladde löschen möchten?"

+#: lib/cannery_web/live/ammo_group_live/show.ex:80
+#: lib/cannery_web/live/range_live/index.ex:56
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:78
-#: lib/cannery_web/live/range_live/index.ex:54
 msgid "Shot records deleted succesfully"
 msgstr "Schießkladde erfolgreich gelöscht"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/form_component.ex:55
+#, elixir-autogen, elixir-format
 msgid "Shot records updated successfully"
 msgstr "Schießkladde erfolgreich aktualisiert"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:38
+#, elixir-autogen, elixir-format
 msgid "%{email} confirmed successfully."
 msgstr "%{email} erfolgreich bestätigt."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:53
+#, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr "Munition erfolgreich zu %{name} verschoben"

+#: lib/cannery_web/live/invite_live/index.ex:123
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:121
 msgid "Copied to clipboard"
 msgstr "Der Zwischenablage hinzugefügt"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:58
+#, elixir-autogen, elixir-format
 msgid "%{name} removed successfully"
 msgstr "%{name} erfolgreich entfernt"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:15
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr "Sie müssen"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+#, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr "Erstellen..."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.ex:147
+#, elixir-autogen, elixir-format
 msgid "Ammo group created successfully"
 msgid_plural "Ammo groups created successfully"
 msgstr[0] "Munitionsgruppe erfolgreich erstellt"
 msgstr[1] "Munitionsgruppen erfolgreich erstellt"
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
-msgid "Are you sure you want to change your language?"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:65
-msgid "Language updated successfully."
-msgstr ""
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@ -11,12 +11,12 @@ msgid ""
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:56
+#: lib/cannery_web/live/home_live.ex:61
 msgid "%{name} lets you easily keep an eye on your ammo levels before and after range day"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:78
+#: lib/cannery_web/live/home_live.ex:83
 msgid "Access from any internet-capable device"
 msgstr ""

@ -26,14 +26,14 @@ msgid "Admins"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:92
+#: lib/cannery_web/live/home_live.ex:97
 msgid "Admins:"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:50
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
-#: lib/cannery_web/live/range_live/index.ex:80
+#: lib/cannery_web/live/range_live/index.ex:82
 msgid "Ammo"
 msgstr ""

@ -45,7 +45,7 @@ msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:87
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:100
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:92
 msgid "Average Price paid"
 msgstr ""

@ -110,7 +110,7 @@ msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:44
-#: lib/cannery_web/live/container_live/index.ex:36
+#: lib/cannery_web/live/container_live/index.ex:38
 #: lib/cannery_web/live/container_live/index.html.heex:3
 msgid "Containers"
 msgstr ""
@ -152,29 +152,29 @@ msgid "Disable"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:53
+#: lib/cannery_web/live/home_live.ex:58
 msgid "Easy to Use:"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:38
-#: lib/cannery_web/live/ammo_group_live/show.ex:40
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
 msgid "Edit Ammo group"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:23
-#: lib/cannery_web/live/ammo_type_live/show.ex:45
+#: lib/cannery_web/live/ammo_type_live/show.ex:47
 msgid "Edit Ammo type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:33
+#: lib/cannery_web/live/invite_live/index.ex:35
 msgid "Edit Invite"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.ex:21
+#: lib/cannery_web/live/tag_live/index.ex:23
 msgid "Edit Tag"
 msgstr ""

@ -208,7 +208,7 @@ msgid "Incendiary"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:87
+#: lib/cannery_web/live/home_live.ex:92
 msgid "Instance Information"
 msgstr ""

@ -218,13 +218,13 @@ msgid "Invite Disabled"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:118
+#: lib/cannery_web/live/home_live.ex:123
 msgid "Invite Only"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:69
-#: lib/cannery_web/live/invite_live/index.ex:41
+#: lib/cannery_web/live/invite_live/index.ex:43
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 msgid "Invites"
 msgstr ""
@ -288,17 +288,17 @@ msgid "New Ammo type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:31
+#: lib/cannery_web/live/container_live/index.ex:33
 msgid "New Container"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:37
+#: lib/cannery_web/live/invite_live/index.ex:39
 msgid "New Invite"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.ex:27
+#: lib/cannery_web/live/tag_live/index.ex:29
 msgid "New Tag"
 msgstr ""

@ -313,7 +313,7 @@ msgid "No Ammo Types"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:120
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:112
 msgid "No ammo for this type"
 msgstr ""

@ -341,9 +341,9 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:30
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
-#: lib/cannery_web/live/ammo_group_live/show.ex:88
+#: lib/cannery_web/live/ammo_group_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
-#: lib/cannery_web/live/range_live/index.ex:82
+#: lib/cannery_web/live/range_live/index.ex:84
 msgid "Notes"
 msgstr ""

@ -372,7 +372,7 @@ msgid "Price paid"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:47
+#: lib/cannery_web/components/ammo_group_card.ex:42
 msgid "Price paid:"
 msgstr ""

@ -384,17 +384,17 @@ msgid "Primer type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:117
+#: lib/cannery_web/live/home_live.ex:122
 msgid "Public Signups"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:65
+#: lib/cannery_web/live/home_live.ex:70
 msgid "Secure:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:68
+#: lib/cannery_web/live/home_live.ex:73
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""

@ -410,17 +410,17 @@ msgid "Settings"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:39
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
 msgid "Show Ammo group"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.ex:44
+#: lib/cannery_web/live/ammo_type_live/show.ex:46
 msgid "Show Ammo type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:75
+#: lib/cannery_web/live/home_live.ex:80
 msgid "Simple:"
 msgstr ""

@ -430,13 +430,13 @@ msgid "Steel"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:103
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:98
 msgid "Stored in"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:38
-#: lib/cannery_web/live/tag_live/index.ex:32
+#: lib/cannery_web/live/tag_live/index.ex:34
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 msgid "Tags"
 msgstr ""
@ -452,12 +452,12 @@ msgid "Text color"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:44
+#: lib/cannery_web/live/home_live.ex:49
 msgid "The self-hosted firearm tracker website"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:103
 msgid "This ammo group is not in a container"
 msgstr ""

@ -496,12 +496,12 @@ msgid "Uses left"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:40
+#: lib/cannery_web/live/home_live.ex:45
 msgid "Welcome to %{name}"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:69
+#: lib/cannery_web/live/home_live.ex:74
 msgid "Your data stays with you, period"
 msgstr ""

@ -522,8 +522,8 @@ msgid "Range day"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:89
-#: lib/cannery_web/live/range_live/index.ex:83
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
+#: lib/cannery_web/live/range_live/index.ex:85
 msgid "Date"
 msgstr ""

@ -538,13 +538,13 @@ msgid "No ammo staged"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:82
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:77
 #: lib/cannery_web/live/range_live/index.html.heex:33
 msgid "Stage for range"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:81
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #: lib/cannery_web/live/range_live/index.html.heex:32
 msgid "Unstage from range"
 msgstr ""
@ -572,13 +572,13 @@ msgid "Date (UTC)"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:37
-#: lib/cannery_web/live/range_live/index.ex:32
+#: lib/cannery_web/live/ammo_group_live/show.ex:39
+#: lib/cannery_web/live/range_live/index.ex:34
 msgid "Edit Shot Records"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:38
+#: lib/cannery_web/live/range_live/index.ex:40
 msgid "New Shot Records"
 msgstr ""

@ -593,19 +593,19 @@ msgid "Rounds left"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:87
-#: lib/cannery_web/live/range_live/index.ex:81
+#: lib/cannery_web/live/ammo_group_live/show.ex:89
+#: lib/cannery_web/live/range_live/index.ex:83
 msgid "Rounds shot"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:44
+#: lib/cannery_web/live/range_live/index.ex:46
 msgid "Shot Records"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:32
-#: lib/cannery_web/live/ammo_group_live/show.ex:38
+#: lib/cannery_web/live/ammo_group_live/show.ex:40
 msgid "Move Ammo group"
 msgstr ""

@ -625,12 +625,12 @@ msgid "Shot log"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:48
-#: lib/cannery_web/live/ammo_group_live/index.ex:118
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
+#: lib/cannery_web/components/ammo_group_card.ex:43
+#: lib/cannery_web/live/ammo_group_live/index.ex:117
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:32
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:39
 #: lib/cannery_web/live/ammo_type_live/index.ex:114
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:104
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:96
 msgid "$%{amount}"
 msgstr ""

@ -675,28 +675,28 @@ msgid "UPC"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:78
+#: lib/cannery_web/templates/user_settings/edit.html.heex:80
 msgid "Confirm new password"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:87
+#: lib/cannery_web/templates/user_settings/edit.html.heex:33
+#: lib/cannery_web/templates/user_settings/edit.html.heex:89
 msgid "Current password"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:71
+#: lib/cannery_web/templates/user_settings/edit.html.heex:73
 msgid "New password"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:141
+#: lib/cannery_web/live/ammo_group_live/index.ex:131
 msgid "Stage"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:141
+#: lib/cannery_web/live/ammo_group_live/index.ex:131
 msgid "Unstage"
 msgstr ""

@ -718,14 +718,14 @@ msgid "Loading..."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:27
-#: lib/cannery_web/live/container_live/show.ex:95
+#: lib/cannery_web/live/container_live/index.ex:29
+#: lib/cannery_web/live/container_live/show.ex:97
 msgid "Edit %{name}"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:46
-#: lib/cannery_web/live/container_live/show.ex:96
+#: lib/cannery_web/live/container_live/index.ex:48
+#: lib/cannery_web/live/container_live/show.ex:98
 msgid "Edit %{name} tags"
 msgstr ""

@ -735,13 +735,13 @@ msgid "Rounds:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.ex:94
+#: lib/cannery_web/live/container_live/show.ex:96
 msgid "Show %{name}"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:113
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:110
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:102
 msgid "No cost information"
 msgstr ""

@ -751,12 +751,12 @@ msgid "% left"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:43
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:38
 msgid "Current value:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:31
 msgid "Original cost:"
 msgstr ""

@ -771,7 +771,7 @@ msgid "Percentage left:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:116
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:111
 msgid "Rounds used"
 msgstr ""

@ -816,8 +816,8 @@ msgid "Reset your password"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:36
-#: lib/cannery_web/live/range_live/index.ex:26
+#: lib/cannery_web/live/ammo_group_live/show.ex:38
+#: lib/cannery_web/live/range_live/index.ex:28
 msgid "Record Shots"
 msgstr ""

@ -830,63 +830,3 @@ msgstr ""
 #: lib/cannery_web/live/ammo_type_live/index.ex:34
 msgid "Ammo types"
 msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:86
-msgid "Added on"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:41
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:91
-msgid "Added on:"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/user_card.ex:30
-msgid "User registered on"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_settings/edit.html.heex:129
-msgid "English"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_settings/edit.html.heex:129
-msgid "French"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_settings/edit.html.heex:129
-msgid "German"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:33
-msgid "Language"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:139
-msgid "Get involved!"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:156
-msgid "Help translate"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:165
-msgid "Report bugs or request features"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:147
-msgid "View the source code"
-msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/actions.po
+++ b/priv/gettext/en/LC_MESSAGES/actions.po
@ -32,14 +32,14 @@ msgid "Add your first type!"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:44
+#: lib/cannery_web/templates/user_settings/edit.html.heex:16
+#: lib/cannery_web/templates/user_settings/edit.html.heex:45
 msgid "Change email"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:58
-#: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#: lib/cannery_web/templates/user_settings/edit.html.heex:60
+#: lib/cannery_web/templates/user_settings/edit.html.heex:101
 msgid "Change password"
 msgstr ""

@ -49,12 +49,12 @@ msgid "Create Invite"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
+#: lib/cannery_web/templates/user_settings/edit.html.heex:108
 msgid "Delete User"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:52
+#: lib/cannery_web/templates/user_registration/new.html.heex:43
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:45
 msgid "Forgot your password?"
@ -66,9 +66,9 @@ msgid "Invite someone new!"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:108
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:48
+#: lib/cannery_web/templates/user_registration/new.html.heex:39
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
@ -102,10 +102,10 @@ msgid "New Tag"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
+#: lib/cannery_web/components/topbar.ex:101
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:25
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:42
+#: lib/cannery_web/templates/user_registration/new.html.heex:33
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:25
 #: lib/cannery_web/templates/user_session/new.html.heex:40
@ -161,14 +161,14 @@ msgid "Why not get some ready to shoot?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:144
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
+#: lib/cannery_web/live/ammo_group_live/index.ex:133
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:50
 msgid "Ammo Details"
 msgstr ""

@ -178,7 +178,7 @@ msgid "Add another container!"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:80
 msgid "Move containers"
 msgstr ""

@ -202,13 +202,3 @@ msgstr ""
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
 msgid "Create"
 msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:113
-msgid "Change Language"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
-msgid "Change language"
-msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@ -12,12 +12,12 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:56
+#: lib/cannery_web/live/home_live.ex:63
 msgid "%{name} lets you easily keep an eye on your ammo levels before and after range day"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:78
+#: lib/cannery_web/live/home_live.ex:85
 msgid "Access from any internet-capable device"
 msgstr ""

@ -27,14 +27,14 @@ msgid "Admins"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:92
+#: lib/cannery_web/live/home_live.ex:99
 msgid "Admins:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:50
+#: lib/cannery_web/components/topbar.ex:52
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
-#: lib/cannery_web/live/range_live/index.ex:80
+#: lib/cannery_web/live/range_live/index.ex:82
 msgid "Ammo"
 msgstr ""

@ -45,8 +45,7 @@ msgid "Ammo type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.ex:87
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:100
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:94
 msgid "Average Price paid"
 msgstr ""

@ -58,7 +57,7 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
 #: lib/cannery_web/live/ammo_type_live/index.ex:71
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:53
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 msgid "Blank"
 msgstr ""

@ -70,35 +69,35 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:53
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:39
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:41
 msgid "Bullet core"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/index.ex:52
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:38
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:40
 msgid "Bullet type"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:55
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:41
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:43
 msgid "Caliber"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:54
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:40
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:42
 msgid "Cartridge"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:56
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:42
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 msgid "Case material"
 msgstr ""

@ -110,8 +109,8 @@ msgid "Container"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:44
-#: lib/cannery_web/live/container_live/index.ex:36
+#: lib/cannery_web/components/topbar.ex:46
+#: lib/cannery_web/live/container_live/index.ex:38
 #: lib/cannery_web/live/container_live/index.html.heex:3
 msgid "Containers"
 msgstr ""
@ -119,7 +118,7 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
 #: lib/cannery_web/live/ammo_type_live/index.ex:72
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 msgid "Corrosive"
 msgstr ""

@ -153,29 +152,29 @@ msgid "Disable"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:53
+#: lib/cannery_web/live/home_live.ex:60
 msgid "Easy to Use:"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:38
-#: lib/cannery_web/live/ammo_group_live/show.ex:40
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
 msgid "Edit Ammo group"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:23
-#: lib/cannery_web/live/ammo_type_live/show.ex:45
+#: lib/cannery_web/live/ammo_type_live/show.ex:47
 msgid "Edit Ammo type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:33
+#: lib/cannery_web/live/invite_live/index.ex:35
 msgid "Edit Invite"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.ex:21
+#: lib/cannery_web/live/tag_live/index.ex:23
 msgid "Edit Tag"
 msgstr ""

@ -197,35 +196,35 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 msgid "Grains"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 msgid "Incendiary"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:87
+#: lib/cannery_web/live/home_live.ex:94
 msgid "Instance Information"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/invite_card.ex:25
+#: lib/cannery_web/components/invite_card.ex:27
 msgid "Invite Disabled"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:118
+#: lib/cannery_web/live/home_live.ex:125
 msgid "Invite Only"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:69
-#: lib/cannery_web/live/invite_live/index.ex:41
+#: lib/cannery_web/components/topbar.ex:71
+#: lib/cannery_web/live/invite_live/index.ex:43
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 msgid "Invites"
 msgstr ""
@ -253,14 +252,14 @@ msgid "Magazine, Clip, Ammo Box, etc"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:56
+#: lib/cannery_web/components/topbar.ex:58
 msgid "Manage"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
 #: lib/cannery_web/live/ammo_type_live/index.ex:73
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:55
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 msgid "Manufacturer"
 msgstr ""

@ -289,17 +288,17 @@ msgid "New Ammo type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:31
+#: lib/cannery_web/live/container_live/index.ex:33
 msgid "New Container"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:37
+#: lib/cannery_web/live/invite_live/index.ex:39
 msgid "New Invite"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.ex:27
+#: lib/cannery_web/live/tag_live/index.ex:29
 msgid "New Tag"
 msgstr ""

@ -314,7 +313,7 @@ msgid "No Ammo Types"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:120
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:114
 msgid "No ammo for this type"
 msgstr ""

@ -342,9 +341,9 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:30
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
-#: lib/cannery_web/live/ammo_group_live/show.ex:88
+#: lib/cannery_web/live/ammo_group_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
-#: lib/cannery_web/live/range_live/index.ex:82
+#: lib/cannery_web/live/range_live/index.ex:84
 msgid "Notes"
 msgstr ""

@ -362,7 +361,7 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 msgid "Pressure"
 msgstr ""

@ -373,29 +372,29 @@ msgid "Price paid"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:47
+#: lib/cannery_web/components/ammo_group_card.ex:42
 msgid "Price paid:"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 msgid "Primer type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:117
+#: lib/cannery_web/live/home_live.ex:124
 msgid "Public Signups"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:65
+#: lib/cannery_web/live/home_live.ex:72
 msgid "Secure:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:68
+#: lib/cannery_web/live/home_live.ex:75
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""

@ -411,17 +410,17 @@ msgid "Settings"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:39
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
 msgid "Show Ammo group"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.ex:44
+#: lib/cannery_web/live/ammo_type_live/show.ex:46
 msgid "Show Ammo type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:75
+#: lib/cannery_web/live/home_live.ex:82
 msgid "Simple:"
 msgstr ""

@ -431,13 +430,13 @@ msgid "Steel"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:103
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:98
 msgid "Stored in"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:38
-#: lib/cannery_web/live/tag_live/index.ex:32
+#: lib/cannery_web/components/topbar.ex:40
+#: lib/cannery_web/live/tag_live/index.ex:34
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 msgid "Tags"
 msgstr ""
@ -453,19 +452,19 @@ msgid "Text color"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:44
+#: lib/cannery_web/live/home_live.ex:51
 msgid "The self-hosted firearm tracker website"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:103
 msgid "This ammo group is not in a container"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 msgid "Tracer"
 msgstr ""

@ -487,7 +486,7 @@ msgid "Users"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/invite_card.ex:20
+#: lib/cannery_web/components/invite_card.ex:22
 msgid "Uses Left:"
 msgstr ""

@ -497,12 +496,12 @@ msgid "Uses left"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:40
+#: lib/cannery_web/live/home_live.ex:47
 msgid "Welcome to %{name}"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:69
+#: lib/cannery_web/live/home_live.ex:76
 msgid "Your data stays with you, period"
 msgstr ""

@ -512,7 +511,7 @@ msgid "No tags for this container"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:62
+#: lib/cannery_web/components/topbar.ex:64
 #: lib/cannery_web/live/ammo_group_live/index.ex:84
 msgid "Range"
 msgstr ""
@ -523,8 +522,8 @@ msgid "Range day"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:89
-#: lib/cannery_web/live/range_live/index.ex:83
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
+#: lib/cannery_web/live/range_live/index.ex:85
 msgid "Date"
 msgstr ""

@ -539,13 +538,13 @@ msgid "No ammo staged"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:82
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:77
 #: lib/cannery_web/live/range_live/index.html.heex:33
 msgid "Stage for range"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:81
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #: lib/cannery_web/live/range_live/index.html.heex:32
 msgid "Unstage from range"
 msgstr ""
@ -573,13 +572,13 @@ msgid "Date (UTC)"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:37
-#: lib/cannery_web/live/range_live/index.ex:32
+#: lib/cannery_web/live/ammo_group_live/show.ex:39
+#: lib/cannery_web/live/range_live/index.ex:34
 msgid "Edit Shot Records"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:38
+#: lib/cannery_web/live/range_live/index.ex:40
 msgid "New Shot Records"
 msgstr ""

@ -594,19 +593,19 @@ msgid "Rounds left"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:87
-#: lib/cannery_web/live/range_live/index.ex:81
+#: lib/cannery_web/live/ammo_group_live/show.ex:89
+#: lib/cannery_web/live/range_live/index.ex:83
 msgid "Rounds shot"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:44
+#: lib/cannery_web/live/range_live/index.ex:46
 msgid "Shot Records"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:32
-#: lib/cannery_web/live/ammo_group_live/show.ex:38
+#: lib/cannery_web/live/ammo_group_live/show.ex:40
 msgid "Move Ammo group"
 msgstr ""

@ -626,12 +625,11 @@ msgid "Shot log"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:48
-#: lib/cannery_web/live/ammo_group_live/index.ex:118
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
-#: lib/cannery_web/live/ammo_type_live/index.ex:114
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:104
+#: lib/cannery_web/components/ammo_group_card.ex:43
+#: lib/cannery_web/live/ammo_group_live/index.ex:117
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:32
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:39
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:98
 msgid "$%{amount}"
 msgstr ""

@ -643,68 +641,68 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:57
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:43
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 msgid "Jacket type"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:58
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:44
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 msgid "Muzzle velocity"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
 #: lib/cannery_web/live/ammo_type_live/index.ex:61
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 msgid "Powder grains per charge"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:59
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:45
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 msgid "Powder type"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
 #: lib/cannery_web/live/ammo_type_live/index.ex:74
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 msgid "UPC"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:78
+#: lib/cannery_web/templates/user_settings/edit.html.heex:80
 msgid "Confirm new password"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:87
+#: lib/cannery_web/templates/user_settings/edit.html.heex:33
+#: lib/cannery_web/templates/user_settings/edit.html.heex:89
 msgid "Current password"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:71
+#: lib/cannery_web/templates/user_settings/edit.html.heex:73
 msgid "New password"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:141
+#: lib/cannery_web/live/ammo_group_live/index.ex:130
 msgid "Stage"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:141
+#: lib/cannery_web/live/ammo_group_live/index.ex:130
 msgid "Unstage"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 msgid "Firing type"
 msgstr ""

@ -719,14 +717,14 @@ msgid "Loading..."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:27
-#: lib/cannery_web/live/container_live/show.ex:95
+#: lib/cannery_web/live/container_live/index.ex:29
+#: lib/cannery_web/live/container_live/show.ex:97
 msgid "Edit %{name}"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:46
-#: lib/cannery_web/live/container_live/show.ex:96
+#: lib/cannery_web/live/container_live/index.ex:48
+#: lib/cannery_web/live/container_live/show.ex:98
 msgid "Edit %{name} tags"
 msgstr ""

@ -736,13 +734,12 @@ msgid "Rounds:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.ex:94
+#: lib/cannery_web/live/container_live/show.ex:96
 msgid "Show %{name}"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.ex:113
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:110
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:104
 msgid "No cost information"
 msgstr ""

@ -752,12 +749,12 @@ msgid "% left"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:43
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:38
 msgid "Current value:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:31
 msgid "Original cost:"
 msgstr ""

@ -772,12 +769,12 @@ msgid "Percentage left:"
 msgstr ""

 #, elixir-autogen, elixir-format, fuzzy
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:116
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:111
 msgid "Rounds used"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:77
 msgid "Current # of rounds:"
 msgstr ""

@ -787,7 +784,7 @@ msgid "Total # of rounds"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:85
 msgid "Total rounds shot:"
 msgstr ""

@ -817,8 +814,8 @@ msgid "Reset your password"
 msgstr ""

 #, elixir-autogen, elixir-format, fuzzy
-#: lib/cannery_web/live/ammo_group_live/show.ex:36
-#: lib/cannery_web/live/range_live/index.ex:26
+#: lib/cannery_web/live/ammo_group_live/show.ex:38
+#: lib/cannery_web/live/range_live/index.ex:28
 msgid "Record Shots"
 msgstr ""

@ -831,63 +828,3 @@ msgstr ""
 #: lib/cannery_web/live/ammo_type_live/index.ex:34
 msgid "Ammo types"
 msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:86
-msgid "Added on"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:41
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:91
-msgid "Added on:"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/user_card.ex:30
-msgid "User registered on"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_settings/edit.html.heex:129
-msgid "English"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_settings/edit.html.heex:129
-msgid "French"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_settings/edit.html.heex:129
-msgid "German"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:33
-msgid "Language"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:139
-msgid "Get involved!"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:156
-msgid "Help translate"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:165
-msgid "Report bugs or request features"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:147
-msgid "View the source code"
-msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/emails.po
+++ b/priv/gettext/en/LC_MESSAGES/emails.po
@ -92,6 +92,6 @@ msgid "This email was sent from %{name} at %{url}, the self-hosted firearm track
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/layout/email.html.heex:13
+#: lib/cannery_web/templates/layout/email.html.heex:17
 msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
 msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/errors.po
+++ b/priv/gettext/en/LC_MESSAGES/errors.po
@ -16,18 +16,18 @@ msgid "Container must be empty before deleting"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/index.ex:71
+#: lib/cannery_web/live/container_live/show.ex:73
 msgid "Could not delete %{name}: %{error}"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:57
+#: lib/cannery_web/live/container_live/index.ex:59
 msgid "Could not find that container"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:84
+#: lib/cannery_web/controllers/user_settings_controller.ex:67
 msgid "Email change link is invalid or it has expired."
 msgstr ""

@ -37,7 +37,7 @@ msgid "Error"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/error/error.html.heex:28
+#: lib/cannery_web/templates/error/error.html.heex:29
 msgid "Go back home"
 msgstr ""

@ -59,9 +59,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:21
-#: lib/cannery_web/templates/user_settings/edit.html.heex:64
-#: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:66
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""

@ -83,7 +82,7 @@ msgid "Sorry, this invite was not found or expired"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:99
+#: lib/cannery_web/controllers/user_settings_controller.ex:82
 msgid "Unable to delete user"
 msgstr ""

@ -98,7 +97,7 @@ msgid "User confirmation link is invalid or it has expired."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:18
+#: lib/cannery_web/live/invite_live/index.ex:20
 msgid "You are not authorized to view this page"
 msgstr ""

@ -108,23 +107,23 @@ msgid "You are not authorized to view this page."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:130
+#: lib/cannery/accounts/user.ex:128
 msgid "did not change"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:151
+#: lib/cannery/accounts/user.ex:149
 msgid "does not match password"
 msgstr ""

 ## From Ecto.Changeset.put_change/3
 #, elixir-autogen, elixir-format, fuzzy
-#: lib/cannery/accounts/user.ex:188
+#: lib/cannery/accounts/user.ex:186
 msgid "is not valid"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:84
+#: lib/cannery/accounts/user.ex:82
 msgid "must have the @ sign and no spaces"
 msgstr ""

@ -161,11 +160,11 @@ msgid "Tag could not be removed"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:113
 msgid "Could not parse number of copies"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:111
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:98
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/prompts.po
+++ b/priv/gettext/en/LC_MESSAGES/prompts.po
@ -21,31 +21,31 @@ msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:38
-#: lib/cannery_web/live/invite_live/index.ex:53
-#: lib/cannery_web/live/invite_live/index.ex:133
-#: lib/cannery_web/live/tag_live/index.ex:38
+#: lib/cannery_web/live/ammo_type_live/show.ex:40
+#: lib/cannery_web/live/invite_live/index.ex:55
+#: lib/cannery_web/live/invite_live/index.ex:135
+#: lib/cannery_web/live/tag_live/index.ex:40
 msgid "%{name} deleted succesfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:109
+#: lib/cannery_web/live/invite_live/index.ex:111
 msgid "%{name} disabled succesfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:87
+#: lib/cannery_web/live/invite_live/index.ex:89
 msgid "%{name} enabled succesfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:62
-#: lib/cannery_web/live/container_live/show.ex:61
+#: lib/cannery_web/live/container_live/index.ex:64
+#: lib/cannery_web/live/container_live/show.ex:63
 msgid "%{name} has been deleted"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:67
+#: lib/cannery_web/live/invite_live/index.ex:69
 msgid "%{name} updated succesfully"
 msgstr ""

@ -58,18 +58,18 @@ msgid "%{name} updated successfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:29
+#: lib/cannery_web/controllers/user_settings_controller.ex:28
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:56
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#: lib/cannery_web/live/ammo_group_live/show.ex:52
 msgid "Ammo group deleted succesfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:88
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:75
 msgid "Ammo group updated successfully"
 msgstr ""

@ -80,7 +80,7 @@ msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:27
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #: lib/cannery_web/live/container_live/index.html.heex:46
 #: lib/cannery_web/live/container_live/show.html.heex:37
 #: lib/cannery_web/live/tag_live/index.html.heex:38
@ -93,19 +93,19 @@ msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:177
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:71
-#: lib/cannery_web/live/ammo_type_live/index.ex:140
+#: lib/cannery_web/live/ammo_group_live/index.ex:165
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
+#: lib/cannery_web/live/ammo_type_live/index.ex:130
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:146
+#: lib/cannery_web/templates/user_settings/edit.html.heex:112
 msgid "Are you sure you want to delete your account?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:84
+#: lib/cannery_web/components/topbar.ex:86
 msgid "Are you sure you want to log out?"
 msgstr ""

@ -115,7 +115,7 @@ msgid "Are you sure you want to make %{name} unlimited?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:77
+#: lib/cannery_web/controllers/user_settings_controller.ex:60
 msgid "Email changed successfully."
 msgstr ""

@ -140,7 +140,7 @@ msgid "Password reset successfully."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:49
+#: lib/cannery_web/controllers/user_settings_controller.ex:47
 msgid "Password updated successfully."
 msgstr ""

@ -150,7 +150,7 @@ msgid "Please check your email to verify your account"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:96
+#: lib/cannery_web/live/home_live.ex:103
 msgid "Register to setup %{name}"
 msgstr ""

@ -166,7 +166,7 @@ msgid "Saving..."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:95
+#: lib/cannery_web/controllers/user_settings_controller.ex:78
 msgid "Your account has been deleted"
 msgstr ""

@ -181,7 +181,7 @@ msgid "%{name} added successfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.ex:37
+#: lib/cannery_web/live/container_live/show.ex:39
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr ""

@ -201,19 +201,19 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:68
+#: lib/cannery_web/live/range_live/index.ex:70
 msgid "Ammo group unstaged succesfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:130
-#: lib/cannery_web/live/range_live/index.ex:128
+#: lib/cannery_web/live/ammo_group_live/show.ex:132
+#: lib/cannery_web/live/range_live/index.ex:130
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:78
-#: lib/cannery_web/live/range_live/index.ex:54
+#: lib/cannery_web/live/ammo_group_live/show.ex:80
+#: lib/cannery_web/live/range_live/index.ex:56
 msgid "Shot records deleted succesfully"
 msgstr ""

@ -233,7 +233,7 @@ msgid "Ammo moved to %{name} successfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:121
+#: lib/cannery_web/live/invite_live/index.ex:123
 msgid "Copied to clipboard"
 msgstr ""

@ -254,18 +254,8 @@ msgid "Creating..."
 msgstr ""

 #, elixir-autogen, elixir-format, fuzzy
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:147
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:134
 msgid "Ammo group created successfully"
 msgid_plural "Ammo groups created successfully"
 msgstr[0] ""
 msgstr[1] ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
-msgid "Are you sure you want to change your language?"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:65
-msgid "Language updated successfully."
-msgstr ""
--- a/priv/gettext/errors.pot
+++ b/priv/gettext/errors.pot
@ -16,18 +16,18 @@ msgid "Container must be empty before deleting"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/index.ex:71
+#: lib/cannery_web/live/container_live/show.ex:73
 msgid "Could not delete %{name}: %{error}"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:57
+#: lib/cannery_web/live/container_live/index.ex:59
 msgid "Could not find that container"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:84
+#: lib/cannery_web/controllers/user_settings_controller.ex:67
 msgid "Email change link is invalid or it has expired."
 msgstr ""

@ -59,9 +59,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:21
-#: lib/cannery_web/templates/user_settings/edit.html.heex:64
-#: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:66
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""

@ -83,7 +82,7 @@ msgid "Sorry, this invite was not found or expired"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:99
+#: lib/cannery_web/controllers/user_settings_controller.ex:82
 msgid "Unable to delete user"
 msgstr ""

@ -98,7 +97,7 @@ msgid "User confirmation link is invalid or it has expired."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:18
+#: lib/cannery_web/live/invite_live/index.ex:20
 msgid "You are not authorized to view this page"
 msgstr ""

@ -108,22 +107,22 @@ msgid "You are not authorized to view this page."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:130
+#: lib/cannery/accounts/user.ex:128
 msgid "did not change"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:151
+#: lib/cannery/accounts/user.ex:149
 msgid "does not match password"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:188
+#: lib/cannery/accounts/user.ex:186
 msgid "is not valid"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:84
+#: lib/cannery/accounts/user.ex:82
 msgid "must have the @ sign and no spaces"
 msgstr ""

--- a/priv/gettext/fr/LC_MESSAGES/actions.po
+++ b/priv/gettext/fr/LC_MESSAGES/actions.po
@ -23,120 +23,119 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "ajouter munition"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr "Ajoutez votre première caisse !"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:12
+#, elixir-autogen, elixir-format
 msgid "Add your first container!"
 msgstr "Ajoutez votre premier conteneur !"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:12
+#, elixir-autogen, elixir-format
 msgid "Add your first type!"
 msgstr "Ajoutez votre premier type !"

+#: lib/cannery_web/templates/user_settings/edit.html.heex:16
+#: lib/cannery_web/templates/user_settings/edit.html.heex:45
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:44
 msgid "Change email"
 msgstr "Changer le mél"

+#: lib/cannery_web/templates/user_settings/edit.html.heex:60
+#: lib/cannery_web/templates/user_settings/edit.html.heex:101
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:58
-#: lib/cannery_web/templates/user_settings/edit.html.heex:99
 msgid "Change password"
 msgstr "Changer le mot de passe"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Create Invite"
 msgstr "Créer une invitation"

+#: lib/cannery_web/templates/user_settings/edit.html.heex:108
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
 msgid "Delete User"
 msgstr "Supprimer utilisateur"

-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:52
+#: lib/cannery_web/templates/user_registration/new.html.heex:43
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:45
+#, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:12
+#, elixir-autogen, elixir-format
 msgid "Invite someone new!"
 msgstr "Invitez une nouvelle personne !"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:106
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:48
+#: lib/cannery_web/templates/user_registration/new.html.heex:39
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Se connecter"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/tag_live/index.html.heex:14
+#, elixir-autogen, elixir-format
 msgid "Make your first tag!"
 msgstr "Faîtes votre premier tag !"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:42
+#, elixir-autogen, elixir-format
 msgid "New Ammo group"
 msgstr "Nouveau groupe de munition"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Ammo type"
 msgstr "Nouveau type de munition"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Container"
 msgstr "Nouveau conteneur"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/tag_live/index.html.heex:19
+#, elixir-autogen, elixir-format
 msgid "New Tag"
 msgstr "Nouveau tag"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:99
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:25
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:42
+#: lib/cannery_web/templates/user_registration/new.html.heex:33
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:25
 #: lib/cannery_web/templates/user_session/new.html.heex:40
+#, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "S’enregistrer"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr "Renvoyer les instructions de confirmation"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr "Réinitialisé le mot de passe"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:46
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
@ -144,83 +143,74 @@ msgstr "Réinitialisé le mot de passe"
 #: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
 #: lib/cannery_web/live/tag_live/form_component.ex:66
+#, elixir-autogen, elixir-format
 msgid "Save"
 msgstr "Sauvegarder"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr "Envoyer les instructions pour réinitialiser le mot de passe"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/show.html.heex:53
+#, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr "Pourquoi pas en ajouter un ?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:52
+#, elixir-autogen, elixir-format
 msgid "Add"
 msgstr "Ajouter"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Stage ammo"
 msgstr "Munition préparée"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:12
+#, elixir-autogen, elixir-format
 msgid "Why not get some ready to shoot?"
 msgstr "Pourquoi pas en préparer pour tirer ?"

-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:144
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
+#: lib/cannery_web/live/ammo_group_live/index.ex:134
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:36
+#, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr "Enregistrer des tirs"

+#: lib/cannery_web/live/ammo_group_live/show.html.heex:50
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 msgid "Ammo Details"
 msgstr "Détails de la munition"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:89
+#, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr "Ajoutez un autre conteneur !"

+#: lib/cannery_web/live/ammo_group_live/show.html.heex:80
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
 msgid "Move containers"
 msgstr "Déplacer les conteneurs"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:127
+#, elixir-autogen, elixir-format
 msgid "Select"
 msgstr "Sélectionner"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
 msgstr "Copier dans le presse-papier"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:18
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:36
+#, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr "ajouter un conteneur en premier"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Créer"
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:113
-msgid "Change Language"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
-msgid "Change language"
-msgstr ""
--- a/priv/gettext/fr/LC_MESSAGES/default.po
+++ b/priv/gettext/fr/LC_MESSAGES/default.po
--- a/priv/gettext/fr/LC_MESSAGES/emails.po
+++ b/priv/gettext/fr/LC_MESSAGES/emails.po
@ -23,94 +23,94 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:30
+#, elixir-autogen, elixir-format
 msgid "Confirm your %{name} account"
 msgstr "Confirmer votre compte %{name}"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
 #: lib/cannery_web/templates/email/reset_password.html.eex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
 #: lib/cannery_web/templates/email/update_email.html.eex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
+#, elixir-autogen, elixir-format
 msgid "Hi %{email},"
 msgstr "Salut %{email},"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:10
+#, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{url}, please ignore this."
 msgstr "Si vous n’avez créé un compte à %{url}, veuillez ignorer ceci."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.txt.eex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:8
+#, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 "Si vous n’avez pas demandé ce changement depuis %{url}, veuillez ignorer "
 "ceci."

-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format
 msgid "Reset your %{name} password"
 msgstr "Réinitialiser votre mot de passe %{name}"

-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format
 msgid "Update your %{name} email"
 msgstr "Mettre à jour votre mél %{name}"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:9
+#, elixir-autogen, elixir-format
 msgid "Welcome to %{name}!"
 msgstr "Bienvenue à %{name} !"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "Welcome to %{name}%!"
 msgstr "Bienvenue à %{name}% !"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/update_email.html.eex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr "Vous pouvez changer votre mél en consultant l’URL ci-dessous :"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
+#, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr "Vous pouvez confirmer votre compte en consultant l’URL ci-dessous :"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.html.eex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
 "Vous pouvez réinitialiser votre mot de passe en visitant l’URL ci-dessous :"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:22
+#, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{name}, please ignore this."
 msgstr "Si vous n’avez pas créé de compte à %{name}, veuillez ignorer ceci."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.html.eex:16
 #: lib/cannery_web/templates/email/update_email.html.eex:16
+#, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{name}, please ignore this."
 msgstr ""
 "Si vous n’avez pas demandé ce changement depuis %{name}, veuillez ignorer "
 "ceci."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/layout/email.txt.eex:9
+#, elixir-autogen, elixir-format
 msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 "Ce mél a été envoyé depuis %{name} à %{url}, le site web de suivi d’arme à "
 "feux."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/layout/email.html.heex:13
+#, elixir-autogen, elixir-format
 msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
 msgstr "Ce mél a été envoyé depuis %{name}, le site web de suivi d’arme à feu."
--- a/priv/gettext/fr/LC_MESSAGES/errors.po
+++ b/priv/gettext/fr/LC_MESSAGES/errors.po
@ -23,165 +23,164 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#, elixir-autogen, elixir-format
 #: lib/cannery/containers.ex:122
+#, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr "Le conteneur doit être vide pour être supprimé"

+#: lib/cannery_web/live/container_live/index.ex:71
+#: lib/cannery_web/live/container_live/show.ex:73
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:71
 msgid "Could not delete %{name}: %{error}"
 msgstr "Impossible de supprimer %{name} : %{error}"

+#: lib/cannery_web/live/container_live/index.ex:59
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:57
 msgid "Could not find that container"
 msgstr "Impossible de trouver ce conteneur"

+#: lib/cannery_web/controllers/user_settings_controller.ex:67
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:84
 msgid "Email change link is invalid or it has expired."
 msgstr "Le lien de changement de mél est invalide ou a expiré."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:8
+#, elixir-autogen, elixir-format
 msgid "Error"
 msgstr "Erreur"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:28
+#, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr "Retour au menu principal"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:11
+#, elixir-autogen, elixir-format
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:17
+#, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr "Mél ou mot de passe invalide"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:9
+#, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr "Pas trouvé"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:21
-#: lib/cannery_web/templates/user_settings/edit.html.heex:64
-#: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:66
+#, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
 "Oups, quelque chose s’est mal passé ! Veuillez vérifier les erreurs en "
 "dessous."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#, elixir-autogen, elixir-format
 msgid "Reset password link is invalid or it has expired."
 msgstr "Le lien de réinitialisation de mot de passe est invalide ou expiré."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
 #: lib/cannery_web/controllers/user_registration_controller.ex:56
+#, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr "Désolé, l’enregistrement public est désactivé"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
 #: lib/cannery_web/controllers/user_registration_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr "Désolé, cette invitation n’est pas trouvée ou est expirée"

+#: lib/cannery_web/controllers/user_settings_controller.ex:82
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:99
 msgid "Unable to delete user"
 msgstr "Impossible de supprimer l’utilisateur·ice"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:10
+#, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr "Non autorisé·e"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr "Le lien de confirmation d’utilisateur·ice est invalide ou a expiré."

+#: lib/cannery_web/live/invite_live/index.ex:20
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:18
 msgid "You are not authorized to view this page"
 msgstr "Vous n’êtes pas autorisé·e à voir cette page"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:177
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr "Vous n’êtes pas autorisé·e à voir cette page."

+#: lib/cannery/accounts/user.ex:128
 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:130
 msgid "did not change"
 msgstr "est inchangé"

+#: lib/cannery/accounts/user.ex:149
 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:151
 msgid "does not match password"
 msgstr "le mot de passe ne correspond pas"

+#: lib/cannery/accounts/user.ex:186
 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:188
 msgid "is not valid"
 msgstr "n’est pas valide"

+#: lib/cannery/accounts/user.ex:82
 #, elixir-autogen, elixir-format
-#: lib/cannery/accounts/user.ex:84
 msgid "must have the @ sign and no spaces"
 msgstr "doit contenir le symbole @ et aucune espace"

-#, elixir-autogen, elixir-format
 #: lib/cannery/tags.ex:40
+#, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr "Tag pas trouvé"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:30
+#, elixir-autogen, elixir-format
 msgid "Tag could not be added"
 msgstr "Le tag n’a pas pu être ajouté"

-#, elixir-autogen, elixir-format
 #: lib/cannery/activity_log.ex:125
+#, elixir-autogen, elixir-format
 msgid "Count must be at least 1"
 msgstr "Le nombre doit être au moins égal à 1"

-#, elixir-autogen, elixir-format
 #: lib/cannery/activity_log.ex:73
 #: lib/cannery/activity_log.ex:120
+#, elixir-autogen, elixir-format
 msgid "Count must be less than %{count}"
 msgstr "La quantité doit être inférieur à %{count}"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:39
 #: lib/cannery_web/controllers/user_auth.ex:161
+#, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
 "Vous devez d’abord confirmer votre compte et vous connecter pour accéder à "
 "cette page."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:52
+#, elixir-autogen, elixir-format
 msgid "Tag could not be removed"
 msgstr "Le tag n’a pas pu être retiré"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.ex:126
+#, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr "Impossible d'analyser le nombre de copies"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.ex:111
+#, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr "Nombre de copies invalide, doit être 1 et %{max}. Été %{multiplier}"
--- a/priv/gettext/fr/LC_MESSAGES/prompts.po
+++ b/priv/gettext/fr/LC_MESSAGES/prompts.po
@ -23,157 +23,156 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:64
 #: lib/cannery_web/live/container_live/form_component.ex:65
 #: lib/cannery_web/live/invite_live/form_component.ex:59
 #: lib/cannery_web/live/tag_live/form_component.ex:101
+#, elixir-autogen, elixir-format
 msgid "%{name} created successfully"
 msgstr "créé avec succès"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:38
-#: lib/cannery_web/live/invite_live/index.ex:53
-#: lib/cannery_web/live/invite_live/index.ex:133
-#: lib/cannery_web/live/tag_live/index.ex:38
+#: lib/cannery_web/live/ammo_type_live/show.ex:40
+#: lib/cannery_web/live/invite_live/index.ex:55
+#: lib/cannery_web/live/invite_live/index.ex:135
+#: lib/cannery_web/live/tag_live/index.ex:40
+#, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
 msgstr "%{name} supprimé avec succès"

+#: lib/cannery_web/live/invite_live/index.ex:111
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:109
 msgid "%{name} disabled succesfully"
 msgstr "%{name} supprimé·e avec succès"

+#: lib/cannery_web/live/invite_live/index.ex:89
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:87
 msgid "%{name} enabled succesfully"
 msgstr "%{name} activé·e avec succès"

+#: lib/cannery_web/live/container_live/index.ex:64
+#: lib/cannery_web/live/container_live/show.ex:63
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:62
-#: lib/cannery_web/live/container_live/show.ex:61
 msgid "%{name} has been deleted"
 msgstr "%{name} a été supprimé·e"

+#: lib/cannery_web/live/invite_live/index.ex:69
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:67
 msgid "%{name} updated succesfully"
 msgstr "%{name} mis à jour avec succès"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:46
 #: lib/cannery_web/live/container_live/form_component.ex:47
 #: lib/cannery_web/live/invite_live/form_component.ex:41
 #: lib/cannery_web/live/tag_live/form_component.ex:83
+#, elixir-autogen, elixir-format
 msgid "%{name} updated successfully"
 msgstr "%{name} mis à jour avec succès"

+#: lib/cannery_web/controllers/user_settings_controller.ex:28
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:29
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr ""
 "Un lien pour confirmer votre changement de mél a été envoyé à la nouvelle "
 "adresse."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:56
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#: lib/cannery_web/live/ammo_group_live/show.ex:52
+#, elixir-autogen, elixir-format
 msgid "Ammo group deleted succesfully"
 msgstr "Groupe de munition supprimé avec succès"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.ex:88
+#, elixir-autogen, elixir-format
 msgid "Ammo group updated successfully"
 msgstr "Groupe de munition mis à jour avec succès"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:102
 #: lib/cannery_web/live/invite_live/index.html.heex:131
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 "Êtes-vous certain·e de supprimer %{email} ? Cette action est définitive !"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:27
 #: lib/cannery_web/live/container_live/index.html.heex:46
 #: lib/cannery_web/live/container_live/show.html.heex:37
 #: lib/cannery_web/live/tag_live/index.html.heex:38
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Êtes-vous certain·e de supprimer %{name} ?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:49
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr "Êtes-vous certain·e de supprimer l’invitation pour %{name} ?"

-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:177
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:71
+#: lib/cannery_web/live/ammo_group_live/index.ex:167
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
 #: lib/cannery_web/live/ammo_type_live/index.ex:140
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Êtes-vous certain·e de supprimer cette munition ?"

+#: lib/cannery_web/templates/user_settings/edit.html.heex:112
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:146
 msgid "Are you sure you want to delete your account?"
 msgstr "Êtes-vous certain·e de supprimer votre compte ?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:84
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to log out?"
 msgstr "Êtes-vous certain·e de vouloir vous déconnecter ?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:74
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to make %{name} unlimited?"
 msgstr "Êtes-vous certain·e de vouloir rendre %{name} illimité ?"

+#: lib/cannery_web/controllers/user_settings_controller.ex:60
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:77
 msgid "Email changed successfully."
 msgstr "Mél changé avec succès."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:23
+#, elixir-autogen, elixir-format
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
 msgstr ""
 "Si votre mél est dans notre système et n’a pas encore été confirmé, vous "
 "recevrez un mél avec les instructions sous peu."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:24
+#, elixir-autogen, elixir-format
 msgid "If your email is in our system, you will receive instructions to reset your password shortly."
 msgstr ""
 "Si votre mél est dans notre système, vous recevrez les instructions pour "
 "réinitialiser votre mot de passe sous peu."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:23
+#, elixir-autogen, elixir-format
 msgid "Logged out successfully."
 msgstr "Déconnecté avec succès."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Password reset successfully."
 msgstr "Mot de passe réinitialiser avec succès."

+#: lib/cannery_web/controllers/user_settings_controller.ex:47
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:49
 msgid "Password updated successfully."
 msgstr "Mot de passe mis à jour avec succès."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:74
+#, elixir-autogen, elixir-format
 msgid "Please check your email to verify your account"
 msgstr "Veuillez vérifier votre mél pour confirmer votre compte"

+#: lib/cannery_web/live/home_live.ex:101
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:96
 msgid "Register to setup %{name}"
 msgstr "S’enregistrer pour mettre en place %{name}"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:48
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
@ -181,112 +180,103 @@ msgstr "S’enregistrer pour mettre en place %{name}"
 #: lib/cannery_web/live/invite_live/form_component.html.heex:30
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
 #: lib/cannery_web/live/tag_live/form_component.ex:68
+#, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Sauvegarde en cours…"

+#: lib/cannery_web/controllers/user_settings_controller.ex:78
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:95
 msgid "Your account has been deleted"
 msgstr "Votre compte a été supprimé"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to remove the %{tag_name} tag from %{container_name}?"
 msgstr ""
 "Êtes-vous certain·e de vouloir retirer le tag %{tag_name} de "
 "%{container_name} ?"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:36
+#, elixir-autogen, elixir-format
 msgid "%{name} added successfully"
 msgstr "%{name} a été ajouté avec succès"

+#: lib/cannery_web/live/container_live/show.ex:39
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.ex:37
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr "%{tag_name} a été retiré de %{container_name}"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:54
+#, elixir-autogen, elixir-format
 msgid "Adding..."
 msgstr "Ajout en cours…"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.ex:68
+#, elixir-autogen, elixir-format
 msgid "Shots recorded successfully"
 msgstr "Tirs enregistré avec succès"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:29
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to unstage this ammo?"
 msgstr "Êtes-vous certain·e de vouloir désélectionner cette munition ?"

+#: lib/cannery_web/live/range_live/index.ex:70
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:68
 msgid "Ammo group unstaged succesfully"
 msgstr "Groupe de munition désélectionner avec succès"

+#: lib/cannery_web/live/ammo_group_live/show.ex:132
+#: lib/cannery_web/live/range_live/index.ex:130
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:130
-#: lib/cannery_web/live/range_live/index.ex:128
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Êtes-vous certain·e de vouloir supprimer cet enregistrement de tir ?"

+#: lib/cannery_web/live/ammo_group_live/show.ex:80
+#: lib/cannery_web/live/range_live/index.ex:56
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:78
-#: lib/cannery_web/live/range_live/index.ex:54
 msgid "Shot records deleted succesfully"
 msgstr "Enregistrements de tir supprimés avec succès"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/form_component.ex:55
+#, elixir-autogen, elixir-format
 msgid "Shot records updated successfully"
 msgstr "Enregistrements de tir mis à jour avec succès"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:38
+#, elixir-autogen, elixir-format
 msgid "%{email} confirmed successfully."
 msgstr "%{email} confirmé avec succès."

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:53
+#, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr "Munition déplacée à %{name} avec succès"

+#: lib/cannery_web/live/invite_live/index.ex:123
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:121
 msgid "Copied to clipboard"
 msgstr "Copié dans le presse-papier"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:58
+#, elixir-autogen, elixir-format
 msgid "%{name} removed successfully"
 msgstr "%{name} retiré avec succès"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:15
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr "Vous aurez besoin de"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+#, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr "Création en cours…"

-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.ex:147
+#, elixir-autogen, elixir-format
 msgid "Ammo group created successfully"
 msgid_plural "Ammo groups created successfully"
 msgstr[0] "Groupe de munition créé avec succès"
 msgstr[1] "Groupes de munitions créé avec succès"
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
-msgid "Are you sure you want to change your language?"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:65
-msgid "Language updated successfully."
-msgstr ""
--- a/priv/gettext/prompts.pot
+++ b/priv/gettext/prompts.pot
@ -20,31 +20,31 @@ msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:38
-#: lib/cannery_web/live/invite_live/index.ex:53
-#: lib/cannery_web/live/invite_live/index.ex:133
-#: lib/cannery_web/live/tag_live/index.ex:38
+#: lib/cannery_web/live/ammo_type_live/show.ex:40
+#: lib/cannery_web/live/invite_live/index.ex:55
+#: lib/cannery_web/live/invite_live/index.ex:135
+#: lib/cannery_web/live/tag_live/index.ex:40
 msgid "%{name} deleted succesfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:109
+#: lib/cannery_web/live/invite_live/index.ex:111
 msgid "%{name} disabled succesfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:87
+#: lib/cannery_web/live/invite_live/index.ex:89
 msgid "%{name} enabled succesfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:62
-#: lib/cannery_web/live/container_live/show.ex:61
+#: lib/cannery_web/live/container_live/index.ex:64
+#: lib/cannery_web/live/container_live/show.ex:63
 msgid "%{name} has been deleted"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:67
+#: lib/cannery_web/live/invite_live/index.ex:69
 msgid "%{name} updated succesfully"
 msgstr ""

@ -57,13 +57,13 @@ msgid "%{name} updated successfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:29
+#: lib/cannery_web/controllers/user_settings_controller.ex:28
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:56
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#: lib/cannery_web/live/ammo_group_live/show.ex:52
 msgid "Ammo group deleted succesfully"
 msgstr ""

@ -92,14 +92,14 @@ msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:177
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:71
+#: lib/cannery_web/live/ammo_group_live/index.ex:167
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
 #: lib/cannery_web/live/ammo_type_live/index.ex:140
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:146
+#: lib/cannery_web/templates/user_settings/edit.html.heex:112
 msgid "Are you sure you want to delete your account?"
 msgstr ""

@ -114,7 +114,7 @@ msgid "Are you sure you want to make %{name} unlimited?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:77
+#: lib/cannery_web/controllers/user_settings_controller.ex:60
 msgid "Email changed successfully."
 msgstr ""

@ -139,7 +139,7 @@ msgid "Password reset successfully."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:49
+#: lib/cannery_web/controllers/user_settings_controller.ex:47
 msgid "Password updated successfully."
 msgstr ""

@ -149,7 +149,7 @@ msgid "Please check your email to verify your account"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:96
+#: lib/cannery_web/live/home_live.ex:101
 msgid "Register to setup %{name}"
 msgstr ""

@ -165,7 +165,7 @@ msgid "Saving..."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:95
+#: lib/cannery_web/controllers/user_settings_controller.ex:78
 msgid "Your account has been deleted"
 msgstr ""

@ -180,7 +180,7 @@ msgid "%{name} added successfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.ex:37
+#: lib/cannery_web/live/container_live/show.ex:39
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr ""

@ -200,19 +200,19 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:68
+#: lib/cannery_web/live/range_live/index.ex:70
 msgid "Ammo group unstaged succesfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:130
-#: lib/cannery_web/live/range_live/index.ex:128
+#: lib/cannery_web/live/ammo_group_live/show.ex:132
+#: lib/cannery_web/live/range_live/index.ex:130
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:78
-#: lib/cannery_web/live/range_live/index.ex:54
+#: lib/cannery_web/live/ammo_group_live/show.ex:80
+#: lib/cannery_web/live/range_live/index.ex:56
 msgid "Shot records deleted succesfully"
 msgstr ""

@ -232,7 +232,7 @@ msgid "Ammo moved to %{name} successfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:121
+#: lib/cannery_web/live/invite_live/index.ex:123
 msgid "Copied to clipboard"
 msgstr ""

@ -258,13 +258,3 @@ msgid "Ammo group created successfully"
 msgid_plural "Ammo groups created successfully"
 msgstr[0] ""
 msgstr[1] ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
-msgid "Are you sure you want to change your language?"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_settings_controller.ex:65
-msgid "Language updated successfully."
-msgstr ""
--- a/priv/repo/migrations/20220506015344_add_locale_setting.exs
+++ b/priv/repo/migrations/20220506015344_add_locale_setting.exs
@ -1,9 +0,0 @@
-defmodule Cannery.Repo.Migrations.AddLocaleSetting do
-  use Ecto.Migration
-
-  def change do
-    alter table("users") do
-      add :locale, :string
-    end
-  end
-end