display used-up date on used-up ammo

Currently translated at 100.0% (157 of 157 strings)

Translation: cannery/default
Translate-URL: https://weblate.bubbletea.dev/projects/cannery/default/fr/

.drone.yml

@@ -32,9 +32,13 @@ steps:
   - mix test
 
 - name: build and publish stable
-  image: plugins/docker
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
   settings:
     repo: shibaobun/cannery
+    purge: true
+    compress: true
+    platforms: linux/amd64,linux/arm64,linux/arm/v7
     username:
       from_secret: docker_username
     password:
@@ -45,9 +49,13 @@ steps:
     - stable
 
 - name: build and publish tagged version
-  image: plugins/docker
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
   settings:
     repo: shibaobun/cannery
+    purge: true
+    compress: true
+    platforms: linux/amd64,linux/arm64,linux/arm/v7
     username:
       from_secret: docker_username
     password:

CHANGELOG.md

@@ -1,3 +1,31 @@
+# v0.5.5
+- Update translations
+- Display used-up date on used-up ammo
+- Make ammo index page a bit more compact
+- Make ammo index page filter used-up ammo
+- Make ammo catalog page include ammo count
+- Make ammo type show page a bit more compact
+- Make ammo type show page include container names for each ammo
+- Make ammo type show page filter used-up ammo
+- Make container show page a bit more compact
+- Make container show page filter used-up ammo
+- Forgot to add the logo as the favicon whoops
+
+# v0.5.4
+- Rename "Ammo" tab to "Catalog", and "Manage" tab is now "Ammo"
+- Ammo groups are now just referred to as Ammo or "Packs"
+- URL paths now reflect new names
+- Add pack and round count to container information
+- Add cute logo >:3 Thank you [kalli](https://twitter.com/t0kkuro)!
+- Add note about deleting an ammo type deleting all ammo of that type as well
+- Prompt to create first ammo type before trying to create first ammo
+- Add note about creating unlimited invites
+- Update screenshot lol
+
+# v0.5.3
+- Update French translation: Thank you [duponin](https://udongein.xyz/users/duponin)!
+- Update German translation: Thank you [Kaia](https://shitposter.club/users/kaia)!
+
 # v0.5.2
 - Add "Added on" date to ammo groups
 - Add "Added on" date to ammo types

CONTRIBUTING.md

@@ -143,3 +143,4 @@ Thank you so much for your contributions!
 - shibao (https://misskey.bubbletea.dev/@shibao)
 - kaia (https://shitposter.club/users/kaia)
 - duponin (https://udongein.xyz/users/duponin)
+- kalli (https://twitter.com/t0kkuro)

README.md

@@ -1,6 +1,6 @@
 # Cannery
 
-![screenshot](https://gitea.bubbletea.dev/shibao/cannery/raw/branch/stable/home.png)
+![old screenshot](https://gitea.bubbletea.dev/shibao/cannery/raw/branch/stable/home.png)
 
 The self-hosted firearm tracker website.
 

assets/css/components.scss

@@ -25,7 +25,7 @@
   }
 
   .btn {
-    @apply inline-block break-words min-w-4;
+    @apply inline-block break-words;
     @apply focus:outline-none px-4 py-2 rounded-lg;
     @apply shadow-sm focus:shadow-lg;
     @apply transition-all duration-300 ease-in-out;
@@ -52,7 +52,7 @@
   }
 
   .link {
-    @apply inline-block break-all min-w-4;
+    @apply inline-block break-words;
     @apply hover:underline;
     @apply transition-colors duration-500 ease-in-out;
   }

lib/cannery/activity_log.ex

@@ -4,8 +4,7 @@ defmodule Cannery.ActivityLog do
   """
 
   import Ecto.Query, warn: false
-  import CanneryWeb.Gettext
-  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo, Ammo.AmmoGroup, Repo}
+  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo.AmmoGroup, Repo}
   alias Ecto.{Changeset, Multi}
 
   @doc """
@@ -60,32 +59,30 @@ defmodule Cannery.ActivityLog do
   """
   @spec create_shot_group(attrs :: map(), User.t(), AmmoGroup.t()) ::
           {:ok, ShotGroup.t()} | {:error, Changeset.t(ShotGroup.t()) | nil}
-  def create_shot_group(
-        attrs,
-        %User{id: user_id},
-        %AmmoGroup{id: ammo_group_id, count: ammo_group_count, user_id: user_id} = ammo_group
-      ) do
-    attrs = attrs |> Map.merge(%{"user_id" => user_id, "ammo_group_id" => ammo_group_id})
-    changeset = %ShotGroup{} |> ShotGroup.create_changeset(attrs)
-    shot_group_count = changeset |> Changeset.get_field(:count)
-
-    if shot_group_count > ammo_group_count do
-      error = dgettext("errors", "Count must be less than %{count}", count: ammo_group_count)
-      changeset = changeset |> Changeset.add_error(:count, error)
-      {:error, changeset}
-    else
-      Multi.new()
-      |> Multi.insert(:create_shot_group, changeset)
-      |> Multi.update(
-        :update_ammo_group,
-        ammo_group |> AmmoGroup.range_changeset(%{"count" => ammo_group_count - shot_group_count})
-      )
-      |> Repo.transaction()
-      |> case do
-        {:ok, %{create_shot_group: shot_group}} -> {:ok, shot_group}
-        {:error, :create_shot_group, changeset, _changes_so_far} -> {:error, changeset}
-        {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
+  def create_shot_group(attrs, user, ammo_group) do
+    Multi.new()
+    |> Multi.insert(
+      :create_shot_group,
+      %ShotGroup{} |> ShotGroup.create_changeset(user, ammo_group, attrs)
+    )
+    |> Multi.run(
+      :ammo_group,
+      fn repo, %{create_shot_group: %{ammo_group_id: ammo_group_id, user_id: user_id}} ->
+        {:ok,
+         repo.one(from ag in AmmoGroup, where: ag.id == ^ammo_group_id and ag.user_id == ^user_id)}
       end
+    )
+    |> Multi.update(
+      :update_ammo_group,
+      fn %{create_shot_group: %{count: shot_group_count}, ammo_group: %{count: ammo_group_count}} ->
+        ammo_group |> AmmoGroup.range_changeset(%{"count" => ammo_group_count - shot_group_count})
+      end
+    )
+    |> Repo.transaction()
+    |> case do
+      {:ok, %{create_shot_group: shot_group}} -> {:ok, shot_group}
+      {:error, :create_shot_group, changeset, _changes_so_far} -> {:error, changeset}
+      {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
     end
   end
 
@@ -104,42 +101,38 @@ defmodule Cannery.ActivityLog do
   @spec update_shot_group(ShotGroup.t(), attrs :: map(), User.t()) ::
           {:ok, ShotGroup.t()} | {:error, Changeset.t(ShotGroup.t()) | nil}
   def update_shot_group(
-        %ShotGroup{count: count, user_id: user_id, ammo_group_id: ammo_group_id} = shot_group,
+        %ShotGroup{count: count, user_id: user_id} = shot_group,
         attrs,
         %User{id: user_id} = user
       ) do
-    %{count: ammo_group_count, user_id: ^user_id} =
-      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(user)
-
-    changeset = shot_group |> ShotGroup.update_changeset(attrs)
-    new_shot_group_count = changeset |> Changeset.get_field(:count)
-    shot_diff_to_add = new_shot_group_count - count
-
-    cond do
-      shot_diff_to_add > ammo_group_count ->
-        error = dgettext("errors", "Count must be less than %{count}", count: ammo_group_count)
-        changeset = changeset |> Changeset.add_error(:count, error)
-        {:error, changeset}
-
-      new_shot_group_count <= 0 ->
-        error = dgettext("errors", "Count must be at least 1")
-        changeset = changeset |> Changeset.add_error(:count, error)
-        {:error, changeset}
-
-      true ->
-        Multi.new()
-        |> Multi.update(:update_shot_group, changeset)
-        |> Multi.update(
-          :update_ammo_group,
-          ammo_group
-          |> AmmoGroup.range_changeset(%{"count" => ammo_group_count - shot_diff_to_add})
-        )
-        |> Repo.transaction()
-        |> case do
-          {:ok, %{update_shot_group: shot_group}} -> {:ok, shot_group}
-          {:error, :update_shot_group, changeset, _changes_so_far} -> {:error, changeset}
-          {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
-        end
+    Multi.new()
+    |> Multi.update(
+      :update_shot_group,
+      shot_group |> ShotGroup.update_changeset(user, attrs)
+    )
+    |> Multi.run(
+      :ammo_group,
+      fn repo, %{update_shot_group: %{ammo_group_id: ammo_group_id, user_id: user_id}} ->
+        {:ok,
+         repo.one(from ag in AmmoGroup, where: ag.id == ^ammo_group_id and ag.user_id == ^user_id)}
+      end
+    )
+    |> Multi.update(
+      :update_ammo_group,
+      fn %{
+           update_shot_group: %{count: new_count},
+           ammo_group: %{count: ammo_group_count} = ammo_group
+         } ->
+        shot_diff_to_add = new_count - count
+        new_ammo_group_count = ammo_group_count - shot_diff_to_add
+        ammo_group |> AmmoGroup.range_changeset(%{"count" => new_ammo_group_count})
+      end
+    )
+    |> Repo.transaction()
+    |> case do
+      {:ok, %{update_shot_group: shot_group}} -> {:ok, shot_group}
+      {:error, :update_shot_group, changeset, _changes_so_far} -> {:error, changeset}
+      {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
     end
   end
 
@@ -158,18 +151,27 @@ defmodule Cannery.ActivityLog do
   @spec delete_shot_group(ShotGroup.t(), User.t()) ::
           {:ok, ShotGroup.t()} | {:error, Changeset.t(ShotGroup.t())}
   def delete_shot_group(
-        %ShotGroup{count: count, user_id: user_id, ammo_group_id: ammo_group_id} = shot_group,
-        %User{id: user_id} = user
+        %ShotGroup{user_id: user_id} = shot_group,
+        %User{id: user_id}
       ) do
-    %{count: ammo_group_count, user_id: ^user_id} =
-      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(user)
-
     Multi.new()
     |> Multi.delete(:delete_shot_group, shot_group)
+    |> Multi.run(
+      :ammo_group,
+      fn repo, %{delete_shot_group: %{ammo_group_id: ammo_group_id, user_id: user_id}} ->
+        {:ok,
+         repo.one(from ag in AmmoGroup, where: ag.id == ^ammo_group_id and ag.user_id == ^user_id)}
+      end
+    )
     |> Multi.update(
       :update_ammo_group,
-      ammo_group
-      |> AmmoGroup.range_changeset(%{"count" => ammo_group_count + count})
+      fn %{
+           delete_shot_group: %{count: count},
+           ammo_group: %{count: ammo_group_count} = ammo_group
+         } ->
+        new_ammo_group_count = ammo_group_count + count
+        ammo_group |> AmmoGroup.range_changeset(%{"count" => new_ammo_group_count})
+      end
     )
     |> Repo.transaction()
     |> case do
@@ -178,21 +180,4 @@ defmodule Cannery.ActivityLog do
       {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
     end
   end
-
-  @doc """
-  Returns an `%Ecto.Changeset{}` for tracking shot_group changes.
-
-  ## Examples
-
-      iex> change_shot_group(shot_group)
-      %Ecto.Changeset{data: %ShotGroup{}}
-
-  """
-  @spec change_shot_group(ShotGroup.t() | ShotGroup.new_shot_group()) ::
-          Changeset.t(ShotGroup.t() | ShotGroup.new_shot_group())
-  @spec change_shot_group(ShotGroup.t() | ShotGroup.new_shot_group(), attrs :: map()) ::
-          Changeset.t(ShotGroup.t() | ShotGroup.new_shot_group())
-  def change_shot_group(%ShotGroup{} = shot_group, attrs \\ %{}) do
-    shot_group |> ShotGroup.update_changeset(attrs)
-  end
 end

lib/cannery/activity_log/shot_group.ex

@@ -4,8 +4,9 @@ defmodule Cannery.ActivityLog.ShotGroup do
   """
 
   use Ecto.Schema
+  import CanneryWeb.Gettext
   import Ecto.Changeset
-  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo.AmmoGroup}
+  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo.AmmoGroup, Repo}
   alias Ecto.{Changeset, UUID}
 
   @primary_key {:id, :binary_id, autogenerate: true}
@@ -37,21 +38,84 @@ defmodule Cannery.ActivityLog.ShotGroup do
   @type id :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_shot_group(), attrs :: map()) :: Changeset.t(new_shot_group())
-  def create_changeset(shot_group, attrs) do
+  @spec create_changeset(
+          new_shot_group(),
+          User.t() | any(),
+          AmmoGroup.t() | any(),
+          attrs :: map()
+        ) ::
+          Changeset.t(new_shot_group())
+  def create_changeset(
+        shot_group,
+        %User{id: user_id},
+        %AmmoGroup{id: ammo_group_id, user_id: user_id} = ammo_group,
+        attrs
+      )
+      when not (user_id |> is_nil()) and not (ammo_group_id |> is_nil()) do
     shot_group
-    |> cast(attrs, [:count, :notes, :date, :ammo_group_id, :user_id])
+    |> change(user_id: user_id)
+    |> change(ammo_group_id: ammo_group_id)
+    |> cast(attrs, [:count, :notes, :date])
     |> validate_number(:count, greater_than: 0)
+    |> validate_create_shot_group_count(ammo_group)
     |> validate_required([:count, :ammo_group_id, :user_id])
   end
 
+  def create_changeset(shot_group, _invalid_user, _invalid_ammo_group, attrs) do
+    shot_group
+    |> cast(attrs, [:count, :notes, :date])
+    |> validate_number(:count, greater_than: 0)
+    |> validate_required([:count, :ammo_group_id, :user_id])
+    |> add_error(:invalid, dgettext("errors", "Please select a valid user and ammo group"))
+  end
+
+  defp validate_create_shot_group_count(changeset, %AmmoGroup{count: ammo_group_count}) do
+    if changeset |> Changeset.get_field(:count) > ammo_group_count do
+      error = dgettext("errors", "Count must be less than %{count}", count: ammo_group_count)
+      changeset |> Changeset.add_error(:count, error)
+    else
+      changeset
+    end
+  end
+
   @doc false
-  @spec update_changeset(t() | new_shot_group(), attrs :: map()) ::
+  @spec update_changeset(t() | new_shot_group(), User.t(), attrs :: map()) ::
           Changeset.t(t() | new_shot_group())
-  def update_changeset(shot_group, attrs) do
+  def update_changeset(
+        %ShotGroup{user_id: user_id} = shot_group,
+        %User{id: user_id} = user,
+        attrs
+      )
+      when not (user_id |> is_nil()) do
     shot_group
     |> cast(attrs, [:count, :notes, :date])
     |> validate_number(:count, greater_than: 0)
     |> validate_required([:count])
+    |> validate_update_shot_group_count(shot_group, user)
+  end
+
+  defp validate_update_shot_group_count(
+         changeset,
+         %ShotGroup{count: count} = shot_group,
+         %User{id: user_id}
+       )
+       when not (user_id |> is_nil()) do
+    %{ammo_group: %AmmoGroup{count: ammo_group_count, user_id: ^user_id}} =
+      shot_group |> Repo.preload(:ammo_group)
+
+    new_shot_group_count = changeset |> Changeset.get_field(:count)
+    shot_diff_to_add = new_shot_group_count - count
+
+    cond do
+      shot_diff_to_add > ammo_group_count ->
+        error = dgettext("errors", "Count must be less than %{count}", count: ammo_group_count)
+        changeset |> Changeset.add_error(:count, error)
+
+      new_shot_group_count <= 0 ->
+        changeset |> Changeset.add_error(:count, dgettext("errors", "Count must be at least 1"))
+
+      true ->
+        changeset
+    end
   end
 end

lib/cannery/ammo.ex

@@ -3,8 +3,9 @@ defmodule Cannery.Ammo do
   The Ammo context.
   """
 
+  import CanneryWeb.Gettext
   import Ecto.Query, warn: false
-  alias Cannery.{Accounts.User, Containers, Repo}
+  alias Cannery.{Accounts.User, Containers, Containers.Container, Repo}
   alias Cannery.ActivityLog.ShotGroup
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Ecto.Changeset
@@ -24,6 +25,25 @@ defmodule Cannery.Ammo do
   def list_ammo_types(%User{id: user_id}),
     do: Repo.all(from at in AmmoType, where: at.user_id == ^user_id, order_by: at.name)
 
+  @doc """
+  Returns a count of ammo_types.
+
+  ## Examples
+
+      iex> get_ammo_types_count!(%User{id: 123})
+      3
+
+  """
+  @spec get_ammo_types_count!(User.t()) :: integer()
+  def get_ammo_types_count!(%User{id: user_id}) do
+    Repo.one(
+      from at in AmmoType,
+        where: at.user_id == ^user_id,
+        select: count(at.id),
+        distinct: true
+    )
+  end
+
   @doc """
   Gets a single ammo_type.
 
@@ -140,11 +160,8 @@ defmodule Cannery.Ammo do
   """
   @spec create_ammo_type(attrs :: map(), User.t()) ::
           {:ok, AmmoType.t()} | {:error, Changeset.t(AmmoType.new_ammo_type())}
-  def create_ammo_type(attrs \\ %{}, %User{id: user_id}) do
-    %AmmoType{}
-    |> AmmoType.create_changeset(attrs |> Map.put("user_id", user_id))
-    |> Repo.insert()
-  end
+  def create_ammo_type(attrs \\ %{}, %User{} = user),
+    do: %AmmoType{} |> AmmoType.create_changeset(user, attrs) |> Repo.insert()
 
   @doc """
   Updates a ammo_type.
@@ -193,22 +210,6 @@ defmodule Cannery.Ammo do
   def delete_ammo_type!(%AmmoType{user_id: user_id} = ammo_type, %User{id: user_id}),
     do: ammo_type |> Repo.delete!()
 
-  @doc """
-  Returns an `%Changeset{}` for tracking ammo_type changes.
-
-  ## Examples
-
-      iex> change_ammo_type(ammo_type)
-      %Changeset{data: %AmmoType{}}
-
-  """
-  @spec change_ammo_type(AmmoType.t() | AmmoType.new_ammo_type()) ::
-          Changeset.t(AmmoType.t() | AmmoType.new_ammo_type())
-  @spec change_ammo_type(AmmoType.t() | AmmoType.new_ammo_type(), attrs :: map()) ::
-          Changeset.t(AmmoType.t() | AmmoType.new_ammo_type())
-  def change_ammo_type(%AmmoType{} = ammo_type, attrs \\ %{}),
-    do: AmmoType.update_changeset(ammo_type, attrs)
-
   @doc """
   Returns the list of ammo_groups for a user and type.
 
@@ -219,7 +220,15 @@ defmodule Cannery.Ammo do
 
   """
   @spec list_ammo_groups_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
-  def list_ammo_groups_for_type(%AmmoType{id: ammo_type_id, user_id: user_id}, %User{id: user_id}) do
+  @spec list_ammo_groups_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
+          [AmmoGroup.t()]
+  def list_ammo_groups_for_type(ammo_type, user, include_empty \\ false)
+
+  def list_ammo_groups_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        true = _include_empty
+      ) do
     Repo.all(
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
@@ -230,6 +239,110 @@ defmodule Cannery.Ammo do
     )
   end
 
+  def list_ammo_groups_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        left_join: sg in assoc(ag, :shot_groups),
+        where: ag.ammo_type_id == ^ammo_type_id,
+        where: ag.user_id == ^user_id,
+        where: not (ag.count == 0),
+        preload: [shot_groups: sg],
+        order_by: ag.id
+    )
+  end
+
+  @doc """
+  Returns the list of ammo_groups for a user and container.
+
+  ## Examples
+
+      iex> list_ammo_groups_for_container(%AmmoType{id: 123}, %User{id: 123})
+      [%AmmoGroup{}, ...]
+
+  """
+  @spec list_ammo_groups_for_container(Container.t(), User.t()) :: [AmmoGroup.t()]
+  @spec list_ammo_groups_for_container(Container.t(), User.t(), include_empty :: boolean()) ::
+          [AmmoGroup.t()]
+  def list_ammo_groups_for_container(container, user, include_empty \\ false)
+
+  def list_ammo_groups_for_container(
+        %Container{id: container_id, user_id: user_id},
+        %User{id: user_id},
+        true = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        left_join: sg in assoc(ag, :shot_groups),
+        where: ag.container_id == ^container_id,
+        where: ag.user_id == ^user_id,
+        preload: [shot_groups: sg],
+        order_by: ag.id
+    )
+  end
+
+  def list_ammo_groups_for_container(
+        %Container{id: container_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        left_join: sg in assoc(ag, :shot_groups),
+        where: ag.container_id == ^container_id,
+        where: ag.user_id == ^user_id,
+        where: not (ag.count == 0),
+        preload: [shot_groups: sg],
+        order_by: ag.id
+    )
+  end
+
+  @doc """
+  Returns the count of ammo_groups for an ammo type.
+
+  ## Examples
+
+      iex> get_ammo_groups_count_for_type(%User{id: 123})
+      3
+
+  """
+  @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
+  @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
+          [AmmoGroup.t()]
+  def get_ammo_groups_count_for_type(ammo_type, user, include_empty \\ false)
+
+  def get_ammo_groups_count_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        true = _include_empty
+      ) do
+    Repo.one!(
+      from ag in AmmoGroup,
+        where: ag.user_id == ^user_id,
+        where: ag.ammo_type_id == ^ammo_type_id,
+        distinct: true,
+        select: count(ag.id)
+    ) || 0
+  end
+
+  def get_ammo_groups_count_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.one!(
+      from ag in AmmoGroup,
+        where: ag.user_id == ^user_id,
+        where: ag.ammo_type_id == ^ammo_type_id,
+        where: not (ag.count == 0),
+        distinct: true,
+        select: count(ag.id)
+    ) || 0
+  end
+
   @doc """
   Returns the list of ammo_groups for a user.
 
@@ -241,22 +354,27 @@ defmodule Cannery.Ammo do
   """
   @spec list_ammo_groups(User.t()) :: [AmmoGroup.t()]
   @spec list_ammo_groups(User.t(), include_empty :: boolean()) :: [AmmoGroup.t()]
-  def list_ammo_groups(%User{id: user_id}, include_empty \\ false) do
-    if include_empty do
+  def list_ammo_groups(user, include_empty \\ false)
+
+  def list_ammo_groups(%User{id: user_id}, true = _include_empty) do
+    Repo.all(
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
         where: ag.user_id == ^user_id,
         preload: [shot_groups: sg],
         order_by: ag.id
-    else
+    )
+  end
+
+  def list_ammo_groups(%User{id: user_id}, false = _include_empty) do
+    Repo.all(
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
         where: ag.user_id == ^user_id,
         where: not (ag.count == 0),
         preload: [shot_groups: sg],
         order_by: ag.id
-    end
-    |> Repo.all()
+    )
   end
 
   @doc """
@@ -317,6 +435,17 @@ defmodule Cannery.Ammo do
     |> Enum.sum()
   end
 
+  @doc """
+  Returns the last entered shot group for an ammo group
+  """
+  @spec get_last_used_shot_group(AmmoGroup.t()) :: ShotGroup.t() | nil
+  def get_last_used_shot_group(%AmmoGroup{} = ammo_group) do
+    ammo_group
+    |> Repo.preload(:shot_groups)
+    |> Map.fetch!(:shot_groups)
+    |> Enum.max_by(fn %{date: date} -> date end, Date, fn -> nil end)
+  end
+
   @doc """
   Calculates the percentage remaining of an ammo group out of 100
   """
@@ -350,18 +479,21 @@ defmodule Cannery.Ammo do
   def create_ammo_groups(
         %{"ammo_type_id" => ammo_type_id, "container_id" => container_id} = attrs,
         multiplier,
-        %User{id: user_id} = user
+        %User{} = user
       )
-      when multiplier >= 1 and multiplier <= @ammo_group_create_limit do
-    # validate ammo type and container ids belong to user
-    _valid_ammo_type = get_ammo_type!(ammo_type_id, user)
-    _valid_container = Containers.get_container!(container_id, user)
-
+      when multiplier >= 1 and multiplier <= @ammo_group_create_limit and
+             not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) do
     now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
 
     changesets =
       Enum.map(1..multiplier, fn _count ->
-        %AmmoGroup{} |> AmmoGroup.create_changeset(attrs |> Map.put("user_id", user_id))
+        %AmmoGroup{}
+        |> AmmoGroup.create_changeset(
+          get_ammo_type!(ammo_type_id, user),
+          Containers.get_container!(container_id, user),
+          user,
+          attrs
+        )
       end)
 
     if changesets |> Enum.all?(fn %{valid?: valid} -> valid end) do
@@ -386,8 +518,27 @@ defmodule Cannery.Ammo do
     end
   end
 
-  def create_ammo_groups(invalid_attrs, _multiplier, _user) do
-    {:error, %AmmoGroup{} |> AmmoGroup.create_changeset(invalid_attrs)}
+  def create_ammo_groups(
+        %{"ammo_type_id" => ammo_type_id, "container_id" => container_id} = attrs,
+        _multiplier,
+        user
+      )
+      when not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) do
+    changeset =
+      %AmmoGroup{}
+      |> AmmoGroup.create_changeset(
+        get_ammo_type!(ammo_type_id, user),
+        Containers.get_container!(container_id, user),
+        user,
+        attrs
+      )
+      |> Changeset.add_error(:multiplier, dgettext("errors", "Invalid multiplier"))
+
+    {:error, changeset}
+  end
+
+  def create_ammo_groups(invalid_attrs, _multiplier, user) do
+    {:error, %AmmoGroup{} |> AmmoGroup.create_changeset(nil, nil, user, invalid_attrs)}
   end
 
   @doc """
@@ -436,18 +587,4 @@ defmodule Cannery.Ammo do
   @spec delete_ammo_group!(AmmoGroup.t(), User.t()) :: AmmoGroup.t()
   def delete_ammo_group!(%AmmoGroup{user_id: user_id} = ammo_group, %User{id: user_id}),
     do: ammo_group |> Repo.delete!()
-
-  @doc """
-  Returns an `%Changeset{}` for tracking ammo_group changes.
-
-  ## Examples
-
-      iex> change_ammo_group(ammo_group)
-      %Changeset{data: %AmmoGroup{}}
-
-  """
-  @spec change_ammo_group(AmmoGroup.t()) :: Changeset.t(AmmoGroup.t())
-  @spec change_ammo_group(AmmoGroup.t(), attrs :: map()) :: Changeset.t(AmmoGroup.t())
-  def change_ammo_group(%AmmoGroup{} = ammo_group, attrs \\ %{}),
-    do: AmmoGroup.update_changeset(ammo_group, attrs)
 end

lib/cannery/ammo/ammo_group.ex

@@ -7,6 +7,7 @@ defmodule Cannery.Ammo.AmmoGroup do
   """
 
   use Ecto.Schema
+  import CanneryWeb.Gettext
   import Ecto.Changeset
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Containers.Container}
@@ -48,22 +49,49 @@ defmodule Cannery.Ammo.AmmoGroup do
   @type id :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_ammo_group(), attrs :: map()) :: Changeset.t(new_ammo_group())
-  def create_changeset(ammo_group, attrs) do
+  @spec create_changeset(
+          new_ammo_group(),
+          AmmoType.t() | nil,
+          Container.t() | nil,
+          User.t(),
+          attrs :: map()
+        ) :: Changeset.t(new_ammo_group())
+  def create_changeset(
+        ammo_group,
+        %AmmoType{id: ammo_type_id},
+        %Container{id: container_id, user_id: user_id},
+        %User{id: user_id},
+        attrs
+      )
+      when not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) and
+             not (user_id |> is_nil()) do
     ammo_group
-    |> cast(attrs, [:count, :price_paid, :notes, :staged, :ammo_type_id, :container_id, :user_id])
+    |> change(ammo_type_id: ammo_type_id)
+    |> change(user_id: user_id)
+    |> change(container_id: container_id)
+    |> cast(attrs, [:count, :price_paid, :notes, :staged])
     |> validate_number(:count, greater_than: 0)
     |> validate_required([:count, :staged, :ammo_type_id, :container_id, :user_id])
   end
 
+  @doc """
+  Invalid changeset, used to prompt user to select ammo type and container
+  """
+  def create_changeset(ammo_group, _invalid_ammo_type, _invalid_container, _invalid_user, attrs) do
+    ammo_group
+    |> cast(attrs, [:ammo_type_id, :container_id])
+    |> validate_required([:ammo_type_id, :container_id])
+    |> add_error(:invalid, dgettext("errors", "Please select an ammo type and container"))
+  end
+
   @doc false
   @spec update_changeset(t() | new_ammo_group(), attrs :: map()) ::
           Changeset.t(t() | new_ammo_group())
   def update_changeset(ammo_group, attrs) do
     ammo_group
-    |> cast(attrs, [:count, :price_paid, :notes, :staged, :ammo_type_id, :container_id])
+    |> cast(attrs, [:count, :price_paid, :notes, :staged])
     |> validate_number(:count, greater_than_or_equal_to: 0)
-    |> validate_required([:count, :staged, :ammo_type_id, :container_id, :user_id])
+    |> validate_required([:count, :staged])
   end
 
   @doc """
@@ -75,6 +103,6 @@ defmodule Cannery.Ammo.AmmoGroup do
   def range_changeset(ammo_group, attrs) do
     ammo_group
     |> cast(attrs, [:count, :staged])
-    |> validate_required([:count, :staged, :ammo_type_id, :container_id, :user_id])
+    |> validate_required([:count, :staged])
   end
 end

lib/cannery/ammo/ammo_type.ex

@@ -105,10 +105,12 @@ defmodule Cannery.Ammo.AmmoType do
     ]
 
   @doc false
-  @spec create_changeset(new_ammo_type(), attrs :: map()) :: Changeset.t(new_ammo_type())
-  def create_changeset(ammo_type, attrs) do
+  @spec create_changeset(new_ammo_type(), User.t(), attrs :: map()) ::
+          Changeset.t(new_ammo_type())
+  def create_changeset(ammo_type, %User{id: user_id}, attrs) do
     ammo_type
-    |> cast(attrs, [:user_id | changeset_fields()])
+    |> change(user_id: user_id)
+    |> cast(attrs, changeset_fields())
     |> validate_required([:name, :user_id])
   end
 
@@ -118,6 +120,6 @@ defmodule Cannery.Ammo.AmmoType do
   def update_changeset(ammo_type, attrs) do
     ammo_type
     |> cast(attrs, changeset_fields())
-    |> validate_required([:name, :user_id])
+    |> validate_required(:name)
   end
 end

lib/cannery/containers.ex

@@ -30,6 +30,25 @@ defmodule Cannery.Containers do
     )
   end
 
+  @doc """
+  Returns a count of containers.
+
+  ## Examples
+
+      iex> get_containers_count!(%User{id: 123})
+      3
+
+  """
+  @spec get_containers_count!(User.t()) :: integer()
+  def get_containers_count!(%User{id: user_id}) do
+    Repo.one(
+      from c in Container,
+        where: c.user_id == ^user_id,
+        select: count(c.id),
+        distinct: true
+    )
+  end
+
   @doc """
   Gets a single container.
 
@@ -71,9 +90,8 @@ defmodule Cannery.Containers do
   """
   @spec create_container(attrs :: map(), User.t()) ::
           {:ok, Container.t()} | {:error, Changeset.t(Container.new_container())}
-  def create_container(attrs, %User{id: user_id}) do
-    attrs = attrs |> Map.put("user_id", user_id)
-    %Container{} |> Container.create_changeset(attrs) |> Repo.insert()
+  def create_container(attrs, %User{} = user) do
+    %Container{} |> Container.create_changeset(user, attrs) |> Repo.insert()
   end
 
   @doc """
@@ -122,7 +140,7 @@ defmodule Cannery.Containers do
         error = dgettext("errors", "Container must be empty before deleting")
 
         container
-        |> change_container()
+        |> Container.update_changeset(%{})
         |> Changeset.add_error(:ammo_groups, error)
         |> Changeset.apply_action(:delete)
     end
@@ -143,25 +161,6 @@ defmodule Cannery.Containers do
     container
   end
 
-  @doc """
-  Returns an `%Changeset{}` for tracking container changes.
-
-  ## Examples
-
-      iex> change_container(container)
-      %Changeset{data: %Container{}}
-
-      iex> change_container(%Changeset{})
-      %Changeset{data: %Container{}}
-
-  """
-  @spec change_container(Container.t() | Container.new_container()) ::
-          Changeset.t(Container.t() | Container.new_container())
-  @spec change_container(Container.t() | Container.new_container(), attrs :: map()) ::
-          Changeset.t(Container.t() | Container.new_container())
-  def change_container(container, attrs \\ %{}),
-    do: container |> Container.update_changeset(attrs)
-
   @doc """
   Adds a tag to a container
 
@@ -173,14 +172,11 @@ defmodule Cannery.Containers do
   """
   @spec add_tag!(Container.t(), Tag.t(), User.t()) :: ContainerTag.t()
   def add_tag!(
-        %Container{id: container_id, user_id: user_id},
-        %Tag{id: tag_id, user_id: user_id},
+        %Container{user_id: user_id} = container,
+        %Tag{user_id: user_id} = tag,
         %User{id: user_id}
-      ) do
-    %ContainerTag{}
-    |> ContainerTag.changeset(%{"container_id" => container_id, "tag_id" => tag_id})
-    |> Repo.insert!()
-  end
+      ),
+      do: %ContainerTag{} |> ContainerTag.create_changeset(tag, container) |> Repo.insert!()
 
   @doc """
   Removes a tag from a container
@@ -207,6 +203,19 @@ defmodule Cannery.Containers do
     if count == 0, do: raise("could not delete container tag"), else: count
   end
 
+  @doc """
+  Returns number of rounds in container. If data is already preloaded, then
+  there will be no db hit.
+  """
+  @spec get_container_ammo_group_count!(Container.t()) :: non_neg_integer()
+  def get_container_ammo_group_count!(%Container{} = container) do
+    container
+    |> Repo.preload(:ammo_groups)
+    |> Map.fetch!(:ammo_groups)
+    |> Enum.reject(fn %{count: count} -> count == 0 end)
+    |> Enum.count()
+  end
+
   @doc """
   Returns number of rounds in container. If data is already preloaded, then
   there will be no db hit.

lib/cannery/containers/container.ex

@@ -42,10 +42,12 @@ defmodule Cannery.Containers.Container do
   @type id :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_container(), attrs :: map()) :: Changeset.t(new_container())
-  def create_changeset(container, attrs) do
+  @spec create_changeset(new_container(), User.t(), attrs :: map()) ::
+          Changeset.t(new_container())
+  def create_changeset(container, %User{id: user_id}, attrs) do
     container
-    |> cast(attrs, [:name, :desc, :type, :location, :user_id])
+    |> change(user_id: user_id)
+    |> cast(attrs, [:name, :desc, :type, :location])
     |> validate_required([:name, :type, :user_id])
   end
 
@@ -55,6 +57,6 @@ defmodule Cannery.Containers.Container do
   def update_changeset(container, attrs) do
     container
     |> cast(attrs, [:name, :desc, :type, :location])
-    |> validate_required([:name, :type, :user_id])
+    |> validate_required([:name, :type])
   end
 end

lib/cannery/containers/container_tag.ex

@@ -31,10 +31,16 @@ defmodule Cannery.Containers.ContainerTag do
   @type id :: UUID.t()
 
   @doc false
-  @spec changeset(new_container_tag(), attrs :: map()) :: Changeset.t(new_container_tag())
-  def changeset(container_tag, attrs) do
+  @spec create_changeset(new_container_tag(), Tag.t(), Container.t()) ::
+          Changeset.t(new_container_tag())
+  def create_changeset(
+        container_tag,
+        %Tag{id: tag_id, user_id: user_id},
+        %Container{id: container_id, user_id: user_id}
+      ) do
     container_tag
-    |> cast(attrs, [:tag_id, :container_id])
+    |> change(tag_id: tag_id)
+    |> change(container_id: container_id)
     |> validate_required([:tag_id, :container_id])
   end
 end

lib/cannery/invites.ex

@@ -100,15 +100,13 @@ defmodule Cannery.Invites do
   """
   @spec create_invite(User.t(), attrs :: map()) ::
           {:ok, Invite.t()} | {:error, Changeset.t(Invite.new_invite())}
-  def create_invite(%User{id: user_id, role: :admin}, attrs) do
+  def create_invite(%User{role: :admin} = user, attrs) do
     token =
       :crypto.strong_rand_bytes(@invite_token_length)
       |> Base.url_encode64()
       |> binary_part(0, @invite_token_length)
 
-    attrs = attrs |> Map.merge(%{"user_id" => user_id, "token" => token})
-
-    %Invite{} |> Invite.create_changeset(attrs) |> Repo.insert()
+    %Invite{} |> Invite.create_changeset(user, token, attrs) |> Repo.insert()
   end
 
   @doc """
@@ -155,19 +153,4 @@ defmodule Cannery.Invites do
   """
   @spec delete_invite!(Invite.t(), User.t()) :: Invite.t()
   def delete_invite!(invite, %User{role: :admin}), do: invite |> Repo.delete!()
-
-  @doc """
-  Returns an `%Changeset{}` for tracking invite changes.
-
-  ## Examples
-
-      iex> change_invite(invite)
-      %Changeset{data: %Invite{}}
-
-  """
-  @spec change_invite(Invite.t() | Invite.new_invite()) ::
-          Changeset.t(Invite.t() | Invite.new_invite())
-  @spec change_invite(Invite.t() | Invite.new_invite(), attrs :: map()) ::
-          Changeset.t(Invite.t() | Invite.new_invite())
-  def change_invite(invite, attrs \\ %{}), do: invite |> Invite.update_changeset(attrs)
 end

lib/cannery/invites/invite.ex

@@ -38,10 +38,12 @@ defmodule Cannery.Invites.Invite do
   @type id :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_invite(), attrs :: map()) :: Changeset.t(new_invite())
