aa-sov-timer 2.4.2__tar.gz → 2.4.3__tar.gz

{aa_sov_timer-2.4.2 → aa_sov_timer-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-sov-timer
-Version: 2.4.2
+Version: 2.4.3
 Summary: Sov Campaign Timer for Alliance Auth
 Project-URL: Changelog, https://github.com/ppfeufer/aa-sov-timer/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/ppfeufer/aa-sov-timer/blob/master/README.md
@@ -734,13 +734,22 @@ ______________________________________________________________________
 - [Screenshots](#screenshots)
   - [AA Sov Timer Dashboard](#aa-sov-timer-dashboard)
 - [Installation](#installation)
-  - [Step 1: Installing the App](#step-1-installing-the-app)
-  - [Step 2: Update Your AA Settings](#step-2-update-your-aa-settings)
-  - [Step 3: Finalizing the Installation](#step-3-finalizing-the-installation)
-  - [Step 4: Preload Eve Universe Data](#step-4-preload-eve-universe-data)
-  - [Step 5: Setting up Permission](#step-5-setting-up-permission)
-  - [Step 6: Keep Campaigns Updated](#step-6-keep-campaigns-updated)
+  - [Bare Metaal Installation](#bare-metaal-installation)
+    - [Step 1: Installing the App](#step-1-installing-the-app)
+    - [Step 2: Update Your AA Settings](#step-2-update-your-aa-settings)
+    - [Step 3: Finalizing the Installation](#step-3-finalizing-the-installation)
+    - [Step 4: Preload Eve Universe Data](#step-4-preload-eve-universe-data)
+    - [Step 5: Setting up Permission](#step-5-setting-up-permission)
+    - [Step 6: Keep Campaigns Updated](#step-6-keep-campaigns-updated)
+  - [Docker Installation](#docker-installation)
+    - [Step 1: Add the App](#step-1-add-the-app)
+    - [Step 2: Update Your AA Settings](#step-2-update-your-aa-settings-1)
+    - [Step 3: Build Auth and Restart Your Containers](#step-3-build-auth-and-restart-your-containers)
+    - [Step 4: Finalizing the Installation](#step-4-finalizing-the-installation)
 - [Updating](#updating)
+  - [Bare Metal Installation](#bare-metal-installation)
+  - [Docker Installation](#docker-installation-1)
+  - [Common Steps](#common-steps)
 - [Changelog](#changelog)
 - [Translation Status](#translation-status)
 - [Contributing](#contributing)
@@ -767,7 +776,9 @@ ______________________________________________________________________
 - AA Sovereignty Timer needs the app [django-eveuniverse](https://gitlab.com/ErikKalkoken/django-eveuniverse)
   to function. Please make sure it is installed before continuing.
 
-### Step 1: Installing the App<a name="step-1-installing-the-app"></a>
+### Bare Metaal Installation<a name="bare-metaal-installation"></a>
+
+#### Step 1: Installing the App<a name="step-1-installing-the-app"></a>
 
 Make sure you're in the virtual environment (venv) of your Alliance Auth installation.
 Then install the latest version:
@@ -776,7 +787,7 @@ Then install the latest version:
 pip install aa-sov-timer
 ```
 
-### Step 2: Update Your AA Settings<a name="step-2-update-your-aa-settings"></a>
+#### Step 2: Update Your AA Settings<a name="step-2-update-your-aa-settings"></a>
 
 Configure your AA settings (`local.py`) as follows:
 
@@ -785,19 +796,16 @@ Configure your AA settings (`local.py`) as follows:
 
 Restart your supervisor
 
-### Step 3: Finalizing the Installation<a name="step-3-finalizing-the-installation"></a>
+#### Step 3: Finalizing the Installation<a name="step-3-finalizing-the-installation"></a>
 
 Copy static files and run migrations
 
 ```shell
 python manage.py collectstatic
-```
-
-```shell
 python manage.py migrate
 ```
 
-### Step 4: Preload Eve Universe Data<a name="step-4-preload-eve-universe-data"></a>
+#### Step 4: Preload Eve Universe Data<a name="step-4-preload-eve-universe-data"></a>
 
 AA Sovereignty Timer uses Eve Universe data to map IDs to names for solar systems,
 regions and constellations. So you need to preload some data from ESI once.
@@ -805,21 +813,18 @@ If you already have run this command, you can skip this step.
 
 ```shell
 python manage.py eveuniverse_load_data map
-```
-
-```shell
 python manage.py sovtimer_load_initial_data
 ```
 
 Both commands might take a moment or two, so be patient ...
 
-### Step 5: Setting up Permission<a name="step-5-setting-up-permission"></a>
+#### Step 5: Setting up Permission<a name="step-5-setting-up-permission"></a>
 
 Now you can set up permissions in Alliance Auth for your users.
 Add `sovtimer | Sovereignty Timer | Can access the Sovereignty Timer module` to
 the states and/or groups you would like to have access.
 
-### Step 6: Keep Campaigns Updated<a name="step-6-keep-campaigns-updated"></a>
+#### Step 6: Keep Campaigns Updated<a name="step-6-keep-campaigns-updated"></a>
 
 Add the following scheduled task to your `local.py`. One done, restart your supervisor.
 
@@ -833,8 +838,57 @@ CELERYBEAT_SCHEDULE["sovtimer.tasks.run_sov_campaign_updates"] = {
 
 Now your system is updating the sovereignty campaigns every 30 seconds.
 
+### Docker Installation<a name="docker-installation"></a>
+
+#### Step 1: Add the App<a name="step-1-add-the-app"></a>
+
+Add the app to your `conf/requirements.txt`:
+
+```text
+aa-sov-timer==2.4.3
+```
+
+#### Step 2: Update Your AA Settings<a name="step-2-update-your-aa-settings-1"></a>
+
+Configure your AA settings (`conf/local.py`) as follows:
+
+- Add `'eveuniverse',` to `INSTALLED_APPS` if not already done for another app
+- Add `'sovtimer',` to `INSTALLED_APPS`
+- Add the Scheduled Task
+
+```python
+# AA Sovereignty Timer - Run sovereignty related updates every 30 seconds
+CELERYBEAT_SCHEDULE["sovtimer.tasks.run_sov_campaign_updates"] = {
+    "task": "sovtimer.tasks.run_sov_campaign_updates",
+    "schedule": 30.0,
+}
+```
+
+#### Step 3: Build Auth and Restart Your Containers<a name="step-3-build-auth-and-restart-your-containers"></a>
+
+```shell
+docker compose build --no-cache
+docker compose --env-file=.env up -d
+```
+
+#### Step 4: Finalizing the Installation<a name="step-4-finalizing-the-installation"></a>
+
+Run migrations, copy static files and load EVE universe data:
+
+```shell
+docker compose exec allianceauth_gunicorn bash
+
+auth collectstatic
+auth migrate
+
+auth eveuniverse_load_data map
+auth sovtimer_load_initial_data
+```
+
 ## Updating<a name="updating"></a>
 
+### Bare Metal Installation<a name="bare-metal-installation"></a>
+
 To update your existing installation of AA Sovereignty Timer, first enable your
 virtual environment.
 
@@ -843,17 +897,40 @@ contains `manage.py`).
 
 ```shell
 pip install -U aa-sov-timer
+
+python manage.py collectstatic
+python manage.py migrate
+```
+
+Finally, restart your AA supervisor service.
+
+### Docker Installation<a name="docker-installation-1"></a>
+
+To update your existing installation of AA Sovereignty Timer, all you need to do is to update the respective line in your `conf/requirements.txt` file to the latest version.
+
+```text
+aa-sov-timer==2.4.3
 ```
 
+Now rebuild your containers and restart them:
+
 ```shell
-python manage.py collectstatic
+docker compose build --no-cache
+docker compose --env-file=.env up -d
 ```
 
+After that, run the following commands to update your database and static files:
+
 ```shell
-python manage.py migrate
+docker compose exec allianceauth_gunicorn bash
+
+auth collectstatic
+auth migrate
 ```
 
-Finally, restart your AA supervisor services.
+### Common Steps<a name="common-steps"></a>
+
+It is possible that some versions need some more changes. Always read the [release notes](https://github.com/ppfeufer/aa-sov-timer/releases) to find out more.
 
 ## Changelog<a name="changelog"></a>
 

{aa_sov_timer-2.4.2 → aa_sov_timer-2.4.3}/README.md

@@ -24,13 +24,22 @@ ______________________________________________________________________
 - [Screenshots](#screenshots)
   - [AA Sov Timer Dashboard](#aa-sov-timer-dashboard)
 - [Installation](#installation)
-  - [Step 1: Installing the App](#step-1-installing-the-app)
-  - [Step 2: Update Your AA Settings](#step-2-update-your-aa-settings)
-  - [Step 3: Finalizing the Installation](#step-3-finalizing-the-installation)
-  - [Step 4: Preload Eve Universe Data](#step-4-preload-eve-universe-data)
-  - [Step 5: Setting up Permission](#step-5-setting-up-permission)
-  - [Step 6: Keep Campaigns Updated](#step-6-keep-campaigns-updated)
+  - [Bare Metaal Installation](#bare-metaal-installation)
+    - [Step 1: Installing the App](#step-1-installing-the-app)
+    - [Step 2: Update Your AA Settings](#step-2-update-your-aa-settings)
+    - [Step 3: Finalizing the Installation](#step-3-finalizing-the-installation)
+    - [Step 4: Preload Eve Universe Data](#step-4-preload-eve-universe-data)
+    - [Step 5: Setting up Permission](#step-5-setting-up-permission)
+    - [Step 6: Keep Campaigns Updated](#step-6-keep-campaigns-updated)
+  - [Docker Installation](#docker-installation)
+    - [Step 1: Add the App](#step-1-add-the-app)
+    - [Step 2: Update Your AA Settings](#step-2-update-your-aa-settings-1)
+    - [Step 3: Build Auth and Restart Your Containers](#step-3-build-auth-and-restart-your-containers)
+    - [Step 4: Finalizing the Installation](#step-4-finalizing-the-installation)
 - [Updating](#updating)
+  - [Bare Metal Installation](#bare-metal-installation)
+  - [Docker Installation](#docker-installation-1)
+  - [Common Steps](#common-steps)
 - [Changelog](#changelog)
 - [Translation Status](#translation-status)
 - [Contributing](#contributing)
@@ -57,7 +66,9 @@ ______________________________________________________________________
 - AA Sovereignty Timer needs the app [django-eveuniverse](https://gitlab.com/ErikKalkoken/django-eveuniverse)
   to function. Please make sure it is installed before continuing.
 
-### Step 1: Installing the App<a name="step-1-installing-the-app"></a>
+### Bare Metaal Installation<a name="bare-metaal-installation"></a>
+
+#### Step 1: Installing the App<a name="step-1-installing-the-app"></a>
 
 Make sure you're in the virtual environment (venv) of your Alliance Auth installation.
 Then install the latest version:
@@ -66,7 +77,7 @@ Then install the latest version:
 pip install aa-sov-timer
 ```
 
-### Step 2: Update Your AA Settings<a name="step-2-update-your-aa-settings"></a>
+#### Step 2: Update Your AA Settings<a name="step-2-update-your-aa-settings"></a>
 
 Configure your AA settings (`local.py`) as follows:
 
@@ -75,19 +86,16 @@ Configure your AA settings (`local.py`) as follows:
 
 Restart your supervisor
 
-### Step 3: Finalizing the Installation<a name="step-3-finalizing-the-installation"></a>
+#### Step 3: Finalizing the Installation<a name="step-3-finalizing-the-installation"></a>
 
 Copy static files and run migrations
 
 ```shell
 python manage.py collectstatic
-```
-
-```shell
 python manage.py migrate
 ```
 
-### Step 4: Preload Eve Universe Data<a name="step-4-preload-eve-universe-data"></a>
+#### Step 4: Preload Eve Universe Data<a name="step-4-preload-eve-universe-data"></a>
 
 AA Sovereignty Timer uses Eve Universe data to map IDs to names for solar systems,
 regions and constellations. So you need to preload some data from ESI once.
@@ -95,21 +103,18 @@ If you already have run this command, you can skip this step.
 
 ```shell
 python manage.py eveuniverse_load_data map
-```
-
-```shell
 python manage.py sovtimer_load_initial_data
 ```
 
 Both commands might take a moment or two, so be patient ...
 
-### Step 5: Setting up Permission<a name="step-5-setting-up-permission"></a>
+#### Step 5: Setting up Permission<a name="step-5-setting-up-permission"></a>
 
 Now you can set up permissions in Alliance Auth for your users.
 Add `sovtimer | Sovereignty Timer | Can access the Sovereignty Timer module` to
 the states and/or groups you would like to have access.
 
-### Step 6: Keep Campaigns Updated<a name="step-6-keep-campaigns-updated"></a>
+#### Step 6: Keep Campaigns Updated<a name="step-6-keep-campaigns-updated"></a>
 
 Add the following scheduled task to your `local.py`. One done, restart your supervisor.
 
@@ -123,8 +128,57 @@ CELERYBEAT_SCHEDULE["sovtimer.tasks.run_sov_campaign_updates"] = {
 
 Now your system is updating the sovereignty campaigns every 30 seconds.
 
+### Docker Installation<a name="docker-installation"></a>
+
+#### Step 1: Add the App<a name="step-1-add-the-app"></a>
+
+Add the app to your `conf/requirements.txt`:
+
+```text
+aa-sov-timer==2.4.3
+```
+
+#### Step 2: Update Your AA Settings<a name="step-2-update-your-aa-settings-1"></a>
+
+Configure your AA settings (`conf/local.py`) as follows:
+
+- Add `'eveuniverse',` to `INSTALLED_APPS` if not already done for another app
+- Add `'sovtimer',` to `INSTALLED_APPS`
+- Add the Scheduled Task
+
+```python
+# AA Sovereignty Timer - Run sovereignty related updates every 30 seconds
+CELERYBEAT_SCHEDULE["sovtimer.tasks.run_sov_campaign_updates"] = {
+    "task": "sovtimer.tasks.run_sov_campaign_updates",
+    "schedule": 30.0,
+}
+```
+
+#### Step 3: Build Auth and Restart Your Containers<a name="step-3-build-auth-and-restart-your-containers"></a>
+
+```shell
+docker compose build --no-cache
+docker compose --env-file=.env up -d
+```
+
+#### Step 4: Finalizing the Installation<a name="step-4-finalizing-the-installation"></a>
+
+Run migrations, copy static files and load EVE universe data:
+
+```shell
+docker compose exec allianceauth_gunicorn bash
+
+auth collectstatic
+auth migrate
+
+auth eveuniverse_load_data map
+auth sovtimer_load_initial_data
+```
+
 ## Updating<a name="updating"></a>
 
+### Bare Metal Installation<a name="bare-metal-installation"></a>
+
 To update your existing installation of AA Sovereignty Timer, first enable your
 virtual environment.
 
@@ -133,17 +187,40 @@ contains `manage.py`).
 
 ```shell
 pip install -U aa-sov-timer
+
+python manage.py collectstatic
+python manage.py migrate
+```
+
+Finally, restart your AA supervisor service.
+
+### Docker Installation<a name="docker-installation-1"></a>
+
+To update your existing installation of AA Sovereignty Timer, all you need to do is to update the respective line in your `conf/requirements.txt` file to the latest version.
+
+```text
+aa-sov-timer==2.4.3
 ```
 
+Now rebuild your containers and restart them:
+
 ```shell
-python manage.py collectstatic
+docker compose build --no-cache
+docker compose --env-file=.env up -d
 ```
 
+After that, run the following commands to update your database and static files:
+
 ```shell
-python manage.py migrate
+docker compose exec allianceauth_gunicorn bash
+
+auth collectstatic
+auth migrate
 ```
 
-Finally, restart your AA supervisor services.
+### Common Steps<a name="common-steps"></a>
+
+It is possible that some versions need some more changes. Always read the [release notes](https://github.com/ppfeufer/aa-sov-timer/releases) to find out more.
 
 ## Changelog<a name="changelog"></a>
 

{aa_sov_timer-2.4.2 → aa_sov_timer-2.4.3}/sovtimer/__init__.py

@@ -5,5 +5,5 @@ App init
 # Django
 from django.utils.translation import gettext_lazy as _
 
-__version__ = "2.4.2"
+__version__ = "2.4.3"
 __title__ = _("Sovereignty Timers")

{aa_sov_timer-2.4.2 → aa_sov_timer-2.4.3}/sovtimer/constants.py

@@ -2,9 +2,6 @@
 Constants we use throughout the app
 """
 
-# Standard Library
-import os
-
 # Alliance Auth
 from esi import __version__ as esi_version
 
@@ -18,10 +15,5 @@ PACKAGE_NAME = "sovtimer"
 GITHUB_URL = f"https://github.com/ppfeufer/{APP_NAME}"
 USER_AGENT = f"{APP_NAME_VERBOSE_USERAGENT}/{__version__} (+{GITHUB_URL}) Django-ESI/{esi_version}"
 
-# aa-sov-timer/sovtimer
-APP_BASE_DIR = os.path.join(os.path.dirname(__file__))
-# aa-sov-timer/sovtimer/static/sovtimer
-APP_STATIC_DIR = os.path.join(APP_BASE_DIR, "static", PACKAGE_NAME)
-
 # All internal URLs need to start with this prefix
 INTERNAL_URL_PREFIX = "-"

{aa_sov_timer-2.4.2 → aa_sov_timer-2.4.3}/sovtimer/locale/cs_CZ/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-06-13 00:06+0200\n"
+"POT-Creation-Date: 2025-06-20 19:18+0200\n"
 "PO-Revision-Date: 2024-07-10 14:26+0000\n"
 "Last-Translator: Dadas Aideron <dadas.aideron@gmail.com>\n"
 "Language-Team: Czech <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/cs/>\n"
@@ -60,27 +60,27 @@ msgid "Sovereignty campaigns"
 msgstr ""
 
 #: sovtimer/templates/sovtimer/dashboard.html:15
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:27
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:25
 msgid "Type"
 msgstr ""
 
 #: sovtimer/templates/sovtimer/dashboard.html:16
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:28
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:26
 msgid "System"
 msgstr ""
 
 #: sovtimer/templates/sovtimer/dashboard.html:17
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:29
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:27
 msgid "Constellation"
 msgstr ""
 
 #: sovtimer/templates/sovtimer/dashboard.html:18
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:30
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:28
 msgid "Region"
 msgstr ""
 
 #: sovtimer/templates/sovtimer/dashboard.html:19
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:31
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:29
 msgid "Owner / Defender"
 msgstr ""
 
@@ -96,39 +96,39 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:4
-msgid "The sovereignty timer list is automatically updated every 30 seconds. Progress for any active campaigns will be shown as <i>Previous - Trend - Current</i>."
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:6
+msgid "Sovereignty campaign list"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:10
-msgid "Sovereignty campaign list"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:12
+msgid "Total campaigns:"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:16
-msgid "Timers total:"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:13
+msgid "Upcoming campaigns (< 4hrs):"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:17
-msgid "Timers upcoming (< 4hrs):"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:14
+msgid "Active campaigns:"
 msgstr ""
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:18
-msgid "Timers active:"
+msgid "The campaign list is automatically updated every 30 seconds. Progress for any active campaigns will be shown as <i>Previous - Trend - Current</i>."
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:32
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:30
 msgid "ADM"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:33
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:31
 msgid "Start"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:34
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:32
 msgid "Remaining"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:35
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:33
 msgid "Progress"
 msgstr ""
 

{aa_sov_timer-2.4.2 → aa_sov_timer-2.4.3}/sovtimer/locale/de/LC_MESSAGES/django.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-06-13 00:06+0200\n"
-"PO-Revision-Date: 2025-04-25 14:24+0000\n"
+"POT-Creation-Date: 2025-06-20 19:18+0200\n"
+"PO-Revision-Date: 2025-06-20 16:44+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: German <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/de/>\n"
 "Language: de\n"
@@ -15,7 +15,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 5.11\n"
+"X-Generator: Weblate 5.11.4\n"
 
 #: sovtimer/__init__.py:9
 msgid "Sovereignty Timers"
@@ -60,27 +60,27 @@ msgid "Sovereignty campaigns"
 msgstr "Souveränitäts-Kampagnen"
 
 #: sovtimer/templates/sovtimer/dashboard.html:15
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:27
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:25
 msgid "Type"
 msgstr "Typ"
 
 #: sovtimer/templates/sovtimer/dashboard.html:16
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:28
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:26
 msgid "System"
 msgstr "System"
 
 #: sovtimer/templates/sovtimer/dashboard.html:17
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:29
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:27
 msgid "Constellation"
 msgstr "Konstellation"
 
 #: sovtimer/templates/sovtimer/dashboard.html:18
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:30
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:28
 msgid "Region"
 msgstr "Region"
 
 #: sovtimer/templates/sovtimer/dashboard.html:19
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:31
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:29
 msgid "Owner / Defender"
 msgstr "Besitzer / Verteidiger"
 
@@ -96,39 +96,39 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:4
-msgid "The sovereignty timer list is automatically updated every 30 seconds. Progress for any active campaigns will be shown as <i>Previous - Trend - Current</i>."
-msgstr "Die Souveränitäts-Timerliste wird automatisch alle 30 Sekunden aktualisiert. Der Fortschritt für alle aktiven Kampagnen wird als <i>Vorher – Trend – Aktuell</i> angezeigt."
-
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:10
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:6
 msgid "Sovereignty campaign list"
 msgstr "Liste der Souveränitäts-Kampagnen"
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:16
-msgid "Timers total:"
-msgstr "Alle Timer:"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:12
+msgid "Total campaigns:"
+msgstr "Alle Kampagnen:"
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:17
-msgid "Timers upcoming (< 4hrs):"
-msgstr "Bevorstehende Timer (< 4 Stunden):"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:13
+msgid "Upcoming campaigns (< 4hrs):"
+msgstr "Bevorstehende Kampagnen (< 4 Stunden):"
+
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:14
+msgid "Active campaigns:"
+msgstr "Aktive Kampagnen:"
 
 #: sovtimer/templates/sovtimer/partials/dashboard/table.html:18
-msgid "Timers active:"
-msgstr "Aktive Timer:"
+msgid "The campaign list is automatically updated every 30 seconds. Progress for any active campaigns will be shown as <i>Previous - Trend - Current</i>."
+msgstr "Die Liste der Souveränitäts-Kampagnen wird automatisch alle 30 Sekunden aktualisiert. Der Fortschritt für alle aktiven Kampagnen wird als <i>Vorher – Trend – Aktuell</i> angezeigt."
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:32
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:30
 msgid "ADM"
 msgstr "ADM"
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:33
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:31
 msgid "Start"
 msgstr "Beginn"
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:34
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:32
 msgid "Remaining"
 msgstr "Verbleibend"
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:35
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:33
 msgid "Progress"
 msgstr "Fortschritt"
 
@@ -152,6 +152,12 @@ msgstr "Verteidiger machen Fortschritte"
 msgid "Attackers making progress"
 msgstr "Angreifer machen Fortschritte"
 
+#~ msgid "Timers total:"
+#~ msgstr "Alle Timer:"
+
+#~ msgid "Timers active:"
+#~ msgstr "Aktive Timer:"
+
 #~ msgctxt "Decimal separator"
 #~ msgid "."
 #~ msgstr ","