-  def create_changeset(invite, attrs) do
+  @spec create_changeset(new_invite(), User.t(), token :: binary(), attrs :: map()) ::
+          Changeset.t(new_invite())
+  def create_changeset(invite, %User{id: user_id}, token, attrs) do
     invite
-    |> cast(attrs, [:name, :token, :uses_left, :disabled_at, :user_id])
+    |> change(token: token, user_id: user_id)
+    |> cast(attrs, [:name, :uses_left, :disabled_at])
     |> validate_required([:name, :token, :user_id])
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
   end
@@ -51,7 +53,7 @@ defmodule Cannery.Invites.Invite do
   def update_changeset(invite, attrs) do
     invite
     |> cast(attrs, [:name, :uses_left, :disabled_at])
-    |> validate_required([:name, :token, :user_id])
+    |> validate_required([:name])
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
   end
 end

lib/cannery/tags.ex

@@ -74,8 +74,8 @@ defmodule Cannery.Tags do
   """
   @spec create_tag(attrs :: map(), User.t()) ::
           {:ok, Tag.t()} | {:error, Changeset.t(Tag.new_tag())}
-  def create_tag(attrs, %User{id: user_id}),
-    do: %Tag{} |> Tag.create_changeset(attrs |> Map.put("user_id", user_id)) |> Repo.insert()
+  def create_tag(attrs, %User{} = user),
+    do: %Tag{} |> Tag.create_changeset(user, attrs) |> Repo.insert()
 
   @doc """
   Updates a tag.
@@ -121,20 +121,6 @@ defmodule Cannery.Tags do
   @spec delete_tag!(Tag.t(), User.t()) :: Tag.t()
   def delete_tag!(%Tag{user_id: user_id} = tag, %User{id: user_id}), do: tag |> Repo.delete!()
 
-  @doc """
-  Returns an `%Changeset{}` for tracking tag changes.
-
-  ## Examples
-
-      iex> change_tag(tag)
-      %Changeset{data: %Tag{}}
-
-  """
-  @spec change_tag(Tag.t() | Tag.new_tag()) :: Changeset.t(Tag.t() | Tag.new_tag())
-  @spec change_tag(Tag.t() | Tag.new_tag(), attrs :: map()) ::
-          Changeset.t(Tag.t() | Tag.new_tag())
-  def change_tag(tag, attrs \\ %{}), do: Tag.update_changeset(tag, attrs)
-
   @doc """
   Get a random tag bg_color in `#ffffff` hex format
 

lib/cannery/tags/tag.ex

@@ -35,10 +35,11 @@ defmodule Cannery.Tags.Tag do
   @type id() :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_tag(), attrs :: map()) :: Changeset.t(new_tag())
-  def create_changeset(tag, attrs) do
+  @spec create_changeset(new_tag(), User.t(), attrs :: map()) :: Changeset.t(new_tag())
+  def create_changeset(tag, %User{id: user_id}, attrs) do
     tag
-    |> cast(attrs, [:name, :bg_color, :text_color, :user_id])
+    |> change(user_id: user_id)
+    |> cast(attrs, [:name, :bg_color, :text_color])
     |> validate_required([:name, :bg_color, :text_color, :user_id])
   end
 
@@ -47,6 +48,6 @@ defmodule Cannery.Tags.Tag do
   def update_changeset(tag, attrs) do
     tag
     |> cast(attrs, [:name, :bg_color, :text_color])
-    |> validate_required([:name, :bg_color, :text_color, :user_id])
+    |> validate_required([:name, :bg_color, :text_color])
   end
 end

lib/cannery_web/components/add_shot_group_component.ex

@@ -16,9 +16,10 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
           },
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{ammo_group: _ammo_group, current_user: _current_user} = assigns, socket) do
+  def update(%{ammo_group: ammo_group, current_user: current_user} = assigns, socket) do
     changeset =
-      %ShotGroup{date: NaiveDateTime.utc_now(), count: 1} |> ActivityLog.change_shot_group()
+      %ShotGroup{date: NaiveDateTime.utc_now(), count: 1}
+      |> ShotGroup.create_changeset(current_user, ammo_group, %{})
 
     {:ok, socket |> assign(assigns) |> assign(:changeset, changeset)}
   end
@@ -27,21 +28,13 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
   def handle_event(
         "validate",
         %{"shot_group" => shot_group_params},
-        %{
-          assigns: %{
-            ammo_group: %AmmoGroup{id: ammo_group_id} = ammo_group,
-            current_user: %User{id: user_id}
-          }
-        } = socket
+        %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket
       ) do
-    shot_group_params =
-      shot_group_params
-      |> process_params(ammo_group)
-      |> Map.merge(%{"ammo_group_id" => ammo_group_id, "user_id" => user_id})
+    params = shot_group_params |> process_params(ammo_group)
 
     changeset =
       %ShotGroup{}
-      |> ActivityLog.change_shot_group(shot_group_params)
+      |> ShotGroup.create_changeset(current_user, ammo_group, params)
       |> Map.put(:action, :validate)
 
     {:noreply, socket |> assign(:changeset, changeset)}
@@ -51,17 +44,12 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
         "save",
         %{"shot_group" => shot_group_params},
         %{
-          assigns: %{
-            ammo_group: %{id: ammo_group_id} = ammo_group,
-            current_user: %{id: user_id} = current_user,
-            return_to: return_to
-          }
+          assigns: %{ammo_group: ammo_group, current_user: current_user, return_to: return_to}
         } = socket
       ) do
     socket =
       shot_group_params
       |> process_params(ammo_group)
-      |> Map.merge(%{"ammo_group_id" => ammo_group_id, "user_id" => user_id})
       |> ActivityLog.create_shot_group(current_user, ammo_group)
       |> case do
         {:ok, _shot_group} ->

lib/cannery_web/components/ammo_group_card.ex

@@ -4,11 +4,16 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
   """
 
   use CanneryWeb, :component
-  alias Cannery.Repo
+  alias Cannery.{Ammo, Repo}
   alias CanneryWeb.Endpoint
 
-  def ammo_group_card(assigns) do
-    assigns = assigns |> assign(:ammo_group, assigns.ammo_group |> Repo.preload(:ammo_type))
+  def ammo_group_card(%{ammo_group: ammo_group} = assigns) do
+    assigns =
+      %{show_container: show_container} = assigns |> assign_new(:show_container, fn -> false end)
+
+    preloads = if show_container, do: [:ammo_type, :container], else: [:ammo_type]
+    ammo_group = ammo_group |> Repo.preload(preloads)
+    assigns = assigns |> assign(:ammo_group, ammo_group)
 
     ~H"""
     <div
@@ -17,7 +22,7 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
             border border-gray-400 rounded-lg shadow-lg hover:shadow-md
             transition-all duration-300 ease-in-out"
     >
-      <%= live_redirect to: Routes.ammo_group_show_path(Endpoint, :show, @ammo_group),
+      <%= live_patch to: Routes.ammo_group_show_path(Endpoint, :show, @ammo_group),
                     class: "mb-2 link" do %>
         <h1 class="title text-xl title-primary-500">
           <%= @ammo_group.ammo_type.name %>
@@ -27,7 +32,7 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
       <div class="flex flex-col justify-center items-center">
         <span class="rounded-lg title text-lg">
           <%= gettext("Count:") %>
-          <%= @ammo_group.count %>
+          <%= if @ammo_group.count == 0, do: "Empty", else: @ammo_group.count %>
         </span>
 
         <%= if @ammo_group.notes do %>
@@ -42,6 +47,13 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
           <%= @ammo_group.inserted_at |> display_datetime() %>
         </span>
 
+        <%= if @ammo_group.count == 0 do %>
+          <span class="rounded-lg title text-lg">
+            <%= gettext("Used up on:") %>
+            <%= @ammo_group |> Ammo.get_last_used_shot_group() |> Map.get(:date) |> display_date() %>
+          </span>
+        <% end %>
+
         <%= if @ammo_group.price_paid do %>
           <span class="rounded-lg title text-lg">
             <%= gettext("Price paid:") %>
@@ -50,6 +62,17 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
             ) %>
           </span>
         <% end %>
+
+        <%= if @show_container and @ammo_group.container do %>
+          <span class="rounded-lg title text-lg">
+            <%= gettext("Container:") %>
+
+            <%= live_patch to: Routes.container_show_path(Endpoint, :show, @ammo_group.container),
+              class: "link" do %>
+              <%= @ammo_group.container.name %>
+            <% end %>
+          </span>
+        <% end %>
       </div>
 
       <%= if assigns |> Map.has_key?(:inner_block) do %>

lib/cannery_web/components/container_card.ex

@@ -45,7 +45,12 @@ defmodule CanneryWeb.Components.ContainerCard do
           </span>
         <% end %>
 
-        <%= if @container.ammo_groups do %>
+        <%= unless @container.ammo_groups |> Enum.empty?() do %>
+          <span class="rounded-lg title text-lg">
+            <%= gettext("Packs:") %>
+            <%= @container |> Containers.get_container_ammo_group_count!() %>
+          </span>
+
           <span class="rounded-lg title text-lg">
             <%= gettext("Rounds:") %>
             <%= @container |> Containers.get_container_rounds!() %>

lib/cannery_web/components/move_ammo_group_component.ex

@@ -22,7 +22,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
           assigns,
         socket
       ) do
-    changeset = Ammo.change_ammo_group(ammo_group)
+    changeset = ammo_group |> AmmoGroup.update_changeset(%{})
 
     containers =
       Containers.list_containers(current_user)

lib/cannery_web/components/table_component.ex

@@ -6,7 +6,7 @@ defmodule CanneryWeb.Components.TableComponent do
     - `:columns`: An array of maps containing the following keys
       - `:label`: A gettext'd or otherwise user-facing string label for the
         column. Can be nil
-      - `:key`: A string key used for sorting
+      - `:key`: An atom key used for sorting
       - `:class`: Extra classes to be applied to the column element, if desired.
         Optional
       - `:sortable`: If false, will prevent the user from sorting with it.
@@ -28,13 +28,13 @@ defmodule CanneryWeb.Components.TableComponent do
             required(:columns) =>
               list(%{
                 required(:label) => String.t() | nil,
-                required(:key) => String.t() | nil,
+                required(:key) => atom() | nil,
                 optional(:class) => String.t(),
                 optional(:sortable) => false
               }),
             required(:rows) =>
               list(%{
-                (key :: String.t()) => any() | {custom_sort_value :: String.t(), value :: any()}
+                (key :: atom()) => any() | {custom_sort_value :: String.t(), value :: any()}
               }),
             optional(any()) => any()
           },
@@ -56,20 +56,19 @@ defmodule CanneryWeb.Components.TableComponent do
   def handle_event(
         "sort_by",
         %{"sort-key" => key},
-        %{assigns: %{rows: rows, last_sort_key: key, sort_mode: sort_mode}} = socket
+        %{assigns: %{rows: rows, last_sort_key: last_sort_key, sort_mode: sort_mode}} = socket
       ) do
-    sort_mode = if sort_mode == :asc, do: :desc, else: :asc
-    rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode)
-    {:noreply, socket |> assign(sort_mode: sort_mode, rows: rows)}
-  end
+    key = key |> String.to_existing_atom()
 
-  def handle_event(
-        "sort_by",
-        %{"sort-key" => key},
-        %{assigns: %{rows: rows}} = socket
-      ) do
-    rows = rows |> sort_by_custom_sort_value_or_value(key, :asc)
-    {:noreply, socket |> assign(last_sort_key: key, sort_mode: :asc, rows: rows)}
+    sort_mode =
+      case {key, sort_mode} do
+        {^last_sort_key, :asc} -> :desc
+        {^last_sort_key, :desc} -> :asc
+        {_new_sort_key, _last_sort_mode} -> :asc
+      end
+
+    rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode)
+    {:noreply, socket |> assign(last_sort_key: key, sort_mode: sort_mode, rows: rows)}
   end
 
   defp sort_by_custom_sort_value_or_value(rows, key, sort_mode) do

lib/cannery_web/components/table_component.html.heex

@@ -1,4 +1,4 @@
-<div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+<div id={@id} class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
   <table class="min-w-full table-auto text-center bg-white">
     <thead class="border-b border-primary-600">
       <tr>

lib/cannery_web/components/topbar.ex

@@ -16,10 +16,16 @@ defmodule CanneryWeb.Components.Topbar do
     <nav role="navigation" class="mb-8 px-8 py-4 w-full bg-primary-400">
       <div class="flex flex-col sm:flex-row justify-between items-center">
         <div class="mb-4 sm:mb-0 sm:mr-8 flex flex-row justify-start items-center space-x-2">
-          <%= live_redirect("Cannery",
-            to: Routes.live_path(Endpoint, HomeLive),
-            class: "mx-2 my-1 leading-5 text-xl text-white hover:underline"
-          ) %>
+          <%= live_redirect to: Routes.live_path(Endpoint, HomeLive),
+            class: "inline mx-2 my-1 leading-5 text-xl text-white"
+            do %>
+            <img
+              src={Routes.static_path(Endpoint, "/images/cannery.svg")}
+              alt={gettext("Cannery logo")}
+              class="inline-block h-8 mx-1"
+            />
+            <h1 class="inline hover:underline">Cannery</h1>
+          <% end %>
 
           <%= if @title_content do %>
             <span class="mx-2 my-1">
@@ -47,13 +53,13 @@ defmodule CanneryWeb.Components.Topbar do
               ) %>
             </li>
             <li class="mx-2 my-1">
-              <%= live_redirect(gettext("Ammo"),
+              <%= live_redirect(gettext("Catalog"),
                 to: Routes.ammo_type_index_path(Endpoint, :index),
                 class: "text-primary-600 text-white hover:underline"
               ) %>
             </li>
             <li class="mx-2 my-1">
-              <%= live_redirect(gettext("Manage"),
+              <%= live_redirect(gettext("Ammo"),
                 to: Routes.ammo_group_index_path(Endpoint, :index),
                 class: "text-primary-600 text-white hover:underline"
               ) %>

lib/cannery_web/live/ammo_group_live/form_component.ex

@@ -21,38 +21,30 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
   end
 
   @spec update(Socket.t()) :: {:ok, Socket.t()}
-  def update(%{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket) do
-    socket =
+  def update(%{assigns: %{current_user: current_user}} = socket) do
+    %{assigns: %{ammo_types: ammo_types, containers: containers}} =
+      socket =
       socket
       |> assign(:ammo_group_create_limit, @ammo_group_create_limit)
-      |> assign(:changeset, Ammo.change_ammo_group(ammo_group))
       |> assign(:ammo_types, Ammo.list_ammo_types(current_user))
       |> assign_new(:containers, fn -> Containers.list_containers(current_user) end)
 
-    {:ok, socket}
+    params =
+      if ammo_types |> List.first() |> is_nil(),
+        do: %{},
+        else: %{} |> Map.put("ammo_type_id", ammo_types |> List.first() |> Map.get(:id))
+
+    params =
+      if containers |> List.first() |> is_nil(),
+        do: params,
+        else: params |> Map.put("container_id", containers |> List.first() |> Map.get(:id))
+
+    {:ok, socket |> assign_changeset(params)}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"ammo_group" => ammo_group_params},
-        %{assigns: %{action: action, ammo_group: ammo_group}} = socket
-      ) do
-    changeset_action =
-      case action do
-        :new -> :insert
-        :edit -> :update
-      end
-
-    changeset = ammo_group |> Ammo.change_ammo_group(ammo_group_params)
-
-    changeset =
-      case changeset |> Changeset.apply_action(changeset_action) do
-        {:ok, _data} -> changeset
-        {:error, changeset} -> changeset
-      end
-
-    {:noreply, socket |> assign(:changeset, changeset)}
+  def handle_event("validate", %{"ammo_group" => ammo_group_params}, socket) do
+    {:noreply, socket |> assign_changeset(ammo_group_params)}
   end
 
   def handle_event(
@@ -76,6 +68,44 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
 
   # Save Helpers
 
+  defp assign_changeset(
+         %{assigns: %{action: action, ammo_group: ammo_group, current_user: user}} = socket,
+         ammo_group_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new ->
+          ammo_type =
+            if ammo_group_params |> Map.has_key?("ammo_type_id"),
+              do: ammo_group_params |> Map.get("ammo_type_id") |> Ammo.get_ammo_type!(user),
+              else: nil
+
+          container =
+            if ammo_group_params |> Map.has_key?("container_id"),
+              do: ammo_group_params |> Map.get("container_id") |> Containers.get_container!(user),
+              else: nil
+
+          ammo_group |> AmmoGroup.create_changeset(ammo_type, container, user, ammo_group_params)
+
+        :edit ->
+          ammo_group |> AmmoGroup.update_changeset(ammo_group_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   defp save_ammo_group(
          %{assigns: %{ammo_group: ammo_group, current_user: current_user, return_to: return_to}} =
            socket,
@@ -85,7 +115,7 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
     socket =
       case Ammo.update_ammo_group(ammo_group, ammo_group_params, current_user) do
         {:ok, _ammo_group} ->
-          prompt = dgettext("prompts", "Ammo group updated successfully")
+          prompt = dgettext("prompts", "Ammo updated successfully")
           socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
@@ -146,8 +176,8 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
         prompt =
           dngettext(
             "prompts",
-            "Ammo group created successfully",
-            "Ammo groups created successfully",
+            "Ammo added successfully",
+            "Ammo added successfully",
             count
           )
 

lib/cannery_web/live/ammo_group_live/index.ex

@@ -9,7 +9,7 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
 
   @impl true
   def mount(_params, _session, socket) do
-    {:ok, socket |> display_ammo_groups()}
+    {:ok, socket |> assign(show_used: false) |> display_ammo_groups()}
   end
 
   @impl true
@@ -72,27 +72,51 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     {:noreply, socket |> display_ammo_groups()}
   end
 
-  defp display_ammo_groups(%{assigns: %{current_user: current_user}} = socket) do
-    ammo_groups = Ammo.list_ammo_groups(current_user) |> Repo.preload([:ammo_type, :container])
-    containers = Containers.list_containers(current_user)
+  @impl true
+  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
+    {:noreply, socket |> assign(:show_used, !show_used) |> display_ammo_groups()}
+  end
+
+  defp display_ammo_groups(
+         %{assigns: %{current_user: current_user, show_used: show_used}} = socket
+       ) do
+    ammo_groups =
+      Ammo.list_ammo_groups(current_user, show_used) |> Repo.preload([:ammo_type, :container])
+
+    ammo_types_count = Ammo.get_ammo_types_count!(current_user)
+    containers_count = Containers.get_containers_count!(current_user)
 
     columns = [
-      %{label: gettext("Ammo type"), key: "ammo_type"},
-      %{label: gettext("Count"), key: "count"},
-      %{label: gettext("Price paid"), key: "price_paid"},
-      %{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}
+      %{label: gettext("Ammo type"), key: :ammo_type},
+      %{label: gettext("Count"), key: :count},
+      %{label: gettext("Price paid"), key: :price_paid},
+      %{label: gettext("% left"), key: :remaining},
+      %{label: gettext("Range"), key: :range},
+      %{label: gettext("Container"), key: :container},
+      %{label: gettext("Added on"), key: :added_on}
     ]
 
+    columns =
+      if show_used do
+        columns ++ [%{label: gettext("Used up on"), key: :used_up_on}]
+      else
+        columns
+      end
+
+    columns = columns ++ [%{label: nil, key: :actions, sortable: false}]
+
     rows =
       ammo_groups
       |> Enum.map(fn ammo_group -> ammo_group |> get_row_data_for_ammo_group(columns) end)
 
     socket
-    |> assign(ammo_groups: ammo_groups, containers: containers, columns: columns, rows: rows)
+    |> assign(
+      ammo_groups: ammo_groups,
+      ammo_types_count: ammo_types_count,
+      containers_count: containers_count,
+      columns: columns,
+      rows: rows
+    )
   end
 
   @spec get_row_data_for_ammo_group(AmmoGroup.t(), [map()]) :: [map()]
@@ -103,8 +127,8 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     |> Enum.into(%{}, fn %{key: key} -> {key, get_value_for_key(key, ammo_group)} end)
   end
 
-  @spec get_value_for_key(String.t(), AmmoGroup.t()) :: any()
-  defp get_value_for_key("ammo_type", %{ammo_type: ammo_type}) do
+  @spec get_value_for_key(atom(), AmmoGroup.t()) :: any()
+  defp get_value_for_key(:ammo_type, %{ammo_type: ammo_type}) do
     {ammo_type.name,
      live_patch(ammo_type.name,
        to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
@@ -112,12 +136,12 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
      )}
   end
 
-  defp get_value_for_key("price_paid", %{price_paid: nil}), do: {"a", nil}
+  defp get_value_for_key(:price_paid, %{price_paid: nil}), do: {"a", nil}
 
-  defp get_value_for_key("price_paid", %{price_paid: price_paid}),
+  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
+  defp get_value_for_key(:added_on, %{inserted_at: inserted_at}) do
     assigns = %{inserted_at: inserted_at}
 
     {inserted_at,
@@ -126,15 +150,30 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
      """}
   end
 
-  defp get_value_for_key("range", %{staged: staged} = ammo_group) do
+  defp get_value_for_key(:used_up_on, ammo_group) do
+    last_shot_group_date =
+      case ammo_group |> Ammo.get_last_used_shot_group() do
+        %{date: last_shot_group_date} -> last_shot_group_date
+        _no_shot_groups -> nil
+      end
+
+    assigns = %{last_shot_group_date: last_shot_group_date}
+
+    {last_shot_group_date,
+     ~H"""
+     <%= @last_shot_group_date |> display_date() %>
+     """}
+  end
+
+  defp get_value_for_key(:range, %{staged: staged} = ammo_group) do
     assigns = %{ammo_group: ammo_group}
 
     {staged,
      ~H"""
-     <div class="min-w-20 py-2 px-4 h-full flex flex-col justify-center items-center">
+     <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
        <button
          type="button"
-         class="mx-2 my-1 btn btn-primary"
+         class="mx-2 my-1 text-sm btn btn-primary"
          phx-click="toggle_staged"
          phx-value-ammo_group_id={ammo_group.id}
        >
@@ -143,16 +182,16 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
 
        <%= live_patch(dgettext("actions", "Record shots"),
          to: Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group),
-         class: "mx-2 my-1 btn btn-primary"
+         class: "mx-2 my-1 text-sm btn btn-primary"
        ) %>
      </div>
      """}
   end
 
-  defp get_value_for_key("remaining", ammo_group),
+  defp get_value_for_key(:remaining, ammo_group),
     do: "#{ammo_group |> Ammo.get_percentage_remaining()}%"
 
-  defp get_value_for_key("actions", ammo_group) do
+  defp get_value_for_key(:actions, ammo_group) do
     assigns = %{ammo_group: ammo_group}
 
     ~H"""
@@ -183,22 +222,28 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     """
   end
 
-  defp get_value_for_key("container", %{container: nil}), do: {nil, nil}
+  defp get_value_for_key(:container, %{container: nil}), do: {nil, nil}
 
-  defp get_value_for_key("container", %{container: %{name: container_name}} = ammo_group) do
+  defp get_value_for_key(:container, %{container: %{name: container_name}} = ammo_group) do
     assigns = %{ammo_group: ammo_group}
 
     {container_name,
      ~H"""
-     <div class="min-w-20 py-2 px-4 h-full space-x-4 flex justify-center items-center">
-       <%= live_patch(@ammo_group.container.name,
+     <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
+       <%= live_patch(
+         @ammo_group.container.name,
+         to: Routes.container_show_path(Endpoint, :show, @ammo_group.container),
+         class: "mx-2 my-1 link"
+       ) %>
+
+       <%= live_patch(
+         gettext("Move ammo"),
          to: Routes.ammo_group_index_path(Endpoint, :move, @ammo_group),
-         class: "btn btn-primary"
+         class: "mx-2 my-1 text-sm btn btn-primary"
        ) %>
      </div>
      """}
   end
 
-  defp get_value_for_key(key, ammo_group),
-    do: ammo_group |> Map.get(key |> String.to_existing_atom())
+  defp get_value_for_key(key, ammo_group), do: ammo_group |> Map.get(key)
 end

lib/cannery_web/live/ammo_group_live/index.html.heex

@@ -8,8 +8,10 @@
       <%= gettext("No Ammo") %>
       <%= display_emoji("😔") %>
     </h2>
+  <% end %>
 
-    <%= if @containers |> Enum.empty?() do %>
+  <%= cond do %>
+    <% @containers_count == 0 -> %>
       <div class="flex justify-center items-center">
         <h2 class="m-2 title text-md text-primary-600">
           <%= dgettext("prompts", "You'll need to") %>
@@ -20,30 +22,37 @@
           class: "btn btn-primary"
         ) %>
       </div>
-    <% else %>
+    <% @ammo_types_count == 0 -> %>
+      <div class="flex justify-center items-center">
+        <h2 class="m-2 title text-md text-primary-600">
+          <%= dgettext("prompts", "You'll need to") %>
+        </h2>
+
+        <%= live_patch(dgettext("actions", "add an ammo type first"),
+          to: Routes.ammo_type_index_path(Endpoint, :new),
+          class: "btn btn-primary"
+        ) %>
+      </div>
+    <% @ammo_groups |> Enum.empty?() -> %>
       <%= live_patch(dgettext("actions", "Add your first box!"),
         to: Routes.ammo_group_index_path(Endpoint, :new),
         class: "btn btn-primary"
       ) %>
-    <% end %>
-  <% else %>
-    <%= if @containers |> Enum.empty?() do %>
-      <div class="flex justify-center items-center">
-        <h2 class="m-2 title text-md text-primary-600">
-          <%= dgettext("prompts", "You'll need to") %>
-        </h2>
-
-        <%= live_patch(dgettext("actions", "add a container first"),
-          to: Routes.container_index_path(Endpoint, :new),
-          class: "btn btn-primary"
-        ) %>
-      </div>
-    <% else %>
-      <%= live_patch(dgettext("actions", "New Ammo group"),
+    <% true -> %>
+      <%= live_patch(dgettext("actions", "Add Ammo"),
         to: Routes.ammo_group_index_path(Endpoint, :new),
         class: "btn btn-primary"
       ) %>
-    <% end %>
+  <% end %>
+
+  <%= unless @ammo_groups |> Enum.empty?() do %>
+    <div class="flex flex-col justify-center items-center">
+      <.toggle_button action="toggle_show_used" value={@show_used}>
+        <span class="title text-lg text-primary-600">
+          <%= gettext("Show used") %>
+        </span>
+      </.toggle_button>
+    </div>
 
     <.live_component
       module={CanneryWeb.Components.TableComponent}
@@ -66,7 +75,6 @@
         ammo_group={@ammo_group}
         return_to={Routes.ammo_group_index_path(Endpoint, :index)}
         current_user={@current_user}
-        containers={@containers}
       />
     </.modal>
   <% @live_action == :add_shot_group -> %>

lib/cannery_web/live/ammo_group_live/show.ex

@@ -35,9 +35,9 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
 
   defp page_title(:add_shot_group), do: gettext("Record Shots")
   defp page_title(:edit_shot_group), do: gettext("Edit Shot Records")
-  defp page_title(:move), do: gettext("Move Ammo group")
-  defp page_title(:show), do: gettext("Show Ammo group")
-  defp page_title(:edit), do: gettext("Edit Ammo group")
+  defp page_title(:move), do: gettext("Move Ammo")
+  defp page_title(:show), do: gettext("Show Ammo")
+  defp page_title(:edit), do: gettext("Edit Ammo")
 
   @impl true
   def handle_event(
@@ -47,7 +47,7 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
       ) do
     ammo_group |> Ammo.delete_ammo_group!(current_user)
 
-    prompt = dgettext("prompts", "Ammo group deleted succesfully")
+    prompt = dgettext("prompts", "Ammo deleted succesfully")
     redirect_to = Routes.ammo_group_index_path(socket, :index)
 
     {:noreply, socket |> put_flash(:info, prompt) |> push_redirect(to: redirect_to)}
@@ -84,10 +84,10 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
     ammo_group = ammo_group |> Repo.preload([:container, :ammo_type, :shot_groups], force: true)
 
     columns = [
-      %{label: gettext("Rounds shot"), key: "count"},
-      %{label: gettext("Notes"), key: "notes"},
-      %{label: gettext("Date"), key: "date"},
-      %{label: nil, key: "actions", sortable: false}
+      %{label: gettext("Rounds shot"), key: :count},
+      %{label: gettext("Notes"), key: :notes},
+      %{label: gettext("Date"), key: :date},
+      %{label: nil, key: :actions, sortable: false}
     ]
 
     rows =
@@ -110,10 +110,10 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
     |> Enum.into(%{}, fn %{key: key} ->
       value =
         case key do
-          "date" ->
+          :date ->
             {date, date |> display_date()}
 
-          "actions" ->
+          :actions ->
             ~H"""
             <div class="px-4 py-2 space-x-4 flex justify-center items-center">
               <%= live_patch to: Routes.ammo_group_show_path(Endpoint, :edit_shot_group, @ammo_group, shot_group),
@@ -136,7 +136,7 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
             """
 
           key ->
-            shot_group |> Map.get(key |> String.to_existing_atom())
+            shot_group |> Map.get(key)
         end
 
       {key, value}

lib/cannery_web/live/ammo_group_live/show.html.heex

@@ -52,7 +52,7 @@
 
   <div class="flex flex-col justify-center items-center">
     <div class="flex flex-wrap justify-center items-center text-primary-600">
-      <%= live_patch(dgettext("actions", "Ammo Details"),
+      <%= live_patch(dgettext("actions", "View in Catalog"),
         to: Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type),
         class: "mx-4 my-2 btn btn-primary",
         data: [qa: "details"]
@@ -105,7 +105,7 @@
 
       <.container_card container={@ammo_group.container} />
     <% else %>
-      <%= gettext("This ammo group is not in a container") %>
+      <%= gettext("This ammo is not in a container") %>
     <% end %>
   </div>
 

lib/cannery_web/live/ammo_type_live/form_component.ex

@@ -13,17 +13,13 @@ defmodule CanneryWeb.AmmoTypeLive.FormComponent do
           %{:ammo_type => AmmoType.t(), :current_user => User.t(), optional(any) => any},
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{ammo_type: ammo_type, current_user: _current_user} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign(:changeset, Ammo.change_ammo_type(ammo_type))}
+  def update(%{current_user: _current_user} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"ammo_type" => ammo_type_params},
-        %{assigns: %{ammo_type: ammo_type}} = socket
-      ) do
-    {:noreply, socket |> assign(:changeset, ammo_type |> Ammo.change_ammo_type(ammo_type_params))}
+  def handle_event("validate", %{"ammo_type" => ammo_type_params}, socket) do
+    {:noreply, socket |> assign_changeset(ammo_type_params)}
   end
 
   def handle_event(
@@ -34,6 +30,31 @@ defmodule CanneryWeb.AmmoTypeLive.FormComponent do
     save_ammo_type(socket, action, ammo_type_params)
   end
 
+  defp assign_changeset(
+         %{assigns: %{action: action, ammo_type: ammo_type, current_user: user}} = socket,
+         ammo_type_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new -> ammo_type |> AmmoType.create_changeset(user, ammo_type_params)
+        :edit -> ammo_type |> AmmoType.update_changeset(ammo_type_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(changeset: changeset)
+  end
+
   defp save_ammo_type(
          %{assigns: %{ammo_type: ammo_type, current_user: current_user, return_to: return_to}} =
            socket,

lib/cannery_web/live/ammo_type_live/index.ex

@@ -48,29 +48,29 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
     columns =
       [
-        %{label: gettext("Name"), key: "name", type: :string},
-        %{label: gettext("Bullet type"), key: "bullet_type", type: :string},
-        %{label: gettext("Bullet core"), key: "bullet_core", type: :string},
-        %{label: gettext("Cartridge"), key: "cartridge", type: :string},
-        %{label: gettext("Caliber"), key: "caliber", type: :string},
-        %{label: gettext("Case material"), key: "case_material", type: :string},
-        %{label: gettext("Jacket type"), key: "jacket_type", type: :string},
-        %{label: gettext("Muzzle velocity"), key: "muzzle_velocity", type: :string},
-        %{label: gettext("Powder type"), key: "powder_type", type: :string},
+        %{label: gettext("Name"), key: :name, type: :name},
+        %{label: gettext("Bullet type"), key: :bullet_type, type: :string},
+        %{label: gettext("Bullet core"), key: :bullet_core, type: :string},
+        %{label: gettext("Cartridge"), key: :cartridge, type: :string},
+        %{label: gettext("Caliber"), key: :caliber, type: :string},
+        %{label: gettext("Case material"), key: :case_material, type: :string},
+        %{label: gettext("Jacket type"), key: :jacket_type, type: :string},
+        %{label: gettext("Muzzle velocity"), key: :muzzle_velocity, type: :string},
+        %{label: gettext("Powder type"), key: :powder_type, type: :string},
         %{
           label: gettext("Powder grains per charge"),
-          key: "powder_grains_per_charge",
+          key: :powder_grains_per_charge,
           type: :string
         },
-        %{label: gettext("Grains"), key: "grains", type: :string},
-        %{label: gettext("Pressure"), key: "pressure", type: :string},
-        %{label: gettext("Primer type"), key: "primer_type", type: :string},
-        %{label: gettext("Firing type"), key: "firing_type", type: :string},
-        %{label: gettext("Tracer"), key: "tracer", type: :boolean},
-        %{label: gettext("Incendiary"), key: "incendiary", type: :boolean},
-        %{label: gettext("Blank"), key: "blank", type: :boolean},
-        %{label: gettext("Corrosive"), key: "corrosive", type: :boolean},
-        %{label: gettext("Manufacturer"), key: "manufacturer", type: :string},
+        %{label: gettext("Grains"), key: :grains, type: :string},
+        %{label: gettext("Pressure"), key: :pressure, type: :string},
+        %{label: gettext("Primer type"), key: :primer_type, type: :string},
+        %{label: gettext("Firing type"), key: :firing_type, type: :string},
+        %{label: gettext("Tracer"), key: :tracer, type: :boolean},
+        %{label: gettext("Incendiary"), key: :incendiary, type: :boolean},
+        %{label: gettext("Blank"), key: :blank, type: :boolean},
+        %{label: gettext("Corrosive"), key: :corrosive, type: :boolean},
+        %{label: gettext("Manufacturer"), key: :manufacturer, type: :string},
         %{label: gettext("UPC"), key: "upc", type: :string}
       ]
       |> Enum.filter(fn %{key: key, type: type} ->
@@ -79,12 +79,13 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
         ammo_types
         |> Enum.any?(fn ammo_type ->
-          not (ammo_type |> Map.get(key |> String.to_existing_atom()) == default_value)
+          not (ammo_type |> Map.get(key) == default_value)
         end)
       end)
       |> Kernel.++([
-        %{label: gettext("Total # of rounds"), key: "round_count", type: :round_count},
-        %{label: gettext("Average Price paid"), key: "avg_price_paid", type: :avg_price_paid},
+        %{label: gettext("Total # of rounds"), key: :round_count, type: :round_count},
+        %{label: gettext("Total # of ammo"), key: :ammo_count, type: :ammo_count},
+        %{label: gettext("Average Price paid"), key: :avg_price_paid, type: :avg_price_paid},
         %{label: nil, key: "actions", type: :actions, sortable: false}
       ])
 
@@ -103,11 +104,14 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
   end
 
   defp get_ammo_type_value(:boolean, key, ammo_type, _current_user),
-    do: ammo_type |> Map.get(key |> String.to_existing_atom()) |> humanize()
+    do: ammo_type |> Map.get(key) |> humanize()
 
   defp get_ammo_type_value(:round_count, _key, ammo_type, current_user),
     do: ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
 
+  defp get_ammo_type_value(:ammo_count, _key, ammo_type, current_user),
+    do: ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user)
+
   defp get_ammo_type_value(:avg_price_paid, _key, ammo_type, current_user) do
     case ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user) do
       nil -> gettext("No cost information")
@@ -115,6 +119,18 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
     end
   end
 
+  defp get_ammo_type_value(:name, _key, ammo_type, _current_user) do
+    assigns = %{ammo_type: ammo_type}
+
+    ~H"""
+    <%= live_redirect to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
+      class: "link",
+      data: [qa: "view-name-#{ammo_type.id}"] do %>
+      <%= ammo_type.name %>
+    <% end %>
+    """
+  end
+
   defp get_ammo_type_value(:actions, _key, ammo_type, _current_user) do
     assigns = %{ammo_type: ammo_type}
 
@@ -137,7 +153,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
             phx_click: "delete",
             phx_value_id: ammo_type.id,
             data: [
-              confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
+              confirm: dgettext("prompts", "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!", name: ammo_type.name),
               qa: "delete-#{ammo_type.id}"
             ] do %>
         <i class="fa-lg fas fa-trash"></i>
@@ -148,6 +164,5 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
   defp get_ammo_type_value(nil, _key, _ammo_type, _current_user), do: nil
 
-  defp get_ammo_type_value(_other, key, ammo_type, _current_user),
-    do: ammo_type |> Map.get(key |> String.to_existing_atom())
+  defp get_ammo_type_value(_other, key, ammo_type, _current_user), do: ammo_type |> Map.get(key)
 end

lib/cannery_web/live/ammo_type_live/index.html.heex

@@ -1,6 +1,6 @@
 <div class="flex flex-col space-y-8 justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
-    <%= gettext("Ammo Types") %>
+    <%= gettext("Catalog") %>
   </h1>
 
   <%= if @rows |> Enum.empty?() do %>

lib/cannery_web/live/ammo_type_live/show.ex

@@ -9,22 +9,12 @@ 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(show_used: false)}
 
   @impl true
   def handle_params(%{"id" => id}, _params, %{assigns: %{current_user: current_user}} = socket) do
     ammo_type = Ammo.get_ammo_type!(id, current_user)
-
-    socket =
-      socket
-      |> assign(
-        page_title: page_title(socket.assigns.live_action),
-        ammo_type: ammo_type,
-        ammo_groups: ammo_type |> Ammo.list_ammo_groups_for_type(current_user),
-        avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user)
-      )
-
-    {:noreply, socket}
+    {:noreply, socket |> display_ammo_type(ammo_type)}
   end
 
   @impl true
@@ -41,6 +31,34 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
     {:noreply, socket |> put_flash(:info, prompt) |> push_redirect(to: redirect_to)}
   end
 
+  @impl true
+  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
+    {:noreply, socket |> assign(:show_used, !show_used) |> display_ammo_type()}
+  end
+
+  defp display_ammo_type(
+         %{
+           assigns: %{
+             live_action: live_action,
+             current_user: current_user,
+             show_used: show_used
+           }
+         } = socket,
+         ammo_type
+       ) do
+    socket
+    |> assign(
+      page_title: page_title(live_action),
+      ammo_type: ammo_type,
+      ammo_groups: ammo_type |> Ammo.list_ammo_groups_for_type(current_user, show_used),
+      avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user)
+    )
+  end
+
+  defp display_ammo_type(%{assigns: %{ammo_type: ammo_type}} = socket) do
+    socket |> display_ammo_type(ammo_type)
+  end
+
   defp page_title(:show), do: gettext("Show Ammo type")
   defp page_title(:edit), do: gettext("Edit Ammo type")
 end

lib/cannery_web/live/ammo_type_live/show.html.heex

@@ -1,5 +1,4 @@
-<div class="mx-auto px-4 sm:px-8 space-y-4 max-w-3xl
-  flex flex-col justify-center items-center">
+<div class="space-y-4 flex flex-col justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
     <%= @ammo_type.name %>
   </h1>
@@ -24,7 +23,7 @@
          phx_click: "delete",
          data: [
            confirm:
-             dgettext("prompts", "Are you sure you want to delete %{name}?", name: @ammo_type.name),
+             dgettext("prompts", "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!", name: @ammo_type.name),
            qa: "delete"
          ] do %>
       <i class="fa-fw fa-lg fas fa-trash"></i>
@@ -114,6 +113,14 @@
 
   <hr class="hr" />
 
+  <div class="flex flex-col justify-center items-center">
+    <.toggle_button action="toggle_show_used" value={@show_used}>
+      <span class="title text-lg text-primary-600">
+        <%= gettext("Show used") %>
+      </span>
+    </.toggle_button>
+  </div>
+
   <div>
     <%= if @ammo_groups |> Enum.empty?() do %>
       <h2 class="mx-8 my-4 title text-lg text-primary-600">
@@ -123,7 +130,7 @@
     <% else %>
       <div class="flex flex-wrap justify-center items-center">
         <%= for ammo_group <- @ammo_groups do %>
-          <.ammo_group_card ammo_group={ammo_group} />
+          <.ammo_group_card ammo_group={ammo_group} show_container={true} />
         <% end %>
       </div>
     <% end %>

lib/cannery_web/live/container_live/form_component.ex

@@ -13,18 +13,13 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
           %{:container => Container.t(), :current_user => User.t(), optional(any) => any},
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{container: container} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign(:changeset, Containers.change_container(container))}
+  def update(%{container: _container} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"container" => container_params},
-        %{assigns: %{container: container}} = socket
-      ) do
-    changeset = container |> Containers.change_container(container_params)
-    {:noreply, socket |> assign(:changeset, changeset)}
+  def handle_event("validate", %{"container" => container_params}, socket) do
+    {:noreply, socket |> assign_changeset(container_params)}
   end
 
   def handle_event(
@@ -35,6 +30,31 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
     save_container(socket, action, container_params)
   end
 
+  defp assign_changeset(
+         %{assigns: %{action: action, container: container, current_user: user}} = socket,
+         container_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new -> container |> Container.create_changeset(user, container_params)
+        :edit -> container |> Container.update_changeset(container_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   defp save_container(
          %{assigns: %{container: container, current_user: current_user, return_to: return_to}} =
            socket,

lib/cannery_web/live/container_live/show.ex

@@ -5,13 +5,13 @@ defmodule CanneryWeb.ContainerLive.Show do
 
   use CanneryWeb, :live_view
   import CanneryWeb.Components.{AmmoGroupCard, TagCard}
-  alias Cannery.{Accounts.User, Containers, Containers.Container, Repo, Tags}
+  alias Cannery.{Accounts.User, Ammo, Containers, Containers.Container, Repo, Tags}
   alias CanneryWeb.Endpoint
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
   @impl true
-  def mount(_params, _session, socket), do: {:ok, socket}
+  def mount(_params, _session, socket), do: {:ok, socket |> assign(show_used: false)}
 
   @impl true
   def handle_params(
@@ -39,7 +39,7 @@ defmodule CanneryWeb.ContainerLive.Show do
               container_name: container.name
             )
 
-          socket |> put_flash(:info, prompt) |> render_container(container.id, current_user)
+          socket |> put_flash(:info, prompt) |> render_container()
 
         {:error, error_string} ->
           socket |> put_flash(:error, error_string)
@@ -82,12 +82,23 @@ defmodule CanneryWeb.ContainerLive.Show do
     {:noreply, socket}
   end
 
+  @impl true
+  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
+    {:noreply, socket |> assign(:show_used, !show_used) |> render_container()}
+  end
+
   @spec render_container(Socket.t(), Container.id(), User.t()) :: Socket.t()
-  defp render_container(%{assigns: %{live_action: live_action}} = socket, id, current_user) do
+  defp render_container(
+         %{assigns: %{live_action: live_action, show_used: show_used}} = socket,
+         id,
+         current_user
+       ) do
     %{name: container_name} =
       container =
       Containers.get_container!(id, current_user)
-      |> Repo.preload([:ammo_groups, :tags], force: true)
+      |> Repo.preload([:tags], force: true)
+
+    ammo_groups = Ammo.list_ammo_groups_for_container(container, current_user, show_used)
 
     page_title =
       case live_action do
@@ -96,6 +107,13 @@ defmodule CanneryWeb.ContainerLive.Show do
         :edit_tags -> gettext("Edit %{name} tags", name: container_name)
       end
 
-    socket |> assign(container: container, page_title: page_title)
+    socket |> assign(container: container, ammo_groups: ammo_groups, page_title: page_title)
+  end
+
+  @spec render_container(Socket.t()) :: Socket.t()
+  defp render_container(
+         %{assigns: %{container: %{id: container_id}, current_user: current_user}} = socket
+       ) do
+    socket |> render_container(container_id, current_user)
   end
 end

lib/cannery_web/live/container_live/show.html.heex

@@ -1,4 +1,4 @@
-<div class="mx-auto space-y-4 max-w-3xl flex flex-col justify-center items-center">
+<div class="space-y-4 flex flex-col justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
     <%= @container.name %>
   </h1>
@@ -22,6 +22,18 @@
     </span>
   <% end %>
 
+  <%= unless @ammo_groups |> Enum.empty?() do %>
+    <span class="rounded-lg title text-lg">
+      <%= gettext("Packs:") %>
+      <%= Enum.count(@ammo_groups) %>
+    </span>
+
+    <span class="rounded-lg title text-lg">
+      <%= gettext("Rounds:") %>
+      <%= @container |> Containers.get_container_rounds!() %>
+    </span>
+  <% end %>
+
   <div class="flex space-x-4 justify-center items-center text-primary-600">
     <%= live_patch to: Routes.container_show_path(Endpoint, :edit, @container),
                class: "text-primary-600 link",
@@ -72,14 +84,22 @@
 
   <hr class="mb-4 hr" />
 
+  <div class="flex flex-col justify-center items-center">
+    <.toggle_button action="toggle_show_used" value={@show_used}>
+      <span class="title text-lg text-primary-600">
+        <%= gettext("Show used") %>
+      </span>
+    </.toggle_button>
+  </div>
+
   <div>
-    <%= if @container.ammo_groups |> Enum.empty?() do %>
+    <%= if @ammo_groups |> Enum.empty?() do %>
       <h2 class="mx-8 my-4 title text-lg text-primary-600">
-        <%= gettext("No ammo groups in this container") %>
+        <%= gettext("No ammo in this container") %>
       </h2>
     <% else %>
       <div class="flex flex-wrap justify-center items-center">
-        <%= for ammo_group <- @container.ammo_groups do %>
+        <%= for ammo_group <- @ammo_groups do %>
           <.ammo_group_card ammo_group={ammo_group} />
         <% end %>
       </div>

lib/cannery_web/live/home_live.ex

@@ -5,6 +5,7 @@ defmodule CanneryWeb.HomeLive do
 
   use CanneryWeb, :live_view
   alias Cannery.Accounts
+  alias CanneryWeb.Endpoint
 
   @impl true
   def mount(_params, _session, socket) do
@@ -36,6 +37,13 @@ defmodule CanneryWeb.HomeLive do
   def render(assigns) do
     ~H"""
     <div class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl">
+      <img
+        src={Routes.static_path(Endpoint, "/images/cannery.svg")}
+        alt={gettext("Cannery logo")}
+        class="inline-block w-32 hover:-mt-2 hover:mb-2 transition-all duration-500 ease-in-out"
+        title={gettext("isn't he cute >:3")}
+      />
+
       <h1 class="title text-primary-600 text-2xl">
         <%= gettext("Welcome to %{name}", name: "Cannery") %>
       </h1>
@@ -126,7 +134,7 @@ 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.5</p>
             <i class="fas fa-md fa-info-circle"></i>
           <% end %>
         </li>

lib/cannery_web/live/invite_live/form_component.ex

@@ -13,23 +13,44 @@ defmodule CanneryWeb.InviteLive.FormComponent do
           %{:invite => Invite.t(), :current_user => User.t(), optional(any) => any},
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{invite: invite} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign(:changeset, Invites.change_invite(invite))}
+  def update(%{invite: _invite} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"invite" => invite_params},
-        %{assigns: %{invite: invite}} = socket
-      ) do
-    {:noreply, socket |> assign(:changeset, invite |> Invites.change_invite(invite_params))}
+  def handle_event("validate", %{"invite" => invite_params}, socket) do
+    {:noreply, socket |> assign_changeset(invite_params)}
   end
 
   def handle_event("save", %{"invite" => invite_params}, %{assigns: %{action: action}} = socket) do
     save_invite(socket, action, invite_params)
   end
 
+  defp assign_changeset(
+         %{assigns: %{action: action, current_user: user, invite: invite}} = socket,
+         invite_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new -> invite |> Invite.create_changeset(user, "example_token", invite_params)
+        :edit -> invite |> Invite.update_changeset(invite_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   defp save_invite(
          %{assigns: %{current_user: current_user, invite: invite, return_to: return_to}} = socket,
          :edit,

lib/cannery_web/live/invite_live/form_component.html.heex

@@ -24,6 +24,9 @@
     <%= label(f, :uses_left, gettext("Uses left"), class: "title text-lg text-primary-600") %>
     <%= number_input(f, :uses_left, min: 0, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :uses_left, "col-span-3") %>
+    <span class="col-span-3 text-primary-400 italic text-center">
+      <%= gettext("Leave \"Uses left\" blank to make invite unlimited") %>
+    </span>
 
     <%= submit(dgettext("actions", "Save"),
       class: "mx-auto btn btn-primary col-span-3",

lib/cannery_web/live/range_live/form_component.ex

@@ -1,6 +1,6 @@
 defmodule CanneryWeb.RangeLive.FormComponent do
   @moduledoc """
-  Livecomponent that can update or create a ShotGroup
+  Livecomponent that can update a ShotGroup
   """
 
   use CanneryWeb, :live_component
@@ -24,7 +24,7 @@ defmodule CanneryWeb.RangeLive.FormComponent do
         } = assigns,
         socket
       ) do
-    changeset = shot_group |> ActivityLog.change_shot_group()
+    changeset = shot_group |> ShotGroup.update_changeset(current_user, %{})
     ammo_group = Ammo.get_ammo_group!(ammo_group_id, current_user)
     {:ok, socket |> assign(assigns) |> assign(ammo_group: ammo_group, changeset: changeset)}
   end
@@ -33,11 +33,11 @@ defmodule CanneryWeb.RangeLive.FormComponent do
   def handle_event(
         "validate",
         %{"shot_group" => shot_group_params},
-        %{assigns: %{shot_group: shot_group}} = socket
+        %{assigns: %{current_user: current_user, shot_group: shot_group}} = socket
       ) do
     changeset =
       shot_group
-      |> ActivityLog.change_shot_group(shot_group_params)
+      |> ShotGroup.update_changeset(current_user, shot_group_params)
       |> Map.put(:action, :validate)
 
     {:noreply, assign(socket, :changeset, changeset)}

lib/cannery_web/live/range_live/index.ex

@@ -65,7 +65,7 @@ defmodule CanneryWeb.RangeLive.Index do
     {:ok, _ammo_group} =
       ammo_group |> Ammo.update_ammo_group(%{"staged" => !ammo_group.staged}, current_user)
 
-    prompt = dgettext("prompts", "Ammo group unstaged succesfully")
+    prompt = dgettext("prompts", "Ammo unstaged succesfully")
     {:noreply, socket |> put_flash(:info, prompt) |> display_shot_groups()}
   end
 
@@ -77,11 +77,11 @@ defmodule CanneryWeb.RangeLive.Index do
     ammo_groups = Ammo.list_staged_ammo_groups(current_user)
 
     columns = [
-      %{label: gettext("Ammo"), key: "name"},
-      %{label: gettext("Rounds shot"), key: "count"},
-      %{label: gettext("Notes"), key: "notes"},
-      %{label: gettext("Date"), key: "date"},
-      %{label: nil, key: "actions", sortable: false}
+      %{label: gettext("Ammo"), key: :name},
+      %{label: gettext("Rounds shot"), key: :count},
+      %{label: gettext("Notes"), key: :notes},
+      %{label: gettext("Date"), key: :date},
+      %{label: nil, key: :actions, sortable: false}
     ]
 
     rows =
@@ -101,17 +101,17 @@ defmodule CanneryWeb.RangeLive.Index do
     |> Enum.into(%{}, fn %{key: key} ->
       value =
         case key do
-          "name" ->
+          :name ->
             {shot_group.ammo_group.ammo_type.name,
              live_patch(shot_group.ammo_group.ammo_type.name,
                to: Routes.ammo_group_show_path(Endpoint, :show, shot_group.ammo_group),
                class: "link"
              )}
 
-          "date" ->
+          :date ->
             date |> display_date()
 
-          "actions" ->
+          :actions ->
             ~H"""
             <div class="px-4 py-2 space-x-4 flex justify-center items-center">
               <%= live_patch to: Routes.range_index_path(Endpoint, :edit, shot_group),
@@ -134,7 +134,7 @@ defmodule CanneryWeb.RangeLive.Index do
             """
 
           key ->
-            shot_group |> Map.get(key |> String.to_existing_atom())
+            shot_group |> Map.get(key)
         end
 
       {key, value}

lib/cannery_web/live/tag_live/form_component.ex

@@ -12,19 +12,44 @@ defmodule CanneryWeb.TagLive.FormComponent do
   @impl true
   @spec update(%{:tag => Tag.t(), :current_user => User.t(), optional(any) => any}, Socket.t()) ::
           {:ok, Socket.t()}
-  def update(%{tag: tag} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign(:changeset, Tags.change_tag(tag))}
+  def update(%{tag: _tag} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event("validate", %{"tag" => tag_params}, %{assigns: %{tag: tag}} = socket) do
-    {:noreply, socket |> assign(:changeset, tag |> Tags.change_tag(tag_params))}
+  def handle_event("validate", %{"tag" => tag_params}, socket) do
+    {:noreply, socket |> assign_changeset(tag_params)}
   end
 
   def handle_event("save", %{"tag" => tag_params}, %{assigns: %{action: action}} = socket) do
     save_tag(socket, action, tag_params)
   end
 
+  defp assign_changeset(
+         %{assigns: %{action: action, current_user: user, tag: tag}} = socket,
+         tag_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new -> tag |> Tag.create_changeset(user, tag_params)
+        :edit -> tag |> Tag.update_changeset(tag_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   @impl true
   def render(assigns) do
     ~H"""

lib/cannery_web/router.ex

@@ -65,12 +65,12 @@ defmodule CanneryWeb.Router do
     live "/tags/new", TagLive.Index, :new
     live "/tags/:id/edit", TagLive.Index, :edit
 
-    live "/ammo_types", AmmoTypeLive.Index, :index
-    live "/ammo_types/new", AmmoTypeLive.Index, :new
-    live "/ammo_types/:id/edit", AmmoTypeLive.Index, :edit
+    live "/catalog", AmmoTypeLive.Index, :index
+    live "/catalog/new", AmmoTypeLive.Index, :new
+    live "/catalog/:id/edit", AmmoTypeLive.Index, :edit
 
-    live "/ammo_types/:id", AmmoTypeLive.Show, :show
-    live "/ammo_types/:id/show/edit", AmmoTypeLive.Show, :edit
+    live "/catalog/:id", AmmoTypeLive.Show, :show
+    live "/catalog/:id/show/edit", AmmoTypeLive.Show, :edit
 
     live "/containers", ContainerLive.Index, :index
     live "/containers/new", ContainerLive.Index, :new
@@ -81,17 +81,17 @@ defmodule CanneryWeb.Router do
     live "/containers/:id/show/edit", ContainerLive.Show, :edit
     live "/containers/:id/show/edit_tags", ContainerLive.Show, :edit_tags
 
-    live "/ammo_groups", AmmoGroupLive.Index, :index
-    live "/ammo_groups/new", AmmoGroupLive.Index, :new
-    live "/ammo_groups/:id/edit", AmmoGroupLive.Index, :edit
-    live "/ammo_groups/:id/add_shot_group", AmmoGroupLive.Index, :add_shot_group
-    live "/ammo_groups/:id/move", AmmoGroupLive.Index, :move
+    live "/ammo", AmmoGroupLive.Index, :index
+    live "/ammo/new", AmmoGroupLive.Index, :new
+    live "/ammo/:id/edit", AmmoGroupLive.Index, :edit
+    live "/ammo/:id/add_shot_group", AmmoGroupLive.Index, :add_shot_group
+    live "/ammo/:id/move", AmmoGroupLive.Index, :move
 
-    live "/ammo_groups/:id", AmmoGroupLive.Show, :show
-    live "/ammo_groups/:id/show/edit", AmmoGroupLive.Show, :edit
-    live "/ammo_groups/:id/show/add_shot_group", AmmoGroupLive.Show, :add_shot_group
-    live "/ammo_groups/:id/show/move", AmmoGroupLive.Show, :move
-    live "/ammo_groups/:id/show/:shot_group_id/edit", AmmoGroupLive.Show, :edit_shot_group
+    live "/ammo/:id", AmmoGroupLive.Show, :show
+    live "/ammo/:id/show/edit", AmmoGroupLive.Show, :edit
+    live "/ammo/:id/show/add_shot_group", AmmoGroupLive.Show, :add_shot_group
+    live "/ammo/:id/show/move", AmmoGroupLive.Show, :move
+    live "/ammo/:id/show/:shot_group_id/edit", AmmoGroupLive.Show, :edit_shot_group
 
     live "/range", RangeLive.Index, :index
     live "/range/:id/edit", RangeLive.Index, :edit

lib/cannery_web/templates/layout/live.html.heex

@@ -22,7 +22,7 @@
     </div>
   </header>
 
-  <div class="mx-4 sm:mx-8 md:mx-16">
+  <div class="mx-4 sm:mx-8 md:mx-16 flex flex-col justify-center items-stretch">
     <%= @inner_content %>
   </div>
 </main>

lib/cannery_web/templates/layout/root.html.heex

@@ -5,6 +5,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <%= csrf_meta_tag() %>
+    <link
+      rel="shortcut icon"
+      type="image/jpg"
+      href={Routes.static_path(@conn, "/images/cannery.svg")}
+    />
     <%= if(assigns |> Map.has_key?(:page_title), do: @page_title, else: "Cannery")
     |> live_title_tag(suffix: " | Cannery") %>
     <link phx-track-static rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")} />

lib/cannery_web/views/view_helpers.ex

@@ -5,6 +5,7 @@ defmodule CanneryWeb.ViewHelpers do
   :view`
   """
 
+  import Phoenix.LiveView
   import Phoenix.LiveView.Helpers
 
   @id_length 16
@@ -65,4 +66,43 @@ defmodule CanneryWeb.ViewHelpers do
       if(Application.get_env(:cannery, CanneryWeb.ViewHelpers)[:shibao_mode], do: "q_q", else: "😔")
 
   def display_emoji(other_emoji), do: other_emoji
+
+  @doc """
+  A toggle button element that can be directed to a liveview or a
+  live_component's `handle_event/3`.
+
+  ## Examples
+
+  <.toggle_button action="my_liveview_action" value={@some_value}>
+    <span>Toggle me!</span>
+  </.toggle_button>
+  <.toggle_button action="my_live_component_action" target={@myself} value={@some_value}>
+    <span>Whatever you want</span>
+  </.toggle_button>
+  """
+  def toggle_button(assigns) do
+    assigns = assigns |> assign_new(:id, fn -> assigns.action end)
+
+    ~H"""
+    <label for={@id} class="inline-flex relative items-center cursor-pointer">
+      <input
+        type="checkbox"
+        value={@value}
+        checked={@value}
+        id={@id}
+        class="sr-only peer"
+        {
+          if assigns |> Map.has_key?(:target),
+            do: %{"phx-click" => @action, "phx-value-value" => @value, "phx-target" => @target},
+            else: %{"phx-click" => @action, "phx-value-value" => @value}
+        }
+      />
+      <div class="w-11 h-6 bg-gray-200 rounded-full peer dark:bg-gray-700 peer-focus:ring-4 peer-focus:ring-teal-300 dark:peer-focus:ring-teal-800 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-1 after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-teal-600">
+      </div>
+      <span class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300">
+        <%= render_slot(@inner_block) %>
+      </span>
+    </label>
+    """
+  end
 end

mix.exs

@@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.5.2",
+      version: "0.5.5",
       elixir: "1.13.4",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:gettext] ++ Mix.compilers(),

priv/gettext/actions.pot

@@ -12,11 +12,12 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
 msgid "Add Ammo"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 msgid "Add your first box!"
 msgstr ""
 
@@ -65,7 +66,7 @@ msgid "Invite someone new!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:112
 #: 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_reset_password/edit.html.heex:48
@@ -80,11 +81,6 @@ msgstr ""
 msgid "Make your first tag!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
-msgid "New Ammo group"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
 msgid "New Ammo type"
@@ -101,7 +97,7 @@ msgid "New Tag"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
+#: lib/cannery_web/components/topbar.ex:105
 #: 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
@@ -128,9 +124,9 @@ msgstr ""
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:66
+#: lib/cannery_web/live/tag_live/form_component.ex:91
 msgid "Save"
 msgstr ""
 
@@ -140,7 +136,7 @@ msgid "Send instructions to reset password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:53
+#: lib/cannery_web/live/container_live/show.html.heex:65
 msgid "Why not add one?"
 msgstr ""
 
@@ -160,17 +156,12 @@ 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/index.ex:183
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:91
 #: 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
-msgid "Ammo Details"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:89
 msgid "Add another container!"
@@ -192,8 +183,7 @@ msgid "Copy to clipboard"
 msgstr ""
 
 #, 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
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
 msgid "add a container first"
 msgstr ""
 
@@ -211,3 +201,13 @@ msgstr ""
 #: lib/cannery_web/templates/user_settings/edit.html.heex:134
 msgid "Change language"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
+msgid "View in Catalog"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+msgid "add an ammo type first"
+msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-19 19:32+0000\n"
-"PO-Revision-Date: 2022-04-19 21:32+0000\n"
-"Last-Translator: shibao <shibao@bubbletea.dev>\n"
+"PO-Revision-Date: 2022-05-12 20:28+0000\n"
+"Last-Translator: Kaia Estra <kaia@fedora.email>\n"
 "Language-Team: German <https://weblate.bubbletea.dev/projects/cannery/"
 "actions/de/>\n"
 "Language: de\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.11.2\n"
+"X-Generator: Weblate 4.12.1\n"
 
 ## This file is a PO Template file.
 ##
@@ -25,11 +25,12 @@ msgstr ""
 ## effect: edit them in PO (.po) files instead.
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
 msgid "Add Ammo"
 msgstr "Munition hinzufügen"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 msgid "Add your first box!"
 msgstr "Fügen Sie ihre erste Box hinzu!"
 
@@ -78,7 +79,7 @@ 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:112
 #: 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_reset_password/edit.html.heex:48
@@ -93,11 +94,6 @@ msgstr "Einloggen"
 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
-msgid "New Ammo group"
-msgstr "Neue Munitionsgruppe"
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
 msgid "New Ammo type"
@@ -114,7 +110,7 @@ msgid "New Tag"
 msgstr "Neuer Tag"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
+#: lib/cannery_web/components/topbar.ex:105
 #: 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
@@ -141,9 +137,9 @@ msgstr "Passwort zurücksetzen"
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:66
+#: lib/cannery_web/live/tag_live/form_component.ex:91
 msgid "Save"
 msgstr "Speichern"
 
@@ -153,7 +149,7 @@ 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
+#: lib/cannery_web/live/container_live/show.html.heex:65
 msgid "Why not add one?"
 msgstr "Warum fügen Sie keine hinzu?"
 
@@ -173,17 +169,12 @@ 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/index.ex:183
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:91
 #: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
 
-#, 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
 msgid "Add another container!"
@@ -205,8 +196,7 @@ 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
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
 msgid "add a container first"
 msgstr "Zuerst einen Behälter hinzufügen"
 
@@ -218,9 +208,19 @@ msgstr "Erstellen"
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:113
 msgid "Change Language"
-msgstr ""
+msgstr "Sprache wechseln"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:134
 msgid "Change language"
+msgstr "Sprache wechseln"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
+msgid "View in Catalog"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+msgid "add an ammo type first"
 msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-19 19:32+0000\n"
-"PO-Revision-Date: 2022-04-19 21:32+0000\n"
-"Last-Translator: shibao <shibao@bubbletea.dev>\n"
+"PO-Revision-Date: 2022-05-12 20:28+0000\n"
+"Last-Translator: Kaia Estra <kaia@fedora.email>\n"
 "Language-Team: German <https://weblate.bubbletea.dev/projects/cannery/"
 "default/de/>\n"
 "Language: de\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.11.2\n"
+"X-Generator: Weblate 4.12.1\n"
 
 ## This file is a PO Template file.
 ##
@@ -24,14 +24,14 @@ msgstr ""
 ## 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/home_live.ex:56
+#: lib/cannery_web/live/home_live.ex:64
 msgid "%{name} lets you easily keep an eye on your ammo levels before and after range day"
 msgstr ""
 "Mit %{name} können Sie ihren Munitionsbestand vor und nach dem Schießen "
 "leicht im Auge behalten"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:78
+#: lib/cannery_web/live/home_live.ex:86
 msgid "Access from any internet-capable device"
 msgstr "Zugriff von jedem Internet-fähigen Gerät"
 
@@ -41,12 +41,12 @@ msgid "Admins"
 msgstr "Admins"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:92
+#: lib/cannery_web/live/home_live.ex:100
 msgid "Admins:"
 msgstr "Admins:"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:50
+#: lib/cannery_web/components/topbar.ex:62
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
 #: lib/cannery_web/live/range_live/index.ex:80
 msgid "Ammo"
@@ -54,25 +54,25 @@ msgstr "Munition"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
-#: lib/cannery_web/live/ammo_group_live/index.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:90
 msgid "Ammo type"
 msgstr "Munitionsarten"
 
 #, 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/index.ex:88
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:99
 msgid "Average Price paid"
 msgstr "Durchschnittlicher Kaufpreis"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/form_component.ex:54
+#: lib/cannery_web/live/tag_live/form_component.ex:79
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
 #, 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:52
 msgid "Blank"
 msgstr "Knallpatrone"
 
@@ -84,47 +84,47 @@ msgstr "Messing"
 #, 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:38
 msgid "Bullet core"
 msgstr "Projektilkern"
 
 #, 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:37
 msgid "Bullet type"
 msgstr "Patronenart"
 
 #, 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:40
 msgid "Caliber"
 msgstr "Kaliber"
 
 #, 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:39
 msgid "Cartridge"
 msgstr "Patrone"
 
 #, 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:41
 msgid "Case material"
 msgstr "Gehäusematerial"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/index.ex:85
+#: lib/cannery_web/live/ammo_group_live/index.ex:95
 msgid "Container"
 msgstr "Behälter"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:44
+#: lib/cannery_web/components/topbar.ex:50
 #: lib/cannery_web/live/container_live/index.ex:36
 #: lib/cannery_web/live/container_live/index.html.heex:3
 msgid "Containers"
@@ -133,18 +133,18 @@ msgstr "Behälter"
 #, 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:53
 msgid "Corrosive"
 msgstr "Korrosiv"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
-#: lib/cannery_web/live/ammo_group_live/index.ex:81
+#: lib/cannery_web/live/ammo_group_live/index.ex:91
 msgid "Count"
 msgstr "Anzahl"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:29
+#: lib/cannery_web/components/ammo_group_card.ex:34
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 msgid "Count:"
 msgstr "Anzahl:"
@@ -167,19 +167,18 @@ msgid "Disable"
 msgstr "Deaktivieren"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:53
+#: lib/cannery_web/live/home_live.ex:61
 msgid "Easy to Use:"
 msgstr "Einfache Anwendung:"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:38
-#: lib/cannery_web/live/ammo_group_live/show.ex:40
 msgid "Edit Ammo group"
 msgstr "Munitionsgruppe bearbeiten"
 
 #, 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:63
 msgid "Edit Ammo type"
 msgstr "Munitionstyp bearbeiten"
 
@@ -211,19 +210,19 @@ msgstr "VM"
 #, 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:46
 msgid "Grains"
 msgstr "Körner"
 
 #, 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:51
 msgid "Incendiary"
 msgstr "Brandmunition"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:87
+#: lib/cannery_web/live/home_live.ex:95
 msgid "Instance Information"
 msgstr "Instanzinformationen"
 
@@ -233,12 +232,12 @@ msgid "Invite Disabled"
 msgstr "Einladung deaktiviert"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:118
+#: lib/cannery_web/live/home_live.ex:126
 msgid "Invite Only"
 msgstr "Nur mit Einladung"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:69
+#: lib/cannery_web/components/topbar.ex:75
 #: lib/cannery_web/live/invite_live/index.ex:41
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 msgid "Invites"
@@ -266,15 +265,10 @@ msgstr "Standort:"
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr "Magazin, Ladestreifen, Munitionskiste usw."
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:56
-msgid "Manage"
-msgstr "Verwalten"
-
 #, 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:54
 msgid "Manufacturer"
 msgstr "Hersteller"
 
@@ -293,7 +287,7 @@ msgstr "Meine coole Munitionskiste"
 #: lib/cannery_web/live/ammo_type_live/index.ex:51
 #: lib/cannery_web/live/container_live/form_component.html.heex:20
 #: lib/cannery_web/live/invite_live/form_component.html.heex:20
-#: lib/cannery_web/live/tag_live/form_component.ex:50
+#: lib/cannery_web/live/tag_live/form_component.ex:75
 msgid "Name"
 msgstr "Name"
 
@@ -328,15 +322,10 @@ msgid "No Ammo Types"
 msgstr "Keine Munitionsarten"
 
 #, 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:127
 msgid "No ammo for this type"
 msgstr "Keine Munition dieser Art"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:78
-msgid "No ammo groups in this container"
-msgstr "Keine Munitionsgruppe in diesem Behälter"
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:8
 msgid "No containers"
@@ -363,7 +352,7 @@ msgid "Notes"
 msgstr "Bemerkungen"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:35
+#: lib/cannery_web/components/ammo_group_card.ex:40
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 msgid "Notes:"
 msgstr "Bemerkungen:"
@@ -376,40 +365,40 @@ msgstr "Auf dem Bücherregal"
 #, 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:47
 msgid "Pressure"
 msgstr "Druck"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
-#: lib/cannery_web/live/ammo_group_live/index.ex:82
+#: lib/cannery_web/live/ammo_group_live/index.ex:92
 msgid "Price paid"
 msgstr "Kaufpreis"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:47
+#: lib/cannery_web/components/ammo_group_card.ex:59
 msgid "Price paid:"
 msgstr "Kaufpreis:"
 
 #, 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:48
 msgid "Primer type"
 msgstr "Zündertyp"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:117
+#: lib/cannery_web/live/home_live.ex:125
 msgid "Public Signups"
 msgstr "Öffentliche Registrierung"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:65
+#: lib/cannery_web/live/home_live.ex:73
 msgid "Secure:"
 msgstr "Sicher:"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:68
+#: lib/cannery_web/live/home_live.ex:76
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
 "Hosten Sie Ihre eigene Instanz oder verwenden Sie eine Instanz, der Sie "
@@ -427,17 +416,12 @@ msgid "Settings"
 msgstr "Einstellungen"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:39
-msgid "Show Ammo group"
-msgstr "Munitionsgruppen anzeigen"
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.ex:44
+#: lib/cannery_web/live/ammo_type_live/show.ex:62
 msgid "Show Ammo type"
 msgstr "Zeige Munitionsarten"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:75
+#: lib/cannery_web/live/home_live.ex:83
 msgid "Simple:"
 msgstr "Einfach:"
 
@@ -452,7 +436,7 @@ msgid "Stored in"
 msgstr "Gelagert in"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:38
+#: lib/cannery_web/components/topbar.ex:44
 #: lib/cannery_web/live/tag_live/index.ex:32
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 msgid "Tags"
@@ -464,24 +448,19 @@ msgid "Tags can be added to your containers to help you organize"
 msgstr "Tags können zur besseren Ordnung einem Behälter hinzugefügt werden"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/form_component.ex:60
+#: lib/cannery_web/live/tag_live/form_component.ex:85
 msgid "Text color"
 msgstr "Textfarbe"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:44
+#: lib/cannery_web/live/home_live.ex:52
 msgid "The self-hosted firearm tracker website"
 msgstr "Die selbst-gehostete Website zur Verwaltung von Schusswaffen"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
-msgid "This ammo group is not in a container"
-msgstr "Diese Munitionsgruppe ist nicht in einem Behälter"
-
 #, 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:50
 msgid "Tracer"
 msgstr "Leuchtspur"
 
@@ -513,23 +492,23 @@ msgid "Uses left"
 msgstr "Verbleibende Nutzung"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:40
+#: lib/cannery_web/live/home_live.ex:48
 msgid "Welcome to %{name}"
 msgstr "Willkommen %{name}"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:69
+#: lib/cannery_web/live/home_live.ex:77
 msgid "Your data stays with you, period"
 msgstr "Ihre Daten bleiben bei Ihnen, Punkt"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:49
+#: lib/cannery_web/live/container_live/show.html.heex:61
 msgid "No tags for this container"
 msgstr "Keine Tags für diesen Behälter"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.ex:84
+#: lib/cannery_web/components/topbar.ex:68
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
 msgid "Range"
 msgstr "Schießplatz"
 
@@ -572,11 +551,6 @@ msgstr "Für Schießplatz deselektieren"
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:3
-msgid "Ammo Types"
-msgstr "Munitionsarten"
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:49
 msgid "Ammo groups"
@@ -622,12 +596,12 @@ msgstr "Schießkladde"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:32
-#: lib/cannery_web/live/ammo_group_live/show.ex:38
 msgid "Move Ammo group"
 msgstr "Munitionsgruppe verschieben"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:240
 msgid "Move ammo"
 msgstr "Munition verschieben"
 
@@ -642,12 +616,12 @@ msgid "Shot log"
 msgstr "Schießkladde"
 
 #, 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/components/ammo_group_card.ex:60
+#: lib/cannery_web/live/ammo_group_live/index.ex:142
 #: 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/live/ammo_type_live/index.ex:118
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
 msgid "$%{amount}"
 msgstr "$%{amount}"
 
@@ -659,35 +633,35 @@ msgstr "Bimetall"
 #, 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:42
 msgid "Jacket type"
 msgstr "Patronenhülse"
 
 #, 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:43
 msgid "Muzzle velocity"
 msgstr "Mündungsgeschwindigkeit"
 
 #, 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:45
 msgid "Powder grains per charge"
 msgstr "Pulverkörner pro Ladung"
 
 #, 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:44
 msgid "Powder type"
 msgstr "Pulverart"
 
 #, 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:55
 msgid "UPC"
 msgstr "UPC"
 
@@ -708,19 +682,19 @@ msgid "New password"
 msgstr "Neues Passwort"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:141
+#: lib/cannery_web/live/ammo_group_live/index.ex:180
 msgid "Stage"
 msgstr "Markiert"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:141
+#: lib/cannery_web/live/ammo_group_live/index.ex:180
 msgid "Unstage"
 msgstr "Demarkiert"
 
 #, 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:49
 msgid "Firing type"
 msgstr "Patronenhülsenform"
 
@@ -736,34 +710,35 @@ msgstr "Lädt..."
 
 #, 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/show.ex:106
 msgid "Edit %{name}"
 msgstr "%{name} bearbeiten"
 
 #, 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/show.ex:107
 msgid "Edit %{name} tags"
 msgstr "Editiere %{name} Tags"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/container_card.ex:50
+#: lib/cannery_web/components/container_card.ex:55
+#: lib/cannery_web/live/container_live/show.html.heex:32
 msgid "Rounds:"
 msgstr "Patronen:"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.ex:94
+#: lib/cannery_web/live/container_live/show.ex:105
 msgid "Show %{name}"
 msgstr "Zeige %{name}"
 
 #, 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/index.ex:117
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:109
 msgid "No cost information"
 msgstr "Keine Preisinformationen"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:83
+#: lib/cannery_web/live/ammo_group_live/index.ex:93
 msgid "% left"
 msgstr "% verbleibend"
 
@@ -793,7 +768,7 @@ msgid "Rounds used"
 msgstr "Patronen verbraucht"
 
 #, 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:74
 msgid "Current # of rounds:"
 msgstr "Derzeitige # an Patronen:"
 
@@ -803,7 +778,7 @@ msgid "Total # of rounds"
 msgstr "Summe aller Patronen"
 
 #, 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:82
 msgid "Total rounds shot:"
 msgstr "Summe abgegebener Schüsse:"
 
@@ -849,61 +824,141 @@ msgid "Ammo types"
 msgstr "Munitionsart"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:86
+#: lib/cannery_web/live/ammo_group_live/index.ex:96
 msgid "Added on"
-msgstr ""
+msgstr "Hinzugefügt am"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:41
+#: lib/cannery_web/components/ammo_group_card.ex:46
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:91
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:90
 msgid "Added on:"
-msgstr ""
+msgstr "Hinzugefügt am:"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/user_card.ex:30
 msgid "User registered on"
-msgstr ""
+msgstr "Benutzer registriert am"
 
 #, 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 ""
+msgstr "Englisch"
 
 #, 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 ""
+msgstr "Französisch"
 
 #, 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 ""
+msgstr "Deutsch"
 
 #, 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 ""
+msgstr "Sprache"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/home_live.ex:147
+msgid "Get involved!"
+msgstr "Mach mit!"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:164
+msgid "Help translate"
+msgstr "Hilf beim Übersetzen"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:173
+msgid "Report bugs or request features"
+msgstr "Sende Bugs oder Erweiterungsvorschläge"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:155
 msgid "View the source code"
+msgstr "Quellcode ansehen"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:56
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:3
+msgid "Catalog"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:40
+msgid "Edit Ammo"
+msgstr "Munitionstyp bearbeiten"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:38
+msgid "Move Ammo"
+msgstr "Munition verschieben"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/container_live/show.html.heex:98
+msgid "No ammo in this container"
+msgstr "Keine Munitionsgruppe in diesem Behälter"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:39
+msgid "Show Ammo"
+msgstr "Zeige Munitionsarten"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
+msgid "This ammo is not in a container"
+msgstr "Diese Munitionsgruppe ist nicht in einem Behälter"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/container_card.ex:50
+#: lib/cannery_web/live/container_live/show.html.heex:27
+msgid "Packs:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:24
+#: lib/cannery_web/live/home_live.ex:42
+msgid "Cannery logo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:44
+msgid "isn't he cute >:3"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+msgid "Leave \"Uses left\" blank to make invite unlimited"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_type_live/index.ex:87
+msgid "Total # of ammo"
+msgstr "Summe aller Patronen"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/components/ammo_group_card.ex:68
+msgid "Container:"
+msgstr "Behälter"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:52
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:119
+#: lib/cannery_web/live/container_live/show.html.heex:90
+msgid "Show used"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
+msgid "Used up on"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:52
+msgid "Used up on:"
 msgstr ""

priv/gettext/de/LC_MESSAGES/errors.po

@@ -24,7 +24,7 @@ msgstr ""
 ## 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
+#: lib/cannery/containers.ex:140
 msgid "Container must be empty before deleting"
 msgstr "Behälter muss vor dem Löschen leer sein"
 
@@ -152,13 +152,13 @@ msgid "Tag could not be added"
 msgstr "Tag konnte nicht hinzugefügt werden"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:125
+#: lib/cannery/activity_log/shot_group.ex:115
 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
+#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:111
 msgid "Count must be less than %{count}"
 msgstr "Anzahl muss weniger als %{count} betragen"
 
@@ -176,13 +176,28 @@ 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
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
 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
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
 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 "
 "%{multiplier}"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/ammo.ex:535
+msgid "Invalid multiplier"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/ammo/ammo_group.ex:84
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/activity_log/shot_group.ex:69
+msgid "Please select a valid user and ammo group"
+msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-19 19:32+0000\n"
-"PO-Revision-Date: 2022-04-19 21:32+0000\n"
+"PO-Revision-Date: 2022-05-12 20:28+0000\n"
 "Last-Translator: Kaia Estra <kaia@fedora.email>\n"
 "Language-Team: German <https://weblate.bubbletea.dev/projects/cannery/"
 "prompts/de/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.11.2\n"
+"X-Generator: Weblate 4.12.1\n"
 
 ## This file is a PO Template file.
 ##
@@ -24,16 +24,16 @@ msgstr ""
 ## 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
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:85
+#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/invite_live/form_component.ex:80
+#: lib/cannery_web/live/tag_live/form_component.ex:126
 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/ammo_type_live/show.ex:28
 #: 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
@@ -62,10 +62,10 @@ 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
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/invite_live/form_component.ex:62
+#: lib/cannery_web/live/tag_live/form_component.ex:108
 msgid "%{name} updated successfully"
 msgstr "%{name} erfolgreich aktualisiert"
 
@@ -76,15 +76,9 @@ 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
 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
-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
@@ -94,9 +88,8 @@ msgstr ""
 "zurückgenommen werden!"
 
 #, 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/container_live/show.html.heex:49
 #: lib/cannery_web/live/tag_live/index.html.heex:38
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
@@ -107,9 +100,8 @@ 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?"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:177
+#: lib/cannery_web/live/ammo_group_live/index.ex:216
 #: 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?"
 
@@ -119,7 +111,7 @@ msgid "Are you sure you want to delete your account?"
 msgstr "Sind Sie sicher, dass sie Ihren Account löschen möchten?"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:84
+#: lib/cannery_web/components/topbar.ex:90
 msgid "Are you sure you want to log out?"
 msgstr "Wirklich ausloggen?"
 
@@ -168,7 +160,7 @@ msgid "Please check your email to verify your account"
 msgstr "Bitte überprüfen Sie ihre Mailbox und bestätigen Sie das Nutzerkonto"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:96
+#: lib/cannery_web/live/home_live.ex:104
 msgid "Register to setup %{name}"
 msgstr "Registrieren Sie sich, um %{name} zu bearbeiten"
 
@@ -177,9 +169,9 @@ msgstr "Registrieren Sie sich, um %{name} zu bearbeiten"
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
-#: lib/cannery_web/live/invite_live/form_component.html.heex:30
+#: lib/cannery_web/live/invite_live/form_component.html.heex:33
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
-#: lib/cannery_web/live/tag_live/form_component.ex:68
+#: lib/cannery_web/live/tag_live/form_component.ex:93
 msgid "Saving..."
 msgstr "Speichere..."
 
@@ -211,7 +203,7 @@ msgid "Adding..."
 msgstr "Füge hinzu..."
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.ex:68
+#: lib/cannery_web/components/add_shot_group_component.ex:56
 msgid "Shots recorded successfully"
 msgstr "Schüsse erfolgreich dokumentiert"
 
@@ -220,11 +212,6 @@ msgstr "Schüsse erfolgreich dokumentiert"
 msgid "Are you sure you want to unstage this ammo?"
 msgstr "Sind sie sicher, dass Sie diese Munition demarkieren möchten?"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:68
-msgid "Ammo group unstaged succesfully"
-msgstr "Munition erfolgreich demarkiert"
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/show.ex:130
 #: lib/cannery_web/live/range_live/index.ex:128
@@ -263,8 +250,8 @@ 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
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 msgid "You'll need to"
 msgstr "Sie müssen"
 
@@ -273,19 +260,40 @@ msgstr "Sie müssen"
 msgid "Creating..."
 msgstr "Erstellen..."
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:147
-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 ""
+msgstr "Möchten Sie die Sprache wechseln?"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:65
 msgid "Language updated successfully."
-msgstr ""
+msgstr "Spracheinstellung gespeichert."
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:50
+msgid "Ammo deleted succesfully"
+msgstr "Munitionsgruppe erfolgreich gelöscht"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/range_live/index.ex:68
+msgid "Ammo unstaged succesfully"
+msgstr "Munition erfolgreich demarkiert"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:118
+msgid "Ammo updated successfully"
+msgstr "Munitionsgruppe erfolgreich aktualisiert"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+msgid "Ammo added successfully"
+msgid_plural "Ammo added successfully"
+msgstr[0] "Munitionsgruppe erfolgreich aktualisiert"
+msgstr[1] "Munitionsgruppe erfolgreich aktualisiert"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_type_live/index.ex:156
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:26
+msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"
+msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"

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:64
 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:86
 msgid "Access from any internet-capable device"
 msgstr ""
 
@@ -26,12 +26,12 @@ msgid "Admins"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:92
+#: lib/cannery_web/live/home_live.ex:100
 msgid "Admins:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:50
+#: lib/cannery_web/components/topbar.ex:62
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
 #: lib/cannery_web/live/range_live/index.ex:80
 msgid "Ammo"
@@ -39,25 +39,25 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
-#: lib/cannery_web/live/ammo_group_live/index.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:90
 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/index.ex:88
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:99
 msgid "Average Price paid"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/form_component.ex:54
+#: lib/cannery_web/live/tag_live/form_component.ex:79
 msgid "Background color"
 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:52
 msgid "Blank"
 msgstr ""
 
@@ -69,47 +69,47 @@ 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:38
 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:37
 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:40
 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:39
 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:41
 msgid "Case material"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/index.ex:85
+#: lib/cannery_web/live/ammo_group_live/index.ex:95
 msgid "Container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:44
+#: lib/cannery_web/components/topbar.ex:50
 #: lib/cannery_web/live/container_live/index.ex:36
 #: lib/cannery_web/live/container_live/index.html.heex:3
 msgid "Containers"
@@ -118,18 +118,18 @@ 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:53
 msgid "Corrosive"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
-#: lib/cannery_web/live/ammo_group_live/index.ex:81
+#: lib/cannery_web/live/ammo_group_live/index.ex:91
 msgid "Count"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:29
+#: lib/cannery_web/components/ammo_group_card.ex:34
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 msgid "Count:"
 msgstr ""
@@ -152,19 +152,18 @@ msgid "Disable"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:53
+#: lib/cannery_web/live/home_live.ex:61
 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
 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:63
 msgid "Edit Ammo type"
 msgstr ""
 
@@ -196,19 +195,19 @@ 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:46
 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:51
 msgid "Incendiary"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:87
+#: lib/cannery_web/live/home_live.ex:95
 msgid "Instance Information"
 msgstr ""
 
@@ -218,12 +217,12 @@ msgid "Invite Disabled"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:118
+#: lib/cannery_web/live/home_live.ex:126
 msgid "Invite Only"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:69
+#: lib/cannery_web/components/topbar.ex:75
 #: lib/cannery_web/live/invite_live/index.ex:41
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 msgid "Invites"
@@ -251,15 +250,10 @@ msgstr ""
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:56
-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:54
 msgid "Manufacturer"
 msgstr ""
 
@@ -278,7 +272,7 @@ msgstr ""
 #: lib/cannery_web/live/ammo_type_live/index.ex:51
 #: lib/cannery_web/live/container_live/form_component.html.heex:20
 #: lib/cannery_web/live/invite_live/form_component.html.heex:20
-#: lib/cannery_web/live/tag_live/form_component.ex:50
+#: lib/cannery_web/live/tag_live/form_component.ex:75
 msgid "Name"
 msgstr ""
 
@@ -313,15 +307,10 @@ 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:127
 msgid "No ammo for this type"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:78
-msgid "No ammo groups in this container"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:8
 msgid "No containers"
@@ -348,7 +337,7 @@ msgid "Notes"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:35
+#: lib/cannery_web/components/ammo_group_card.ex:40
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 msgid "Notes:"
 msgstr ""
@@ -361,40 +350,40 @@ 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:47
 msgid "Pressure"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
-#: lib/cannery_web/live/ammo_group_live/index.ex:82
+#: lib/cannery_web/live/ammo_group_live/index.ex:92
 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:59
 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:48
 msgid "Primer type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:117
+#: lib/cannery_web/live/home_live.ex:125
 msgid "Public Signups"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:65
+#: lib/cannery_web/live/home_live.ex:73
 msgid "Secure:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:68
+#: lib/cannery_web/live/home_live.ex:76
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
 
@@ -410,17 +399,12 @@ msgid "Settings"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:39
-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:62
 msgid "Show Ammo type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:75
+#: lib/cannery_web/live/home_live.ex:83
 msgid "Simple:"
 msgstr ""
 
@@ -435,7 +419,7 @@ msgid "Stored in"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:38
+#: lib/cannery_web/components/topbar.ex:44
 #: lib/cannery_web/live/tag_live/index.ex:32
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 msgid "Tags"
@@ -447,24 +431,19 @@ msgid "Tags can be added to your containers to help you organize"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/form_component.ex:60
+#: lib/cannery_web/live/tag_live/form_component.ex:85
 msgid "Text color"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:44
+#: lib/cannery_web/live/home_live.ex:52
 msgid "The self-hosted firearm tracker website"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
-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:50
 msgid "Tracer"
 msgstr ""
 
@@ -496,23 +475,23 @@ msgid "Uses left"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:40
+#: lib/cannery_web/live/home_live.ex:48
 msgid "Welcome to %{name}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:69
+#: lib/cannery_web/live/home_live.ex:77
 msgid "Your data stays with you, period"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:49
+#: lib/cannery_web/live/container_live/show.html.heex:61
 msgid "No tags for this container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.ex:84
+#: lib/cannery_web/components/topbar.ex:68
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
 msgid "Range"
 msgstr ""
 
@@ -555,11 +534,6 @@ msgstr ""
 msgid "Record shots"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:3
-msgid "Ammo Types"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:49
 msgid "Ammo groups"
@@ -605,12 +579,12 @@ 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
 msgid "Move Ammo group"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:240
 msgid "Move ammo"
 msgstr ""
 
@@ -625,12 +599,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/components/ammo_group_card.ex:60
+#: lib/cannery_web/live/ammo_group_live/index.ex:142
 #: 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/live/ammo_type_live/index.ex:118
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
 msgid "$%{amount}"
 msgstr ""
 
@@ -642,35 +616,35 @@ 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:42
 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:43
 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:45
 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:44
 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:55
 msgid "UPC"
 msgstr ""
 
@@ -691,19 +665,19 @@ 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:180
 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:180
 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:49
 msgid "Firing type"
 msgstr ""
 
@@ -719,34 +693,35 @@ 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/show.ex:106
 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/show.ex:107
 msgid "Edit %{name} tags"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/container_card.ex:50
+#: lib/cannery_web/components/container_card.ex:55
+#: lib/cannery_web/live/container_live/show.html.heex:32
 msgid "Rounds:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.ex:94
+#: lib/cannery_web/live/container_live/show.ex:105
 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/index.ex:117
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:109
 msgid "No cost information"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:83
+#: lib/cannery_web/live/ammo_group_live/index.ex:93
 msgid "% left"
 msgstr ""
 
@@ -776,7 +751,7 @@ 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:74
 msgid "Current # of rounds:"
 msgstr ""
 
@@ -786,7 +761,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:82
 msgid "Total rounds shot:"
 msgstr ""
 
@@ -832,14 +807,14 @@ msgid "Ammo types"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:86
+#: lib/cannery_web/live/ammo_group_live/index.ex:96
 msgid "Added on"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:41
+#: lib/cannery_web/components/ammo_group_card.ex:46
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:91
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:90
 msgid "Added on:"
 msgstr ""
 
@@ -872,21 +847,101 @@ msgid "Language"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:139
+#: lib/cannery_web/live/home_live.ex:147
 msgid "Get involved!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:156
+#: lib/cannery_web/live/home_live.ex:164
 msgid "Help translate"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:165
+#: lib/cannery_web/live/home_live.ex:173
 msgid "Report bugs or request features"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:147
+#: lib/cannery_web/live/home_live.ex:155
 msgid "View the source code"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:56
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:3
+msgid "Catalog"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.ex:40
+msgid "Edit Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.ex:38
+msgid "Move Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/show.html.heex:98
+msgid "No ammo in this container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.ex:39
+msgid "Show Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
+msgid "This ammo is not in a container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/container_card.ex:50
+#: lib/cannery_web/live/container_live/show.html.heex:27
+msgid "Packs:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:24
+#: lib/cannery_web/live/home_live.ex:42
+msgid "Cannery logo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:44
+msgid "isn't he cute >:3"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+msgid "Leave \"Uses left\" blank to make invite unlimited"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.ex:87
+msgid "Total # of ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:68
+msgid "Container:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:52
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:119
+#: lib/cannery_web/live/container_live/show.html.heex:90
+msgid "Show used"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
+msgid "Used up on"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:52
+msgid "Used up on:"
+msgstr ""

priv/gettext/en/LC_MESSAGES/actions.po

@@ -13,11 +13,12 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
 msgid "Add Ammo"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 msgid "Add your first box!"
 msgstr ""
 
@@ -66,7 +67,7 @@ msgid "Invite someone new!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:112
 #: 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_reset_password/edit.html.heex:48
@@ -81,11 +82,6 @@ msgstr ""
 msgid "Make your first tag!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
-msgid "New Ammo group"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
 msgid "New Ammo type"
@@ -102,7 +98,7 @@ msgid "New Tag"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
+#: lib/cannery_web/components/topbar.ex:105
 #: 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
@@ -129,9 +125,9 @@ msgstr ""
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:66
+#: lib/cannery_web/live/tag_live/form_component.ex:91
 msgid "Save"
 msgstr ""
 
@@ -141,7 +137,7 @@ msgid "Send instructions to reset password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:53
+#: lib/cannery_web/live/container_live/show.html.heex:65
 msgid "Why not add one?"
 msgstr ""
 
@@ -161,17 +157,12 @@ 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/index.ex:183
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:91
 #: 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
-msgid "Ammo Details"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:89
 msgid "Add another container!"
@@ -193,8 +184,7 @@ msgid "Copy to clipboard"
 msgstr ""
 
 #, 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
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
 msgid "add a container first"
 msgstr ""
 
@@ -212,3 +202,13 @@ msgstr ""
 #: lib/cannery_web/templates/user_settings/edit.html.heex:134
 msgid "Change language"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
+msgid "View in Catalog"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+msgid "add an ammo type first"
+msgstr ""

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:64
 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:86
 msgid "Access from any internet-capable device"
 msgstr ""
 
@@ -27,12 +27,12 @@ msgid "Admins"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:92
+#: lib/cannery_web/live/home_live.ex:100
 msgid "Admins:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:50
+#: lib/cannery_web/components/topbar.ex:62
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
 #: lib/cannery_web/live/range_live/index.ex:80
 msgid "Ammo"
@@ -40,25 +40,25 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
-#: lib/cannery_web/live/ammo_group_live/index.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:90
 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/index.ex:88
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:99
 msgid "Average Price paid"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/form_component.ex:54
+#: lib/cannery_web/live/tag_live/form_component.ex:79
 msgid "Background color"
 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:52
 msgid "Blank"
 msgstr ""
 
@@ -70,47 +70,47 @@ 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:38
 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:37
 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:40
 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:39
 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:41
 msgid "Case material"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/index.ex:85
+#: lib/cannery_web/live/ammo_group_live/index.ex:95
 msgid "Container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:44
+#: lib/cannery_web/components/topbar.ex:50
 #: lib/cannery_web/live/container_live/index.ex:36
 #: lib/cannery_web/live/container_live/index.html.heex:3
 msgid "Containers"
@@ -119,18 +119,18 @@ 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:53
 msgid "Corrosive"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
-#: lib/cannery_web/live/ammo_group_live/index.ex:81
+#: lib/cannery_web/live/ammo_group_live/index.ex:91
 msgid "Count"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:29
+#: lib/cannery_web/components/ammo_group_card.ex:34
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 msgid "Count:"
 msgstr ""
@@ -153,19 +153,18 @@ msgid "Disable"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:53
+#: lib/cannery_web/live/home_live.ex:61
 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
 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:63
 msgid "Edit Ammo type"
 msgstr ""
 
@@ -197,19 +196,19 @@ 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:46
 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:51
 msgid "Incendiary"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:87
+#: lib/cannery_web/live/home_live.ex:95
 msgid "Instance Information"
 msgstr ""
 
@@ -219,12 +218,12 @@ msgid "Invite Disabled"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:118
+#: lib/cannery_web/live/home_live.ex:126
 msgid "Invite Only"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:69
+#: lib/cannery_web/components/topbar.ex:75
 #: lib/cannery_web/live/invite_live/index.ex:41
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 msgid "Invites"
@@ -252,15 +251,10 @@ msgstr ""
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:56
-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:54
 msgid "Manufacturer"
 msgstr ""
 
@@ -279,7 +273,7 @@ msgstr ""
 #: lib/cannery_web/live/ammo_type_live/index.ex:51
 #: lib/cannery_web/live/container_live/form_component.html.heex:20
 #: lib/cannery_web/live/invite_live/form_component.html.heex:20
-#: lib/cannery_web/live/tag_live/form_component.ex:50
+#: lib/cannery_web/live/tag_live/form_component.ex:75
 msgid "Name"
 msgstr ""
 
@@ -314,15 +308,10 @@ 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:127
 msgid "No ammo for this type"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:78
-msgid "No ammo groups in this container"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:8
 msgid "No containers"
@@ -349,7 +338,7 @@ msgid "Notes"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:35
+#: lib/cannery_web/components/ammo_group_card.ex:40
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 msgid "Notes:"
 msgstr ""
@@ -362,40 +351,40 @@ 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:47
 msgid "Pressure"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
-#: lib/cannery_web/live/ammo_group_live/index.ex:82
+#: lib/cannery_web/live/ammo_group_live/index.ex:92
 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:59
 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:48
 msgid "Primer type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:117
+#: lib/cannery_web/live/home_live.ex:125
 msgid "Public Signups"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:65
+#: lib/cannery_web/live/home_live.ex:73
 msgid "Secure:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:68
+#: lib/cannery_web/live/home_live.ex:76
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
 
@@ -411,17 +400,12 @@ msgid "Settings"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:39
-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:62
 msgid "Show Ammo type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:75
+#: lib/cannery_web/live/home_live.ex:83
 msgid "Simple:"
 msgstr ""
 
@@ -436,7 +420,7 @@ msgid "Stored in"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:38
+#: lib/cannery_web/components/topbar.ex:44
 #: lib/cannery_web/live/tag_live/index.ex:32
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 msgid "Tags"
@@ -448,24 +432,19 @@ msgid "Tags can be added to your containers to help you organize"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/form_component.ex:60
+#: lib/cannery_web/live/tag_live/form_component.ex:85
 msgid "Text color"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:44
+#: lib/cannery_web/live/home_live.ex:52
 msgid "The self-hosted firearm tracker website"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
-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:50
 msgid "Tracer"
 msgstr ""
 
@@ -497,23 +476,23 @@ msgid "Uses left"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:40
+#: lib/cannery_web/live/home_live.ex:48
 msgid "Welcome to %{name}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:69
+#: lib/cannery_web/live/home_live.ex:77
 msgid "Your data stays with you, period"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:49
+#: lib/cannery_web/live/container_live/show.html.heex:61
 msgid "No tags for this container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.ex:84
+#: lib/cannery_web/components/topbar.ex:68
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
 msgid "Range"
 msgstr ""
 
@@ -556,11 +535,6 @@ msgstr ""
 msgid "Record shots"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:3
-msgid "Ammo Types"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:49
 msgid "Ammo groups"
@@ -606,12 +580,12 @@ 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
 msgid "Move Ammo group"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:240
 msgid "Move ammo"
 msgstr ""
 
@@ -626,12 +600,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/components/ammo_group_card.ex:60
+#: lib/cannery_web/live/ammo_group_live/index.ex:142
 #: 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/live/ammo_type_live/index.ex:118
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
 msgid "$%{amount}"
 msgstr ""
 
@@ -643,35 +617,35 @@ 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:42
 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:43
 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:45
 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:44
 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:55
 msgid "UPC"
 msgstr ""
 
@@ -692,19 +666,19 @@ 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:180
 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:180
 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:49
 msgid "Firing type"
 msgstr ""
 
@@ -720,34 +694,35 @@ 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/show.ex:106
 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/show.ex:107
 msgid "Edit %{name} tags"
 msgstr ""
 
 #, elixir-autogen, elixir-format, fuzzy
-#: lib/cannery_web/components/container_card.ex:50
+#: lib/cannery_web/components/container_card.ex:55
+#: lib/cannery_web/live/container_live/show.html.heex:32
 msgid "Rounds:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.ex:94
+#: lib/cannery_web/live/container_live/show.ex:105
 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/index.ex:117
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:109
 msgid "No cost information"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:83
+#: lib/cannery_web/live/ammo_group_live/index.ex:93
 msgid "% left"
 msgstr ""
 
@@ -777,7 +752,7 @@ 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:74
 msgid "Current # of rounds:"
 msgstr ""
 
@@ -787,7 +762,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:82
 msgid "Total rounds shot:"
 msgstr ""
 
@@ -833,14 +808,14 @@ msgid "Ammo types"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:86
+#: lib/cannery_web/live/ammo_group_live/index.ex:96
 msgid "Added on"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:41
+#: lib/cannery_web/components/ammo_group_card.ex:46
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:91
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:90
 msgid "Added on:"
 msgstr ""
 
@@ -873,21 +848,101 @@ msgid "Language"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:139
+#: lib/cannery_web/live/home_live.ex:147
 msgid "Get involved!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:156
+#: lib/cannery_web/live/home_live.ex:164
 msgid "Help translate"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:165
+#: lib/cannery_web/live/home_live.ex:173
 msgid "Report bugs or request features"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:147
+#: lib/cannery_web/live/home_live.ex:155
 msgid "View the source code"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:56
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:3
+msgid "Catalog"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:40
+msgid "Edit Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:38
+msgid "Move Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/container_live/show.html.heex:98
+msgid "No ammo in this container"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:39
+msgid "Show Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
+msgid "This ammo is not in a container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/container_card.ex:50
+#: lib/cannery_web/live/container_live/show.html.heex:27
+msgid "Packs:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:24
+#: lib/cannery_web/live/home_live.ex:42
+msgid "Cannery logo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:44
+msgid "isn't he cute >:3"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+msgid "Leave \"Uses left\" blank to make invite unlimited"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_type_live/index.ex:87
+msgid "Total # of ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/components/ammo_group_card.ex:68
+msgid "Container:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:52
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:119
+#: lib/cannery_web/live/container_live/show.html.heex:90
+msgid "Show used"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
+msgid "Used up on"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:52
+msgid "Used up on:"
+msgstr ""

priv/gettext/en/LC_MESSAGES/errors.po

@@ -11,7 +11,7 @@ msgstr ""
 "Language: en\n"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery/containers.ex:122
+#: lib/cannery/containers.ex:140
 msgid "Container must be empty before deleting"
 msgstr ""
 
@@ -139,13 +139,13 @@ msgid "Tag could not be added"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:125
+#: lib/cannery/activity_log/shot_group.ex:115
 msgid "Count must be at least 1"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:73
-#: lib/cannery/activity_log.ex:120
+#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:111
 msgid "Count must be less than %{count}"
 msgstr ""
 
@@ -161,11 +161,26 @@ 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:156
 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:141
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/ammo.ex:535
+msgid "Invalid multiplier"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/ammo/ammo_group.ex:84
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/activity_log/shot_group.ex:69
+msgid "Please select a valid user and ammo group"
+msgstr ""

priv/gettext/en/LC_MESSAGES/prompts.po

@@ -12,16 +12,16 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, 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
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:85
+#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/invite_live/form_component.ex:80
+#: lib/cannery_web/live/tag_live/form_component.ex:126
 msgid "%{name} created successfully"
 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/ammo_type_live/show.ex:28
 #: 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
@@ -50,10 +50,10 @@ msgid "%{name} updated succesfully"
 msgstr ""
 
 #, 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
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/invite_live/form_component.ex:62
+#: lib/cannery_web/live/tag_live/form_component.ex:108
 msgid "%{name} updated successfully"
 msgstr ""
 
@@ -64,15 +64,9 @@ 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
 msgid "Ammo group deleted succesfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:88
-msgid "Ammo group updated successfully"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:102
 #: lib/cannery_web/live/invite_live/index.html.heex:131
@@ -80,9 +74,8 @@ 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/container_live/index.html.heex:46
-#: lib/cannery_web/live/container_live/show.html.heex:37
+#: lib/cannery_web/live/container_live/show.html.heex:49
 #: lib/cannery_web/live/tag_live/index.html.heex:38
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
@@ -93,9 +86,8 @@ 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/index.ex:216
 #: 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 ""
 
@@ -105,7 +97,7 @@ 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:90
 msgid "Are you sure you want to log out?"
 msgstr ""
 
@@ -150,7 +142,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:104
 msgid "Register to setup %{name}"
 msgstr ""
 
@@ -159,9 +151,9 @@ msgstr ""
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
-#: lib/cannery_web/live/invite_live/form_component.html.heex:30
+#: lib/cannery_web/live/invite_live/form_component.html.heex:33
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
-#: lib/cannery_web/live/tag_live/form_component.ex:68
+#: lib/cannery_web/live/tag_live/form_component.ex:93
 msgid "Saving..."
 msgstr ""
 
@@ -191,7 +183,7 @@ msgid "Adding..."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.ex:68
+#: lib/cannery_web/components/add_shot_group_component.ex:56
 msgid "Shots recorded successfully"
 msgstr ""
 
@@ -200,11 +192,6 @@ msgstr ""
 msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:68
-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
@@ -243,8 +230,8 @@ msgid "%{name} removed successfully"
 msgstr ""
 
 #, 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
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 msgid "You'll need to"
 msgstr ""
 
@@ -253,13 +240,6 @@ msgstr ""
 msgid "Creating..."
 msgstr ""
 
-#, elixir-autogen, elixir-format, fuzzy
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:147
-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?"
@@ -269,3 +249,31 @@ msgstr ""
 #: lib/cannery_web/controllers/user_settings_controller.ex:65
 msgid "Language updated successfully."
 msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:50
+msgid "Ammo deleted succesfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/range_live/index.ex:68
+msgid "Ammo unstaged succesfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:118
+msgid "Ammo updated successfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+msgid "Ammo added successfully"
+msgid_plural "Ammo added successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_type_live/index.ex:156
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:26
+msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"
+msgstr ""

priv/gettext/errors.pot

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery/containers.ex:122
+#: lib/cannery/containers.ex:140
 msgid "Container must be empty before deleting"
 msgstr ""
 
@@ -138,13 +138,13 @@ msgid "Tag could not be added"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:125
+#: lib/cannery/activity_log/shot_group.ex:115
 msgid "Count must be at least 1"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:73
-#: lib/cannery/activity_log.ex:120
+#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:111
 msgid "Count must be less than %{count}"
 msgstr ""
 
@@ -160,11 +160,26 @@ 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:156
 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:141
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/ammo.ex:535
+msgid "Invalid multiplier"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/ammo/ammo_group.ex:84
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/activity_log/shot_group.ex:69
+msgid "Please select a valid user and ammo group"
+msgstr ""

priv/gettext/es/LC_MESSAGES/actions.po

@@ -0,0 +1,226 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-21 19:45+0000\n"
+"PO-Revision-Date: 2022-05-22 22:52+0000\n"
+"Last-Translator: Hannah Winter <konhat@hotmail.es>\n"
+"Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
+"actions/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.12.2\n"
+
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
+msgid "Add Ammo"
+msgstr "Añadir Munición"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
+msgid "Add your first box!"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.html.heex:12
+msgid "Add your first container!"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:12
+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
+msgid "Change email"
+msgstr "Cambiar correo electrónico"
+
+#, 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 "Cambiar contraseña"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:17
+msgid "Create Invite"
+msgstr "Crear Invitación"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_settings/edit.html.heex:142
+msgid "Delete User"
+msgstr "Eliminar cuenta de Usuario"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_registration/new.html.heex:52
+#: 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?"
+msgstr "¿Has olvidado tu contraseña?"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:12
+msgid "Invite someone new!"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:112
+#: 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_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
+msgid "Log in"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/tag_live/index.html.heex:14
+msgid "Make your first tag!"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:17
+msgid "New Ammo type"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.html.heex:17
+msgid "New Container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/tag_live/index.html.heex:19
+msgid "New Tag"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:105
+#: 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_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
+msgid "Register"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:3
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+msgid "Resend confirmation instructions"
+msgstr ""
+
+#, 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
+msgid "Reset password"
+msgstr ""
+
+#, 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
+#: lib/cannery_web/live/container_live/form_component.html.heex:50
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
+#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/tag_live/form_component.ex:91
+msgid "Save"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+msgid "Send instructions to reset password"
+msgstr "Enviar instrucciones para reestablecer contraseña"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/show.html.heex:65
+msgid "Why not add one?"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:52
+msgid "Add"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.html.heex:17
+msgid "Stage ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.html.heex:12
+msgid "Why not get some ready to shoot?"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:183
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
+#: lib/cannery_web/live/range_live/index.html.heex:36
+msgid "Record shots"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/move_ammo_group_component.ex:89
+msgid "Add another container!"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
+msgid "Move containers"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/move_ammo_group_component.ex:127
+msgid "Select"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:33
+msgid "Copy to clipboard"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
+msgid "add a container first"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: 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 ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
+msgid "View in Catalog"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+msgid "add an ammo type first"
+msgstr ""

priv/gettext/es/LC_MESSAGES/default.po

@@ -0,0 +1,962 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-21 19:44+0000\n"
+"PO-Revision-Date: 2022-05-22 22:52+0000\n"
+"Last-Translator: Ed <ed.ylles1997@gmail.com>\n"
+"Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
+"default/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.12.2\n"
+
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:64
+msgid "%{name} lets you easily keep an eye on your ammo levels before and after range day"
+msgstr ""
+"%{name} te permite mantener un ojo en tus niveles de munición antes y "
+"después de un día en el campo de tiro"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:86
+msgid "Access from any internet-capable device"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:90
+msgid "Admins"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:100
+msgid "Admins:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:62
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:3
+#: lib/cannery_web/live/range_live/index.ex:80
+msgid "Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
+#: lib/cannery_web/live/ammo_group_live/index.ex:90
+msgid "Ammo type"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.ex:88
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:99
+msgid "Average Price paid"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/tag_live/form_component.ex:79
+msgid "Background color"
+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:52
+msgid "Blank"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68
+msgid "Brass"
+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:38
+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:37
+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:40
+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:39
+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:41
+msgid "Case material"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/move_ammo_group_component.ex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
+#: lib/cannery_web/live/ammo_group_live/index.ex:95
+msgid "Container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:50
+#: lib/cannery_web/live/container_live/index.ex:36
+#: lib/cannery_web/live/container_live/index.html.heex:3
+msgid "Containers"
+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:53
+msgid "Corrosive"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
+#: lib/cannery_web/live/ammo_group_live/index.ex:91
+msgid "Count"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:34
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:8
+msgid "Count:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:24
+#: lib/cannery_web/live/container_live/form_component.html.heex:27
+msgid "Description"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/container_card.ex:31
+#: lib/cannery_web/live/container_live/show.html.heex:8
+msgid "Description:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:59
+msgid "Disable"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:61
+msgid "Easy to Use:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:38
+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:63
+msgid "Edit Ammo type"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.ex:33
+msgid "Edit Invite"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/tag_live/index.ex:21
+msgid "Edit Tag"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:63
+msgid "Enable"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:35
+msgid "Example bullet type abbreviations"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
+msgid "FMJ"
+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:46
+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:51
+msgid "Incendiary"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:95
+msgid "Instance Information"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/invite_card.ex:25
+msgid "Invite Disabled"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:126
+msgid "Invite Only"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:75
+#: lib/cannery_web/live/invite_live/index.ex:41
+#: lib/cannery_web/live/invite_live/index.html.heex:3
+msgid "Invites"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_session/new.html.heex:28
+msgid "Keep me logged in for 60 days"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/move_ammo_group_component.ex:69
+#: lib/cannery_web/live/container_live/form_component.html.heex:42
+msgid "Location"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/container_card.ex:43
+#: lib/cannery_web/live/container_live/show.html.heex:20
+msgid "Location:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/form_component.html.heex:38
+msgid "Magazine, Clip, Ammo Box, etc"
+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:54
+msgid "Manufacturer"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/form_component.html.heex:31
+msgid "Metal ammo can with the anime girl sticker"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/form_component.html.heex:23
+msgid "My cool ammo can"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:20
+#: lib/cannery_web/live/ammo_type_live/index.ex:51
+#: lib/cannery_web/live/container_live/form_component.html.heex:20
+#: lib/cannery_web/live/invite_live/form_component.html.heex:20
+#: lib/cannery_web/live/tag_live/form_component.ex:75
+msgid "Name"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.ex:29
+msgid "New Ammo type"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.ex:31
+msgid "New Container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.ex:37
+msgid "New Invite"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/tag_live/index.ex:27
+msgid "New Tag"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:8
+msgid "No Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:8
+msgid "No Ammo Types"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:127
+msgid "No ammo for this type"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.html.heex:8
+msgid "No containers"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:8
+msgid "No invites"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:30
+#: lib/cannery_web/live/tag_live/index.html.heex:10
+msgid "No tags"
+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/range_live/form_component.html.heex:29
+#: lib/cannery_web/live/range_live/index.ex:82
+msgid "Notes"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:40
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:24
+msgid "Notes:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/form_component.html.heex:46
+msgid "On the bookshelf"
+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:47
+msgid "Pressure"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.ex:92
+msgid "Price paid"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:59
+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:48
+msgid "Primer type"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:125
+msgid "Public Signups"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:73
+msgid "Secure:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:76
+msgid "Self-host your own instance, or use an instance from someone you trust."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:79
+msgid "Set Unlimited"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:10
+#: lib/cannery_web/templates/user_settings/edit.html.heex:3
+msgid "Settings"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/show.ex:62
+msgid "Show Ammo type"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:83
+msgid "Simple:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
+msgid "Steel"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:103
+msgid "Stored in"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:44
+#: lib/cannery_web/live/tag_live/index.ex:32
+#: lib/cannery_web/live/tag_live/index.html.heex:3
+msgid "Tags"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/tag_live/index.html.heex:6
+msgid "Tags can be added to your containers to help you organize"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/tag_live/form_component.ex:85
+msgid "Text color"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:52
+msgid "The self-hosted firearm tracker website"
+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:50
+msgid "Tracer"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/move_ammo_group_component.ex:68
+#: lib/cannery_web/live/container_live/form_component.html.heex:35
+msgid "Type"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/container_card.ex:37
+#: lib/cannery_web/live/container_live/show.html.heex:14
+msgid "Type:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:119
+msgid "Users"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/invite_card.ex:20
+msgid "Uses Left:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/form_component.html.heex:24
+msgid "Uses left"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:48
+msgid "Welcome to %{name}"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:77
+msgid "Your data stays with you, period"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/show.html.heex:61
+msgid "No tags for this container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:68
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
+msgid "Range"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.html.heex:3
+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
+msgid "Date"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/form_component.html.heex:21
+msgid "Shots fired"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.html.heex:8
+msgid "No ammo staged"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:82
+#: 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/range_live/index.html.heex:32
+msgid "Unstage from range"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/add_shot_group_component.html.heex:3
+#: lib/cannery_web/live/ammo_group_live/index.ex:26
+msgid "Record shots"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:49
+msgid "Ammo groups"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/add_shot_group_component.html.heex:38
+#: lib/cannery_web/live/range_live/form_component.html.heex:36
+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
+msgid "Edit Shot Records"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.ex:38
+msgid "New Shot Records"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.html.heex:48
+msgid "No shots recorded"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/add_shot_group_component.html.heex:21
+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
+msgid "Rounds shot"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.ex:44
+msgid "Shot Records"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:32
+msgid "Move Ammo group"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:240
+msgid "Move ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/move_ammo_group_component.ex:85
+msgid "No other containers"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.html.heex:53
+msgid "Shot log"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:60
+#: lib/cannery_web/live/ammo_group_live/index.ex:142
+#: 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:118
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
+msgid "$%{amount}"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
+msgid "Bimetal"
+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:42
+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:43
+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:45
+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:44
+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:55
+msgid "UPC"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_settings/edit.html.heex:78
+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
+msgid "Current password"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_settings/edit.html.heex:71
+msgid "New password"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:180
+msgid "Stage"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:180
+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:49
+msgid "Firing type"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/layout/live.html.heex:50
+msgid "Reconnecting..."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/layout/live.html.heex:37
+msgid "Loading..."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.ex:27
+#: lib/cannery_web/live/container_live/show.ex:106
+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:107
+msgid "Edit %{name} tags"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/container_card.ex:55
+#: lib/cannery_web/live/container_live/show.html.heex:32
+msgid "Rounds:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/show.ex:105
+msgid "Show %{name}"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.ex:117
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:109
+msgid "No cost information"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:93
+msgid "% left"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:43
+msgid "Current value:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:36
+msgid "Original cost:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:13
+msgid "Original count:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:18
+msgid "Percentage left:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:116
+msgid "Rounds used"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:74
+msgid "Current # of rounds:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.ex:86
+msgid "Total # of rounds"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:82
+msgid "Total rounds shot:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
+msgid "Confirm your account"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:9
+msgid "Forgot your password?"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_session_controller.ex:8
+msgid "Log in"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_registration_controller.ex:35
+msgid "Register"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:36
+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
+msgid "Record Shots"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:58
+msgid "Copies"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: 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:96
+msgid "Added on"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:46
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:90
+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:147
+msgid "Get involved!"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:164
+msgid "Help translate"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:173
+msgid "Report bugs or request features"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:155
+msgid "View the source code"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:56
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:3
+msgid "Catalog"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:40
+msgid "Edit Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:38
+msgid "Move Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/container_live/show.html.heex:98
+msgid "No ammo in this container"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:39
+msgid "Show Ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
+msgid "This ammo is not in a container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/container_card.ex:50
+#: lib/cannery_web/live/container_live/show.html.heex:27
+msgid "Packs:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:24
+#: lib/cannery_web/live/home_live.ex:42
+msgid "Cannery logo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:44
+msgid "isn't he cute >:3"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+msgid "Leave \"Uses left\" blank to make invite unlimited"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_type_live/index.ex:87
+msgid "Total # of ammo"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/components/ammo_group_card.ex:68
+msgid "Container:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:52
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:119
+#: lib/cannery_web/live/container_live/show.html.heex:90
+msgid "Show used"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
+msgid "Used up on"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:52
+msgid "Used up on:"
+msgstr ""

priv/gettext/es/LC_MESSAGES/emails.po

@@ -0,0 +1,114 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-21 19:44+0000\n"
+"PO-Revision-Date: 2022-05-22 22:52+0000\n"
+"Last-Translator: Ed <ed.ylles1997@gmail.com>\n"
+"Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
+"emails/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.12.2\n"
+
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#, elixir-autogen, elixir-format
+#: lib/cannery/accounts/email.ex:30
+msgid "Confirm your %{name} account"
+msgstr "Confirma el %{name} de la cuenta"
+
+#, 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
+msgid "Hi %{email},"
+msgstr "Hola %{email},"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:10
+msgid "If you didn't create an account at %{url}, please ignore this."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/email/reset_password.txt.eex:8
+#: lib/cannery_web/templates/email/update_email.txt.eex:8
+msgid "If you didn't request this change from %{url}, please ignore this."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/accounts/email.ex:37
+msgid "Reset your %{name} password"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/accounts/email.ex:44
+msgid "Update your %{name} email"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/email/confirm_email.html.eex:9
+msgid "Welcome to %{name}!"
+msgstr "¡Bienvenide a %{name}!"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+msgid "Welcome to %{name}%!"
+msgstr "¡Bienvenide a %{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
+msgid "You can change your email by visiting the URL below:"
+msgstr ""
+"Puede cambiar su correo electrónico visitando el enlace que se muestra a "
+"continuación:"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/email/confirm_email.html.eex:14
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:6
+msgid "You can confirm your account by visiting the URL below:"
+msgstr ""
+"Puede confirmar su cuenta visitando el enlace que se muestra a continuación:"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/email/reset_password.html.eex:8
+#: lib/cannery_web/templates/email/reset_password.txt.eex:4
+msgid "You can reset your password by visiting the URL below:"
+msgstr ""
+"Puede reestablecer su contraseña visitando el enlace que se muestra a "
+"continuación:"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/email/confirm_email.html.eex:22
+msgid "If you didn't create an account at %{name}, please ignore this."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/email/reset_password.html.eex:16
+#: lib/cannery_web/templates/email/update_email.html.eex:16
+msgid "If you didn't request this change from %{name}, please ignore this."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/layout/email.txt.eex:9
+msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
+msgstr ""
+
+#, 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 ""

priv/gettext/es/LC_MESSAGES/errors.po

@@ -0,0 +1,201 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-21 19:44+0000\n"
+"PO-Revision-Date: 2022-05-22 22:52+0000\n"
+"Last-Translator: Ed <ed.ylles1997@gmail.com>\n"
+"Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
+"errors/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.12.2\n"
+
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#, elixir-autogen, elixir-format
+#: lib/cannery/containers.ex:140
+msgid "Container must be empty before deleting"
+msgstr "el Contenedor debe estar vació antes de borrarlo"
+
+#, 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 "No se pudo eliminar %{name}: %{error}"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.ex:57
+msgid "Could not find that container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:84
+msgid "Email change link is invalid or it has expired."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/error/error.html.heex:8
+msgid "Error"
+msgstr "Error"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/error/error.html.heex:28
+msgid "Go back home"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/views/error_view.ex:11
+msgid "Internal Server Error"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_session_controller.ex:17
+msgid "Invalid email or password"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/views/error_view.ex:9
+msgid "Not found"
+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
+msgid "Oops, something went wrong! Please check the errors below."
+msgstr ""
+"¡Ups, algo ha ido mal! Por favor, compruebe los errores que se muestran a "
+"continuación."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+msgid "Reset password link is invalid or it has expired."
+msgstr ""
+"El enlace de reestablecimiento de la contraseña es inválido o ha caducado."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_registration_controller.ex:25
+#: lib/cannery_web/controllers/user_registration_controller.ex:56
+msgid "Sorry, public registration is disabled"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_registration_controller.ex:15
+#: lib/cannery_web/controllers/user_registration_controller.ex:46
+msgid "Sorry, this invite was not found or expired"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:99
+msgid "Unable to delete user"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/views/error_view.ex:10
+msgid "Unauthorized"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+msgid "User confirmation link is invalid or it has expired."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.ex:18
+msgid "You are not authorized to view this page"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_auth.ex:177
+msgid "You are not authorized to view this page."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/accounts/user.ex:130
+msgid "did not change"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/accounts/user.ex:151
+msgid "does not match password"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/accounts/user.ex:188
+msgid "is not valid"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/accounts/user.ex:84
+msgid "must have the @ sign and no spaces"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/tags.ex:40
+msgid "Tag not found"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:30
+msgid "Tag could not be added"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/activity_log/shot_group.ex:115
+msgid "Count must be at least 1"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:111
+msgid "Count must be less than %{count}"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_auth.ex:39
+#: lib/cannery_web/controllers/user_auth.ex:161
+msgid "You must confirm your account and log in to access this page."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:52
+msgid "Tag could not be removed"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
+msgid "Could not parse number of copies"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
+msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/ammo.ex:535
+msgid "Invalid multiplier"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/ammo/ammo_group.ex:84
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/activity_log/shot_group.ex:69
+msgid "Please select a valid user and ammo group"
+msgstr ""

priv/gettext/es/LC_MESSAGES/prompts.po

@@ -0,0 +1,298 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-21 19:44+0000\n"
+"PO-Revision-Date: 2022-06-06 19:05+0000\n"
+"Last-Translator: Ed <ed.ylles1997@gmail.com>\n"
+"Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
+"prompts/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.12.2\n"
+
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:85
+#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/invite_live/form_component.ex:80
+#: lib/cannery_web/live/tag_live/form_component.ex:126
+msgid "%{name} created successfully"
+msgstr "%{name} creado exitosamente"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.ex:41
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
+#: 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
+msgid "%{name} deleted succesfully"
+msgstr "%{name} borrado exitosamente"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.ex:109
+msgid "%{name} disabled succesfully"
+msgstr "%{name} desactivado exitosamente"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.ex:87
+msgid "%{name} enabled succesfully"
+msgstr "%{name} activado exitosamente"
+
+#, 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} ha sido borrado"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.ex:67
+msgid "%{name} updated succesfully"
+msgstr "%{name} actualizado exitosamente"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/invite_live/form_component.ex:62
+#: lib/cannery_web/live/tag_live/form_component.ex:108
+msgid "%{name} updated successfully"
+msgstr "%{name} actualizado exitosamente"
+
+#, 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 enlace para confirmar el correo electrónico ha sido enviado a la nueva "
+"dirección."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:56
+msgid "Ammo group deleted succesfully"
+msgstr "Grupo de Munición borrado exitosamente"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:102
+#: lib/cannery_web/live/invite_live/index.html.heex:131
+msgid "Are you sure you want to delete %{email}? This action is permanent!"
+msgstr "Está seguro que desea eliminar %{email}? Esta acción es permanente!"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.html.heex:46
+#: lib/cannery_web/live/container_live/show.html.heex:49
+#: lib/cannery_web/live/tag_live/index.html.heex:38
+msgid "Are you sure you want to delete %{name}?"
+msgstr "Está seguro que desea eliminar %{name}?"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:49
+msgid "Are you sure you want to delete the invite for %{name}?"
+msgstr "Está seguro que quiere eliminar la invitación para %{name}?"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:216
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:71
+msgid "Are you sure you want to delete this ammo?"
+msgstr "Está seguro que desea eliminar esta munición?"
+
+#, 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 "Está seguro que desea eliminar su cuenta?"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:90
+msgid "Are you sure you want to log out?"
+msgstr "Está seguro que desea cerrar sesión?"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:74
+msgid "Are you sure you want to make %{name} unlimited?"
+msgstr "Está seguro que desea hacer %{name} ilimitado?"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:77
+msgid "Email changed successfully."
+msgstr "Correo electrónico cambiado exitosamente."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:23
+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 su correo electrónico está en nuestro sistema y no ha sido confirmado "
+"aun, recibirá un correo con instrucciones en breve."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:24
+msgid "If your email is in our system, you will receive instructions to reset your password shortly."
+msgstr ""
+"Si su correo electrónico está en nuestro sistema, recibirá instrucciones "
+"para reiniciar la contraseña en breve."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_session_controller.ex:23
+msgid "Logged out successfully."
+msgstr "Sesión cerrada exitosamente."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:46
+msgid "Password reset successfully."
+msgstr "Contraseña reiniciada exitosamente."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:49
+msgid "Password updated successfully."
+msgstr "Contraseña cambiada exitosamente."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_registration_controller.ex:74
+msgid "Please check your email to verify your account"
+msgstr "Por favor chequea el correo para verificar tu cuenta"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:104
+msgid "Register to setup %{name}"
+msgstr "Regístrese para configurar %{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
+#: lib/cannery_web/live/container_live/form_component.html.heex:52
+#: lib/cannery_web/live/invite_live/form_component.html.heex:33
+#: lib/cannery_web/live/range_live/form_component.html.heex:42
+#: lib/cannery_web/live/tag_live/form_component.ex:93
+msgid "Saving..."
+msgstr "Guardando..."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:95
+msgid "Your account has been deleted"
+msgstr "Su cuenta ha sido eliminada"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:16
+msgid "Are you sure you want to remove the %{tag_name} tag from %{container_name}?"
+msgstr ""
+"Está seguro que desea remover la etiqueta %{tag_name} de %{container_name}?"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:36
+msgid "%{name} added successfully"
+msgstr "%{name} añadido exitosamente"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/show.ex:37
+msgid "%{tag_name} has been removed from %{container_name}"
+msgstr "se ha removido %{tag_name} de %{container_name}"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:54
+msgid "Adding..."
+msgstr "Añadiendo..."
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/add_shot_group_component.ex:56
+msgid "Shots recorded successfully"
+msgstr "Tiros registrados exitosamente"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.html.heex:29
+msgid "Are you sure you want to unstage this ammo?"
+msgstr "Está seguro que desea desmontar esta munición?"
+
+#, 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 ""
+
+#, 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 ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/form_component.ex:55
+msgid "Shot records updated successfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:38
+msgid "%{email} confirmed successfully."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/move_ammo_group_component.ex:53
+msgid "Ammo moved to %{name} successfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.ex:121
+msgid "Copied to clipboard"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:58
+msgid "%{name} removed successfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
+msgid "You'll need to"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+msgid "Creating..."
+msgstr ""
+
+#, 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 ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:50
+msgid "Ammo deleted succesfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/range_live/index.ex:68
+msgid "Ammo unstaged succesfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:118
+msgid "Ammo updated successfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+msgid "Ammo added successfully"
+msgid_plural "Ammo added successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_type_live/index.ex:156
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:26
+msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"
+msgstr ""

priv/gettext/fr/LC_MESSAGES/actions.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-20 18:02+0000\n"
-"PO-Revision-Date: 2022-04-24 08:27+0000\n"
+"PO-Revision-Date: 2022-05-18 18:51+0000\n"
 "Last-Translator: Antonin Dupont <pwet@dupon.in>\n"
 "Language-Team: French <https://weblate.bubbletea.dev/projects/cannery/"
 "actions/fr/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.12\n"
+"X-Generator: Weblate 4.12.1\n"
 
 ## This file is a PO Template file.
 ##
@@ -25,11 +25,12 @@ msgstr ""
 ## effect: edit them in PO (.po) files instead.
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
 msgid "Add Ammo"
 msgstr "ajouter munition"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 msgid "Add your first box!"
 msgstr "Ajoutez votre première caisse !"
 
@@ -78,7 +79,7 @@ msgid "Invite someone new!"
 msgstr "Invitez une nouvelle personne !"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:112
 #: 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_reset_password/edit.html.heex:48
@@ -93,11 +94,6 @@ msgstr "Se connecter"
 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
-msgid "New Ammo group"
-msgstr "Nouveau groupe de munition"
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
 msgid "New Ammo type"
@@ -114,7 +110,7 @@ msgid "New Tag"
 msgstr "Nouveau tag"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
+#: lib/cannery_web/components/topbar.ex:105
 #: 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
@@ -141,9 +137,9 @@ msgstr "Réinitialisé le mot de passe"
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:66
+#: lib/cannery_web/live/tag_live/form_component.ex:91
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -153,7 +149,7 @@ 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
+#: lib/cannery_web/live/container_live/show.html.heex:65
 msgid "Why not add one?"
 msgstr "Pourquoi pas en ajouter un ?"
 
@@ -173,17 +169,12 @@ 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/index.ex:183
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:91
 #: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr "Enregistrer des tirs"
 
-#, 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
 msgid "Add another container!"
@@ -205,8 +196,7 @@ 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
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
 msgid "add a container first"
 msgstr "ajouter un conteneur en premier"
 
@@ -218,9 +208,19 @@ msgstr "Créer"
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:113
 msgid "Change Language"
-msgstr ""
+msgstr "Changer la langue"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:134
 msgid "Change language"
+msgstr "Changer la langue"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
+msgid "View in Catalog"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+msgid "add an ammo type first"
 msgstr ""

priv/gettext/fr/LC_MESSAGES/default.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-20 18:02+0000\n"
-"PO-Revision-Date: 2022-04-25 00:12+0000\n"
+"PO-Revision-Date: 2022-05-21 19:47+0000\n"
 "Last-Translator: shibao <shibao@bubbletea.dev>\n"
 "Language-Team: French <https://weblate.bubbletea.dev/projects/cannery/"
 "default/fr/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.12\n"
+"X-Generator: Weblate 4.12.2\n"
 
 ## This file is a PO Template file.
 ##
@@ -24,14 +24,14 @@ msgstr ""
 ## 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/home_live.ex:56
+#: lib/cannery_web/live/home_live.ex:64
 msgid "%{name} lets you easily keep an eye on your ammo levels before and after range day"
 msgstr ""
 "%{name} vous permet de facilement garder un œil sur votre niveau de munition "
 "avant et après une journée de stand"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:78
+#: lib/cannery_web/live/home_live.ex:86
 msgid "Access from any internet-capable device"
 msgstr "Accédez depuis n’importe quel appareil connecté à internet"
 
@@ -41,12 +41,12 @@ msgid "Admins"
 msgstr "Administrateur·ices"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:92
+#: lib/cannery_web/live/home_live.ex:100
 msgid "Admins:"
 msgstr "Administrateur·ices :"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:50
+#: lib/cannery_web/components/topbar.ex:62
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
 #: lib/cannery_web/live/range_live/index.ex:80
 msgid "Ammo"
@@ -54,25 +54,25 @@ msgstr "Munition"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
-#: lib/cannery_web/live/ammo_group_live/index.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:90
 msgid "Ammo type"
 msgstr "Type de munition"
 
 #, 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/index.ex:88
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:99
 msgid "Average Price paid"
 msgstr "Prix acheté moyen"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/form_component.ex:54
+#: lib/cannery_web/live/tag_live/form_component.ex:79
 msgid "Background color"
 msgstr "Couleur de fond"
 
 #, 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:52
 msgid "Blank"
 msgstr "Vide"
 
@@ -84,47 +84,47 @@ msgstr "Cuivre"
 #, 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:38
 msgid "Bullet core"
 msgstr "Noyau de balle"
 
 #, 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:37
 msgid "Bullet type"
 msgstr "Type de balle"
 
 #, 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:40
 msgid "Caliber"
 msgstr "Calibre"
 
 #, 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:39
 msgid "Cartridge"
 msgstr "Cartouche"
 
 #, 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:41
 msgid "Case material"
 msgstr "Matériau de la caisse"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/index.ex:85
+#: lib/cannery_web/live/ammo_group_live/index.ex:95
 msgid "Container"
 msgstr "Conteneur"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:44
+#: lib/cannery_web/components/topbar.ex:50
 #: lib/cannery_web/live/container_live/index.ex:36
 #: lib/cannery_web/live/container_live/index.html.heex:3
 msgid "Containers"
@@ -133,18 +133,18 @@ msgstr "Conteneurs"
 #, 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:53
 msgid "Corrosive"
 msgstr "Corrosive"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
-#: lib/cannery_web/live/ammo_group_live/index.ex:81
+#: lib/cannery_web/live/ammo_group_live/index.ex:91
 msgid "Count"
 msgstr "Quantité"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:29
+#: lib/cannery_web/components/ammo_group_card.ex:34
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 msgid "Count:"
 msgstr "Quantité :"
@@ -167,19 +167,18 @@ msgid "Disable"
 msgstr "Désactiver"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:53
+#: lib/cannery_web/live/home_live.ex:61
 msgid "Easy to Use:"
 msgstr "Simple à utiliser :"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:38
-#: lib/cannery_web/live/ammo_group_live/show.ex:40
 msgid "Edit Ammo group"
 msgstr "Éditer le groupe de munition"
 
 #, 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:63
 msgid "Edit Ammo type"
 msgstr "Éditer le type de munition"
 
@@ -211,19 +210,19 @@ msgstr "FMJ"
 #, 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:46
 msgid "Grains"
 msgstr "Graines"
 
 #, 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:51
 msgid "Incendiary"
 msgstr "Incendiaire"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:87
+#: lib/cannery_web/live/home_live.ex:95
 msgid "Instance Information"
 msgstr "Information de l’instance"
 
@@ -233,12 +232,12 @@ msgid "Invite Disabled"
 msgstr "Invitation désactivée"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:118
+#: lib/cannery_web/live/home_live.ex:126
 msgid "Invite Only"
 msgstr "Uniquement sur invitation"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:69
+#: lib/cannery_web/components/topbar.ex:75
 #: lib/cannery_web/live/invite_live/index.ex:41
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 msgid "Invites"
@@ -266,15 +265,10 @@ msgstr "Localisation :"
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr "Chargeur, lame-chargeur, boite de munition, etc."
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:56
-msgid "Manage"
-msgstr "Gérer"
-
 #, 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:54
 msgid "Manufacturer"
 msgstr "Fabricant"
 
@@ -293,7 +287,7 @@ msgstr "Ma superbe boite de munition"
 #: lib/cannery_web/live/ammo_type_live/index.ex:51
 #: lib/cannery_web/live/container_live/form_component.html.heex:20
 #: lib/cannery_web/live/invite_live/form_component.html.heex:20
-#: lib/cannery_web/live/tag_live/form_component.ex:50
+#: lib/cannery_web/live/tag_live/form_component.ex:75
 msgid "Name"
 msgstr "Nom"
 
@@ -328,15 +322,10 @@ msgid "No Ammo Types"
 msgstr "Aucun type de munition"
 
 #, 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:127
 msgid "No ammo for this type"
 msgstr "Aucune munition pour ce type"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:78
-msgid "No ammo groups in this container"
-msgstr "Aucun groupe de munition pour ce conteneur"
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:8
 msgid "No containers"
@@ -363,7 +352,7 @@ msgid "Notes"
 msgstr "Notes"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:35
+#: lib/cannery_web/components/ammo_group_card.ex:40
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 msgid "Notes:"
 msgstr "Notes :"
@@ -376,40 +365,40 @@ msgstr "Sur l’étagère"
 #, 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:47
 msgid "Pressure"
 msgstr "Pression"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
-#: lib/cannery_web/live/ammo_group_live/index.ex:82
+#: lib/cannery_web/live/ammo_group_live/index.ex:92
 msgid "Price paid"
 msgstr "Prix payé"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:47
+#: lib/cannery_web/components/ammo_group_card.ex:59
 msgid "Price paid:"
 msgstr "Prix payé :"
 
 #, 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:48
 msgid "Primer type"
 msgstr "Type d’amorce"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:117
+#: lib/cannery_web/live/home_live.ex:125
 msgid "Public Signups"
 msgstr "Enregistrements publics"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:65
+#: lib/cannery_web/live/home_live.ex:73
 msgid "Secure:"
 msgstr "Sécurisé :"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:68
+#: lib/cannery_web/live/home_live.ex:76
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
 "Auto-hébergez votre propre instance ou utilisez celle d’une personne à "
@@ -427,17 +416,12 @@ msgid "Settings"
 msgstr "Paramètres"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:39
-msgid "Show Ammo group"
-msgstr "Montrer le groupe de munition"
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.ex:44
+#: lib/cannery_web/live/ammo_type_live/show.ex:62
 msgid "Show Ammo type"
 msgstr "Montrer le type de munition"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:75
+#: lib/cannery_web/live/home_live.ex:83
 msgid "Simple:"
 msgstr "Simple :"
 
@@ -452,7 +436,7 @@ msgid "Stored in"
 msgstr "Est stocké dans"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:38
+#: lib/cannery_web/components/topbar.ex:44
 #: lib/cannery_web/live/tag_live/index.ex:32
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 msgid "Tags"
@@ -466,24 +450,19 @@ msgstr ""
 "organiser"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/form_component.ex:60
+#: lib/cannery_web/live/tag_live/form_component.ex:85
 msgid "Text color"
 msgstr "Couleur du texte"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:44
+#: lib/cannery_web/live/home_live.ex:52
 msgid "The self-hosted firearm tracker website"
 msgstr "Le site web de suivi d’arme à feux auto-hébergé"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
-msgid "This ammo group is not in a container"
-msgstr "Ce groupe de munition n’est pas dans un conteneur"
-
 #, 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:50
 msgid "Tracer"
 msgstr "Traceuse"
 
@@ -515,23 +494,23 @@ msgid "Uses left"
 msgstr "Utilisations restantes"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:40
+#: lib/cannery_web/live/home_live.ex:48
 msgid "Welcome to %{name}"
 msgstr "Bienvenue à %{name}"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:69
+#: lib/cannery_web/live/home_live.ex:77
 msgid "Your data stays with you, period"
 msgstr "Vos données restent avec vous, point final"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:49
+#: lib/cannery_web/live/container_live/show.html.heex:61
 msgid "No tags for this container"
 msgstr "Aucun tag pour ce conteneur"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.ex:84
+#: lib/cannery_web/components/topbar.ex:68
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
 msgid "Range"
 msgstr "Portée"
 
@@ -574,11 +553,6 @@ msgstr "Désélectionner pour le stand"
 msgid "Record shots"
 msgstr "Tirs enregistrés"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:3
-msgid "Ammo Types"
-msgstr "Types de munition"
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:49
 msgid "Ammo groups"
@@ -624,12 +598,12 @@ msgstr "Enregistrements de tir"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:32
-#: lib/cannery_web/live/ammo_group_live/show.ex:38
 msgid "Move Ammo group"
 msgstr "Déplacer le groupe de munition"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:240
 msgid "Move ammo"
 msgstr "Déplacer munition"
 
@@ -644,12 +618,12 @@ msgid "Shot log"
 msgstr "Évènements de tir"
 
 #, 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/components/ammo_group_card.ex:60
+#: lib/cannery_web/live/ammo_group_live/index.ex:142
 #: 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/live/ammo_type_live/index.ex:118
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
 msgid "$%{amount}"
 msgstr "%{amount} $"
 
@@ -661,35 +635,35 @@ msgstr "Bi-métal"
 #, 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:42
 msgid "Jacket type"
 msgstr "Type de douille"
 
 #, 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:43
 msgid "Muzzle velocity"
 msgstr "Vélocité du canon"
 
 #, 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:45
 msgid "Powder grains per charge"
 msgstr "Graines de poudre par charge"
 
 #, 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:44
 msgid "Powder type"
 msgstr "Type de poudre"
 
 #, 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:55
 msgid "UPC"
 msgstr "UPC"
 
@@ -710,19 +684,19 @@ msgid "New password"
 msgstr "Nouveau mot de passe"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:141
+#: lib/cannery_web/live/ammo_group_live/index.ex:180
 msgid "Stage"
 msgstr "Sélectionné"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:141
+#: lib/cannery_web/live/ammo_group_live/index.ex:180
 msgid "Unstage"
 msgstr "Désélectionner"
 
 #, 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:49
 msgid "Firing type"
 msgstr "Type d’allumage"
 
@@ -738,34 +712,35 @@ msgstr "Chargement en cours…"
 
 #, 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/show.ex:106
 msgid "Edit %{name}"
 msgstr "Éditer %{name}"
 
 #, 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/show.ex:107
 msgid "Edit %{name} tags"
 msgstr "Éditer les tags de %{name}"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/container_card.ex:50
+#: lib/cannery_web/components/container_card.ex:55
+#: lib/cannery_web/live/container_live/show.html.heex:32
 msgid "Rounds:"
 msgstr "Cartouches :"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.ex:94
+#: lib/cannery_web/live/container_live/show.ex:105
 msgid "Show %{name}"
 msgstr "Montrer %{name}"
 
 #, 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/index.ex:117
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:109
 msgid "No cost information"
 msgstr "Aucune information de prix"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:83
+#: lib/cannery_web/live/ammo_group_live/index.ex:93
 msgid "% left"
 msgstr "% restante"
 
@@ -795,7 +770,7 @@ msgid "Rounds used"
 msgstr "Cartouches utilisées"
 
 #, 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:74
 msgid "Current # of rounds:"
 msgstr "Quantité actuelle de cartouches :"
 
@@ -805,7 +780,7 @@ msgid "Total # of rounds"
 msgstr "Quantité de cartouches"
 
 #, 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:82
 msgid "Total rounds shot:"
 msgstr "Nombre totale de cartouches tirées :"
 
@@ -851,61 +826,141 @@ msgid "Ammo types"
 msgstr "Types de munition"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:86
+#: lib/cannery_web/live/ammo_group_live/index.ex:96
 msgid "Added on"
-msgstr ""
+msgstr "Ajouté le"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/ammo_group_card.ex:41
+#: lib/cannery_web/components/ammo_group_card.ex:46
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:91
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:90
 msgid "Added on:"
-msgstr ""
+msgstr "Ajouté le :"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/user_card.ex:30
 msgid "User registered on"
-msgstr ""
+msgstr "Utilisateur·ice enregistré·e le"
 
 #, 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 ""
+msgstr "Anglais"
 
 #, 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 ""
+msgstr "Français"
 
 #, 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 ""
+msgstr "Allemand"
 
 #, 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 ""
+msgstr "Langue"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/home_live.ex:147
+msgid "Get involved!"
+msgstr "Impliquez-vous !"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:164
+msgid "Help translate"
+msgstr "Aider à la traduction"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:173
+msgid "Report bugs or request features"
+msgstr "Remonter des bugs ou une demande de fonctionnalité"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:155
 msgid "View the source code"
+msgstr "Voir le code source"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:56
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:3
+msgid "Catalog"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:40
+msgid "Edit Ammo"
+msgstr "Éditer le type de munition"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:38
+msgid "Move Ammo"
+msgstr "Déplacer munition"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/container_live/show.html.heex:98
+msgid "No ammo in this container"
+msgstr "Aucun groupe de munition pour ce conteneur"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:39
+msgid "Show Ammo"
+msgstr "Montrer le type de munition"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
+msgid "This ammo is not in a container"
+msgstr "Ce groupe de munition n’est pas dans un conteneur"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/container_card.ex:50
+#: lib/cannery_web/live/container_live/show.html.heex:27
+msgid "Packs:"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:24
+#: lib/cannery_web/live/home_live.ex:42
+msgid "Cannery logo"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/home_live.ex:44
+msgid "isn't he cute >:3"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+msgid "Leave \"Uses left\" blank to make invite unlimited"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_type_live/index.ex:87
+msgid "Total # of ammo"
+msgstr "Quantité de cartouches"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/components/ammo_group_card.ex:68
+msgid "Container:"
+msgstr "Conteneur"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:52
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:119
+#: lib/cannery_web/live/container_live/show.html.heex:90
+msgid "Show used"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
+msgid "Used up on"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/ammo_group_card.ex:52
+msgid "Used up on:"
 msgstr ""

priv/gettext/fr/LC_MESSAGES/errors.po

@@ -24,7 +24,7 @@ msgstr ""
 ## 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
+#: lib/cannery/containers.ex:140
 msgid "Container must be empty before deleting"
 msgstr "Le conteneur doit être vide pour être supprimé"
 
@@ -153,13 +153,13 @@ 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
+#: lib/cannery/activity_log/shot_group.ex:115
 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
+#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:111
 msgid "Count must be less than %{count}"
 msgstr "La quantité doit être inférieur à %{count}"
 
@@ -177,11 +177,26 @@ 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
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
 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
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
 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}"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/ammo.ex:535
+msgid "Invalid multiplier"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/ammo/ammo_group.ex:84
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery/activity_log/shot_group.ex:69
+msgid "Please select a valid user and ammo group"
+msgstr ""

priv/gettext/fr/LC_MESSAGES/prompts.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-20 18:02+0000\n"
-"PO-Revision-Date: 2022-04-24 08:27+0000\n"
+"PO-Revision-Date: 2022-05-18 18:51+0000\n"
 "Last-Translator: Antonin Dupont <pwet@dupon.in>\n"
 "Language-Team: French <https://weblate.bubbletea.dev/projects/cannery/"
 "prompts/fr/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.12\n"
+"X-Generator: Weblate 4.12.1\n"
 
 ## This file is a PO Template file.
 ##
@@ -24,21 +24,21 @@ msgstr ""
 ## 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
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:85
+#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/invite_live/form_component.ex:80
+#: lib/cannery_web/live/tag_live/form_component.ex:126
 msgid "%{name} created successfully"
-msgstr "créé avec succès"
+msgstr "%{name} 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/ammo_type_live/show.ex:28
 #: 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
 msgid "%{name} deleted succesfully"
-msgstr "%{name} supprimé avec succès"
+msgstr "%{name} supprimé· avec succès"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:109
@@ -62,10 +62,10 @@ 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
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/invite_live/form_component.ex:62
+#: lib/cannery_web/live/tag_live/form_component.ex:108
 msgid "%{name} updated successfully"
 msgstr "%{name} mis à jour avec succès"
 
@@ -78,15 +78,9 @@ 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
 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
-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
@@ -95,9 +89,8 @@ 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/container_live/show.html.heex:49
 #: lib/cannery_web/live/tag_live/index.html.heex:38
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Êtes-vous certain·e de supprimer %{name} ?"
@@ -108,9 +101,8 @@ 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/index.ex:216
 #: 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 "Êtes-vous certain·e de supprimer cette munition ?"
 
@@ -120,7 +112,7 @@ 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
+#: lib/cannery_web/components/topbar.ex:90
 msgid "Are you sure you want to log out?"
 msgstr "Êtes-vous certain·e de vouloir vous déconnecter ?"
 
@@ -169,7 +161,7 @@ msgid "Please check your email to verify your account"
 msgstr "Veuillez vérifier votre mél pour confirmer votre compte"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:96
+#: lib/cannery_web/live/home_live.ex:104
 msgid "Register to setup %{name}"
 msgstr "S’enregistrer pour mettre en place %{name}"
 
@@ -178,9 +170,9 @@ msgstr "S’enregistrer pour mettre en place %{name}"
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
-#: lib/cannery_web/live/invite_live/form_component.html.heex:30
+#: lib/cannery_web/live/invite_live/form_component.html.heex:33
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
-#: lib/cannery_web/live/tag_live/form_component.ex:68
+#: lib/cannery_web/live/tag_live/form_component.ex:93
 msgid "Saving..."
 msgstr "Sauvegarde en cours…"
 
@@ -212,7 +204,7 @@ msgid "Adding..."
 msgstr "Ajout en cours…"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.ex:68
+#: lib/cannery_web/components/add_shot_group_component.ex:56
 msgid "Shots recorded successfully"
 msgstr "Tirs enregistré avec succès"
 
@@ -221,11 +213,6 @@ msgstr "Tirs enregistré avec succès"
 msgid "Are you sure you want to unstage this ammo?"
 msgstr "Êtes-vous certain·e de vouloir désélectionner cette munition ?"
 
-#, 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"
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/show.ex:130
 #: lib/cannery_web/live/range_live/index.ex:128
@@ -264,8 +251,8 @@ 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
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 msgid "You'll need to"
 msgstr "Vous aurez besoin de"
 
@@ -274,19 +261,40 @@ msgstr "Vous aurez besoin de"
 msgid "Creating..."
 msgstr "Création en cours…"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:147
-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 ""
+msgstr "Êtes-vous certain·e de vouloir changer votre langue ?"
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:65
 msgid "Language updated successfully."
-msgstr ""
+msgstr "Langue mise à jour avec succès."
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:50
+msgid "Ammo deleted succesfully"
+msgstr "Groupe de munition supprimé avec succès"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/range_live/index.ex:68
+msgid "Ammo unstaged succesfully"
+msgstr "Groupe de munition désélectionner avec succès"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:118
+msgid "Ammo updated successfully"
+msgstr "Groupe de munition mis à jour avec succès"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+msgid "Ammo added successfully"
+msgid_plural "Ammo added successfully"
+msgstr[0] "Groupe de munition mis à jour avec succès"
+msgstr[1] "Groupe de munition mis à jour avec succès"
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_type_live/index.ex:156
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:26
+msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"
+msgstr "Êtes-vous certain·e de supprimer %{name} ?"

priv/gettext/prompts.pot

@@ -11,16 +11,16 @@ msgid ""
 msgstr ""
 
 #, 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
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:85
+#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/invite_live/form_component.ex:80
+#: lib/cannery_web/live/tag_live/form_component.ex:126
 msgid "%{name} created successfully"
 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/ammo_type_live/show.ex:28
 #: 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
@@ -49,10 +49,10 @@ msgid "%{name} updated succesfully"
 msgstr ""
 
 #, 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
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/invite_live/form_component.ex:62
+#: lib/cannery_web/live/tag_live/form_component.ex:108
 msgid "%{name} updated successfully"
 msgstr ""
 
@@ -63,15 +63,9 @@ 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
 msgid "Ammo group deleted succesfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:88
-msgid "Ammo group updated successfully"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:102
 #: lib/cannery_web/live/invite_live/index.html.heex:131
@@ -79,9 +73,8 @@ 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/container_live/index.html.heex:46
-#: lib/cannery_web/live/container_live/show.html.heex:37
+#: lib/cannery_web/live/container_live/show.html.heex:49
 #: lib/cannery_web/live/tag_live/index.html.heex:38
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
@@ -92,9 +85,8 @@ 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/index.ex:216
 #: 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 ""
 
@@ -104,7 +96,7 @@ 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:90
 msgid "Are you sure you want to log out?"
 msgstr ""
 
@@ -149,7 +141,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:104
 msgid "Register to setup %{name}"
 msgstr ""
 
@@ -158,9 +150,9 @@ msgstr ""
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
-#: lib/cannery_web/live/invite_live/form_component.html.heex:30
+#: lib/cannery_web/live/invite_live/form_component.html.heex:33
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
-#: lib/cannery_web/live/tag_live/form_component.ex:68
+#: lib/cannery_web/live/tag_live/form_component.ex:93
 msgid "Saving..."
 msgstr ""
 
@@ -190,7 +182,7 @@ msgid "Adding..."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.ex:68
+#: lib/cannery_web/components/add_shot_group_component.ex:56
 msgid "Shots recorded successfully"
 msgstr ""
 
@@ -199,11 +191,6 @@ msgstr ""
 msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:68
-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
@@ -242,8 +229,8 @@ msgid "%{name} removed successfully"
 msgstr ""
 
 #, 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
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 msgid "You'll need to"
 msgstr ""
 
@@ -252,13 +239,6 @@ msgstr ""
 msgid "Creating..."
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:147
-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?"
@@ -268,3 +248,31 @@ msgstr ""
 #: lib/cannery_web/controllers/user_settings_controller.ex:65
 msgid "Language updated successfully."
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.ex:50
+msgid "Ammo deleted succesfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.ex:68
+msgid "Ammo unstaged succesfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:118
+msgid "Ammo updated successfully"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+msgid "Ammo added successfully"
+msgid_plural "Ammo added successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.ex:156
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:26
+msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"
+msgstr ""

priv/i18n/es.tbx

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE martif PUBLIC "ISO 12200:1999A//DTD MARTIF core (DXFcdV04)//EN" "TBXcdv04.dtd">
+<martif type="TBX">
+<martifHeader>
+<fileDesc>
+<sourceDesc><p>Translate Toolkit</p></sourceDesc>
+</fileDesc>
+</martifHeader>
+<text><body></body></text>
+</martif>

test/cannery/activity_log_test.exs

@@ -178,10 +178,5 @@ defmodule Cannery.ActivityLogTest do
         ActivityLog.get_shot_group!(shot_group.id, current_user)
       end
     end
-
-    test "change_shot_group/1 returns a shot_group changeset",
-         %{shot_group: shot_group} do
-      assert %Ecto.Changeset{} = ActivityLog.change_shot_group(shot_group)
-    end
   end
 end

test/cannery/ammo_test.exs

@@ -92,11 +92,6 @@ defmodule Cannery.AmmoTest do
       assert {:ok, %AmmoType{}} = Ammo.delete_ammo_type(ammo_type, current_user)
       assert_raise Ecto.NoResultsError, fn -> Ammo.get_ammo_type!(ammo_type.id, current_user) end
     end
-
-    test "change_ammo_type/1 returns a ammo_type changeset",
-         %{ammo_type: ammo_type} do
-      assert %Changeset{} = Ammo.change_ammo_type(ammo_type)
-    end
   end
 
   describe "ammo_groups" do
@@ -180,9 +175,5 @@ defmodule Cannery.AmmoTest do
         Ammo.get_ammo_group!(ammo_group.id, current_user)
       end
     end
-
-    test "change_ammo_group/1 returns a ammo_group changeset", %{ammo_group: ammo_group} do
-      assert %Changeset{} = Ammo.change_ammo_group(ammo_group)
-    end
   end
 end

test/cannery/containers_test.exs

@@ -87,9 +87,5 @@ defmodule Cannery.ContainersTest do
         Containers.get_container!(container.id, current_user)
       end
     end
-
-    test "change_container/1 returns a container changeset", %{container: container} do
-      assert %Changeset{} = Containers.change_container(container)
-    end
   end
 end

test/cannery/invites_test.exs

@@ -68,9 +68,5 @@ defmodule Cannery.InvitesTest do
       assert {:ok, %Invite{}} = Invites.delete_invite(invite, current_user)
       assert_raise Ecto.NoResultsError, fn -> Invites.get_invite!(invite.id, current_user) end
     end
-
-    test "change_invite/1 returns a invite changeset", %{invite: invite} do
-      assert %Changeset{} = Invites.change_invite(invite)
-    end
   end
 end

test/cannery/tags_test.exs

@@ -68,9 +68,5 @@ defmodule Cannery.TagsTest do
       assert {:ok, %Tag{}} = Tags.delete_tag(tag, current_user)
       assert_raise Ecto.NoResultsError, fn -> Tags.get_tag!(tag.id, current_user) end
     end
-
-    test "change_tag/1 returns a tag changeset", %{tag: tag} do
-      assert %Changeset{} = Tags.change_tag(tag)
-    end
   end
 end

test/cannery_web/live/ammo_group_live_test.exs

@@ -35,15 +35,15 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       {:ok, _index_live, html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
       ammo_group = ammo_group |> Repo.preload(:ammo_type)
-      assert html =~ gettext("Ammo groups")
+      assert html =~ gettext("Ammo")
       assert html =~ ammo_group.ammo_type.name
     end
 
     test "saves a single new ammo_group", %{conn: conn} do
       {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
-      assert index_live |> element("a", dgettext("actions", "New Ammo group")) |> render_click() =~
-               gettext("New Ammo group")
+      assert index_live |> element("a", dgettext("actions", "Add Ammo")) |> render_click() =~
+               gettext("Add Ammo")
 
       assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
 
@@ -57,7 +57,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
         |> render_submit()
         |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
 
-      assert html =~ dgettext("prompts", "Ammo group created successfully")
+      assert html =~ dgettext("prompts", "Ammo added successfully")
       assert html =~ "42"
     end
 
@@ -66,8 +66,8 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
 
       {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
-      assert index_live |> element("a", dgettext("actions", "New Ammo group")) |> render_click() =~
-               gettext("New Ammo group")
+      assert index_live |> element("a", dgettext("actions", "Add Ammo")) |> render_click() =~
+               gettext("Add Ammo")
 
       assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
 
@@ -83,15 +83,15 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
         |> render_submit()
         |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
 
-      assert html =~ dgettext("prompts", "Ammo groups created successfully")
+      assert html =~ dgettext("prompts", "Ammo added successfully")
       assert Ammo.list_ammo_groups(current_user) |> Enum.count() == multiplier + 1
     end
 
     test "does not save invalid number of new ammo_groups", %{conn: conn} do
       {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
-      assert index_live |> element("a", dgettext("actions", "New Ammo group")) |> render_click() =~
-               gettext("New Ammo group")
+      assert index_live |> element("a", dgettext("actions", "Add Ammo")) |> render_click() =~
+               gettext("Add Ammo")
 
       assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
 
@@ -150,7 +150,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       assert index_live
              |> element("[data-qa=\"edit-#{ammo_group.id}\"]")
              |> render_click() =~
-               gettext("Edit Ammo group")
+               gettext("Edit Ammo")
 
       assert_patch(index_live, Routes.ammo_group_index_path(conn, :edit, ammo_group))
 
@@ -164,7 +164,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
         |> render_submit()
         |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
 
-      assert html =~ dgettext("prompts", "Ammo group updated successfully")
+      assert html =~ dgettext("prompts", "Ammo updated successfully")
       assert html =~ "43"
     end
 
@@ -186,7 +186,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       {:ok, _show_live, html} = live(conn, Routes.ammo_group_show_path(conn, :show, ammo_group))
 
       ammo_group = ammo_group |> Repo.preload(:ammo_type)
-      assert html =~ gettext("Show Ammo group")
+      assert html =~ gettext("Show Ammo")
       assert html =~ ammo_group.ammo_type.name
     end
 
@@ -196,7 +196,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       assert show_live
              |> element("[data-qa=\"edit\"]")
              |> render_click() =~
-               gettext("Edit Ammo group")
+               gettext("Edit Ammo")
 
       assert_patch(show_live, Routes.ammo_group_show_path(conn, :edit, ammo_group))
 
@@ -210,7 +210,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
         |> render_submit()
         |> follow_redirect(conn, Routes.ammo_group_show_path(conn, :show, ammo_group))
 
-      assert html =~ dgettext("prompts", "Ammo group updated successfully")
+      assert html =~ dgettext("prompts", "Ammo updated successfully")
       assert html =~ "some updated notes"
     end