Clean up post-merge lint

I am a *bit* sorry for this commit, because ideally this would've been
folded into 6d50b1c2c7 and whatever the
source of the other "conflict" was.

However, as the things have been merged in a batch, I can't do much more
than this.

.github/workflows/main.yaml

@@ -27,6 +27,7 @@ jobs:
           set -euo pipefail
           pip install mypy
           pip install -r requirements.txt
+          pip install -r build-requirements.txt
       - name: Typecheck
         run: |
           python -m mypy --config mypy.ini -p snikket_web
@@ -44,11 +45,34 @@ jobs:
       - name: Install
         run: |
           set -euo pipefail
-          pip install flake8
+          pip install flake8 flake8-print
       - name: Linting
         run: |
           python -m flake8 snikket_web
 
+  translation-check:
+    runs-on: ubuntu-latest
+
+    name: 'lint: i18n'
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.9'
+      - name: Install
+        run: |
+          set -euo pipefail
+          pip install flask-babel
+      - name: Linting
+        run: |
+          sed -ri '/^"POT-Creation-Date: /d' snikket_web/translations/messages.pot
+          git add snikket_web/translations/messages.pot
+          make extract_translations
+          sed -ri '/^"POT-Creation-Date: /d' snikket_web/translations/messages.pot
+          git diff --exit-code --color -- snikket_web/translations/messages.pot
+
+
   build:
     runs-on: ubuntu-latest
 

Dockerfile

@@ -1,7 +1,12 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim AS build
 
-ARG BUILD_SERIES=dev
+RUN set -eu; \
-ARG BUILD_ID=0
+    export DEBIAN_FRONTEND=noninteractive ; \
+    apt-get update ; \
+    apt-get install -y --no-install-recommends \
+        python3 python3-pip python3-setuptools python3-wheel \
+        libpython3-dev \
+        make build-essential;
 
 COPY requirements.txt /opt/snikket-web-portal/requirements.txt
 COPY build-requirements.txt /opt/snikket-web-portal/build-requirements.txt
@@ -12,30 +17,43 @@ COPY babel.cfg /opt/snikket-web-portal/babel.cfg
 WORKDIR /opt/snikket-web-portal
 
 RUN set -eu; \
-    export DEBIAN_FRONTEND=noninteractive ; \
-    apt-get update ; \
-    apt-get install -y --no-install-recommends \
-        python3 python3-pip python3-setuptools python3-wheel \
-        libpython3-dev \
-        make build-essential \
-        netcat \
-        ; \
     pip3 install -r requirements.txt; \
     pip3 install -r build-requirements.txt; \
-    make; \
+    make;
-    pip3 uninstall -yr build-requirements.txt; \
+
-    apt-get remove -y build-essential make libpython3-dev; \
+
-    apt-get autoremove -y; \
+FROM debian:bullseye-slim
-    pip3 install hypercorn; \
+
-    rm -rf /root/.cache; \
+ARG BUILD_SERIES=dev
-    apt-get clean ; rm -rf /var/lib/apt/lists
+ARG BUILD_ID=0
 
 COPY docker/env.py /etc/snikket-web-portal/env.py
+
 ENV SNIKKET_WEB_PYENV=/etc/snikket-web-portal/env.py
 
 ENV SNIKKET_WEB_PROSODY_ENDPOINT=http://127.0.0.1:5280/
 
+COPY requirements.txt /opt/snikket-web-portal/requirements.txt
+
+WORKDIR /opt/snikket-web-portal
+
+RUN set -eu; \
+    export DEBIAN_FRONTEND=noninteractive ; \
+    apt-get update ; \
+    apt-get install -y --no-install-recommends \
+        python3 python3-pip python3-setuptools python3-wheel build-essential libpython3-dev netcat; \
+    pip3 install -r requirements.txt; \
+    apt-get remove -y --autoremove build-essential libpython3-dev; \
+    apt-get clean ; rm -rf /var/lib/apt/lists; \
+    pip3 install hypercorn; \
+    rm -rf /root/.cache;
+
 HEALTHCHECK CMD nc -zv ${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE:-127.0.0.1} ${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT:-5765}
 
+COPY --from=build /opt/snikket-web-portal/snikket_web/ /opt/snikket-web-portal/snikket_web
+COPY babel.cfg /opt/snikket-web-portal/babel.cfg
+
+RUN echo "$BUILD_SERIES $BUILD_ID" > /opt/snikket-web-portal/.app_version
+
 ADD docker/entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

babel.cfg

@@ -1,4 +1,3 @@
 [python: snikket_web/**.py]
 [jinja2: snikket_web/templates/**.html]
 [jinja2: snikket_web/templates/**.j2]
-extensions=jinja2.ext.autoescape,jinja2.ext.with_

build-requirements.txt

@@ -1,3 +1,4 @@
 pyscss~=1.3
 mypy
 python-dotenv~=0.15
+types-toml

docker/entrypoint.sh

@@ -5,4 +5,4 @@ export SNIKKET_WEB_DOMAIN="$SNIKKET_DOMAIN"
 export SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE="${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE-127.0.0.1}"
 export SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT="${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT-5765}"
 
-exec hypercorn -b "${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE}:${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT}" 'snikket_web:create_app()'
+exec hypercorn -b "${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE}:${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT}" --access-logfile=- --log-file=- 'snikket_web:create_app()'

requirements.txt

@@ -1,8 +1,9 @@
 aiohttp~=3.6
-quart~=0.11
+quart~=0.17
 flask-wtf~=0.14
-hsluv~=0.0.2
+hsluv~=5.0
 flask-babel~=1.0
 email-validator~=1.1
 environ-config~=20.0
+wtforms~=3.0
 typing-extensions

snikket_web/__init__.py

@@ -18,10 +18,12 @@ from quart import (
     jsonify,
 )
 
+import werkzeug.exceptions
+
 import environ
 
 from . import colour, infra
-from ._version import version, version_info  # noqa:F401
+from ._version import version  # noqa:F401
 
 
 async def proc() -> typing.Dict[str, typing.Any]:
@@ -40,7 +42,7 @@ async def proc() -> typing.Dict[str, typing.Any]:
 
     try:
         user_info = await infra.client.get_user_info()
-    except (aiohttp.ClientError, quart.exceptions.HTTPException):
+    except (aiohttp.ClientError, werkzeug.exceptions.HTTPException):
         user_info = {}
 
     return {
@@ -105,16 +107,16 @@ async def backend_error_handler(exc: Exception) -> quart.Response:
 
 
 async def generic_http_error(
-        exc: quart.exceptions.HTTPException,
+        exc: werkzeug.exceptions.HTTPException,
         ) -> quart.Response:
     return quart.Response(
         await render_template(
             "generic_http_error.html",
-            status=exc.status_code,
+            status=exc.code,
             description=exc.description,
             name=exc.name,
         ),
-        status=exc.status_code,
+        status=exc.code,
     )
 
 
@@ -145,21 +147,29 @@ class AppConfig:
     site_name = environ.var("")
     avatar_cache_ttl = environ.var(1800, converter=int)
     languages = environ.var([
+        # Keep `en` as the first language, because it is used as a fallback
+        # if the language negotiation cannot find another match. It is more
+        # likely that users are able to read english (or find a suitable
+        # online translator) than, for instance, danish.
+        "en",
         "da",
         "de",
-        "en",
         "fr",
         "id",
         "it",
         "pl",
         "sv",
+        "zh_Hans_CN",
     ], converter=autosplit)
-    apple_store_url = environ.var("")
+    apple_store_url = environ.var(
+        "https://apps.apple.com/us/app/snikket/id1545164189",
+    )
     # Default limit of 1 MiB is what was discovered to be the effective limit
     # in #67, hence we set that here for now.
     # Future versions may change this default, and the standard deployment
     # tools may also very well override it.
     max_avatar_size = environ.var(1024*1024, converter=int)
+    show_metrics = environ.bool_var(True)
 
 
 _UPPER_CASE = "".join(map(chr, range(ord("A"), ord("Z")+1)))
@@ -172,7 +182,7 @@ def create_app() -> quart.Quart:
         pass
     else:
         import runpy
-        init_vars = runpy.run_path(env_init)  # type:ignore
+        init_vars = runpy.run_path(env_init)
         for name, value in init_vars.items():
             if not name:
                 continue
@@ -191,23 +201,24 @@ def create_app() -> quart.Quart:
     app.config["AVATAR_CACHE_TTL"] = config.avatar_cache_ttl
     app.config["APPLE_STORE_URL"] = config.apple_store_url
     app.config["MAX_AVATAR_SIZE"] = config.max_avatar_size
+    app.config["SHOW_METRICS"] = config.show_metrics
 
     app.context_processor(proc)
     app.register_error_handler(
         aiohttp.ClientConnectorError,
-        backend_error_handler,  # type:ignore
+        backend_error_handler,
     )
     app.register_error_handler(
-        quart.exceptions.HTTPException,
+        werkzeug.exceptions.HTTPException,
         generic_http_error,  # type:ignore
     )
     app.register_error_handler(
         Exception,
-        generic_error_handler,  # type:ignore
+        generic_error_handler,
     )
 
     @app.route("/")
-    async def index() -> quart.Response:
+    async def index() -> werkzeug.Response:
         if infra.client.has_session:
             return redirect(url_for('user.index'))
 

snikket_web/_version.py

@@ -1,5 +1,15 @@
-version_info = (0, 1, 2, "a0")
+import os
-version = (
+import subprocess
-    ".".join(map(str, version_info[:3])) +
+
-    (f"-{version_info[3]}" if version_info[3] else "")
+version = "(unknown)"
-)
+
+if os.path.exists(".app_version"):
+    with open(".app_version") as f:
+        version = f.read().strip()
+elif os.path.exists(".git"):
+    try:
+        version = subprocess.check_output([
+            "git", "describe", "--always"
+        ]).strip().decode("utf8")
+    except OSError:
+        version = "dev (unknown)"

snikket_web/admin.py

@@ -1,14 +1,17 @@
 import json
+import resource
+import time
 import typing
 
 from datetime import datetime
 
 import aiohttp
 
+import werkzeug.exceptions
+
 import quart.flask_patch
 
 import wtforms
-import wtforms.fields.html5
 
 from quart import (
     Blueprint,
@@ -18,11 +21,12 @@ from quart import (
     request,
     abort,
     flash,
+    current_app,
 )
 
 from flask_babel import lazy_gettext as _l, _
 
-from . import prosodyclient
+from . import prosodyclient, _version
 from .infra import client, circle_name, BaseForm
 
 bp = Blueprint("admin", __name__, url_prefix="/admin")
@@ -31,7 +35,11 @@ bp = Blueprint("admin", __name__, url_prefix="/admin")
 @bp.route("/")
 @client.require_admin_session()
 async def index() -> str:
-    return await render_template("admin_home.html")
+    show_metrics = current_app.config["SHOW_METRICS"]
+    return await render_template(
+        "admin_home.html",
+        show_metrics=show_metrics,
+    )
 
 
 class PasswordResetLinkPost(BaseForm):
@@ -56,9 +64,6 @@ async def users() -> str:
     )
 
 
-_LIMITED_ROLE_NAME = _("Limited")
-
-
 class EditUserForm(BaseForm):
     localpart = wtforms.StringField(
         _l("Login name"),
@@ -71,9 +76,7 @@ class EditUserForm(BaseForm):
     role = wtforms.RadioField(
         _l("Access Level"),
         choices=[
-            # NOTE: enable this only after something has been done which
+            ("prosody:restricted", _("Limited")),
-            # actually enforces the described restrictions :).
-            # ("prosody:restricted", _l("Limited")),
             ("prosody:normal", _l("Normal user")),
             ("prosody:admin", _l("Administrator")),
         ],
@@ -90,7 +93,7 @@ class EditUserForm(BaseForm):
 
 @bp.route("/user/<localpart>/", methods=["GET", "POST"])
 @client.require_admin_session()
-async def edit_user(localpart: str) -> typing.Union[quart.Response, str]:
+async def edit_user(localpart: str) -> typing.Union[werkzeug.Response, str]:
     target_user_info = await client.get_user_by_localpart(localpart)
 
     form = EditUserForm()
@@ -145,7 +148,7 @@ class DeleteUserForm(BaseForm):
 
 @bp.route("/user/<localpart>/delete", methods=["GET", "POST"])
 @client.require_admin_session()
-async def delete_user(localpart: str) -> typing.Union[str, quart.Response]:
+async def delete_user(localpart: str) -> typing.Union[str, werkzeug.Response]:
     target_user_info = await client.get_user_by_localpart(localpart)
     form = DeleteUserForm()
     if form.validate_on_submit():
@@ -184,7 +187,7 @@ async def debug_user(localpart: str) -> typing.Union[str, quart.Response]:
 @client.require_admin_session()
 async def user_password_reset_link(
         id_: str,
-        ) -> typing.Union[str, quart.Response]:
+        ) -> typing.Union[str, werkzeug.Response]:
     invite_info = await client.get_invite_by_id(
         id_,
     )
@@ -276,7 +279,7 @@ class InvitePost(BaseForm):
 
 @bp.route("/invitations", methods=["GET", "POST"])
 @client.require_admin_session()
-async def invitations() -> typing.Union[str, quart.Response]:
+async def invitations() -> typing.Union[str, werkzeug.Response]:
     invites = sorted(
         (
             invite
@@ -322,7 +325,7 @@ class InviteForm(BaseForm):
 
 @bp.route("/invitation/-/new", methods=["POST"])
 @client.require_admin_session()
-async def create_invite() -> typing.Union[str, quart.Response]:
+async def create_invite() -> typing.Union[str, werkzeug.Response]:
     form = InvitePost()
     circles = await client.list_groups()
     form.circles.choices = [
@@ -350,7 +353,7 @@ async def create_invite() -> typing.Union[str, quart.Response]:
 
 @bp.route("/invitation/<id_>", methods=["GET", "POST"])
 @client.require_admin_session()
-async def edit_invite(id_: str) -> typing.Union[str, quart.Response]:
+async def edit_invite(id_: str) -> typing.Union[str, werkzeug.Response]:
     try:
         invite_info = await client.get_invite_by_id(id_)
     except aiohttp.ClientResponseError as exc:
@@ -416,7 +419,7 @@ async def circles() -> str:
 
 @bp.route("/circle/-/new", methods=["POST"])
 @client.require_admin_session()
-async def create_circle() -> typing.Union[str, quart.Response]:
+async def create_circle() -> typing.Union[str, werkzeug.Response]:
     create_form = CirclePost()
     if create_form.validate_on_submit():
         circle = await client.create_group(
@@ -462,7 +465,7 @@ class EditCircleForm(BaseForm):
 
 @bp.route("/circle/<id_>", methods=["GET", "POST"])
 @client.require_admin_session()
-async def edit_circle(id_: str) -> typing.Union[str, quart.Response]:
+async def edit_circle(id_: str) -> typing.Union[str, werkzeug.Response]:
     async with client.authenticated_session() as session:
         try:
             circle = await client.get_group_by_id(
@@ -478,21 +481,21 @@ async def edit_circle(id_: str) -> typing.Union[str, quart.Response]:
                 return redirect(url_for(".circles"))
             raise
 
-        users = sorted(
+        users = {
-            await client.list_users(),
+            user.localpart: user
-            key=lambda x: x.localpart
+            for user in await client.list_users()
-        )
+        }
         circle_members = [
-            user for user in users
+            (localpart, users.get(localpart))
-            if user.localpart in circle.members
+            for localpart in sorted(circle.members)
         ]
 
     form = EditCircleForm()
-    form.user_to_add.choices = [
+    form.user_to_add.choices = sorted(
-        (user.localpart, user.localpart)
+        (localpart, localpart)
-        for user in users
+        for localpart in users.keys()
-        if user.localpart not in circle.members
+        if localpart not in circle.members
-    ]
+    )
     valid_users = [x[0] for x in form.user_to_add.choices]
 
     invite_form = InvitePost()
@@ -540,8 +543,6 @@ async def edit_circle(id_: str) -> typing.Union[str, quart.Response]:
             )
 
         return redirect(url_for(".edit_circle", id_=id_))
-    else:
-        print(form.errors)
 
     return await render_template(
         "admin_edit_circle.html",
@@ -550,3 +551,153 @@ async def edit_circle(id_: str) -> typing.Union[str, quart.Response]:
         circle_members=circle_members,
         invite_form=invite_form,
     )
+
+
+_CPU_EPOCH = time.process_time()
+_MONOTONIC_EPOCH = time.monotonic()
+
+
+def get_system_stats() -> typing.MutableMapping[
+        str,
+        typing.Optional[typing.Union[int, float]]]:
+    pagesize = resource.getpagesize()
+    my_rss: typing.Optional[int] = None
+    try:
+        with open("/proc/self/statm") as f:
+            stats = f.read().split()
+        my_rss = int(stats[1]) * pagesize
+    except (ValueError, IndexError, TypeError, OSError):
+        pass
+
+    my_cpu = (
+        (time.process_time() - _CPU_EPOCH) /
+        (time.monotonic() - _MONOTONIC_EPOCH)
+    )
+
+    mem_total, mem_available = None, None
+    load5: typing.Optional[float] = None
+
+    try:
+        with open("/proc/loadavg") as f:
+            stats = f.read().split()
+        load5 = float(stats[1])
+    except (ValueError, IndexError, TypeError, OSError):
+        pass
+
+    try:
+        with open("/proc/meminfo") as f:
+            for line in f:
+                if line.startswith("MemTotal"):
+                    mem_total = int(line.split()[1]) * 1024
+                elif line.startswith("MemAvailable"):
+                    mem_available = int(line.split()[1]) * 1024
+                if mem_total is not None and mem_available is not None:
+                    break
+    except (ValueError, TypeError, IndexError, OSError):
+        pass
+
+    return {
+        "portal_rss": my_rss,
+        "portal_cpu": my_cpu,
+        "load5": load5,
+        "mem_total": mem_total,
+        "mem_available": mem_available,
+    }
+
+
+class AnnouncementForm(BaseForm):
+    text = wtforms.StringField(
+        _("Message contents"),
+        widget=wtforms.widgets.TextArea(),
+        validators=[wtforms.validators.DataRequired()],
+    )
+
+    online_only = wtforms.BooleanField(
+        _("Only send to online users"),
+    )
+
+    action_post_all = wtforms.SubmitField(
+        _("Post to all users"),
+    )
+
+    action_send_preview = wtforms.SubmitField(
+        _("Send preview to yourself"),
+    )
+
+
+@bp.route("/system/", methods=["GET", "POST"])
+@client.require_admin_session()
+async def system() -> typing.Union[str, werkzeug.Response]:
+    form = AnnouncementForm()
+
+    if form.validate_on_submit():
+        recipients = "self"
+        if form.action_post_all.data:
+            if form.online_only.data:
+                recipients = "online"
+            else:
+                recipients = "all"
+
+        await client.post_announcement(
+            form.text.data,
+            recipients=recipients,
+        )
+        await flash(
+            _("Announcement sent!"),
+            "success",
+        )
+        if recipients != "self":
+            # redirect only if not previewing
+            return redirect(url_for(".system"))
+
+    version = None
+    now = None
+    show_metrics = current_app.config["SHOW_METRICS"]
+    if show_metrics:
+        version = await client.get_server_version()
+        now = time.time()
+        try:
+            prosody_metrics = await client.get_system_metrics()
+        except werkzeug.exceptions.NotFound:
+            # server does not offer the endpoint for whatever reason -- ignore
+            prosody_metrics = {}
+
+        metrics = get_system_stats()
+        try:
+            prosody_cpu_metrics = prosody_metrics["cpu"]
+        except KeyError:
+            pass
+        else:
+            metrics["prosody_cpu"] = (prosody_cpu_metrics["value"] /
+                                      (now - prosody_cpu_metrics["since"]))
+
+        try:
+            metrics["prosody_rss"] = prosody_metrics["memory"]
+        except KeyError:
+            pass
+
+        try:
+            metrics["prosody_devices"] = prosody_metrics["c2s"]
+        except KeyError:
+            pass
+
+        try:
+            metrics["prosody_uploads"] = prosody_metrics["uploads"]
+        except KeyError:
+            pass
+
+        for k in list(metrics.keys()):
+            if metrics[k] is None:
+                # so that defaulting in jinja works
+                del metrics[k]
+    else:
+        metrics = {}
+
+    return await render_template(
+        "admin_system.html",
+        metrics=metrics,
+        version=_version.version,
+        prosody_version=version,
+        form=form,
+        show_metrics=show_metrics,
+    )

snikket_web/infra.py

@@ -1,5 +1,6 @@
 import base64
 import itertools
+import math
 import secrets
 import typing
 
@@ -7,6 +8,7 @@ import quart.flask_patch  # noqa:F401
 from quart import (
     current_app,
     request,
+    g,
 )
 
 import flask_babel
@@ -22,11 +24,21 @@ client.default_login_redirect = "main.login"
 babel = flask_babel.Babel()
 
 
+BYTE_UNIT_SCALE_MAP = [
+    "B",
+    "kiB",
+    "MiB",
+    "GiB",
+    "TiB",
+]
+
+
 @babel.localeselector  # type:ignore
 def selected_locale() -> str:
+    g.language_header_accessed = True
     selected = request.accept_languages.best_match(
         current_app.config['LANGUAGES']
-    )
+    ) or current_app.config['LANGUAGES'][0]
     return selected
 
 
@@ -42,14 +54,39 @@ def circle_name(c: typing.Any) -> str:
     return c.name
 
 
+def format_bytes(n: float) -> str:
+    try:
+        scale = max(math.floor(math.log(n, 1024)), 0)
+    except ValueError:
+        scale = 0
+    try:
+        unit = BYTE_UNIT_SCALE_MAP[scale]
+        factor = 1024**scale
+    except IndexError:
+        unit = "TiB"
+        factor = 1024**4
+    if factor > 1:
+        return "{:.1f} {}".format(n / factor, unit)
+    return "{} {}".format(n, unit)
+
+
+def add_vary_language_header(resp: quart.Response) -> quart.Response:
+    if getattr(g, "language_header_accessed", False):
+        resp.vary.add("Accept-Language")
+    return resp
+
+
 def init_templating(app: quart.Quart) -> None:
     app.template_filter("repr")(repr)
     app.template_filter("format_datetime")(flask_babel.format_datetime)
     app.template_filter("format_date")(flask_babel.format_date)
     app.template_filter("format_time")(flask_babel.format_time)
     app.template_filter("format_timedelta")(flask_babel.format_timedelta)
+    app.template_filter("format_percent")(flask_babel.format_percent)
+    app.template_filter("format_bytes")(format_bytes)
     app.template_filter("flatten")(flatten)
     app.template_filter("circle_name")(circle_name)
+    app.after_request(add_vary_language_header)
 
 
 def generate_error_id() -> str:

snikket_web/invite.py

@@ -10,13 +10,16 @@ from quart import (
     current_app,
     render_template,
     redirect,
+    request,
     url_for,
     session as http_session,
 )
 
+import werkzeug
+
 import wtforms
 
-from flask_babel import lazy_gettext as _l
+from flask_babel import lazy_gettext as _l, gettext
 
 from .infra import client, selected_locale, BaseForm
 
@@ -26,6 +29,11 @@ bp = Blueprint("invite", __name__)
 
 INVITE_SESSION_JID = "invite-session-jid"
 
+MAX_IMPORT_DATA_SIZE = 5*1024*1024  # 5MB
+SUPPORTED_IMPORT_TYPES = ["application/xml", "text/xml"]
+
+EIMPORTTOOBIG = _l("The account data you tried to import is too large to"
+                   " upload. Please contact your Snikket operator.")
 
 # https://play.google.com/store/apps/details?id=org.snikket.android&referrer={uri|urlescape}&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1
 
@@ -40,14 +48,14 @@ def apple_store_badge() -> str:
 
 
 @bp.context_processor
-def context() -> typing.Mapping[str, typing.Any]:
+def context() -> typing.Dict[str, typing.Any]:
     return {
         "apple_store_badge": apple_store_badge,
     }
 
 
 @bp.route("/<id_>")
-async def view_old(id_: str) -> quart.Response:
+async def view_old(id_: str) -> werkzeug.Response:
     return redirect(url_for(".view", id_=id_))
 
 
@@ -125,7 +133,7 @@ class RegisterForm(BaseForm):
 
 
 @bp.route("/<id_>/register", methods=["GET", "POST"])
-async def register(id_: str) -> typing.Union[str, quart.Response]:
+async def register(id_: str) -> typing.Union[str, werkzeug.Response]:
     try:
         invite = await client.get_public_invite_by_id(id_)
     except aiohttp.ClientResponseError as exc:
@@ -163,6 +171,7 @@ async def register(id_: str) -> typing.Union[str, quart.Response]:
                 raise
         else:
             http_session[INVITE_SESSION_JID] = jid
+            await client.login(jid, form.password.data)
             return redirect(url_for(".success"))
 
     return await render_template(
@@ -192,7 +201,7 @@ class ResetForm(BaseForm):
 
 
 @bp.route("/<id_>/reset", methods=["GET", "POST"])
-async def reset(id_: str) -> typing.Union[str, quart.Response]:
+async def reset(id_: str) -> typing.Union[str, werkzeug.Response]:
     try:
         invite = await client.get_public_invite_by_id(id_)
     except aiohttp.ClientResponseError as exc:
@@ -232,11 +241,55 @@ async def reset(id_: str) -> typing.Union[str, quart.Response]:
     )
 
 
+class DataImportForm(BaseForm):
+    account_data_file = wtforms.FileField(
+        _l("Account data file")
+    )
+
+    action_import = wtforms.SubmitField(
+        _l("Import data")
+    )
+
+
 @bp.route("/success", methods=["GET", "POST"])
+@client.require_session()
 async def success() -> str:
+    form = DataImportForm()
+    if form.validate_on_submit():
+        ok = True
+        file_info = (await request.files).get(form.account_data_file.name)
+        if file_info is not None:
+            mimetype = file_info.mimetype
+            data = file_info.stream.read()
+            if len(data) > MAX_IMPORT_DATA_SIZE:
+                form.account_data_file.errors.append(EIMPORTTOOBIG)
+                ok = False
+            elif mimetype not in SUPPORTED_IMPORT_TYPES:
+                form.account_data_file.errors.append(
+                    # not breaking the line here to avoid extract
+                    # translations failing (defensive)
+                    gettext("The account data you tried to import is in an unknown format. Please upload an XML file in XEP-0227 format (provided format: %(mimetype)s).", mimetype=mimetype),  # noqa:E501
+                )
+                ok = False
+            elif len(data) > 0:
+                await client.import_account_data(data)
+
+        if ok:
+            # Re-render success page, this time with no import option
+            return await render_template(
+                "invite_success.html",
+                jid=http_session.get(INVITE_SESSION_JID, ""),
+                migration_success=True,
+                    )
+
     return await render_template(
         "invite_success.html",
         jid=http_session.get(INVITE_SESSION_JID, ""),
+        migration_success=False,
+        form=form,
+        max_import_size=MAX_IMPORT_DATA_SIZE,
+        import_too_big_warning_header=_l("Error"),
+        import_too_big_warning=EIMPORTTOOBIG,
     )
 
 
@@ -249,5 +302,5 @@ async def reset_success() -> str:
 
 
 @bp.route("/-")
-async def index() -> quart.Response:
+async def index() -> werkzeug.Response:
     return redirect(url_for("index"))

snikket_web/main.py

@@ -18,6 +18,8 @@ from quart import (
     flash,
 )
 
+import werkzeug.exceptions
+
 import babel
 import wtforms
 
@@ -32,7 +34,7 @@ bp = quart.Blueprint("main", __name__)
 
 
 class LoginForm(BaseForm):
-    address = wtforms.TextField(
+    address = wtforms.StringField(
         _l("Address"),
         validators=[wtforms.validators.InputRequired()],
     )
@@ -48,7 +50,7 @@ class LoginForm(BaseForm):
 
 
 @bp.route("/-")
-async def index() -> quart.Response:
+async def index() -> werkzeug.Response:
     return redirect(url_for("index"))
 
 
@@ -56,7 +58,7 @@ ERR_CREDENTIALS_INVALID = _l("Invalid username or password.")
 
 
 @bp.route("/login", methods=["GET", "POST"])
-async def login() -> typing.Union[str, quart.Response]:
+async def login() -> typing.Union[str, werkzeug.Response]:
     if client.has_session and (await client.test_session()):
         return redirect(url_for('user.index'))
 
@@ -76,7 +78,7 @@ async def login() -> typing.Union[str, quart.Response]:
             password = form.password.data
             try:
                 await client.login(jid, password)
-            except quart.exceptions.Unauthorized:
+            except werkzeug.exceptions.Unauthorized:
                 form.password.errors.append(ERR_CREDENTIALS_INVALID)
             else:
                 await flash(
@@ -91,24 +93,30 @@ async def login() -> typing.Union[str, quart.Response]:
 @bp.route("/meta/about.html")
 async def about() -> str:
     version = None
+    core_versions = {}
     extra_versions = {}
-
     if current_app.debug or client.is_admin_session:
         version = _version.version
-        extra_versions["Quart"] = quart.__version__
+        try:
+            core_versions["Prosody"] = await client.get_server_version()
+        except werkzeug.exceptions.Unauthorized:
+            core_versions["Prosody"] = "unknown"
+
+    if current_app.debug:
         extra_versions["aiohttp"] = aiohttp.__version__
         extra_versions["babel"] = babel.__version__
         extra_versions["wtforms"] = wtforms.__version__
         extra_versions["flask-wtf"] = flask_wtf.__version__
         try:
             extra_versions["Prosody"] = await client.get_server_version()
-        except quart.exceptions.Unauthorized:
+        except werkzeug.exceptions.Unauthorized:
             extra_versions["Prosody"] = "unknown"
 
     return await render_template(
         "about.html",
         version=version,
         extra_versions=extra_versions,
+        core_versions=core_versions,
     )
 
 
@@ -123,6 +131,7 @@ def repad(s: str) -> str:
 
 @bp.route("/avatar/<from_>/<code>")
 async def avatar(from_: str, code: str) -> quart.Response:
+    etag: typing.Optional[str]
     try:
         etag = request.headers["if-none-match"]
     except KeyError:

snikket_web/prosodyclient.py

@@ -19,7 +19,9 @@ from quart import (
     current_app, _app_ctx_stack, session as http_session, abort, redirect,
     url_for,
 )
-import quart.exceptions
+import quart
+
+import werkzeug.exceptions
 
 from . import xmpputil
 from .xmpputil import split_jid
@@ -296,6 +298,9 @@ class ProsodyClient:
     def _public_v1_endpoint(self, subpath: str) -> str:
         return "{}/register_api{}".format(self._endpoint_base, subpath)
 
+    def _xep227_endpoint(self, subpath: str) -> str:
+        return "{}/xep227{}".format(self._endpoint_base, subpath)
+
     async def _oauth2_bearer_token(self,
                                    session: aiohttp.ClientSession,
                                    jid: str,
@@ -383,16 +388,16 @@ class ProsodyClient:
             ) -> typing.Callable[
                 [typing.Callable[..., typing.Awaitable[T]]],
                 typing.Callable[..., typing.Awaitable[
-                    typing.Union[T, quart.Response]]]]:
+                    typing.Union[T, quart.Response, werkzeug.Response]]]]:
         def decorator(
                 f: typing.Callable[..., typing.Awaitable[T]],
                 ) -> typing.Callable[..., typing.Awaitable[
-                    typing.Union[T, quart.Response]]]:
+                    typing.Union[T, quart.Response, werkzeug.Response]]]:
             @functools.wraps(f)
             async def wrapped(
                     *args: typing.Any,
                     **kwargs: typing.Any,
-                    ) -> typing.Union[T, quart.Response]:
+                    ) -> typing.Union[T, quart.Response, werkzeug.Response]:
                 if not self.has_session or not (await self.test_session()):
                     redirect_to_value = redirect_to
                     if redirect_to_value is not False:
@@ -412,17 +417,17 @@ class ProsodyClient:
             ) -> typing.Callable[
                 [typing.Callable[..., typing.Awaitable[T]]],
                 typing.Callable[..., typing.Awaitable[
-                    typing.Union[T, quart.Response]]]]:
+                    typing.Union[T, quart.Response, werkzeug.Response]]]]:
         def decorator(
                 f: typing.Callable[..., typing.Awaitable[T]],
                 ) -> typing.Callable[..., typing.Awaitable[
-                    typing.Union[T, quart.Response]]]:
+                    typing.Union[T, quart.Response, werkzeug.Response]]]:
             @functools.wraps(f)
             @self.require_session(redirect_to=redirect_to)
             async def wrapped(
                     *args: typing.Any,
                     **kwargs: typing.Any,
-                    ) -> typing.Union[T, quart.Response]:
+                    ) -> typing.Union[T, quart.Response, werkzeug.Response]:
                 if not self.is_admin_session:
                     raise abort(403, "This is not for you.")
 
@@ -489,7 +494,7 @@ class ProsodyClient:
                 session=session,
             )
             avatar_hash = avatar_info["sha1"]
-        except quart.exceptions.HTTPException:
+        except werkzeug.exceptions.HTTPException:
             avatar_hash = None
 
         return {
@@ -510,7 +515,7 @@ class ProsodyClient:
             "to": self.session_address,
         }
 
-        async with session.post(self._rest_endpoint, data=req) as resp:
+        async with session.post(self._rest_endpoint, json=req) as resp:
             return resp.status == 200
 
     @autosession
@@ -523,7 +528,7 @@ class ProsodyClient:
             "to": domain,
         }
 
-        async with session.post(self._rest_endpoint, data=req) as resp:
+        async with session.post(self._rest_endpoint, json=req) as resp:
             if resp.status != 200:
                 return "unknwn"
             try:
@@ -641,7 +646,7 @@ class ProsodyClient:
                     new_access_model,
                 )
             ))
-        except quart.exceptions.NotFound:
+        except werkzeug.exceptions.NotFound:
             if ignore_not_found:
                 return
             raise
@@ -771,7 +776,7 @@ class ProsodyClient:
             session: aiohttp.ClientSession,
             ) -> str:
         access_models = filter(
-            lambda x: not isinstance(x, quart.exceptions.NotFound),
+            lambda x: not isinstance(x, werkzeug.exceptions.NotFound),
             await asyncio.gather(
                 self.get_avatar_access_model(session=session),
                 self.get_nickname_access_model(session=session),
@@ -1121,6 +1126,34 @@ class ProsodyClient:
                 ) as resp:
             self._raise_error_from_response(resp)
 
+    @autosession
+    async def export_account_data(
+            self,
+            *,
+            session: aiohttp.ClientSession,
+            ) -> typing.Optional[str]:
+        async with session.get(
+                self._xep227_endpoint("/export?stores=roster,vcard,pep,pep_data"),  # noqa:E501
+                ) as resp:
+            self._raise_error_from_response(resp)
+            if resp.status == 204:
+                return None
+            return await resp.text()
+
+    @autosession
+    async def import_account_data(
+            self,
+            user_xml: str,
+            *,
+            session: aiohttp.ClientSession,
+            ) -> bool:
+        async with session.put(
+                self._xep227_endpoint("/import?stores=roster,vcard,pep,pep_data"),  # noqa:E501
+                data=user_xml,
+                ) as resp:
+            self._raise_error_from_response(resp)
+            return True
+
     @autosession
     async def revoke_token(
             self,
@@ -1175,3 +1208,41 @@ class ProsodyClient:
                     json=payload) as resp:
                 resp.raise_for_status()
                 return (await resp.json())["jid"]
+
+    @autosession
+    async def get_system_metrics(
+            self,
+            *,
+            session: aiohttp.ClientSession) -> typing.Mapping:
+        async with session.get(
+                self._admin_v1_endpoint("/server/metrics"),
+                ) as resp:
+            if resp.status == 404:
+                return {}
+            self._raise_error_from_response(resp)
+            resp.raise_for_status()
+            return await resp.json()
+
+    @autosession
+    async def post_announcement(
+            self,
+            body: str,
+            recipients: str,
+            *,
+            session: aiohttp.ClientSession) -> None:
+        recipients_payload: typing.Union[str, typing.Sequence[str]]
+        if recipients == "self":
+            recipients_payload = [self.session_address]
+        else:
+            recipients_payload = recipients
+
+        payload = {
+            "recipients": recipients_payload,
+            "body": body,
+        }
+
+        async with session.post(
+                self._admin_v1_endpoint("/server/announcement"),
+                json=payload) as resp:
+            self._raise_error_from_response(resp)
+            resp.raise_for_status()

snikket_web/static/img/icons.svg

@@ -42,6 +42,11 @@ licensed under the terms of the Apache 2.0 License -->
 <g fill="none"><path d="M0 0h24v24H0V0z" /><path d="M0 0h24v24H0V0z" opacity=".87" /></g>
 <path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM9 8V6c0-1.66 1.34-3 3-3s3 1.34 3 3v2H9z" />
 </symbol>
+<!-- from: communication/import_export/materialiconsround/24px.svg -->
+<symbol id="icon-import_export" viewBox="0 0 24 24">
+<path d="M0 0h24v24H0V0z" fill="none" />
+<path d="M8.65 3.35L5.86 6.14c-.32.31-.1.85.35.85H8V13c0 .55.45 1 1 1s1-.45 1-1V6.99h1.79c.45 0 .67-.54.35-.85L9.35 3.35c-.19-.19-.51-.19-.7 0zM16 17.01V11c0-.55-.45-1-1-1s-1 .45-1 1v6.01h-1.79c-.45 0-.67.54-.35.85l2.79 2.78c.2.19.51.19.71 0l2.79-2.78c.32-.31.09-.85-.35-.85H16z" />
+</symbol>
 <!-- from: communication/qr_code/materialiconsround/24px.svg -->
 <symbol id="icon-qrcode" viewBox="0 0 24 24">
 <g><rect fill="none" height="24" width="24" /><rect fill="none" height="24" width="24" /></g>
@@ -52,6 +57,12 @@ licensed under the terms of the Apache 2.0 License -->
 <path d="M0 0h24v24H0V0z" fill="none" />
 <path d="M12.65 10C11.7 7.31 8.9 5.5 5.77 6.12c-2.29.46-4.15 2.29-4.63 4.58C.32 14.57 3.26 18 7 18c2.61 0 4.83-1.67 5.65-4H17v2c0 1.1.9 2 2 2s2-.9 2-2v-2c1.1 0 2-.9 2-2s-.9-2-2-2h-8.35zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z" />
 </symbol>
+<!-- from: communication/rss_feed/materialiconsround/24px.svg -->
+<symbol id="icon-broadcast" viewBox="0 0 24 24">
+<path d="M0 0h24v24H0V0z" fill="none" />
+<circle cx="6.18" cy="17.82" r="2.18" />
+<path d="M5.59 10.23c-.84-.14-1.59.55-1.59 1.4 0 .71.53 1.28 1.23 1.4 2.92.51 5.22 2.82 5.74 5.74.12.7.69 1.23 1.4 1.23.85 0 1.54-.75 1.41-1.59-.68-4.2-3.99-7.51-8.19-8.18zm-.03-5.71C4.73 4.43 4 5.1 4 5.93c0 .73.55 1.33 1.27 1.4 6.01.6 10.79 5.38 11.39 11.39.07.73.67 1.28 1.4 1.28.84 0 1.5-.73 1.42-1.56-.73-7.34-6.57-13.19-13.92-13.92z" />
+</symbol>
 <!-- from: content/add_circle_outline/materialiconsround/24px.svg -->
 <symbol id="icon-add" viewBox="0 0 24 24">
 <path d="M0 0h24v24H0V0z" fill="none" />
@@ -77,6 +88,26 @@ licensed under the terms of the Apache 2.0 License -->
 <path d="M0 0h24v24H0V0z" fill="none" />
 <path d="M21.94 11.23C21.57 8.76 19.32 7 16.82 7h-2.87c-.52 0-.95.43-.95.95s.43.95.95.95h2.9c1.6 0 3.04 1.14 3.22 2.73.17 1.43-.64 2.69-1.85 3.22l1.4 1.4c1.63-1.02 2.64-2.91 2.32-5.02zM4.12 3.56c-.39-.39-1.02-.39-1.41 0s-.39 1.02 0 1.41l2.4 2.4c-1.94.8-3.27 2.77-3.09 5.04C2.23 15.05 4.59 17 7.23 17h2.82c.52 0 .95-.43.95-.95s-.43-.95-.95-.95H7.16c-1.63 0-3.1-1.19-3.25-2.82-.15-1.72 1.11-3.17 2.75-3.35l2.1 2.1c-.43.09-.76.46-.76.92v.1c0 .52.43.95.95.95h1.78L13 15.27V17h1.73l3.3 3.3c.39.39 1.02.39 1.41 0 .39-.39.39-1.02 0-1.41L4.12 3.56zM16 11.95c0-.52-.43-.95-.95-.95h-.66l1.49 1.49c.07-.13.12-.28.12-.44v-.1z" />
 </symbol>
+<!-- from: content/send/materialiconsround/24px.svg -->
+<symbol id="icon-send" viewBox="0 0 24 24">
+<path d="M0 0h24v24H0V0z" fill="none" />
+<path d="M3.4 20.4l17.45-7.48c.81-.35.81-1.49 0-1.84L3.4 3.6c-.66-.29-1.39.2-1.39.91L2 9.12c0 .5.37.93.87.99L17 12 2.87 13.88c-.5.07-.87.5-.87 1l.01 4.61c0 .71.73 1.2 1.39.91z" />
+</symbol>
+<!-- from: file/file_download/materialicons/24px.svg -->
+<symbol id="icon-download" viewBox="0 0 24 24">
+<path d="M0 0h24v24H0z" fill="none" />
+<path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z" />
+</symbol>
+<!-- from: file/file_upload/materialicons/24px.svg -->
+<symbol id="icon-upload" viewBox="0 0 24 24">
+<path d="M0 0h24v24H0z" fill="none" />
+<path d="M9 16h6v-6h4l-7-7-7 7h4zm-4 2h14v2H5z" />
+</symbol>
+<!-- from: file/folder/materialiconsround/24px.svg -->
+<symbol id="icon-folder" viewBox="0 0 24 24">
+<path d="M0 0h24v24H0V0z" fill="none" />
+<path d="M10.59 4.59C10.21 4.21 9.7 4 9.17 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-1.41-1.41z" />
+</symbol>
 <!-- from: navigation/arrow_back/materialiconsround/24px.svg -->
 <symbol id="icon-back" viewBox="0 0 24 24">
 <path d="M0 0h24v24H0V0z" fill="none" />
@@ -142,4 +173,9 @@ licensed under the terms of the Apache 2.0 License -->
 <path d="M0 0h24v24H0V0z" fill="none" />
 <path d="M17 7h-3c-.55 0-1 .45-1 1s.45 1 1 1h3c1.65 0 3 1.35 3 3s-1.35 3-3 3h-3c-.55 0-1 .45-1 1s.45 1 1 1h3c2.76 0 5-2.24 5-5s-2.24-5-5-5zm-9 5c0 .55.45 1 1 1h6c.55 0 1-.45 1-1s-.45-1-1-1H9c-.55 0-1 .45-1 1zm2 3H7c-1.65 0-3-1.35-3-3s1.35-3 3-3h3c.55 0 1-.45 1-1s-.45-1-1-1H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h3c.55 0 1-.45 1-1s-.45-1-1-1z" />
 </symbol>
+<!-- from: content/insights/materialiconsround/24px.svg -->
+<symbol id="icon-insights" viewBox="0 0 24 24">
+<g><rect fill="none" height="24" width="24" /><rect fill="none" height="24" width="24" /></g>
+<g><g><path d="M21,8c-1.45,0-2.26,1.44-1.93,2.51l-3.55,3.56c-0.3-0.09-0.74-0.09-1.04,0l-2.55-2.55C12.27,10.45,11.46,9,10,9 c-1.45,0-2.27,1.44-1.93,2.52l-4.56,4.55C2.44,15.74,1,16.55,1,18c0,1.1,0.9,2,2,2c1.45,0,2.26-1.44,1.93-2.51l4.55-4.56 c0.3,0.09,0.74,0.09,1.04,0l2.55,2.55C12.73,16.55,13.54,18,15,18c1.45,0,2.27-1.44,1.93-2.52l3.56-3.55 C21.56,12.26,23,11.45,23,10C23,8.9,22.1,8,21,8z" /><polygon points="15,9 15.94,6.93 18,6 15.94,5.07 15,3 14.08,5.07 12,6 14.08,6.93" /><polygon points="3.5,11 4,9 6,8.5 4,8 3.5,6 3,8 1,8.5 3,9" /></g></g>
+</symbol>
 </defs></svg>

snikket_web/templates/about.html

@@ -17,9 +17,12 @@
 		<h3>{% trans %}Trademarks{% endtrans %}</h3>
 		<p>{% trans trademarks_url="https://snikket.org/about/trademarks/" %}“Snikket” and the parrot logo are trademarks of Snikket Community Interest Company. For more information about the trademarks, visit the <a href="{{ trademarks_url }}">Snikket Trademarks information page</a>.{% endtrans %}
 		<h3>{% trans %}Software Versions{% endtrans %}</h3>
-		<pre>Snikket Server
+		<pre>Domain: {{ config["SNIKKET_DOMAIN"] }}
-Domain: {{ config["SNIKKET_DOMAIN"] }}
+Web Portal{% if version %} ({{ version }}){% endif %}
-Snikket Web Portal{% if version %} ({{ version }}){% endif %}
+{%- if core_versions -%}
+{% for name, version in core_versions.items() %}
+{{ name }} ({{ version }}){% endfor %}
+{%- endif -%}
 {%- if extra_versions -%}
 {% for name, version in extra_versions.items() %}
 {{ name }} ({{ version }}){% endfor %}

snikket_web/templates/admin_edit_circle.html

@@ -1,5 +1,5 @@
 {% extends "admin_app.html" %}
-{% from "library.j2" import form_button, standard_button, value_or_hint, custom_form_button, clipboard_button %}
+{% from "library.j2" import form_button, standard_button, value_or_hint, custom_form_button, clipboard_button, icon %}
 {% block head_lead %}
 {{ super() }}
 {% include "copy-snippet.html" %}
@@ -56,14 +56,21 @@
 {%- if circle_members -%}
 <div class="el-2 elevated"><table>
 	<thead>
-		<th>Login name</th>
+		<th>{% trans %}Login name{% endtrans %}</th>
-		<th class="collapsible">Display name</th>
+		<th class="collapsible">{% trans %}Display name{% endtrans %}</th>
-		<th>Actions</th>
+		<th>{% trans %}Actions{% endtrans %}</th>
 	</thead>
 	<tbody>
-{%- for member in circle_members -%}
+{%- for localpart, member in circle_members -%}
 		<tr>
-			<td>{{ member.localpart }}</td>
+			<td>
+				{%- if member -%}
+				{{ localpart }}
+				{%- else -%}
+				{{ localpart }}
+				<span class="with-tooltip above" data-tooltip="{% trans %}The user has been deleted from the server.{% endtrans %}"><em> ({% trans %}deleted{% endtrans %})</em></span>
+				{%- endif -%}
+			</td>
 			<td class="collapsible">{% call value_or_hint(member.display_name) %}{% endcall %}</td>
 			<td class="nowrap">
 				{%- call custom_form_button("remove_user", form.action_remove_user.name, member.localpart, class="primary danger", slim=True) -%}

snikket_web/templates/admin_edit_user.html

@@ -18,8 +18,7 @@
 {% endmacro %}
 {% block content %}
 <h1>{% trans user_name=target_user.localpart %}Edit user {{ user_name }}{% endtrans %}</h1>
-<div class="form layout-expanded"><form method="POST">
+<form method="POST">{{ form.csrf_token }}<div class="form layout-expanded">
-	{{ form.csrf_token }}
 	<h2 class="form-title">{% trans %}Edit user{% endtrans %}</h2>
 	<div class="f-ebox">
 		{{ form.localpart.label }}
@@ -55,9 +54,9 @@
 		{%- endcall -%}
 		{%- call form_button("done", form.action_save, class="primary") %}{% endcall -%}
 	</div>
-</form></div>
+</div>
 <h2>{% trans %}Further actions{% endtrans %}</h2>
-<div class="form layout-expanded"><form method="POST">
+<div class="form layout-expanded">
 	<h2 class="form-title">{% trans %}Reset password{% endtrans %}</h2>
 	{{ form.csrf_token }}
 	<p class="form-desc">
@@ -75,5 +74,5 @@
 			{%- trans -%}Show debug information{%- endtrans -%}
 		{%- endcall -%}
 	</div>
-</form></div>
+</div></form>
 {% endblock %}

snikket_web/templates/admin_home.html

@@ -31,6 +31,18 @@
 			<div>{% call standard_button("link", url_for(".invitations"), class="primary") %}{% trans %}Manage invitations{% endtrans %}{% endcall %}</div>
 			{#- -#}
 		</li>
+		<li>
+			<h2>{% trans %}System health{% endtrans %}</h2>
+			{#- -#}
+			{%- if show_metrics -%}
+			<p>{% trans %}View the server status or send a broadcast message to all users.{% endtrans %}</p>
+			{%- else -%}
+			<p>{% trans %}Send a broadcast message to all users.{% endtrans %}</p>
+			{%- endif -%}
+			{#- -#}
+			<div>{% call standard_button("insights", url_for(".system"), class="primary") %}{% trans %}Manage system{% endtrans %}{% endcall %}</div>
+			{#- -#}
+		</li>
 		<li>
 			{#- -#}
 			<p>{% trans %}Go back to your user's web portal page.{% endtrans %}</p>

snikket_web/templates/admin_system.html

@@ -0,0 +1,105 @@
+{% extends "admin_app.html" %}
+{% from "library.j2" import form_button %}
+{% block content %}
+<h1>{% trans %}Manage system{% endtrans %}</h1>
+{% if show_metrics %}
+<h2>{% trans %}Overall system status{% endtrans %}</h2>
+<div class="elevated el-2">
+	<dl>
+		<dt>{% trans %}System load (5 minute average){% endtrans %}</dt>
+		<dd>
+			{%- if metrics.load5 -%}
+			{{ metrics.load5 }}
+			{%- else -%}
+			<em>{% trans %}unknown{% endtrans %}</em>
+			{%- endif -%}
+		</dd>
+		<dt>{% trans %}Memory use{% endtrans %}</dt>
+		<dd>
+			{%- if metrics.mem_total and metrics.mem_available -%}
+			{% trans percentage_global=((1 - (metrics.mem_available / metrics.mem_total)) | format_percent), percentage_snikket=((((metrics.prosody_rss | default(0)) + (metrics.portal_rss | default(0))) / metrics.mem_total) | format_percent), mem_available=(metrics.mem_total | format_bytes) %}{{ percentage_global }} of {{ mem_available }}. Of that, Snikket uses {{ percentage_snikket }}.{% endtrans %}
+			{%- else -%}
+			<em>{% trans %}unknown{% endtrans %}</em>
+			{%- endif -%}
+		</dd>
+	</dl>
+</div>
+<h2>{% trans %}Web portal status{% endtrans %}</h2>
+<div class="elevated el-2">
+	<dl>
+		<dt>{% trans %}Version{% endtrans %}</dt>
+		<dd>{{ version }} <a href="{{ url_for("main.about") }}">{% trans %}View all versions{% endtrans %}</a></dd>
+		<dt>{% trans %}Average CPU use{% endtrans %}</dt>
+		<dd>
+			{%- if metrics.portal_cpu -%}
+			{{ metrics.portal_cpu | format_percent }}
+			{%- else -%}
+			<em>{% trans %}unknown{% endtrans %}</em>
+			{%- endif -%}
+		</dd>
+		<dt>{% trans %}Current memory use{% endtrans %}</dt>
+		<dd>
+			{%- if metrics.portal_rss -%}
+			{{ metrics.portal_rss | format_bytes }}
+			{%- else -%}
+			<em>{% trans %}unknown{% endtrans %}</em>
+			{%- endif -%}
+		</dd>
+	</dl>
+</div>
+<h2>{% trans %}Snikket server status{% endtrans %}</h2>
+<div class="elevated el-2">
+	<dl>
+		<dt>{% trans %}Version{% endtrans %}</dt>
+		<dd>{{ prosody_version }} <a href="{{ url_for("main.about") }}">{% trans %}View all versions{% endtrans %}</a></dd>
+		<dt>{% trans %}Average CPU use{% endtrans %}</dt>
+		<dd>
+			{%- if metrics.prosody_cpu -%}
+			{{ metrics.prosody_cpu | format_percent }}
+			{%- else -%}
+			<em>{% trans %}unknown{% endtrans %}</em>
+			{%- endif -%}
+		</dd>
+		<dt>{% trans %}Current memory use{% endtrans %}</dt>
+		<dd>
+			{%- if metrics.prosody_rss -%}
+			{{ metrics.prosody_rss | format_bytes }}
+			{%- else -%}
+			<em>{% trans %}unknown{% endtrans %}</em>
+			{%- endif -%}
+		</dd>
+		<dt>{% trans %}Storage used by shared files{% endtrans %}</dt>
+		<dd>
+			{%- if metrics.prosody_uploads | default(None) is not none -%}
+			{{ metrics.prosody_uploads | format_bytes }}
+			{%- else -%}
+			<em>{% trans %}unknown{% endtrans %}</em>
+			{%- endif -%}
+		</dd>
+		<dt>{% trans %}Connected devices{% endtrans %}</dt>
+		<dd>
+			{%- if metrics.prosody_devices | default(None) is not none -%}
+			{{ metrics.prosody_devices }}
+			{%- else -%}
+			<em>{% trans %}unknown{% endtrans %}</em>
+			{%- endif -%}
+		</dd>
+	</dl>
+</div>
+{% endif %}
+<h2>{% trans %}Broadcast message{% endtrans %}</h2>
+<form method="POST">{{ form.csrf_token }}<div class="form layout-expanded">
+	<p class="form-desc">{% trans %}This form allows you to send a message to all users currently online on your Snikket server. Use it wisely.{% endtrans %}</p>
+	<div class="f-ebox">
+		{{ form.text.label }}
+		{{ form.text }}
+	</div>
+	<div class="f-ebox">
+		{{ form.online_only }}{{ form.online_only.label }}
+	</div>
+	<div class="f-bbox">
+		{%- call form_button("send", form.action_send_preview, class="primary") -%}{%- endcall -%}
+		{%- call form_button("broadcast", form.action_post_all, class="secondary accent") -%}{%- endcall -%}
+	</div>
+</div></form>
+{% endblock %}

snikket_web/templates/invite_register.html

@@ -28,12 +28,12 @@
 		</div>
 		<div class="f-ebox">
 			{{ form.password.label }}
-			{{ form.password }}
+			{{ form.password(autocomplete="new-password") }}
 			<p class="field-desc weak">{% trans %}Enter a secure password that you do not use anywhere else.{% endtrans %}</p>
 		</div>
 		<div class="f-ebox">
 			{{ form.password_confirm.label }}
-			{{ form.password_confirm }}
+			{{ form.password_confirm(autocomplete="new-password") }}
 		</div>
 		<div class="f-bbox">
 			{%- call form_button("done", form.action_register, class="primary") -%}{%- endcall -%}

snikket_web/templates/invite_reset.html

@@ -17,11 +17,11 @@
 	{%- call render_errors(form) %}{% endcall -%}
 	<div class="f-ebox">
 		{{ form.password.label }}
-		{{ form.password }}
+		{{ form.password(autocomplete="new-password") }}
 	</div>
 	<div class="f-ebox">
 		{{ form.password_confirm.label }}
-		{{ form.password_confirm }}
+		{{ form.password_confirm(autocomplete="new-password") }}
 	</div>
 	<div class="f-bbox">
 		{%- call form_button("passwd", form.action_reset, class="primary") -%}{%- endcall -%}

snikket_web/templates/invite_success.html

@@ -1,6 +1,6 @@
 {% extends "invite.html" %}
 {% set body_id = "invite" %}
-{% from "library.j2" import form_button, clipboard_button %}
+{% from "library.j2" import form_button, clipboard_button, render_errors %}
 {% block head_lead %}
 <title>{% trans site_name=config["SITE_NAME"] %}Successfully registered on {{ site_name }} | Snikket{% endtrans %}</title>
 {%- include "copy-snippet.html" -%}
@@ -15,6 +15,47 @@
 		{% trans %}Copy address{% endtrans %}
 	{%- endcall -%}
 	<p>{% trans %}You can now set up your legacy XMPP client with the above address and the password you chose during registration.{% endtrans %}</p>
-	<p>{% trans %}You can now safely close this page.{% endtrans %}</p>
+	<p>{% trans login_url=url_for('main.login') %}You can now safely close this page, or log in to the web portal to <a href="{{ login_url }}">manage your account</a>.{% endtrans %}</p>
+
+	{% if migration_success %}
+		<h2>{% trans %}Import successful{% endtrans %}</h2>
+		<p>{% trans %}Congratulations! Your account data has been successfully imported.{% endtrans %}</p>
+	{% endif %}
+
+	{% if form %}
+		<h2>{% trans %}Moving to Snikket?{% endtrans %}</h2>
+		<p>{% trans %}If you are moving from a different Snikket instance or another XMPP-compatible service, you may optionally import the data (contacts, profile information, etc.) from your previous account. When you have exported the data from your previous account, upload it using the form below.{% endtrans %}</p>
+
+		<div class="form layout-expanded"><form method="POST" enctype="multipart/form-data">
+			<h3 class="form-title">{% trans %}Upload account data{% endtrans %}</h3>
+			{{ form.csrf_token }}
+			{% call render_errors(form) %}{% endcall %}
+			<div class="f-ebox">
+				{{ form.account_data_file.label }}
+				{{ form.account_data_file(accept="application/xml",
+						 data_maxsize=max_import_size,
+						 data_warning_header=import_too_big_warning_header,
+						 data_maxsize_warning=import_too_big_warning) }}
+			</div>
+			<div class="f-bbox">
+				{%- call form_button("upload", form.action_import, class="secondary") %}{% endcall -%}
+			</div>
+			<script type="text/javascript">
+			document.getElementById("{{ form.account_data_file.id }}").onchange = function() {
+				var maxsize_s = this.dataset.maxsize;
+				var maxsize = parseInt(maxsize_s);
+				if (this.files[0].size > maxsize) {
+					var warning_header = this.dataset.warningHeader;
+					var warning_text = this.dataset.maxsizeWarning;
+					this.setCustomValidity(warning_text);
+					this.reportValidity();
+					this.value = null;
+				} else {
+					this.setCustomValidity("");
+				}
+			};
+			</script>
+	</form></div>
+	{% endif %}
 </div>
 {% endblock %}

snikket_web/templates/invite_view.html

@@ -68,7 +68,7 @@
 			{#- -#}
 			<div id="qr-info-url" class="tab-pane active">
 				<p>{% trans %}Use a <em>QR code</em> scanner on your mobile device to scan the code below:{% endtrans %}</p>
-				<div id="qr-invite-page" data-qrdata="{{ url_for(".view", id_=invite_id, _external=True) }}" class="qr"></div>
+				<div id="qr-invite-page" data-qrdata="{{ url_for(".view", id_=invite_id, _external=True, _scheme="https") }}" class="qr"></div>
 			</div>
 			{#- -#}
 			<div id="qr-info-uri" class="tab-pane">
@@ -127,7 +127,7 @@
 		<p>{% trans %}After installing Snikket via F-Droid, you have to return to this invite link and tap on "Open the app" to proceed.{% endtrans %}</p>
 		<ol>
 			<li><p>{% trans %}First install Snikket from F-Droid using the button below:{% endtrans %}</p>
-			<p><a href="{{ f_droid_url }}" class="popover" data-popover-id="fdroid-popover"><img alt='{% trans %}Install via F-Droid{% endtrans %}' src='{{ url_for('static', filename='img/f-droid-badge.png') }}' class="fdroid"/></a></p></li>
+			<p><a href="{{ f_droid_url }}"><img alt='{% trans %}Install via F-Droid{% endtrans %}' src='{{ url_for('static', filename='img/f-droid-badge.png') }}' class="fdroid"/></a></p></li>
 			<li><p>{% trans %}After the installation is complete, you can return to this page and tap the "Open the app" button to continue with the setup:{% endtrans %}</p>
 			<p>
 			{%- call standard_button("exit_to_app", invite.xmpp_uri, class="primary") -%}

snikket_web/templates/user_home.html

@@ -30,6 +30,7 @@
 			<div>
 				<div>{% call standard_button("edit", url_for(".profile"), class="primary") %}{% trans %}Edit profile{% endtrans %}{% endcall %}</div>
 				<div>{% call standard_button("passwd", url_for(".change_pw"), class="secondary") %}{% trans %}Change password{% endtrans %}{% endcall %}</div>
+				<div>{% call standard_button("folder", url_for(".manage_data"), class="secondary") %}{% trans %}Manage your data{% endtrans %}{% endcall %}</div>
 			</div>
 			{#- -#}
 		</li>

snikket_web/templates/user_manage_data.html

@@ -0,0 +1,24 @@
+{% extends "app.html" %}
+{% from "library.j2" import standard_button, form_button, render_errors, avatar with context %}
+{% block content %}
+<h1>{% trans %}Manage your data{% endtrans %}</h1>
+<nav class="welcome">
+	<ul>
+		<li>
+			<h2>{% trans %}Export account{% endtrans %}</h2>
+			<p>{% trans %}Download your account data as a file for backup purposes or to move your account to another service.{% endtrans %}</p>
+
+			{% call render_errors(form) %}{% endcall %}
+
+			<div class="f-bbox">
+				{%- call standard_button("back", url_for('.index'), class="tertiary") %}{% trans %}Back{% endtrans %}{% endcall -%}
+
+				<form method="POST">
+					{{ form.csrf_token }}
+					{%- call form_button("download", form.action_export, class="primary") %}{% endcall -%}
+				</form>
+			</div>
+		</li>
+	</ul>
+</nav>
+{% endblock %}

snikket_web/templates/user_passwd.html

@@ -9,15 +9,15 @@
 	{%- endcall -%}
 	<div class="f-ebox">
 		{{ form.current_password.label(class="required") }}
-		{{ form.current_password(class=("has-error" if form.current_password.name in form.errors else "")) }}
+		{{ form.current_password(class=("has-error" if form.current_password.name in form.errors else ""), autocomplete="current-password") }}
 	</div>
 	<div class="f-ebox">
 		{{ form.new_password.label(class="required") }}
-		{{ form.new_password }}
+		{{ form.new_password(autocomplete="new-password") }}
 	</div>
 	<div class="f-ebox">
 		{{ form.new_password_confirm.label(class="required") }}
-		{{ form.new_password_confirm(class=("has-error" if form.new_password_confirm.name in form.errors else "")) }}
+		{{ form.new_password_confirm(class=("has-error" if form.new_password_confirm.name in form.errors else ""), autocomplete="new-password") }}
 	</div>
 	<div class="box warning">
 		<header>{% trans %}Warning{% endtrans %}</header>

snikket_web/translations/da/LC_MESSAGES/messages.po

@@ -6,197 +6,283 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"Report-Msgid-Bugs-To: translations@snikket.org\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
-"PO-Revision-Date: 2021-03-10 19:03+0000\n"
+"PO-Revision-Date: 2022-05-30 14:01+0000\n"
-"Last-Translator: Daniel Holmgaard <annoncer@protonmail.com>\n"
+"Last-Translator: Daniel Holmgaard <fovatis@tutanota.com>\n"
-"Language-Team: Danish <https://i18n.sotecware.net/projects/snikket/web-"
+"Language-Team: Danish <http://i18n.sotecware.net/projects/snikket/web-portal/"
-"portal/da/>\n"
+"da/>\n"
 "Language: da\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.4.2\n"
+"X-Generator: Weblate 4.8.1\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "Slet bruger permanent"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "Login-navn"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
-msgid "User deleted"
+#: snikket_web/templates/admin_edit_circle.html:60
-msgstr "Bruger slettet"
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "Kaldenavn"
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
+msgstr "Adgangsniveau"
+
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr "Begrænset"
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr "Normal bruger"
+
+#: snikket_web/admin.py:80
+msgid "Administrator"
+msgstr "Administrator"
+
+#: snikket_web/admin.py:85
+msgid "Update user"
+msgstr "Opdater bruger"
+
+#: snikket_web/admin.py:89
+msgid "Create password reset link"
+msgstr "Opret link til nulstilling af adgangskode"
+
+#: snikket_web/admin.py:107
 msgid "Password reset link created"
 msgstr "Link til nulstilling af adgangskode oprettet"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+msgid "User information updated."
+msgstr "Brugerinformation opdateret."
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "Slet bruger permanent"
+
+#: snikket_web/admin.py:157
+msgid "User deleted"
+msgstr "Bruger slettet"
+
+#: snikket_web/admin.py:195
+msgid "Password reset link not found"
+msgstr "Link til nulstilling af adgangskode ikke fundet"
+
+#: snikket_web/admin.py:207
 msgid "Password reset link deleted"
 msgstr "Link til nulstilling af adgangskode slettet"
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "Inviter til cirkel"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "Mindst en cirkel skal vælges"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "Gyldig for"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "En time"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "Tolv timer"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "En dag"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "En uge"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "Fire uger"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "Invitationstype"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr "Individuel"
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr "Gruppe"
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "Ny invitationslink"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "Tilbagekald"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 msgid "Invitation created"
 msgstr "Invitation oprettet"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 msgid "No such invitation exists"
 msgstr "Denne invitation findes ikke"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 msgid "Invitation revoked"
 msgstr "Invitation tilbagekaldt"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "Navn"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "Opret cirkel"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 msgid "Circle created"
 msgstr "Cirkel oprettet"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "Vælg bruger"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 msgid "Update circle"
 msgstr "Opdater cirkel"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "Slet cirkel permanent"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "Tilføj bruger"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 msgid "No such circle exists"
 msgstr "Denne cirkel findes ikke"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 msgid "Circle data updated"
-msgstr "Cirkel data opdateret"
+msgstr "Cirkel-data opdateret"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 msgid "Circle deleted"
 msgstr "Cirkel slettet"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 msgid "User added to circle"
 msgstr "Bruger tilføjet til cirkel"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 msgid "User removed from circle"
 msgstr "Bruger fjernet fra cirkel"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr "Meddelelsens indhold"
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr "Send kun til online brugere"
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr "Send til alle brugere"
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr "Send forhåndsvisning til dig selv"
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr "Bekendgørelse sendt!"
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "Hoved"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+"De kontodata, du forsøgte at importere, er for store til at uploade. Kontakt "
+"din Snikket-operatør."
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr "Brugernavn"
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "Adgangskode"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 msgid "Confirm password"
 msgstr "Bekræft adgangskode"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
-#, fuzzy
-#| msgid "The passwords must match"
 msgid "The passwords must match."
-msgstr "Adgangskoderne skal matche"
+msgstr "Adgangskoderne skal matche."
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 msgid "Create account"
 msgstr "Opret konto"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
-#, fuzzy
-#| msgid "That username is already taken"
 msgid "That username is already taken."
-msgstr "Det brugernavn er allerede taget"
+msgstr "Det brugernavn er allerede taget."
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
-#, fuzzy
-#| msgid "Registration was declined for unknown reasons"
 msgid "Registration was declined for unknown reasons."
-msgstr "Registrering blev afvist af ukendte årsager"
+msgstr "Registrering blev afvist af ukendte årsager."
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
-#, fuzzy
-#| msgid "The username is not valid"
 msgid "The username is not valid."
-msgstr "Brugernavnet er ikke gyldigt"
+msgstr "Brugernavnet er ikke gyldigt."
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "Ændr adgangskode"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr "Kontodatafil"
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr "Importer data"
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+"De kontodata, du forsøgte at importere, er i et ukendt format. Upload en XML-"
+"fil i XEP-0227-format (forudsat format: %(mimetype)s)."
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr "Fejl"
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "Adresse"
@@ -213,80 +299,85 @@ msgstr "Ugyldigt brugernavn eller adgangskode."
 msgid "Login successful!"
 msgstr "Login lykkedes!"
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "Nuværende adgangskode"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "Ny adgangskode"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "Bekræft ny adgangskode"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
-#, fuzzy
-#| msgid "The new passwords must match"
 msgid "The new passwords must match."
-msgstr "Den nye adgangskode skal matche"
+msgstr "Den nye adgangskode skal matche."
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "Log ud"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr "Ingen"
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "Kun venner"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "Alle"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "Kaldenavn"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "Avatar"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr "Profilsynlighed"
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "Opdater profil"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
-#, fuzzy
+msgid "Account data"
-#| msgid "Incorrect password"
+msgstr "Kontodata"
-msgid "Incorrect password."
-msgstr "Forkert adgangskode"
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr "Upload"
+
+#: snikket_web/user.py:111
+msgid "Incorrect password."
+msgstr "Forkert adgangskode."
+
+#: snikket_web/user.py:115
 msgid "Password changed"
 msgstr "Adgangskode ændret"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
 msgstr ""
+"Den valgte avatar er for stor. For at kunne uploade større avatarer skal du "
+"bruge appen."
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 msgid "Profile updated"
 msgstr "Profil opdateret"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
-msgstr "Fejl"
+msgstr "Exporter"
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
+msgstr "Du har i øjeblikket ingen kontodata at eksportere."
 
 #: snikket_web/templates/_footer.html:4
 #, python-format
@@ -418,8 +509,9 @@ msgid "Members"
 msgstr "Medlemmer"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "Handlinger"
 
@@ -494,12 +586,12 @@ msgid "Copy complete output"
 msgstr "Kopier komplet output"
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "Slet bruger %(user_name)s"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "Slet bruger"
 
@@ -507,11 +599,6 @@ msgstr "Slet bruger"
 msgid "Are you sure you want to delete the following user?"
 msgstr "Er du sikker på, at du vil slette følgende bruger?"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "Login-navn"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "Fare"
@@ -563,7 +650,7 @@ msgstr "Denne cirkel er ikke tilknyttet nogen gruppechat."
 
 #: snikket_web/templates/admin_edit_circle.html:44
 msgid "Return to circle list"
-msgstr ""
+msgstr "Retur til cirkeliste"
 
 #: snikket_web/templates/admin_edit_circle.html:48
 msgid "Delete circle"
@@ -577,28 +664,37 @@ msgstr "Sletning af en cirkel vil ikke slette brugere i cirklen."
 msgid "Circle members"
 msgstr "Cirkel medlemmer"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr "Brugeren er blevet slettet fra serveren."
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr "Slettet"
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Fjern bruger %(username)s fra cirkel"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr "Den nuværende cirkel har ingen medlemmer."
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "Inviter flere medlemmer"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "Tilføj eksisterende bruger"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr "Alle brugere tilføjet"
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr "Alle brugerne af denne tjeneste er allerede i denne cirkel."
 
@@ -651,11 +747,96 @@ msgstr "Denne bruger vil blive tilføjet som kontakt hos %(peer_jid)s."
 msgid "Created"
 msgstr "Oprettet"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
-#, fuzzy
-#| msgid "New invitation link"
 msgid "Return to invitation list"
-msgstr "Ny invitationslink"
+msgstr "Retur til invitationsliste"
+
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+"Begrænset brugere kan interagere med brugere på den samme Snikket-tjeneste "
+"og være medlemmer af cirkler."
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+"Som begrænset brugere og kan desuden også interagere med brugere på andre "
+"Snikket-tjenester."
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr ""
+"Som normale brugere og kan desuden få adgang til adminpanelet i webportalen."
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, python-format
+msgid "Edit user %(user_name)s"
+msgstr "Rediger bruger %(user_name)s"
+
+#: snikket_web/templates/admin_edit_user.html:22
+msgid "Edit user"
+msgstr "Rediger bruger"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr "Login-navnet kan ikke ændres."
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+"En brugers adgangsniveau bestemmer, hvilke interaktioner der er tilladt for "
+"dem på din Snikket-tjeneste."
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+
+#: snikket_web/templates/admin_edit_user.html:50
+msgid "Return to user list"
+msgstr "Retur til brugerliste"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr "Yderligere handlinger"
+
+#: snikket_web/templates/admin_edit_user.html:60
+msgid "Reset password"
+msgstr "Nustil adgangskode"
+
+#: snikket_web/templates/admin_edit_user.html:63
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+"Hvis brugeren har mistet deres adgangskode, kan du bruge knappen nedenfor "
+"til at oprette et specielt link, der giver mulighed for at ændre "
+"adgangskoden til kontoen en gang."
+
+#: snikket_web/templates/admin_edit_user.html:68
+msgid "Debug information"
+msgstr "Fejlretningsoplysninger"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+"I nogle tilfælde er detaljeret oplysninger om brugerkontoen og de "
+"tilsluttede enheder nødvendige for at foretage fejlfinding af problemer. "
+"Knappen nedenfor afslører disse (følsomme) oplysninger."
+
+#: snikket_web/templates/admin_edit_user.html:74
+msgid "Show debug information"
+msgstr "Vis fejlretningsoplysninger"
 
 #: snikket_web/templates/admin_home.html:4
 msgid "Welcome to the admin panel!"
@@ -697,11 +878,28 @@ msgstr "Opret, tilbagekald eller kopier invitationer."
 msgid "Manage invitations"
 msgstr "Håndter invitationer"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr "Systemets sundhed"
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr "Vis serverstatus, eller send en udsendelsesmeddelelse til alle brugere."
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr "Send en udsendelsesmeddelelse til alle brugere."
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+msgid "Manage system"
+msgstr "Håndter system"
+
+#: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
 msgstr "Gå tilbage din brugers webportal side."
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr "Afslut administrator panel"
 
@@ -754,15 +952,101 @@ msgstr ""
 msgid "Destroy link"
 msgstr "Ødelæg link"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
+msgstr "Samlet systemstatus"
-msgstr "Vis fejlretningsoplysninger for %(user_name)s"
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr "Systembelastning (5 minutters gennemsnit)"
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr "ukendt"
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr "Forbrug af hukommelse"
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
-msgstr "Opret link til nulstilling af adgangskode til %(user_name)s"
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+"%(percentage_global)s af %(mem_available)s. Der af bruger Snikket "
+"%(percentage_snikket)s."
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr "Webportalens status"
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr "Version"
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr "Vis alle versioner"
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr "Gennemsnitlig CPU-forbrug"
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr "Nuværende hukommelsesbrug"
+
+#: snikket_web/templates/admin_system.html:50
+msgid "Snikket server status"
+msgstr "Snikket server status"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr "Lagerplads, der bruges af delte filer"
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr "Forbundet enheder"
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr "Send besked"
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+"Denne formular giver dig mulighed for at sende en besked til alle brugere, "
+"der i øjeblikket er online på din Snikket-server. Brug den med omtanke."
+
+#: snikket_web/templates/admin_users.html:19
+msgid "The user is an administrator."
+msgstr "Brugeren er administrator."
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr " (Administrator)"
+
+#: snikket_web/templates/admin_users.html:22
+msgid "The user is restricted."
+msgstr "Brugeren er begrænset."
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
+msgstr " (Begrænset)"
 
 #: snikket_web/templates/app.html:4
 msgid "Snikket Web Portal"
@@ -923,7 +1207,6 @@ msgid "You can now log in using your new password."
 msgstr "Du kan nu logge ind med din nye adgangskode."
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr "Du kan sikkert lukke denne side."
 
@@ -1015,6 +1298,43 @@ msgstr ""
 "Du kan nu konfigurere din ældre XMPP-klient med ovenstående adresse og den "
 "adgangskode, du valgte under registreringen."
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+"Du kan nu trygt lukke denne side eller logge ind på webportalen for at <a "
+"href=\"%(login_url)s\">administrere din konto</a>."
+
+#: snikket_web/templates/invite_success.html:21
+msgid "Import successful"
+msgstr "Importering lykkes"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr "Tillykke! Dine kontodata er blevet importeret."
+
+#: snikket_web/templates/invite_success.html:26
+msgid "Moving to Snikket?"
+msgstr "Flytte til Snikket?"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+"Hvis du flytter fra en anden Snikket-platform eller en anden XMPP-kompatibel "
+"tjeneste, kan du eventuelt importere dataene (kontakter, profiloplysninger "
+"osv.) fra din tidligere konto. Når du har eksporteret dataene fra din "
+"tidligere konto, skal du uploade dem ved hjælp af nedenstående formular."
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr "Upload kontodata"
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1066,7 +1386,7 @@ msgstr "Download i App Store"
 
 #: snikket_web/templates/invite_view.html:32
 msgid "Get it on F-Droid"
-msgstr ""
+msgstr "Få den på F-Droid"
 
 #: snikket_web/templates/invite_view.html:35
 msgid "Send to mobile device"
@@ -1138,17 +1458,19 @@ msgstr ""
 
 #: snikket_web/templates/invite_view.html:93
 msgid "Install on iOS"
-msgstr ""
+msgstr "Installer på iOS"
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
+"Efter download af Snikket fra App Store, skal du vende tilbage til dette "
+"invitationslink og trykke på \"Åbn appen\" for at fortsætte."
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
-msgstr ""
+msgstr "Download først Snikket fra App Store ved hjælp af nedenstående knap:"
 
 #: snikket_web/templates/invite_view.html:103
 #: snikket_web/templates/invite_view.html:131
@@ -1156,21 +1478,25 @@ msgid ""
 "After the installation is complete, you can return to this page and tap the "
 "\"Open the app\" button to continue with the setup:"
 msgstr ""
+"Når installationen er afsluttet, kan du vende tilbage til denne side og "
+"trykke på knappen \"Åbn appen\" for at fortsætte med opsætningen:"
 
 #: snikket_web/templates/invite_view.html:121
 #: snikket_web/templates/invite_view.html:130
 msgid "Install via F-Droid"
-msgstr ""
+msgstr "Installer via F-droid"
 
 #: snikket_web/templates/invite_view.html:127
 msgid ""
 "After installing Snikket via F-Droid, you have to return to this invite link "
 "and tap on \"Open the app\" to proceed."
 msgstr ""
+"Efter installation af Snikket via F-Droid, skal du vende tilbage til dette "
+"invitationslink og trykke på \"Åbn appen\" for at fortsætte."
 
 #: snikket_web/templates/invite_view.html:129
 msgid "First install Snikket from F-Droid using the button below:"
-msgstr ""
+msgstr "Installer først Snikket fra F-Droid ved hjælp af knappen nedenfor:"
 
 #: snikket_web/templates/library.j2:18
 msgid "Copy link"
@@ -1180,10 +1506,6 @@ msgstr "Kopier link"
 msgid "Invalid input"
 msgstr "Ugyldig input"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr "Slettet"
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
@@ -1200,7 +1522,7 @@ msgstr "Snikket Login"
 
 #: snikket_web/templates/login.html:14
 msgid "Enter your Snikket address and password to manage your account."
-msgstr "Indtast din Snikket adresse og adgangskode for håndter din konto."
+msgstr "Indtast din Snikket adresse og adgangskode for at håndter din konto."
 
 #: snikket_web/templates/login.html:19
 msgid "Incorrect address"
@@ -1240,15 +1562,20 @@ msgstr "Din XMPP adresse"
 msgid "Edit profile"
 msgstr "Rediger profil"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+msgid "Manage your data"
+msgstr "Håndter dine data"
+
+#: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
 msgstr "Din Snikket"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr "Håndter brugere, invitationer og cirkler på din Snikket tjeneste."
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 msgid "Admin panel"
 msgstr "Administrator panel"
 
@@ -1264,6 +1591,18 @@ msgstr ""
 "Klik herunder for at logge dig selv ud af webportalen. Dette på virkeringen "
 "af de forbundne enheder."
 
+#: snikket_web/templates/user_manage_data.html:8
+msgid "Export account"
+msgstr "Eksporter konto"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+"Download dine kontodata som en fil til sikkerhedskopieringsformål eller for "
+"at flytte din konto til en anden tjeneste."
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "Ændr din adgangskode"
@@ -1306,5 +1645,8 @@ msgstr ""
 "Denne sektion tillader dig at kontrollere, hvem der kan se din profil "
 "informationer, så som avatar og kaldenavn."
 
+#~ msgid "Create password reset link for %(user_name)s"
+#~ msgstr "Opret link til nulstilling af adgangskode til %(user_name)s"
+
 #~ msgid "Login failed"
 #~ msgstr "Log ind fejlede"

snikket_web/translations/de/LC_MESSAGES/messages.po

@@ -6,189 +6,282 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: SnikketWeb 0.1.0\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"Report-Msgid-Bugs-To: translations@snikket.org\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
-"PO-Revision-Date: 2021-03-21 16:31+0000\n"
+"PO-Revision-Date: 2022-01-18 14:59+0000\n"
 "Last-Translator: Jonas Schäfer <jonas@zombofant.net>\n"
-"Language-Team: German <https://i18n.sotecware.net/projects/snikket/web-"
+"Language-Team: German <http://i18n.sotecware.net/projects/snikket/web-portal/"
-"portal/de/>\n"
+"de/>\n"
 "Language: de\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.5.1\n"
+"X-Generator: Weblate 4.8.1\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "Benutzer endgültig löschen"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "Anmeldename"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
-msgid "User deleted"
+#: snikket_web/templates/admin_edit_circle.html:60
-msgstr "Benutzer gelöscht"
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "Anzeigename"
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
+msgstr "Berechtigungen"
+
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr "Eingeschränkt"
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr "Normaler Benutzer"
+
+#: snikket_web/admin.py:80
+msgid "Administrator"
+msgstr "Administrator"
+
+#: snikket_web/admin.py:85
+msgid "Update user"
+msgstr "Benutzer ändern"
+
+#: snikket_web/admin.py:89
+msgid "Create password reset link"
+msgstr "Passwort-Link erzeugen"
+
+#: snikket_web/admin.py:107
 msgid "Password reset link created"
 msgstr "Link zum Zurücksetzen des Passwortes erzeugt"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+msgid "User information updated."
+msgstr "Benutzerinformationen gespeichert."
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "Benutzer endgültig löschen"
+
+#: snikket_web/admin.py:157
+msgid "User deleted"
+msgstr "Benutzer gelöscht"
+
+#: snikket_web/admin.py:195
+msgid "Password reset link not found"
+msgstr "Link zum Zurücksetzen des Passwortes nicht gefunden"
+
+#: snikket_web/admin.py:207
 msgid "Password reset link deleted"
 msgstr "Link gelöscht"
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "In Gemeinschaft einladen"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "Mindestens eine Gemeinschaft muss ausgewählt sein"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "Gültig für"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "Eine Stunde"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "Zwölf Stunden"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "Ein Tag"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "Eine Woche"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "Vier Wochen"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "Art der Einladung"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr "Einzelperson"
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr "Gruppe"
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "Neuer Einladungslink"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "Löschen"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 msgid "Invitation created"
 msgstr "Einladung angelegt"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 msgid "No such invitation exists"
 msgstr "Diese Einladung existiert nicht"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 msgid "Invitation revoked"
 msgstr "Einladung gelöscht"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "Name"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "Gemeinschaft gründen"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 msgid "Circle created"
 msgstr "Gemeinschaft gegründet"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "Benutzer auswählen"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 msgid "Update circle"
 msgstr "Gemeinschaft ändern"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "Gemeinschaft endgültig löschen"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "Benutzer hinzufügen"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 msgid "No such circle exists"
 msgstr "Diese Gemeinschaft existiert nicht"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 msgid "Circle data updated"
 msgstr "Gemeinschaftsdaten aktualisiert"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 msgid "Circle deleted"
 msgstr "Gemeinschaft gelöscht"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 msgid "User added to circle"
 msgstr "Benutzer zur Gemeinschaft hinzugefügt"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 msgid "User removed from circle"
 msgstr "Benutzer aus der Gemeinschaft entfernt"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr "Nachrichteninhalt"
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr "Nur an verbundene Benutzer senden"
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr "An alle Benutzer senden"
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr "Vorschau an dich selbst senden"
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr "Ankündigung verschickt!"
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "Kern"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+"Der Kontoexport ist zu groß. Bitte kontaktiere deinen Snikket-Betreiber."
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr "Benutzername"
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "Passwort"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 msgid "Confirm password"
 msgstr "Passwort (Bestätigung)"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
 msgid "The passwords must match."
 msgstr "Die Passwörter müssen übereinstimmen."
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 msgid "Create account"
 msgstr "Konto anlegen"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
 msgid "That username is already taken."
 msgstr "Dieser Benutzername ist bereits belegt."
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
 msgid "Registration was declined for unknown reasons."
 msgstr "Die Registrierung wurde aus unbekannten Gründen abgelehnt."
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
 msgid "The username is not valid."
 msgstr "Der Benutzername ist ungültig."
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "Passwort ändern"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr "Kontoexportdatei"
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr "Daten importieren"
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+"Der Kontoexport ist in einem unbekannten Format. Es können nur XML-Dateien "
+"im XEP-0227-Format verarbeitet werden (erhaltenes Format: %(mimetype)s)."
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr "Fehler"
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "Adresse"
@@ -205,64 +298,67 @@ msgstr "Benutzername oder Passwort falsch."
 msgid "Login successful!"
 msgstr "Anmeldung erfolgreich!"
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "Neues Passwort (Bestätigung)"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
 msgid "The new passwords must match."
 msgstr "Die neuen Passwörter müssen übereinstimmen."
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "Abmelden"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr "Niemand"
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "Nur Freunde"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "Jeder"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "Anzeigename"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "Bild"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr "Profilsichtbarkeit"
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "Profil bearbeiten"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
+msgid "Account data"
+msgstr "Kontodaten"
+
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr "Hochladen"
+
+#: snikket_web/user.py:111
 msgid "Incorrect password."
 msgstr "Ungültiges Passwort."
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:115
 msgid "Password changed"
 msgstr "Passwort geändert"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
@@ -270,13 +366,17 @@ msgstr ""
 "Das gewählte Profilbild ist zu groß. Benutze die App um größere Bilder "
 "hochladen zu können."
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 msgid "Profile updated"
 msgstr "Profil gespeichert"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
-msgstr "Fehler"
+msgstr "Exportieren"
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
+msgstr "Du hast derzeit keine Kontodaten, die exportiert werden können."
 
 #: snikket_web/templates/_footer.html:4
 #, python-format
@@ -409,8 +509,9 @@ msgid "Members"
 msgstr "Mitglieder"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "Aktionen"
 
@@ -485,12 +586,12 @@ msgid "Copy complete output"
 msgstr "Komplette Ausgabe kopieren"
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "Benutzer %(user_name)s löschen"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "Benutzer löschen"
 
@@ -498,11 +599,6 @@ msgstr "Benutzer löschen"
 msgid "Are you sure you want to delete the following user?"
 msgstr "Bist du sicher dass du den folgenden Benutzer löschen willst?"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "Anmeldename"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "Gefahr"
@@ -557,7 +653,7 @@ msgstr "Diese Gemeinschaft hat keinen zugehörigen Gruppenchat."
 
 #: snikket_web/templates/admin_edit_circle.html:44
 msgid "Return to circle list"
-msgstr ""
+msgstr "Zurück zur Gemeinschaftsliste"
 
 #: snikket_web/templates/admin_edit_circle.html:48
 msgid "Delete circle"
@@ -573,28 +669,37 @@ msgstr ""
 msgid "Circle members"
 msgstr "Mitglieder der Gemeinschaft"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr "Dieser Benutzer wurde von diesem Server gelöscht."
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr "gelöscht"
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Benutzer %(username)s aus der Gemeinschaft entfernen"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr "Diese Gemeinschaft hat derzeit keine Mitglieder."
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "Mehr Mitglieder einladen"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "Bestehenden Benuzter hinzufügen"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr "Alle Benutzer hinzugefügt"
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr "Alle Benutzer dieses Dienstes sind bereits in dieser Gemeinschaft."
 
@@ -648,11 +753,98 @@ msgstr "Der Benutzer wird als Kontakt von %(peer_jid)s hinzugefügt."
 msgid "Created"
 msgstr "Erzeugt"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
-#, fuzzy
-#| msgid "New invitation link"
 msgid "Return to invitation list"
-msgstr "Neuer Einladungslink"
+msgstr "Zurück zur Einladungsliste"
+
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+"Eingeschränkte Benutzer können mit anderen Benutzern auf dem selben Snikket-"
+"Server interagieren und Mitglieder in Gemeinschaften sein."
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+"Wie eingeschränkte Benutzer, zusätzlich können normale Benutzer auch mit "
+"Benutzern auf anderen Snikket-Servern interagieren."
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr ""
+"Wie normale Benutzer, zusätzlich können Administratoren auf den Adminbereich "
+"zugreifen."
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, python-format
+msgid "Edit user %(user_name)s"
+msgstr "Benutzer %(user_name)s bearbeiten"
+
+#: snikket_web/templates/admin_edit_user.html:22
+msgid "Edit user"
+msgstr "Benutzer bearbeiten"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr "Der Anmeldename kann nicht geändert werden."
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+"Die Berechtigungen von Benutzern bestimmen, welche Interaktionen ihnen auf "
+"deinem Snikket-Server erlaubt sind."
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+
+#: snikket_web/templates/admin_edit_user.html:50
+msgid "Return to user list"
+msgstr "Zurück zur Benutzerliste"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr "Weitere Aktionen"
+
+#: snikket_web/templates/admin_edit_user.html:60
+msgid "Reset password"
+msgstr "Passwort zurücksetzen"
+
+#: snikket_web/templates/admin_edit_user.html:63
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+"Wenn ein Benutzer das Passwort verloren oder vergessen hat, kannst du den "
+"folgenden Button verwenden um einen Link zu erzeugen. Dieser Link erlaubt es "
+"einmalig, das Passwort des Kontos zu ändern."
+
+#: snikket_web/templates/admin_edit_user.html:68
+msgid "Debug information"
+msgstr "Informationen zur Fehlerbehebung"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+"In seltenen Fällen kann es vorkommen, dass weiterführende Informationen über "
+"das Benutzerkonto sowie die verbundenen Geräte erforderlich sind um ein "
+"Problem zu beheben. Der folgende Button zeigt diese (teilweise "
+"vertraulichen) Informationen an."
+
+#: snikket_web/templates/admin_edit_user.html:74
+msgid "Show debug information"
+msgstr "Debugging-Informationen anzeigen"
 
 #: snikket_web/templates/admin_home.html:4
 msgid "Welcome to the admin panel!"
@@ -694,11 +886,29 @@ msgstr "Erzeugen, Löschen oder Kopieren von Einladungen."
 msgid "Manage invitations"
 msgstr "Einladungen verwalten"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr "Systemzustand"
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr ""
+"Einsehen des Serverzustands oder versenden einer Nachricht an alle Benutzer."
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr "Nachricht an alle Benutzer versenden."
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+msgid "Manage system"
+msgstr "System verwalten"
+
+#: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
 msgstr "Zurück zur Startseite deines Benutzers."
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr "Adminbereich verlassen"
 
@@ -751,15 +961,101 @@ msgstr ""
 msgid "Destroy link"
 msgstr "Link zerstören"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
+msgstr "Gesamtzustand"
-msgstr "Debugging-Informationen für %(user_name)s anzeigen"
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr "Systemlast (5-Minuten-Durchschnitt)"
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr "unbekannt"
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr "Arbeitsspeicherverbrauch"
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
-msgstr "Link zum Zurücksetzen des Passwortes von %(user_name)s erzeugen"
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+"%(percentage_global)s von %(mem_available)s. Davon belegt Snikket "
+"%(percentage_snikket)s."
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr "Status des Webportals"
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr "Version"
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr "Alle Versionen anzeigen"
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr "Durchschnittlicher CPU-Verbrauch"
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr "Aktuelle Speicherbelegung"
+
+#: snikket_web/templates/admin_system.html:50
+msgid "Snikket server status"
+msgstr "Status des Snikket-Servers"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr "Durch geteilte Dateien belegter Speicherplatz"
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr "Verbundene Geräte"
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr "Nachricht an alle senden"
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+"Mit diesem Formular kannst du eine Nachricht an alle Benutzer schicken, die "
+"zu deinem Snikket-Dienst gehören. Gebrauche es klug."
+
+#: snikket_web/templates/admin_users.html:19
+msgid "The user is an administrator."
+msgstr "Der Benutzer ist ein Administrator."
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr " (Administrator)"
+
+#: snikket_web/templates/admin_users.html:22
+msgid "The user is restricted."
+msgstr "Dieser Benutzer ist eingeschränkt."
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
+msgstr " (Eingeschränkt)"
 
 #: snikket_web/templates/app.html:4
 msgid "Snikket Web Portal"
@@ -925,7 +1221,6 @@ msgid "You can now log in using your new password."
 msgstr "Du kannst dich nun mit deinem neuen Passwort anmelden."
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr "Du kannst diese Seite nun schließen."
 
@@ -1020,6 +1315,44 @@ msgstr ""
 "Du kannst nun deinen normalen XMPP-Clienten mit der obenstehenden Adresse "
 "und deinem gewählten Passwort einrichten."
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+"Du kannst diese Seite nun schließen oder dich im Webportal anmelden um dein "
+"<a href=\"%(login_url)s\">Konto zu bearbeiten</a>."
+
+#: snikket_web/templates/invite_success.html:21
+msgid "Import successful"
+msgstr "Import erfolgreich"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr "Gratulation! Deine Kontodaten wurden erfolgreich importiert."
+
+#: snikket_web/templates/invite_success.html:26
+msgid "Moving to Snikket?"
+msgstr "Am Umziehen zu Snikket?"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+"Wenn du dabei bist, dein Konto von einer anderen Snikket-Instanz oder XMPP-"
+"kompatiblen Dienst umzuziehen, kannst du optional deine Kontodaten ("
+"Kontakte, Profilinformationen etc.) von deinem vorherigen Konto importieren. "
+"Wenn du die Daten von deinem alten Konto exportiert hast, lade sie mit dem "
+"untenstehenden Formular hoch."
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr "Kontodaten hochladen"
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1045,7 +1378,7 @@ msgstr ""
 
 #: snikket_web/templates/invite_view.html:20
 msgid "Get started"
-msgstr "Leg los!"
+msgstr "Erste Schritte"
 
 #: snikket_web/templates/invite_view.html:22
 msgid "Install the Snikket App on your Android or iOS device."
@@ -1150,14 +1483,14 @@ msgstr "Installation auf iOS"
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
 "Nachdem du Snikket vom App Store heruntergeladen hast musst du zu diesem "
 "Einladungslink zurückkehren und \"App öffnen\" antippen um fortzufahren."
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
 msgstr ""
 "Lade zunächst Snikket aus dem App Store herunter indem du den folgenden "
 "Button benutzt:"
@@ -1197,10 +1530,6 @@ msgstr "Link kopieren"
 msgid "Invalid input"
 msgstr "Ungültige Eingabe"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr "gelöscht"
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
@@ -1260,16 +1589,21 @@ msgstr "Deine XMPP-Adresse"
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+msgid "Manage your data"
+msgstr "Daten verwalten"
+
+#: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
 msgstr "Dein Snikket"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr ""
 "Benutzer, Einladungen und Gemeinschaften dieses Snikket-Dienstes verwalten."
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 msgid "Admin panel"
 msgstr "Adminbereich"
 
@@ -1285,6 +1619,16 @@ msgstr ""
 "Klicke unten um dich aus dem Webportal abzumelden. Dies betrifft keine "
 "anderen Geräte von dir."
 
+#: snikket_web/templates/user_manage_data.html:8
+msgid "Export account"
+msgstr "Konto exportieren"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr "Lade deine Kontodaten als Backup oder zum Umziehen herunter."
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "Ändere dein Passwort"
@@ -1327,30 +1671,15 @@ msgstr ""
 "Hier kannst du einstellen, wer deine Profilinformationen, wie Bild oder "
 "Anzeigename einsehen kann."
 
+#~ msgid "Create password reset link for %(user_name)s"
+#~ msgstr "Link zum Zurücksetzen des Passwortes von %(user_name)s erzeugen"
+
 #~ msgid "Login failed"
 #~ msgstr "Anmeldung fehlgeschlagen"
 
 #~ msgid "Not on mobile?"
 #~ msgstr "Nicht am Smartphone?"
 
-#~ msgid "Edit user %(user_name)s"
-#~ msgstr "Benutzer %(user_name)s bearbeiten"
-
-#~ msgid "User information"
-#~ msgstr "Benutzerinformationen"
-
-#~ msgid ""
-#~ "If the user has forgotten their password, use the below button to create "
-#~ "a password reset link. The password reset link can be used once to change "
-#~ "the password of the account. Transmit the link to the user via a secure "
-#~ "channel."
-#~ msgstr ""
-#~ "Wenn ein Benutzer das Passwort vergessen hat, kannst du den folgenden "
-#~ "Button benutzen um einen Link zum Zurücksetzen des Passworts zu erzeugen. "
-#~ "Dieser Link kann dann ein einziges Mal verwendet werden um das Passwort "
-#~ "des Kontos zu ändern. Lasse den Link dem Benutzer auf einem sicheren "
-#~ "Übertragungsweg zukommen."
-
 #~ msgid "No users left"
 #~ msgstr "Keine Benutzer übrig"
 

snikket_web/translations/en/LC_MESSAGES/messages.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
-"PO-Revision-Date: 2021-02-02 21:01+0000\n"
+"PO-Revision-Date: 2021-06-19 15:01+0000\n"
 "Last-Translator: Jonas Schäfer <jonas@zombofant.net>\n"
 "Language-Team: English <https://i18n.sotecware.net/projects/snikket/web-"
 "portal/en/>\n"
@@ -17,210 +17,310 @@ 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.4.2\n"
+"X-Generator: Weblate 4.5.1\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "Delete user permanently"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "Login name"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "Display name"
+
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
+msgstr ""
+
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr ""
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr ""
+
+#: snikket_web/admin.py:80
 #, fuzzy
-#| msgid "deleted"
+#| msgid "Admin area"
-msgid "User deleted"
+msgid "Administrator"
-msgstr "deleted"
+msgstr "Admin area"
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:85
+#, fuzzy
+#| msgid "Update circle"
+msgid "Update user"
+msgstr "Update circle"
+
+#: snikket_web/admin.py:89
+#, fuzzy
+#| msgid "Create password reset links or delete users."
+msgid "Create password reset link"
+msgstr "Create password reset links or delete users."
+
+#: snikket_web/admin.py:107
 #, fuzzy
 #| msgid "Password reset link for %(user_name)s"
 msgid "Password reset link created"
 msgstr "Password reset link for %(user_name)s"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+#, fuzzy
+#| msgid "User information"
+msgid "User information updated."
+msgstr "User information"
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "Delete user permanently"
+
+#: snikket_web/admin.py:157
+#, fuzzy
+#| msgid "deleted"
+msgid "User deleted"
+msgstr "deleted"
+
+#: snikket_web/admin.py:195
+#, fuzzy
+#| msgid "Password reset link for %(user_name)s"
+msgid "Password reset link not found"
+msgstr "Password reset link for %(user_name)s"
+
+#: snikket_web/admin.py:207
 #, fuzzy
 #| msgid "Create password reset links or delete users."
 msgid "Password reset link deleted"
 msgstr "Create password reset links or delete users."
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "Invite to circle"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "At least one circle must be selected"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "Valid for"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "One hour"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "Twelve hours"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "One day"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "One week"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "Four weeks"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "Invitation type"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr "Individual"
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr "Group"
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "New invitation link"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "Revoke"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 #, fuzzy
 #| msgid "Invitation type"
 msgid "Invitation created"
 msgstr "Invitation type"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 #, fuzzy
 #| msgid "New invitation link"
 msgid "No such invitation exists"
 msgstr "New invitation link"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 #, fuzzy
 #| msgid "Invitation type"
 msgid "Invitation revoked"
 msgstr "Invitation type"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "Name"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "Create circle"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 #, fuzzy
 #| msgid "Circle name"
 msgid "Circle created"
 msgstr "Circle name"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "Select user"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 msgid "Update circle"
 msgstr "Update circle"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "Delete circle permanently"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "Add user"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 #, fuzzy
 #| msgid "No circles"
 msgid "No such circle exists"
 msgstr "No circles"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 #, fuzzy
 #| msgid "Circle name"
 msgid "Circle data updated"
 msgstr "Circle name"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 #, fuzzy
 #| msgid "deleted"
 msgid "Circle deleted"
 msgstr "deleted"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 #, fuzzy
 #| msgid "Invite to circle"
 msgid "User added to circle"
 msgstr "Invite to circle"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 #, fuzzy
 #| msgid "Remove user %(username)s from circle"
 msgid "User removed from circle"
 msgstr "Remove user %(username)s from circle"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr ""
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr ""
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr ""
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr ""
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr ""
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "Main"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr "Username"
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "Password"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 msgid "Confirm password"
 msgstr "Confirm password"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
 #, fuzzy
 #| msgid "The passwords must match"
 msgid "The passwords must match."
 msgstr "The passwords must match"
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 msgid "Create account"
 msgstr "Create account"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
 #, fuzzy
 #| msgid "That username is already taken"
 msgid "That username is already taken."
 msgstr "That username is already taken"
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
 #, fuzzy
 #| msgid "Registration was declined for unknown reasons"
 msgid "Registration was declined for unknown reasons."
 msgstr "Registration was declined for unknown reasons"
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
 #, fuzzy
 #| msgid "The username is not valid"
 msgid "The username is not valid."
 msgstr "The username is not valid"
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "Change password"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr ""
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr ""
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr ""
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "Address"
@@ -237,83 +337,90 @@ msgstr "Invalid username or password."
 msgid "Login successful!"
 msgstr ""
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "Current password"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "New password"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "Confirm new password"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
 #, fuzzy
 #| msgid "The new passwords must match"
 msgid "The new passwords must match."
 msgstr "The new passwords must match"
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "Sign out"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr "Nobody"
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "Friends only"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "Everyone"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "Display name"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "Avatar"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr "Profile visibility"
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "Update profile"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
+msgid "Account data"
+msgstr ""
+
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr ""
+
+#: snikket_web/user.py:111
 #, fuzzy
 #| msgid "Incorrect password"
 msgid "Incorrect password."
 msgstr "Incorrect password"
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:115
 #, fuzzy
 #| msgid "Password change failed"
 msgid "Password changed"
 msgstr "Password change failed"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
 msgstr ""
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 #, fuzzy
 #| msgid "Profile"
 msgid "Profile updated"
 msgstr "Profile"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
+msgstr ""
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
 msgstr ""
 
 #: snikket_web/templates/_footer.html:4
@@ -442,8 +549,9 @@ msgid "Members"
 msgstr "Members"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "Actions"
 
@@ -518,12 +626,12 @@ msgid "Copy complete output"
 msgstr "Copy complete output"
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "Delete user %(user_name)s"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "Delete user"
 
@@ -531,11 +639,6 @@ msgstr "Delete user"
 msgid "Are you sure you want to delete the following user?"
 msgstr "Are you sure you want to delete the following user?"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "Login name"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "Danger"
@@ -602,28 +705,37 @@ msgstr "Deleting a circle does not delete any users in the circle."
 msgid "Circle members"
 msgstr "Circle members"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr "deleted"
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Remove user %(username)s from circle"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr "This circle currently has no members."
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "Invite more members"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "Add existing user"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr "All users added"
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr "All users on this service are already in this circle."
 
@@ -674,12 +786,105 @@ msgstr "The user will get added as contact of %(peer_jid)s."
 msgid "Created"
 msgstr "Created"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
 #, fuzzy
 #| msgid "New invitation link"
 msgid "Return to invitation list"
 msgstr "New invitation link"
 
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, python-format
+msgid "Edit user %(user_name)s"
+msgstr "Edit user %(user_name)s"
+
+#: snikket_web/templates/admin_edit_user.html:22
+#, fuzzy
+#| msgid "Add user"
+msgid "Edit user"
+msgstr "Add user"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:50
+#, fuzzy
+#| msgid "New invitation link"
+msgid "Return to user list"
+msgstr "New invitation link"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:60
+#, fuzzy
+#| msgid "Reset your password"
+msgid "Reset password"
+msgstr "Reset your password"
+
+#: snikket_web/templates/admin_edit_user.html:63
+#, fuzzy
+#| msgid ""
+#| "If the user has forgotten their password, use the below button to create "
+#| "a password reset link. The password reset link can be used once to change "
+#| "the password of the account. Transmit the link to the user via a secure "
+#| "channel."
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+"If the user has forgotten their password, use the below button to create a "
+"password reset link. The password reset link can be used once to change the "
+"password of the account. Transmit the link to the user via a secure channel."
+
+#: snikket_web/templates/admin_edit_user.html:68
+#, fuzzy
+#| msgid "User information"
+msgid "Debug information"
+msgstr "User information"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:74
+#, fuzzy
+#| msgid "Show debug information for %(user_name)s"
+msgid "Show debug information"
+msgstr "Show debug information for %(user_name)s"
+
 #: snikket_web/templates/admin_home.html:4
 msgid "Welcome to the admin panel!"
 msgstr "Welcome to the admin panel!"
@@ -719,11 +924,30 @@ msgstr "Create, revoke or copy invitations."
 msgid "Manage invitations"
 msgstr "Manage invitations"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+#, fuzzy
+#| msgid "Manage users"
+msgid "Manage system"
+msgstr "Manage users"
+
+#: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
 msgstr "Go back to your user's web portal page."
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr "Exit admin panel"
 
@@ -776,15 +1000,103 @@ msgstr ""
 msgid "Destroy link"
 msgstr "Destroy link"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
+msgstr ""
-msgstr "Show debug information for %(user_name)s"
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr "System load (5-minute average)"
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
-msgstr "Create password reset link for %(user_name)s"
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:50
+#, fuzzy
+#| msgid "Snikket Web Portal"
+msgid "Snikket server status"
+msgstr "Snikket Web Portal"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:19
+#, fuzzy
+#| msgid "The username is not valid"
+msgid "The user is an administrator."
+msgstr "The username is not valid"
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:22
+#, fuzzy
+#| msgid "The username is not valid"
+msgid "The user is restricted."
+msgstr "The username is not valid"
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
+msgstr ""
 
 #: snikket_web/templates/app.html:4
 msgid "Snikket Web Portal"
@@ -944,7 +1256,6 @@ msgid "You can now log in using your new password."
 msgstr "You can now log in using your new password."
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr "You can now safely close this page."
 
@@ -1035,6 +1346,41 @@ msgstr ""
 "You can now set up your legacy XMPP client with the above address and the "
 "password you chose during registration."
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:21
+#, fuzzy
+#| msgid "Password reset successful"
+msgid "Import successful"
+msgstr "Password reset successful"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:26
+#, fuzzy
+#| msgid "Using the Snikket app"
+msgid "Moving to Snikket?"
+msgstr "Using the Snikket app"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr ""
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1160,12 +1506,12 @@ msgstr ""
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
 msgstr ""
 
 #: snikket_web/templates/invite_view.html:103
@@ -1198,10 +1544,6 @@ msgstr "Copy link"
 msgid "Invalid input"
 msgstr "Invalid input"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr "deleted"
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr "Can be used multiple times to create accounts on this Snikket service."
@@ -1256,15 +1598,22 @@ msgstr "Your XMPP address"
 msgid "Edit profile"
 msgstr "Edit profile"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+#, fuzzy
+#| msgid "Manage users"
+msgid "Manage your data"
+msgstr "Manage users"
+
+#: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
 msgstr "Your Snikket"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr "Manage users, invitations and circles of your Snikket service."
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 msgid "Admin panel"
 msgstr "Admin panel"
 
@@ -1280,6 +1629,18 @@ msgstr ""
 "Click below to log yourself out of the web portal. This does not affect any "
 "other connected devices."
 
+#: snikket_web/templates/user_manage_data.html:8
+#, fuzzy
+#| msgid "Your account"
+msgid "Export account"
+msgstr "Your account"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "Change your password"
@@ -1322,29 +1683,15 @@ msgstr ""
 "This section allows you to control who can see your profile information, "
 "like avatar and nickname."
 
+#~ msgid "Create password reset link for %(user_name)s"
+#~ msgstr "Create password reset link for %(user_name)s"
+
 #~ msgid "Login failed"
 #~ msgstr "Login failed"
 
 #~ msgid "Not on mobile?"
 #~ msgstr "Not on mobile?"
 
-#~ msgid "Edit user %(user_name)s"
-#~ msgstr "Edit user %(user_name)s"
-
-#~ msgid "User information"
-#~ msgstr "User information"
-
-#~ msgid ""
-#~ "If the user has forgotten their password, use the below button to create "
-#~ "a password reset link. The password reset link can be used once to change "
-#~ "the password of the account. Transmit the link to the user via a secure "
-#~ "channel."
-#~ msgstr ""
-#~ "If the user has forgotten their password, use the below button to create "
-#~ "a password reset link. The password reset link can be used once to change "
-#~ "the password of the account. Transmit the link to the user via a secure "
-#~ "channel."
-
 #~ msgid "No users left"
 #~ msgstr "No users left"
 

snikket_web/translations/en_GB/LC_MESSAGES/messages.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
-"PO-Revision-Date: 2021-02-02 21:01+0000\n"
+"PO-Revision-Date: 2021-06-19 15:01+0000\n"
-"Last-Translator: riccio <unriccio@email.it>\n"
+"Last-Translator: Jonas Schäfer <jonas@zombofant.net>\n"
 "Language-Team: English (United Kingdom) <https://i18n.sotecware.net/projects/"
 "snikket/web-portal/en_GB/>\n"
 "Language: en_GB\n"
@@ -17,210 +17,310 @@ 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.4.2\n"
+"X-Generator: Weblate 4.5.1\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "Delete user permanently"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "Login name"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/templates/admin_edit_circle.html:60
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "Display name"
+
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
+msgstr ""
+
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr ""
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr ""
+
+#: snikket_web/admin.py:80
 #, fuzzy
-#| msgid "deleted"
+#| msgid "Admin dashboard"
-msgid "User deleted"
+msgid "Administrator"
-msgstr "deleted"
+msgstr "Admin dashboard"
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:85
+#, fuzzy
+#| msgid "Create circle"
+msgid "Update user"
+msgstr "Create circle"
+
+#: snikket_web/admin.py:89
+#, fuzzy
+#| msgid "Create password reset links or delete users."
+msgid "Create password reset link"
+msgstr "Create password reset links or delete users."
+
+#: snikket_web/admin.py:107
 #, fuzzy
 #| msgid "Password reset link for %(user_name)s"
 msgid "Password reset link created"
 msgstr "Password reset link for %(user_name)s"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+#, fuzzy
+#| msgid "User information"
+msgid "User information updated."
+msgstr "User information"
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "Delete user permanently"
+
+#: snikket_web/admin.py:157
+#, fuzzy
+#| msgid "deleted"
+msgid "User deleted"
+msgstr "deleted"
+
+#: snikket_web/admin.py:195
+#, fuzzy
+#| msgid "Password reset link for %(user_name)s"
+msgid "Password reset link not found"
+msgstr "Password reset link for %(user_name)s"
+
+#: snikket_web/admin.py:207
 #, fuzzy
 #| msgid "Create password reset links or delete users."
 msgid "Password reset link deleted"
 msgstr "Create password reset links or delete users."
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "Invite to circle"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "At least one circle must be selected"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "Valid for"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "One hour"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "Twelve hours"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "One day"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "One week"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "Four weeks"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "Invitation type"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr ""
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr ""
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "New invitation link"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "Revoke"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 #, fuzzy
 #| msgid "Invitation type"
 msgid "Invitation created"
 msgstr "Invitation type"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 #, fuzzy
 #| msgid "New invitation link"
 msgid "No such invitation exists"
 msgstr "New invitation link"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 #, fuzzy
 #| msgid "Invitation type"
 msgid "Invitation revoked"
 msgstr "Invitation type"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "Name"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "Create circle"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 #, fuzzy
 #| msgid "Circle name"
 msgid "Circle created"
 msgstr "Circle name"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "Select user"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 #, fuzzy
 #| msgid "Create circle"
 msgid "Update circle"
 msgstr "Create circle"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "Delete circle permanently"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "Add user"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 #, fuzzy
 #| msgid "No circles"
 msgid "No such circle exists"
 msgstr "No circles"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 #, fuzzy
 #| msgid "Circle name"
 msgid "Circle data updated"
 msgstr "Circle name"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 #, fuzzy
 #| msgid "deleted"
 msgid "Circle deleted"
 msgstr "deleted"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 #, fuzzy
 #| msgid "Invite to circle"
 msgid "User added to circle"
 msgstr "Invite to circle"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 #, fuzzy
 #| msgid "Remove user %(username)s from circle"
 msgid "User removed from circle"
 msgstr "Remove user %(username)s from circle"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr ""
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr ""
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr ""
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr ""
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr ""
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "Main"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr ""
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "Password"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 #, fuzzy
 #| msgid "Confirm new password"
 msgid "Confirm password"
 msgstr "Confirm new password"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
 #, fuzzy
 #| msgid "The passwords must match"
 msgid "The passwords must match."
 msgstr "The passwords must match"
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 #, fuzzy
 #| msgid "Create circle"
 msgid "Create account"
 msgstr "Create circle"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
 msgid "That username is already taken."
 msgstr ""
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
 msgid "Registration was declined for unknown reasons."
 msgstr ""
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
 msgid "The username is not valid."
 msgstr ""
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "Change password"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr ""
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr ""
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr ""
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "Address"
@@ -239,83 +339,90 @@ msgstr "Invalid user name or password."
 msgid "Login successful!"
 msgstr ""
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "Current password"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "New password"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "Confirm new password"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
 #, fuzzy
 #| msgid "The new passwords must match"
 msgid "The new passwords must match."
 msgstr "The new passwords must match"
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "Sign out"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr "Nobody"
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "Friends only"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "Everyone"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "Display name"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "Avatar"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr "Profile visibility"
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "Update profile"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
+msgid "Account data"
+msgstr ""
+
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr ""
+
+#: snikket_web/user.py:111
 #, fuzzy
 #| msgid "Incorrect password"
 msgid "Incorrect password."
 msgstr "Incorrect password"
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:115
 #, fuzzy
 #| msgid "Password change failed"
 msgid "Password changed"
 msgstr "Password change failed"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
 msgstr ""
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 #, fuzzy
 #| msgid "Profile"
 msgid "Profile updated"
 msgstr "Profile"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
+msgstr ""
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
 msgstr ""
 
 #: snikket_web/templates/_footer.html:4
@@ -441,8 +548,9 @@ msgid "Members"
 msgstr "Members"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "Actions"
 
@@ -518,12 +626,12 @@ msgid "Copy complete output"
 msgstr "Copy complete output"
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "Delete user %(user_name)s"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "Delete user"
 
@@ -531,11 +639,6 @@ msgstr "Delete user"
 msgid "Are you sure you want to delete the following user?"
 msgstr "Are you sure you want to delete the following user?"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "Login name"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "Danger"
@@ -603,28 +706,37 @@ msgstr "Deleting a circle does not delete any users in the circle."
 msgid "Circle members"
 msgstr "Circle members"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr "deleted"
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Remove user %(username)s from circle"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr "This circle currently has no members."
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "Invite more members"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "Add existing user"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr "All users on this service are already in this circle."
 
@@ -675,12 +787,105 @@ msgstr ""
 msgid "Created"
 msgstr "Created"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
 #, fuzzy
 #| msgid "New invitation link"
 msgid "Return to invitation list"
 msgstr "New invitation link"
 
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, python-format
+msgid "Edit user %(user_name)s"
+msgstr "Edit user %(user_name)s"
+
+#: snikket_web/templates/admin_edit_user.html:22
+#, fuzzy
+#| msgid "Add user"
+msgid "Edit user"
+msgstr "Add user"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:50
+#, fuzzy
+#| msgid "New invitation link"
+msgid "Return to user list"
+msgstr "New invitation link"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:60
+#, fuzzy
+#| msgid "Change your password"
+msgid "Reset password"
+msgstr "Change your password"
+
+#: snikket_web/templates/admin_edit_user.html:63
+#, fuzzy
+#| msgid ""
+#| "If the user has forgotten their password, use the below button to create "
+#| "a password reset link. The password reset link can be used once to change "
+#| "the password of the account. Transmit the link to the user via a secure "
+#| "channel."
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+"If the user has forgotten their password, use the below button to create a "
+"password reset link. The password reset link can be used once to change the "
+"password of the account. Transmit the link to the user via a secure channel."
+
+#: snikket_web/templates/admin_edit_user.html:68
+#, fuzzy
+#| msgid "User information"
+msgid "Debug information"
+msgstr "User information"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:74
+#, fuzzy
+#| msgid "Show debug information for %(user_name)s"
+msgid "Show debug information"
+msgstr "Show debug information for %(user_name)s"
+
 #: snikket_web/templates/admin_home.html:4
 #, fuzzy
 #| msgid "Welcome to the administration dashboard!"
@@ -726,13 +931,32 @@ msgstr "Create, revoke or view invitations."
 msgid "Manage invitations"
 msgstr "Manage invitations"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+#, fuzzy
+#| msgid "Manage users"
+msgid "Manage system"
+msgstr "Manage users"
+
+#: snikket_web/templates/admin_home.html:48
 #, fuzzy
 #| msgid "Go back to your user’s web portal page."
 msgid "Go back to your user's web portal page."
 msgstr "Go back to your user’s web portal page."
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr ""
 
@@ -785,15 +1009,99 @@ msgstr ""
 msgid "Destroy link"
 msgstr "Destroy link"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
+msgstr ""
-msgstr "Show debug information for %(user_name)s"
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr "System load (5-minute average)"
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
-msgstr "Create password reset link for %(user_name)s"
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:50
+#, fuzzy
+#| msgid "Snikket Web Portal"
+msgid "Snikket server status"
+msgstr "Snikket Web Portal"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:19
+msgid "The user is an administrator."
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:22
+msgid "The user is restricted."
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
+msgstr ""
 
 #: snikket_web/templates/app.html:4
 msgid "Snikket Web Portal"
@@ -954,7 +1262,6 @@ msgid "You can now log in using your new password."
 msgstr ""
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr ""
 
@@ -1037,6 +1344,41 @@ msgid ""
 "password you chose during registration."
 msgstr ""
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:21
+#, fuzzy
+#| msgid "Password reset"
+msgid "Import successful"
+msgstr "Password reset"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:26
+#, fuzzy
+#| msgid "About Snikket"
+msgid "Moving to Snikket?"
+msgstr "About Snikket"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr ""
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1148,12 +1490,12 @@ msgstr ""
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
 msgstr ""
 
 #: snikket_web/templates/invite_view.html:103
@@ -1186,10 +1528,6 @@ msgstr "Copy link"
 msgid "Invalid input"
 msgstr "Invalid input"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr "deleted"
-
 #: snikket_web/templates/library.j2:122
 #, fuzzy
 #| msgid "Manage users and invitations of this Snikket service."
@@ -1254,19 +1592,26 @@ msgstr "Email address"
 msgid "Edit profile"
 msgstr "Update profile"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+#, fuzzy
+#| msgid "Manage users"
+msgid "Manage your data"
+msgstr "Manage users"
+
+#: snikket_web/templates/user_home.html:39
 #, fuzzy
 #| msgid "About Snikket"
 msgid "Your Snikket"
 msgstr "About Snikket"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 #, fuzzy
 #| msgid "Manage users and invitations of this Snikket service."
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr "Manage users and invitations of this Snikket service."
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 #, fuzzy
 #| msgid "Admin dashboard"
 msgid "Admin panel"
@@ -1284,6 +1629,18 @@ msgstr ""
 "Click below to log yourself out of the web portal. This does not affect any "
 "other connected devices."
 
+#: snikket_web/templates/user_manage_data.html:8
+#, fuzzy
+#| msgid "Create circle"
+msgid "Export account"
+msgstr "Create circle"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "Change your password"
@@ -1328,26 +1685,12 @@ msgstr ""
 "This section allows you to control who can see your profile information, "
 "like avatar and nickname."
 
+#~ msgid "Create password reset link for %(user_name)s"
+#~ msgstr "Create password reset link for %(user_name)s"
+
 #~ msgid "Login failed"
 #~ msgstr "Login failed"
 
-#~ msgid "Edit user %(user_name)s"
-#~ msgstr "Edit user %(user_name)s"
-
-#~ msgid "User information"
-#~ msgstr "User information"
-
-#~ msgid ""
-#~ "If the user has forgotten their password, use the below button to create "
-#~ "a password reset link. The password reset link can be used once to change "
-#~ "the password of the account. Transmit the link to the user via a secure "
-#~ "channel."
-#~ msgstr ""
-#~ "If the user has forgotten their password, use the below button to create "
-#~ "a password reset link. The password reset link can be used once to change "
-#~ "the password of the account. Transmit the link to the user via a secure "
-#~ "channel."
-
 #~ msgid "No users left"
 #~ msgstr "No users left"
 

snikket_web/translations/fr/LC_MESSAGES/messages.po

@@ -6,189 +6,284 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"Report-Msgid-Bugs-To: translations@snikket.org\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
-"PO-Revision-Date: 2021-03-21 16:31+0000\n"
+"PO-Revision-Date: 2022-04-11 13:00+0000\n"
-"Last-Translator: Link Mauve <linkmauve@linkmauve.fr>\n"
+"Last-Translator: David Baraniak <admin@chipmnk.dev>\n"
-"Language-Team: French <https://i18n.sotecware.net/projects/snikket/web-"
+"Language-Team: French <http://i18n.sotecware.net/projects/snikket/web-portal/"
-"portal/fr/>\n"
+"fr/>\n"
 "Language: fr\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.5.1\n"
+"X-Generator: Weblate 4.8.1\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "Désinscrire définitivement l’utilisateur"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "Identifiant"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
-msgid "User deleted"
+#: snikket_web/templates/admin_edit_circle.html:60
-msgstr "Utilisateur supprimé"
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "Nom à afficher"
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
+msgstr "Niveau d’accès"
+
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr "Limité"
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr "Utilisateur normal"
+
+#: snikket_web/admin.py:80
+msgid "Administrator"
+msgstr "Administrateur"
+
+#: snikket_web/admin.py:85
+msgid "Update user"
+msgstr "Modifier l’utilisateur"
+
+#: snikket_web/admin.py:89
+msgid "Create password reset link"
+msgstr "Créer le lien de réinitialisation de mot de passe"
+
+#: snikket_web/admin.py:107
 msgid "Password reset link created"
 msgstr "Lien de réinitialisation du mot de passe créé"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+msgid "User information updated."
+msgstr "Informations de l’utilisateur mises à jour."
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "Désinscrire définitivement l’utilisateur"
+
+#: snikket_web/admin.py:157
+msgid "User deleted"
+msgstr "Utilisateur supprimé"
+
+#: snikket_web/admin.py:195
+msgid "Password reset link not found"
+msgstr "Lien de réinitialisation du mot de passe introuvable"
+
+#: snikket_web/admin.py:207
 msgid "Password reset link deleted"
 msgstr "Liens de réinitialisation de mot de passe supprimé"
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "Inviter dans le cercle"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "Au moins un cercle doit être sélectionné"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "Valide pour"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "Une heure"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "Douze heures"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "Une journée"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "Une semaine"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "Quatre semaines"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "Type d’invitation"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr "Individuelle"
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr "Groupe"
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "Nouveau lien d’invitation"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "Révoquer"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 msgid "Invitation created"
 msgstr "Invitation créée"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 msgid "No such invitation exists"
 msgstr "Cette invitation n’existe pas"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 msgid "Invitation revoked"
 msgstr "Invitation révoquée"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "Nom"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "Créer un cercle"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 msgid "Circle created"
 msgstr "Cercle créé"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "Sélectionner un utilisateur"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 msgid "Update circle"
 msgstr "Mettre à jour le cercle"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "Supprimer le cercle définitivement"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 msgid "No such circle exists"
 msgstr "Ce cercle n’existe pas"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 msgid "Circle data updated"
 msgstr "Données du cercle mises à jour"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 msgid "Circle deleted"
 msgstr "Cercle supprimé"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 msgid "User added to circle"
 msgstr "Utilisateur ajouté à ce cercle"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 msgid "User removed from circle"
 msgstr "Utilisateur retiré du cercle"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr "Contenu du message"
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr "Envoyer uniquement aux utilisateurs connectés"
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr "Envoyer aux utilisateurs"
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr "Envoyer une prévisualisation à vous-mêmes"
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr "Annonce envoyée !"
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "Principal"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+"Les données du compte que vous avez essayé d'importer sont trop volumineuses "
+"pour être téléchargées. Veuillez contacter votre opérateur Snikket."
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "Mot de passe"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
 msgid "The passwords must match."
 msgstr "Les mots de passe doivent être identiques."
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 msgid "Create account"
 msgstr "Créer un compte"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
 msgid "That username is already taken."
 msgstr "Ce nom d’utilisateur est déjà utilisé."
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
 msgid "Registration was declined for unknown reasons."
 msgstr "L’enregistrement a été refusé pour des raisons inconnues."
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
 msgid "The username is not valid."
 msgstr "Le nom d’utilisateur n’est pas valide."
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr "Fichier de données du compte"
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr "Importer les données"
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+"Les données du compte que vous avez essayé d'importer sont dans un format "
+"inconnu. Veuillez télécharger un fichier XML au format XEP-0227 (format "
+"fourni : %(mimetype)s)."
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr "Erreur"
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "Adresse"
@@ -205,64 +300,67 @@ msgstr "Nom d’utilisateur ou mot de passe incorrect."
 msgid "Login successful!"
 msgstr "Connexion réussie !"
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "Confirmer le nouveau mot de passe"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
 msgid "The new passwords must match."
 msgstr "Les nouveaux mots de passe doivent être identiques."
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "Se déconnecter"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr "Personne"
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "Amis seulement"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "Tout le monde"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "Nom à afficher"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "Avatar"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr "Visibilité du profil"
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "Mettre à jour le profil"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
+msgid "Account data"
+msgstr "Données du compte"
+
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr "Télécharger"
+
+#: snikket_web/user.py:111
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect."
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:115
 msgid "Password changed"
 msgstr "Mot de passe changé"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
@@ -270,13 +368,17 @@ msgstr ""
 "L’avatar choisi est trop gros. Pour utiliser un avatar aussi large, veuillez "
 "utiliser l’application."
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
-msgstr "Erreur"
+msgstr "Exporter"
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
+msgstr "Vous n'avez actuellement aucune donnée de compte à exporter."
 
 #: snikket_web/templates/_footer.html:4
 #, python-format
@@ -408,8 +510,9 @@ msgid "Members"
 msgstr "Membres"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "Actions"
 
@@ -484,12 +587,12 @@ msgid "Copy complete output"
 msgstr "Copier le journal entier"
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "Désinscrire l’utilisateur %(user_name)s"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "Désinscrire un utilisateur"
 
@@ -497,11 +600,6 @@ msgstr "Désinscrire un utilisateur"
 msgid "Are you sure you want to delete the following user?"
 msgstr "Êtes-vous certain(e) de vouloir désinscrire l’utilisateur suivant ?"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "Identifiant"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "Danger"
@@ -555,7 +653,7 @@ msgstr "Ce cercle n’a pas de conversation de groupe associée."
 
 #: snikket_web/templates/admin_edit_circle.html:44
 msgid "Return to circle list"
-msgstr ""
+msgstr "Revenir à la liste des cercles"
 
 #: snikket_web/templates/admin_edit_circle.html:48
 msgid "Delete circle"
@@ -569,28 +667,37 @@ msgstr "Supprimer un cercle ne supprime aucun utilisateur dans le cercle."
 msgid "Circle members"
 msgstr "Membres du cercle"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr "Cet utilisateur a été supprimé du serveur."
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr "supprimé"
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Retirer l’utilisateur %(username)s du cercle"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr "Ce cercle n’a pas encore de membres."
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "Inviter d’autres membres"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "Ajouter un utilisateur existant"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr "Tous les utilisateurs ont été ajoutés"
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr "Tous les utilisateurs de ce service sont déjà dans ce cercle."
 
@@ -642,11 +749,97 @@ msgstr "L’utilisateur sera ajouté en tant que contact de %(peer_jid)s."
 msgid "Created"
 msgstr "Créé le"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
-#, fuzzy
-#| msgid "New invitation link"
 msgid "Return to invitation list"
-msgstr "Nouveau lien d’invitation"
+msgstr "Revenir à la liste des invitations"
+
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+"Les utilisateurs limités ne peuvent interagir qu’avec les utilisateurs du "
+"même service Snikket et faire partie de cercles."
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+"Comme les utilisateurs limités, mais peuvent aussi interagir avec les "
+"utilisateurs d’autres services Snikket."
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr ""
+"Comme les utilisateurs normaux, mais peuvent accéder au panneau "
+"d’administration dans le portail web."
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, python-format
+msgid "Edit user %(user_name)s"
+msgstr "Modifier l’utilisateur %(user_name)s"
+
+#: snikket_web/templates/admin_edit_user.html:22
+msgid "Edit user"
+msgstr "Modifier l’utilisateur"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr "Le nom d’utilisateur ne peut pas être changé."
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+"Le niveau d’accès d’un utilisateur détermine les interactions qui lui sont "
+"permises sur votre service Snikket."
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+
+#: snikket_web/templates/admin_edit_user.html:50
+msgid "Return to user list"
+msgstr "Revenir à la liste des utilisateurs"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr "Actions supplémentaires"
+
+#: snikket_web/templates/admin_edit_user.html:60
+msgid "Reset password"
+msgstr "Réinitialiser le mot de passe"
+
+#: snikket_web/templates/admin_edit_user.html:63
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+"Si l’utilisateur a perdu son mot de passe, vous pouvez utiliser le bouton ci-"
+"dessous pour créer un lien spécial qui permet de changer le mot de passe de "
+"son compte, une seule fois."
+
+#: snikket_web/templates/admin_edit_user.html:68
+msgid "Debug information"
+msgstr "Informations de debug"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+"Dans certains cas, des informations additionnelles sur le compte de "
+"l’utilisateur et les clients connectés sont nécessaires pour résoudre des "
+"problèmes. Le bouton ci-dessous révèle ces informations sensibles."
+
+#: snikket_web/templates/admin_edit_user.html:74
+msgid "Show debug information"
+msgstr "Afficher les informations de debug"
 
 #: snikket_web/templates/admin_home.html:4
 msgid "Welcome to the admin panel!"
@@ -689,11 +882,29 @@ msgstr "Créer, révoquer, ou copier des invitations."
 msgid "Manage invitations"
 msgstr "Gérer les invitations"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr "Santé du système"
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr ""
+"Voir le statut du serveur, ou diffuser un message à tous les utilisateurs."
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr "Diffuser un message aux utilisateurs."
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+msgid "Manage system"
+msgstr "Gérer le système"
+
+#: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
 msgstr "Retourner au portail web de votre utilisateur."
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr "Quitter le panneau d’administration"
 
@@ -702,9 +913,8 @@ msgid "Pending invitations"
 msgstr "Invitations en attente"
 
 #: snikket_web/templates/admin_invites.html:21
-#, fuzzy
 msgid "Expires"
-msgstr "Expires"
+msgstr "Expire"
 
 #: snikket_web/templates/admin_invites.html:22
 msgid "Type"
@@ -747,15 +957,101 @@ msgstr ""
 msgid "Destroy link"
 msgstr "Supprimer le lien"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
+msgstr "Statut général du système"
-msgstr "Afficher les informations de débogage pour %(user_name)s"
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr "Charge système (moyenne sur 5 minutes)"
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr "inconnu(e)"
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr "Utilisation mémoire"
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
-msgstr "Crée un lien de réinitialisation de mot de passe pour %(user_name)s"
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+"%(percentage_global)s de %(mem_available)s. De tout ça, Snikket utilise "
+"%(percentage_snikket)s."
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr "Statut du portail web"
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr "Version"
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr "Voir toutes les versions"
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr "Utilisation CPU moyenne"
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr "Utilisation mémoire courante"
+
+#: snikket_web/templates/admin_system.html:50
+msgid "Snikket server status"
+msgstr "Statut du serveur Snikket"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr "Stockage utilisé par les fichiers partagés"
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr "Clients connectés"
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr "Diffusion de message"
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+"Ce formulaire vous permet d’écrire un message à tous les utilisateurs "
+"présentement conectés à votre serveur Snikket. Utilisez-le judicieusement."
+
+#: snikket_web/templates/admin_users.html:19
+msgid "The user is an administrator."
+msgstr "L’utilisateur est un administrateur."
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr " (administrateur)"
+
+#: snikket_web/templates/admin_users.html:22
+msgid "The user is restricted."
+msgstr "L’utilisateur est restreint."
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
+msgstr " (restreint)"
 
 #: snikket_web/templates/app.html:4
 msgid "Snikket Web Portal"
@@ -921,7 +1217,6 @@ msgstr ""
 "Vous pouvez désormais vous connecter en utilisant votre nouveau mot de passe."
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr "Vous pouvez maintenant fermer cette page en toute sécurité."
 
@@ -1018,6 +1313,46 @@ msgstr ""
 "Vous pouvez maintenant configurer votre client XMPP avec l’adresse ci-dessus "
 "et le mot de passe que vous avez choisi lors de l’enregistrement."
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+"Vous pouvez maintenant fermer cette page en toute sécurité, ou vous "
+"connecter au portail web pour <a href=\"%(login_url)s\">gérer votre "
+"compte</a>."
+
+#: snikket_web/templates/invite_success.html:21
+msgid "Import successful"
+msgstr "Importation réussie"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr ""
+"Félicitations ! Les données de votre compte ont été importées avec succès."
+
+#: snikket_web/templates/invite_success.html:26
+msgid "Moving to Snikket?"
+msgstr "Nouveau utilisateur Snikket ?"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+"Si vous passez d'une autre instance de Snikket ou d'un autre service "
+"compatible XMPP, vous pouvez éventuellement importer les données (contacts, "
+"informations de profil, etc.) de votre ancien compte. Lorsque vous avez "
+"exporté les données de votre ancien compte, téléchargez-les en utilisant le "
+"formulaire ci-dessous."
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr "Télécharger les données du compte"
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1071,10 +1406,9 @@ msgstr "Télécharger sur l’App Store"
 
 #: snikket_web/templates/invite_view.html:32
 msgid "Get it on F-Droid"
-msgstr ""
+msgstr "Obtenez-le sur F-Droid"
 
 #: snikket_web/templates/invite_view.html:35
-#, fuzzy
 msgid "Send to mobile device"
 msgstr "Envoyer vers l'appareil"
 
@@ -1150,13 +1484,17 @@ msgstr "Installer sur iOS"
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
+"Après avoir téléchargé Snikket depuis l'App Store, vous devez revenir à ce "
+"lien d'invitation et cliquer sur \"Ouvrir l'application\" pour continuer."
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
 msgstr ""
+"Téléchargez d'abord Snikket depuis l'App Store en utilisant le bouton ci-"
+"dessous :"
 
 #: snikket_web/templates/invite_view.html:103
 #: snikket_web/templates/invite_view.html:131
@@ -1164,6 +1502,9 @@ msgid ""
 "After the installation is complete, you can return to this page and tap the "
 "\"Open the app\" button to continue with the setup:"
 msgstr ""
+"Une fois l'installation terminée, vous pouvez revenir à cette page et "
+"appuyer sur le bouton \"Ouvrir l'application\" pour poursuivre la "
+"configuration :"
 
 #: snikket_web/templates/invite_view.html:121
 #: snikket_web/templates/invite_view.html:130
@@ -1175,10 +1516,13 @@ msgid ""
 "After installing Snikket via F-Droid, you have to return to this invite link "
 "and tap on \"Open the app\" to proceed."
 msgstr ""
+"Après avoir installé Snikket via F-Droid, vous devez revenir à ce lien "
+"d'invitation et appuyer sur \"Ouvrir l'application\" pour continuer."
 
 #: snikket_web/templates/invite_view.html:129
 msgid "First install Snikket from F-Droid using the button below:"
 msgstr ""
+"Installez d'abord Snikket depuis F-Droid en utilisant le bouton ci-dessous :"
 
 #: snikket_web/templates/library.j2:18
 msgid "Copy link"
@@ -1188,10 +1532,6 @@ msgstr "Copier le lien"
 msgid "Invalid input"
 msgstr "Saisie invalide"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr "supprimé"
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
@@ -1247,16 +1587,21 @@ msgstr "Votre adresse XMPP"
 msgid "Edit profile"
 msgstr "Éditer votre profil"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+msgid "Manage your data"
+msgstr "Gérer vos données"
+
+#: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
 msgstr "Votre Snikket"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr ""
 "Gérer les utilisateurs, invitations et cercles de votre service Snikket."
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 msgid "Admin panel"
 msgstr "Panneau d’administration"
 
@@ -1272,6 +1617,18 @@ msgstr ""
 "Cliquez ci-dessous pour vous déconnecter du portail. Ceci n’affecte pas vos "
 "autres appareils connectés."
 
+#: snikket_web/templates/user_manage_data.html:8
+msgid "Export account"
+msgstr "Exportation du compte"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+"Téléchargez les données de votre compte sous forme d'un fichier à des fins "
+"de sauvegarde ou pour transférer votre compte vers un autre service."
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "Changer votre mot de passe"
@@ -1314,29 +1671,15 @@ msgstr ""
 "Cette section permet de configurer qui peut voir votre profil, comme par "
 "exemple votre avatar et votre pseudonyme."
 
+#~ msgid "Create password reset link for %(user_name)s"
+#~ msgstr "Crée un lien de réinitialisation de mot de passe pour %(user_name)s"
+
 #~ msgid "Login failed"
 #~ msgstr "Échec d’identification"
 
 #~ msgid "Not on mobile?"
 #~ msgstr "Pas sur mobile ?"
 
-#~ msgid "Edit user %(user_name)s"
-#~ msgstr "Modifier l’utilisateur %(user_name)s"
-
-#~ msgid "User information"
-#~ msgstr "Informations de l’utilisateur"
-
-#~ msgid ""
-#~ "If the user has forgotten their password, use the below button to create "
-#~ "a password reset link. The password reset link can be used once to change "
-#~ "the password of the account. Transmit the link to the user via a secure "
-#~ "channel."
-#~ msgstr ""
-#~ "Si l’utilisateur a oublié son mot de passe, utilisez le bouton ci-dessous "
-#~ "pour créer un lien de réinitialisation du mot de passe. Ce lien peut-être "
-#~ "utilisé une fois pour changer le mot de passe du compte. Assurez-vous de "
-#~ "communiquer le lien de façon sécurisée."
-
 #~ msgid "<label for=\"link-field\">Link</label>"
 #~ msgstr "<label for=\"link-field\">Lien</label>"
 

snikket_web/translations/id/LC_MESSAGES/messages.po

@@ -6,197 +6,283 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"Report-Msgid-Bugs-To: translations@snikket.org\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
-"PO-Revision-Date: 2021-02-25 16:02+0000\n"
+"PO-Revision-Date: 2022-01-18 14:59+0000\n"
 "Last-Translator: uira <inboxriau@andriana.id>\n"
-"Language-Team: Indonesian <https://i18n.sotecware.net/projects/snikket/web-"
+"Language-Team: Indonesian <http://i18n.sotecware.net/projects/snikket/"
-"portal/id/>\n"
+"web-portal/id/>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 4.8.1\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "Hapus permanen pengguna"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "Nama login"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
-msgid "User deleted"
+#: snikket_web/templates/admin_edit_circle.html:60
-msgstr "Pengguna dihapus"
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "Nama tampilan"
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
+msgstr "Level akses"
+
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr "Terbatas"
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr "Pengguna normal"
+
+#: snikket_web/admin.py:80
+msgid "Administrator"
+msgstr "Administrator"
+
+#: snikket_web/admin.py:85
+msgid "Update user"
+msgstr "Memperbarui pengguna"
+
+#: snikket_web/admin.py:89
+msgid "Create password reset link"
+msgstr "Buat tautan setel ulang kata sandi"
+
+#: snikket_web/admin.py:107
 msgid "Password reset link created"
 msgstr "Tautan setel ulang kata sandi dibuat"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+msgid "User information updated."
+msgstr "Informasi pengguna diperbarui."
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "Hapus permanen pengguna"
+
+#: snikket_web/admin.py:157
+msgid "User deleted"
+msgstr "Pengguna dihapus"
+
+#: snikket_web/admin.py:195
+msgid "Password reset link not found"
+msgstr "Tautan setel ulang kata sandi tidak ditemukan"
+
+#: snikket_web/admin.py:207
 msgid "Password reset link deleted"
 msgstr "Tautan setel ulang kata sandi dihapus"
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "Undang masuk kelompok"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "Minimal satu kelompok harus dipilih"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "Valid selama"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "Satu jam"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "Dua belas jam"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "Satu hari"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "Satu minggu"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "Empat minggu"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "Jenis undangan"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr "Individu"
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr "Grup"
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "Tautan undangan baru"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "Batalkan"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 msgid "Invitation created"
 msgstr "Undangan dibuat"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 msgid "No such invitation exists"
 msgstr "Undangan tidak tersedia"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 msgid "Invitation revoked"
 msgstr "Undangan dibatalkan"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "Nama"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "Buat kelompok"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 msgid "Circle created"
 msgstr "Kelompok dibuat"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "Pilih pengguna"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 msgid "Update circle"
 msgstr "Memperbarui kelompok"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "Hapus kelompok secara permanen"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "Tambah pengguna"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 msgid "No such circle exists"
 msgstr "Kelompok tersebut tidak ada"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 msgid "Circle data updated"
 msgstr "Data kelompok diperbarui"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 msgid "Circle deleted"
 msgstr "Kelompok dihapus"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 msgid "User added to circle"
 msgstr "Pengguna ditambahkan ke kelompok"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 msgid "User removed from circle"
 msgstr "Pengguna dihapus dari kelompok"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr "Isi pesan"
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr "Hanya kirim ke pengguna online"
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr "Kirim ke semua pengguna"
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr "Kirim pratinjau ke diri sendiri"
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr "Pengumuman terkirim!"
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "Utama"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+"Data akun yang coba diimpor terlalu besar untuk diunggah. Silakan hubungi "
+"operator Snikket Anda."
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr "Nama pengguna"
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "Kata sandi"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 msgid "Confirm password"
 msgstr "Konfirmasi kata sandi"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
-#, fuzzy
-#| msgid "The passwords must match"
 msgid "The passwords must match."
-msgstr "Kata sandi harus cocok"
+msgstr "Kata sandi harus cocok."
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 msgid "Create account"
 msgstr "Buat akun"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
-#, fuzzy
-#| msgid "That username is already taken"
 msgid "That username is already taken."
-msgstr "Nama pengguna itu sudah dipakai"
+msgstr "Nama pengguna itu sudah dipakai."
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
-#, fuzzy
-#| msgid "Registration was declined for unknown reasons"
 msgid "Registration was declined for unknown reasons."
-msgstr "Pendaftaran ditolak karena alasan yang tidak diketahui"
+msgstr "Pendaftaran ditolak karena alasan yang tidak diketahui."
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
-#, fuzzy
-#| msgid "The username is not valid"
 msgid "The username is not valid."
-msgstr "Nama pengguna tidak valid"
+msgstr "Nama pengguna tidak valid."
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "Ganti kata sandi"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr "File data akun"
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr "Impor data"
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+"Data akun yang coba diimpor dalam format yang tidak dikenal. Harap unggah "
+"file XML dalam format XEP-0227 (format yang disediakan: %(mimetype)s)."
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr "Kesalahan"
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "Alamat"
@@ -213,80 +299,85 @@ msgstr "Nama pengguna atau kata sandi salah."
 msgid "Login successful!"
 msgstr "Login berhasil!"
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "Kata sandi sekarang"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "Kata sandi baru"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "Konfirmasi kata sandi"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
-#, fuzzy
-#| msgid "The new passwords must match"
 msgid "The new passwords must match."
-msgstr "Kata sandi baru harus cocok"
+msgstr "Kata sandi baru harus cocok."
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "Keluar"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr "Tak seorangpun"
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "Hanya teman"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "Semua orang"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "Nama tampilan"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "Gambar profil"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr "Visibilitas profil"
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "Perbarui profil"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
-#, fuzzy
+msgid "Account data"
-#| msgid "Incorrect password"
+msgstr "Data akun"
-msgid "Incorrect password."
-msgstr "Kata sandi salah"
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr "Unggah"
+
+#: snikket_web/user.py:111
+msgid "Incorrect password."
+msgstr "Kata sandi salah."
+
+#: snikket_web/user.py:115
 msgid "Password changed"
 msgstr "Kata sandi diganti"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
 msgstr ""
+"Avatar yang dipilih terlalu besar. Untuk dapat mengunggah avatar yang lebih "
+"besar, sila gunakan aplikasi."
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 msgid "Profile updated"
 msgstr "Profil diperbarui"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
-msgstr "Kesalahan"
+msgstr "Ekspor"
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
+msgstr "Anda tidak memiliki data akun untuk diekspor."
 
 #: snikket_web/templates/_footer.html:4
 #, python-format
@@ -420,8 +511,9 @@ msgid "Members"
 msgstr "Anggota"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "Tindakan"
 
@@ -496,12 +588,12 @@ msgid "Copy complete output"
 msgstr "Salin keluaran lengkap"
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "Hapus pengguna %(user_name)s"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "Hapus pengguna"
 
@@ -509,11 +601,6 @@ msgstr "Hapus pengguna"
 msgid "Are you sure you want to delete the following user?"
 msgstr "Apakah anda yakin mau menghapus pengguna tersebut?"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "Nama login"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "Berbahaya"
@@ -567,7 +654,7 @@ msgstr "Kelompok ini tidak memiliki percakapan grup."
 
 #: snikket_web/templates/admin_edit_circle.html:44
 msgid "Return to circle list"
-msgstr ""
+msgstr "Kembali ke daftar circle"
 
 #: snikket_web/templates/admin_edit_circle.html:48
 msgid "Delete circle"
@@ -583,28 +670,37 @@ msgstr ""
 msgid "Circle members"
 msgstr "Anggota kelompok"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr "Pengguna telah dihapus dari server"
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr "Dihapus"
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Hapus pengguna %(username)s dari kelompok"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr "Kelompok ini sedang tidak memiliki anggota."
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "Ajak lebih banyak anggota"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "Tambahkan pengguna yang ada"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr "Semua pengguna ditambahkan"
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr "Semua pengguna layanan ini sudah ada di kelompok ini."
 
@@ -658,11 +754,95 @@ msgstr "Pengguna akan ditambahkan ke kontak %(peer_jid)s."
 msgid "Created"
 msgstr "Dibuat"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
-#, fuzzy
-#| msgid "New invitation link"
 msgid "Return to invitation list"
-msgstr "Tautan undangan baru"
+msgstr "Kembali ke daftar undangan"
+
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+"Pengguna terbatas dapat berinteraksi dengan pengguna di layanan Snikket yang "
+"sama dan menjadi anggota kelompok."
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+"Seperti pengguna terbatas dan juga dapat berinteraksi dengan pengguna di "
+"layanan Snikket lain."
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr "Seperti pengguna biasa dan dapat mengakses panel admin di portal web."
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, python-format
+msgid "Edit user %(user_name)s"
+msgstr "Edit pengguna %(user_name)s"
+
+#: snikket_web/templates/admin_edit_user.html:22
+msgid "Edit user"
+msgstr "Edit pengguna"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr "Nama login tidak dapat diganti."
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+"Level akses pengguna menentukan interaksi apa yang diizinkan untuk mereka di "
+"layanan Snikket Anda."
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+
+#: snikket_web/templates/admin_edit_user.html:50
+msgid "Return to user list"
+msgstr "Kembali ke daftar pengguna"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr "Tindakan lanjutan"
+
+#: snikket_web/templates/admin_edit_user.html:60
+msgid "Reset password"
+msgstr "Setel kata sandi"
+
+#: snikket_web/templates/admin_edit_user.html:63
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+"Jika pengguna lupa kata sandi, Anda dapat menggunakan tombol di bawah ini "
+"untuk membuat tautan khusus yang memungkinkan untuk mengubah kata sandi "
+"akun, sekali."
+
+#: snikket_web/templates/admin_edit_user.html:68
+msgid "Debug information"
+msgstr "Informasi debug"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+"Dalam beberapa kasus, informasi tambahan tentang akun pengguna dan perangkat "
+"yang terhubung diperlukan untuk memecahkan masalah. Tombol di bawah "
+"mengungkapkan informasi (sensitif) ini."
+
+#: snikket_web/templates/admin_edit_user.html:74
+msgid "Show debug information"
+msgstr "Tampilkan informasi debug"
 
 #: snikket_web/templates/admin_home.html:4
 msgid "Welcome to the admin panel!"
@@ -703,11 +883,28 @@ msgstr "Buat, batalkan, atau salin undangan."
 msgid "Manage invitations"
 msgstr "Kelola undangan"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr "Kesehatan sistem"
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr "Lihat status server atau kirim pesan siaran ke semua pengguna."
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr "Kirim pesan siaran ke semua pengguna."
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+msgid "Manage system"
+msgstr "Kelola sistem"
+
+#: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
 msgstr "Kembali ke halaman portal web pengguna."
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr "Keluar panel administrator"
 
@@ -760,15 +957,101 @@ msgstr ""
 msgid "Destroy link"
 msgstr "Hancurkan tautan"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
+msgstr "Kesehatan sistem keseluruhan"
-msgstr "Lihat informasi debug untuk %(user_name)s"
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr "Beban sistem (rata-rata 5 menit)"
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr "Tidak diketahui"
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr "Penggunaan memori"
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
-msgstr "Buat tautan setel ulang kata sandi untuk %(user_name)s"
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+"%(percentage_global)s of %(mem_available)s. Dari jumlah itu, Snikket "
+"menggunakan %(percentage_snikket)s."
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr "Status portal web"
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr "Versi"
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr "Lihat versi semua"
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr "Penggunaan CPU rata-rata"
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr "Penggunaan CPU rata-rata"
+
+#: snikket_web/templates/admin_system.html:50
+msgid "Snikket server status"
+msgstr "Status server Snikket"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr "Penyimpanan yang digunakan oleh file bersama"
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr "Perangkat terhubung"
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr "Sebarkan pesan"
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+"Form ini memungkinkan mengirim pesan ke semua pengguna yang saat ini online "
+"di server Snikket Anda. Gunakan dengan bijak."
+
+#: snikket_web/templates/admin_users.html:19
+msgid "The user is an administrator."
+msgstr "Pengguna adalah administrator."
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr " (Admin)"
+
+#: snikket_web/templates/admin_users.html:22
+msgid "The user is restricted."
+msgstr "Pengguna terbatas."
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
+msgstr " (Terbatas)"
 
 #: snikket_web/templates/app.html:4
 msgid "Snikket Web Portal"
@@ -932,7 +1215,6 @@ msgid "You can now log in using your new password."
 msgstr "Anda dapat masuk menggunakan kata sandi baru Anda."
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr "Sekarang Anda dapat menutup halaman ini."
 
@@ -1024,6 +1306,44 @@ msgstr ""
 "Sekarang anda dapat mempersiapkan aplikasi XMPP lawas Anda dengan alamat di "
 "atas dan kata sandi yang dipilih saat pendaftaran."
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+"Anda dapat menutup halaman ini dengan aman, atau masuk ke portal web untuk "
+"<a href=\"%(login_url)s\">mengelola akun anda</a>."
+
+#: snikket_web/templates/invite_success.html:21
+msgid "Import successful"
+msgstr "Impor berhasil"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr "Selamat! Data akun Anda telah berhasil diimpor."
+
+#: snikket_web/templates/invite_success.html:26
+msgid "Moving to Snikket?"
+msgstr "Pindahkan ke Snikket?"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+"Jika Anda berpindah dari instans Snikket yang berbeda atau layanan lain yang "
+"kompatibel dengan XMPP, Anda memiliki pilihan mengimpor data (kontak, "
+"informasi profil, dll.) dari akun Anda sebelumnya. Ketika Anda telah "
+"mengekspor data dari akun Anda sebelumnya, unggah menggunakan form di bawah "
+"ini."
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr "Unggah data akun"
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1075,7 +1395,7 @@ msgstr "Unduh di App Store"
 
 #: snikket_web/templates/invite_view.html:32
 msgid "Get it on F-Droid"
-msgstr ""
+msgstr "Dapatkan di F-Droid"
 
 #: snikket_web/templates/invite_view.html:35
 msgid "Send to mobile device"
@@ -1147,17 +1467,19 @@ msgstr ""
 
 #: snikket_web/templates/invite_view.html:93
 msgid "Install on iOS"
-msgstr ""
+msgstr "Pasang di iOS"
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
+"Setelah mengunduh Snikket dari App Store, Anda harus kembali ke tautan "
+"undangan ini dan klik \"Buka aplikasi\" untuk melanjutkan."
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
-msgstr ""
+msgstr "Pertama, unduh Snikket dari App Store menggunakan tombol di bawah ini:"
 
 #: snikket_web/templates/invite_view.html:103
 #: snikket_web/templates/invite_view.html:131
@@ -1165,21 +1487,25 @@ msgid ""
 "After the installation is complete, you can return to this page and tap the "
 "\"Open the app\" button to continue with the setup:"
 msgstr ""
+"Setelah instalasi selesai, Anda dapat kembali ke halaman ini dan mengetuk "
+"tombol \"Buka aplikasi\" untuk melanjutkan pemasangan:"
 
 #: snikket_web/templates/invite_view.html:121
 #: snikket_web/templates/invite_view.html:130
 msgid "Install via F-Droid"
-msgstr ""
+msgstr "Install melalui F-Droid"
 
 #: snikket_web/templates/invite_view.html:127
 msgid ""
 "After installing Snikket via F-Droid, you have to return to this invite link "
 "and tap on \"Open the app\" to proceed."
 msgstr ""
+"Setelah menginstal Snikket melalui F-Droid, Anda harus kembali ke tautan "
+"undangan ini dan ketuk \"Buka aplikasi\" untuk melanjutkan."
 
 #: snikket_web/templates/invite_view.html:129
 msgid "First install Snikket from F-Droid using the button below:"
-msgstr ""
+msgstr "Pertama install Snikket dari F-Droid menggunakan tombol di bawah ini:"
 
 #: snikket_web/templates/library.j2:18
 msgid "Copy link"
@@ -1189,10 +1515,6 @@ msgstr "Salin tautan"
 msgid "Invalid input"
 msgstr "Input tidak valid"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr "Dihapus"
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
@@ -1248,15 +1570,20 @@ msgstr "Alamat XMPP anda"
 msgid "Edit profile"
 msgstr "Edit profil"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+msgid "Manage your data"
+msgstr "Kelola data anda"
+
+#: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
 msgstr "Snikket anda"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr "Kelola pengguna, undangan dan kelompok pengguna layanan Snikket."
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 msgid "Admin panel"
 msgstr "Panel Administrator"
 
@@ -1272,6 +1599,18 @@ msgstr ""
 "Klik tombol untuk keluar dari portal web. Ini tidak mempengaruhi perangkat "
 "lain yang terhubung."
 
+#: snikket_web/templates/user_manage_data.html:8
+msgid "Export account"
+msgstr "Ekspor akun"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+"Unduh data akun sebagai file untuk backup atau untuk memindahkan akun Anda "
+"ke layanan lain."
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "Ganti kata sandi anda"
@@ -1314,29 +1653,15 @@ msgstr ""
 "Bagian ini memungkinkan Anda untuk mengontrol siapa yang bisa melihat profil "
 "Anda, seperti avatar dan nama panggilan."
 
+#~ msgid "Create password reset link for %(user_name)s"
+#~ msgstr "Buat tautan setel ulang kata sandi untuk %(user_name)s"
+
 #~ msgid "Login failed"
 #~ msgstr "Percobaan masuk gagal"
 
 #~ msgid "Not on mobile?"
 #~ msgstr "Bukan di ponsel?"
 
-#~ msgid "Edit user %(user_name)s"
-#~ msgstr "Edit pengguna %(user_name)s"
-
-#~ msgid "User information"
-#~ msgstr "Informasi pengguna"
-
-#~ msgid ""
-#~ "If the user has forgotten their password, use the below button to create "
-#~ "a password reset link. The password reset link can be used once to change "
-#~ "the password of the account. Transmit the link to the user via a secure "
-#~ "channel."
-#~ msgstr ""
-#~ "Jika pengguna lupa kata sandi, gunakan tombol di bawah untuk membuat "
-#~ "tautan setel ulang kata sandi. Tautan pengaturan ulang kata sandi dapat "
-#~ "digunakan satu kali untuk mengubah kata sandi akun. Kirimkan link ke "
-#~ "pengguna melalui saluran aman."
-
 #~ msgid "<label for=\"link-field\">Link</label>"
 #~ msgstr "<label for=\"link-field\">Tautan</label>"
 

snikket_web/translations/it/LC_MESSAGES/messages.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
-"PO-Revision-Date: 2021-02-25 16:02+0000\n"
+"PO-Revision-Date: 2021-05-19 15:12+0000\n"
 "Last-Translator: Roberto Resoli <roberto@resolutions.it>\n"
 "Language-Team: Italian <https://i18n.sotecware.net/projects/snikket/web-"
 "portal/it/>\n"
@@ -17,186 +17,268 @@ 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.4.2\n"
+"X-Generator: Weblate 4.5.1\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "Elimina definitivamente l'utente"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "Nome utente"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
-msgid "User deleted"
+#: snikket_web/templates/admin_edit_circle.html:60
-msgstr "Utente rimosso"
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "Nome visualizzato"
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
+msgstr "Livello di accesso"
+
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr "Limitato"
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr "Utente normale"
+
+#: snikket_web/admin.py:80
+msgid "Administrator"
+msgstr "Amministratore"
+
+#: snikket_web/admin.py:85
+msgid "Update user"
+msgstr "Aggiorna utente"
+
+#: snikket_web/admin.py:89
+msgid "Create password reset link"
+msgstr "Crea collegamento per reimpostare la password"
+
+#: snikket_web/admin.py:107
 msgid "Password reset link created"
 msgstr "Creato collegamento per reimpostare la password"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+msgid "User information updated."
+msgstr "Informazioni utente aggiornate."
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "Elimina definitivamente l'utente"
+
+#: snikket_web/admin.py:157
+msgid "User deleted"
+msgstr "Utente rimosso"
+
+#: snikket_web/admin.py:195
+msgid "Password reset link not found"
+msgstr "Collegamento per reimpostare la password non trovato"
+
+#: snikket_web/admin.py:207
 msgid "Password reset link deleted"
 msgstr "Eliminato collegamento per reimpostare la password"
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "Invita nella cerchia"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "Devi selezionare almeno una cerchia"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "Valido per"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "Un'ora"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "Dodici ore"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "Un giorno"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "Una settimana"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "Quattro settimane"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "Tipo di invito"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr "Individuale"
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr "Gruppo"
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "Nuovo collegamento di invito"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "Revoca"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 msgid "Invitation created"
 msgstr "Invito creato"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 msgid "No such invitation exists"
 msgstr "Questo invito non esiste"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 msgid "Invitation revoked"
 msgstr "Invito revocato"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "Nome"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "Crea cerchia"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 msgid "Circle created"
 msgstr "Cerchia creata"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "Seleziona utente"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 msgid "Update circle"
 msgstr "Modifica cerchia"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "Elimina cerchia definitivamente"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "Aggiungi utente"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 msgid "No such circle exists"
 msgstr "Questa cerchia non esiste"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 msgid "Circle data updated"
 msgstr "Dati della cerchia aggiornati"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 msgid "Circle deleted"
 msgstr "Cerchia eliminata"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 msgid "User added to circle"
 msgstr "Utente aggiunto alla cerchia"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 msgid "User removed from circle"
 msgstr "Utente rimosso dalla cerchia"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr ""
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr ""
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr ""
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr ""
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr ""
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "Principale"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr "Nome utente"
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "Password"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 msgid "Confirm password"
 msgstr "Conferma password"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
-#, fuzzy
-#| msgid "The passwords must match"
 msgid "The passwords must match."
-msgstr "Le password devono essere identiche"
+msgstr "Le password devono essere identiche."
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 msgid "Create account"
 msgstr "Crea utenza"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
-#, fuzzy
-#| msgid "That username is already taken"
 msgid "That username is already taken."
-msgstr "Nome utente già in uso"
+msgstr "Nome utente già in uso."
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
-#, fuzzy
-#| msgid "Registration was declined for unknown reasons"
 msgid "Registration was declined for unknown reasons."
-msgstr "Registrazione rifiutata per motivi sconosciuti"
+msgstr "Registrazione rifiutata per motivi sconosciuti."
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
-#, fuzzy
-#| msgid "The username is not valid"
 msgid "The username is not valid."
-msgstr "Nome utente non valido"
+msgstr "Nome utente non valido."
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "Cambia password"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr ""
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr ""
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr "Errore"
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "Indirizzo"
@@ -213,80 +295,85 @@ msgstr "Nome utente o password non validi."
 msgid "Login successful!"
 msgstr "Accesso riuscito!"
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "Password attuale"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "Nuova password"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "Conferma nuova password"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
-#, fuzzy
-#| msgid "The new passwords must match"
 msgid "The new passwords must match."
-msgstr "Le nuove password devono essere identiche"
+msgstr "Le nuove password devono essere identiche."
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "Esci"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr "Nessuno"
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "Solo amici"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "Chiunque"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "Nome visualizzato"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "Avatar"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr "Visibilità del profilo"
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "Modifica profilo"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
-#, fuzzy
+msgid "Account data"
-#| msgid "Incorrect password"
+msgstr ""
-msgid "Incorrect password."
-msgstr "Password errata"
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr ""
+
+#: snikket_web/user.py:111
+msgid "Incorrect password."
+msgstr "Password errata."
+
+#: snikket_web/user.py:115
 msgid "Password changed"
 msgstr "Password cambiata"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
 msgstr ""
+"L'avatar scelto è troppo grande. Per utilizzare un avatar così grande, "
+"utilizzate l'app."
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
-msgstr "Errore"
+msgstr ""
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
+msgstr ""
 
 #: snikket_web/templates/_footer.html:4
 #, python-format
@@ -419,8 +506,9 @@ msgid "Members"
 msgstr "Membri"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "Azioni"
 
@@ -495,12 +583,12 @@ msgid "Copy complete output"
 msgstr "Copia l'intero output"
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "Elimina utente %(user_name)s"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "Elimina utente"
 
@@ -508,11 +596,6 @@ msgstr "Elimina utente"
 msgid "Are you sure you want to delete the following user?"
 msgstr "Sei sicura/o di volere eliminare il seguente utente?"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "Nome utente"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "Pericolo"
@@ -567,7 +650,7 @@ msgstr "Questa cerchia non è collegata ad una chat di gruppo."
 
 #: snikket_web/templates/admin_edit_circle.html:44
 msgid "Return to circle list"
-msgstr ""
+msgstr "Ritorna alle lista delle cerchie"
 
 #: snikket_web/templates/admin_edit_circle.html:48
 msgid "Delete circle"
@@ -581,28 +664,37 @@ msgstr "Eliminare una cerchia non elimina nessuno dei suoi utenti."
 msgid "Circle members"
 msgstr "Membri della cerchia"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr "rimosso"
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Rimuovi l'utente %(username)s dalla cerchia"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr "Al momento questa cerchia non contiene membri."
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "Invita altri membri"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "Aggiungi un utente esistente"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr "Tutti gli utenti sono stati aggiunti"
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr "Tutti gli utenti di questo servizio sono già in questa cerchia."
 
@@ -655,11 +747,97 @@ msgstr "L'utente verrà aggiunto come contatto di %(peer_jid)s."
 msgid "Created"
 msgstr "Creato"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
-#, fuzzy
-#| msgid "New invitation link"
 msgid "Return to invitation list"
-msgstr "Nuovo collegamento di invito"
+msgstr "Ritorna alla lista degli inviti"
+
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+"Gli utenti limitati possono interagire con utenti sullo stesso servizio "
+"Snikket ed essere membri di cerchie."
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+"Come gli utenti limitati, e possono anche interagire con utenti di altri "
+"servizi Snikket."
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr ""
+"Come gli utenti normali e possono accedere al pannello amministrativo del "
+"portale web."
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, python-format
+msgid "Edit user %(user_name)s"
+msgstr "Modifica utente %(user_name)s"
+
+#: snikket_web/templates/admin_edit_user.html:22
+msgid "Edit user"
+msgstr "Modifica utente"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr "Il nome di login non può essere cambiato."
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+"Il livello di accesso di un utente determina quali interazioni gli sono "
+"consentite sul tuo servizio Snikket."
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+
+#: snikket_web/templates/admin_edit_user.html:50
+msgid "Return to user list"
+msgstr "Ritorna alla lista utenti"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr "Azioni ulteriori"
+
+#: snikket_web/templates/admin_edit_user.html:60
+msgid "Reset password"
+msgstr "Reimposta la password"
+
+#: snikket_web/templates/admin_edit_user.html:63
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+"Se l'utente ha perso la sua password, è possibile utilizzare il pulsante qui "
+"sotto per creare un link speciale che permette di cambiare la password "
+"dell'account, una sola volta."
+
+#: snikket_web/templates/admin_edit_user.html:68
+msgid "Debug information"
+msgstr "Informazioni diagnostiche"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+"In alcuni casi, informazioni estese sull'account utente e sui dispositivi "
+"collegati sono necessarie per risolvere i problemi. Il pulsante qui sotto "
+"rivela queste informazioni (sensibili)."
+
+#: snikket_web/templates/admin_edit_user.html:74
+msgid "Show debug information"
+msgstr "Mostra informazioni diagnostiche"
 
 #: snikket_web/templates/admin_home.html:4
 msgid "Welcome to the admin panel!"
@@ -700,11 +878,30 @@ msgstr "Crea, revoca o copia inviti."
 msgid "Manage invitations"
 msgstr "Gestisci inviti"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+#, fuzzy
+#| msgid "Manage users"
+msgid "Manage system"
+msgstr "Gestisci utenti"
+
+#: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
 msgstr "Torna al tuo portale utente."
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr "Esci dal pannello amministrativo"
 
@@ -757,15 +954,99 @@ msgstr ""
 msgid "Destroy link"
 msgstr "Elimina collegamento"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
+msgstr ""
-msgstr "Mostra informazioni diagnostiche per %(user_name)s"
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
-msgstr "Crea collegamento per reimpostare la password di %(user_name)s"
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:50
+#, fuzzy
+#| msgid "Snikket Web Portal"
+msgid "Snikket server status"
+msgstr "Portale Web di Snikket"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:19
+msgid "The user is an administrator."
+msgstr "L'utente è un amministratore."
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr " (Amministratore)"
+
+#: snikket_web/templates/admin_users.html:22
+msgid "The user is restricted."
+msgstr "L'utente è limitato."
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
+msgstr " (Limitato)"
 
 #: snikket_web/templates/app.html:4
 msgid "Snikket Web Portal"
@@ -929,7 +1210,6 @@ msgid "You can now log in using your new password."
 msgstr "Ora puoi collegarti utilizzando la nuova password."
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr "Puoi chiudere questa pagina in tutta sicurezza."
 
@@ -1023,6 +1303,41 @@ msgstr ""
 "Ora puoi impostare il tuo client XMPP con l'indirizzo mostrato sopra e la "
 "password che hai impostato durante la registrazione."
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:21
+#, fuzzy
+#| msgid "Operation successful"
+msgid "Import successful"
+msgstr "Operazione completata"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:26
+#, fuzzy
+#| msgid "Using the Snikket app"
+msgid "Moving to Snikket?"
+msgstr "Usa l'applicazione Snikket"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr ""
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1076,7 +1391,7 @@ msgstr "Scarica dall'App Store"
 
 #: snikket_web/templates/invite_view.html:32
 msgid "Get it on F-Droid"
-msgstr ""
+msgstr "Scaricalo da F-Droid"
 
 #: snikket_web/templates/invite_view.html:35
 msgid "Send to mobile device"
@@ -1149,17 +1464,21 @@ msgstr ""
 
 #: snikket_web/templates/invite_view.html:93
 msgid "Install on iOS"
-msgstr ""
+msgstr "Installa su iOS"
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
+"Dopo aver scaricato Snikket dall'App Store, devi tornare a questo link di "
+"invito e toccare \"Apri nell'app\" per procedere."
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
 msgstr ""
+"Per prima cosa, scarica Snikket dall'App Store utilizzando il pulsante qui "
+"sotto:"
 
 #: snikket_web/templates/invite_view.html:103
 #: snikket_web/templates/invite_view.html:131
@@ -1167,21 +1486,26 @@ msgid ""
 "After the installation is complete, you can return to this page and tap the "
 "\"Open the app\" button to continue with the setup:"
 msgstr ""
+"Dopo che l'installazione è completa, puoi tornare a questa pagina e toccare "
+"il pulsante \"Apri nell'app\" per continuare con la configurazione:"
 
 #: snikket_web/templates/invite_view.html:121
 #: snikket_web/templates/invite_view.html:130
 msgid "Install via F-Droid"
-msgstr ""
+msgstr "Installa da F-Droid"
 
 #: snikket_web/templates/invite_view.html:127
 msgid ""
 "After installing Snikket via F-Droid, you have to return to this invite link "
 "and tap on \"Open the app\" to proceed."
 msgstr ""
+"Dopo aver installato Snikket da F-Droid, devi tornare a questo link di "
+"invito e toccare su \"Apri nell'app\" per procedere."
 
 #: snikket_web/templates/invite_view.html:129
 msgid "First install Snikket from F-Droid using the button below:"
 msgstr ""
+"Per prima cosa installa Snikket da F-Droid utilizzando il pulsante qui sotto:"
 
 #: snikket_web/templates/library.j2:18
 msgid "Copy link"
@@ -1191,10 +1515,6 @@ msgstr "Copia collegamento"
 msgid "Invalid input"
 msgstr "Dati non validi"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr "rimosso"
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
@@ -1253,15 +1573,22 @@ msgstr "Il tuo indirizzo XMPP"
 msgid "Edit profile"
 msgstr "Modifica profilo"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+#, fuzzy
+#| msgid "Manage users"
+msgid "Manage your data"
+msgstr "Gestisci utenti"
+
+#: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
 msgstr "Il tuo Snikket"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr "Gestisci utenti, inviti e cerchie del tuo servizio Snikket."
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 msgid "Admin panel"
 msgstr "Pannello amministrativo"
 
@@ -1277,6 +1604,18 @@ msgstr ""
 "Premi il pulsante sottostante per uscire dal portale web. Non ha effetto "
 "sugli altri dispositivi collegati."
 
+#: snikket_web/templates/user_manage_data.html:8
+#, fuzzy
+#| msgid "Your account"
+msgid "Export account"
+msgstr "La tua utenza"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "Modifica la tua password"
@@ -1319,6 +1658,9 @@ msgstr ""
 "Questa sezione ti permette di controllare chi può visualizzare i dettagli "
 "del tuo profilo, come ad esempio l'avatar o il soprannome."
 
+#~ msgid "Create password reset link for %(user_name)s"
+#~ msgstr "Crea collegamento per reimpostare la password di %(user_name)s"
+
 #~ msgid "Login failed"
 #~ msgstr "Accesso non riuscito"
 

snikket_web/translations/ja/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
 "PO-Revision-Date: 2021-01-28 17:55+0000\n"
 "Last-Translator: pep <pep@bouah.net>\n"
 "Language-Team: Japanese <https://i18n.sotecware.net/projects/snikket/web-"
@@ -20,205 +20,305 @@ msgstr ""
 "X-Generator: Weblate 4.4.2\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "ユーザーを削除する"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "ロゲイン名"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
-msgid "User deleted"
+#: snikket_web/templates/admin_edit_circle.html:60
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "表示名"
+
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
 msgstr ""
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr ""
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr ""
+
+#: snikket_web/admin.py:80
+#, fuzzy
+#| msgid "Admin area"
+msgid "Administrator"
+msgstr "管理"
+
+#: snikket_web/admin.py:85
+#, fuzzy
+#| msgid "Update circle"
+msgid "Update user"
+msgstr "サークルを更新"
+
+#: snikket_web/admin.py:89
+#, fuzzy
+#| msgid "Password reset link for %(user_name)s"
+msgid "Create password reset link"
+msgstr "%(user_name)s のパスワード再設定リンク"
+
+#: snikket_web/admin.py:107
 #, fuzzy
 #| msgid "Password reset link for %(user_name)s"
 msgid "Password reset link created"
 msgstr "%(user_name)s のパスワード再設定リンク"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+#, fuzzy
+#| msgid "User information"
+msgid "User information updated."
+msgstr "ユーザー詳細"
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "ユーザーを削除する"
+
+#: snikket_web/admin.py:157
+msgid "User deleted"
+msgstr ""
+
+#: snikket_web/admin.py:195
+#, fuzzy
+#| msgid "Password reset link for %(user_name)s"
+msgid "Password reset link not found"
+msgstr "%(user_name)s のパスワード再設定リンク"
+
+#: snikket_web/admin.py:207
 #, fuzzy
 #| msgid "Password reset link for %(user_name)s"
 msgid "Password reset link deleted"
 msgstr "%(user_name)s のパスワード再設定リンク"
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "サークルに紹介する"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "サークルを選択してください"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "有効期限"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "一時間"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "１２時間"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "一日"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "一週間"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "４週間"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "紹介の種類"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr "一回"
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr "複数回"
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "新しい紹介状"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "取り消す"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 #, fuzzy
 #| msgid "Invitation type"
 msgid "Invitation created"
 msgstr "紹介の種類"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 #, fuzzy
 #| msgid "New invitation link"
 msgid "No such invitation exists"
 msgstr "新しい紹介状"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 #, fuzzy
 #| msgid "Invitation type"
 msgid "Invitation revoked"
 msgstr "紹介の種類"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "名"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "サークルを作成"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 #, fuzzy
 #| msgid "Circle name"
 msgid "Circle created"
 msgstr "サークル名"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "ユーザー選択"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 msgid "Update circle"
 msgstr "サークルを更新"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "サークルを削除"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "ユーザーを追加する"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 #, fuzzy
 #| msgid "No circles"
 msgid "No such circle exists"
 msgstr "なし"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 #, fuzzy
 #| msgid "Circle name"
 msgid "Circle data updated"
 msgstr "サークル名"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 #, fuzzy
 #| msgid "Circle members"
 msgid "Circle deleted"
 msgstr "サークル会員"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 #, fuzzy
 #| msgid "Invite to circle"
 msgid "User added to circle"
 msgstr "サークルに紹介する"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 #, fuzzy
 #| msgid "Remove user %(username)s from circle"
 msgid "User removed from circle"
 msgstr "%(username)s をサークルから外す"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr ""
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr ""
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr ""
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr ""
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr ""
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "第一サークル"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr "ユーザー名"
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "パスワード"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 msgid "Confirm password"
 msgstr "確認用パスワード"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
 #, fuzzy
 #| msgid "The passwords must match"
 msgid "The passwords must match."
 msgstr "確認用パスワードが一致しません"
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 msgid "Create account"
 msgstr "アカウント作成"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
 #, fuzzy
 #| msgid "That username is already taken"
 msgid "That username is already taken."
 msgstr "このユーザー名は存在しています"
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
 #, fuzzy
 #| msgid "Registration was declined for unknown reasons"
 msgid "Registration was declined for unknown reasons."
 msgstr "理由不明の登録エラー"
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
 #, fuzzy
 #| msgid "The username is not valid"
 msgid "The username is not valid."
 msgstr "ユーザー名が不正"
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "パスワード変更"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr ""
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr ""
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr ""
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "アドレス"
@@ -235,83 +335,90 @@ msgstr "ユーザー名またはパスワードが不正。"
 msgid "Login successful!"
 msgstr ""
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "現在のパスワード"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "新しいパスワードの確認"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
 #, fuzzy
 #| msgid "The new passwords must match"
 msgid "The new passwords must match."
 msgstr "新しいパスワードが不一致"
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "サインアウト"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr ""
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "コンタクト限定"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "全員"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "表示名"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "アバター"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr ""
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "プロファイル管理"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
+msgid "Account data"
+msgstr ""
+
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr ""
+
+#: snikket_web/user.py:111
 #, fuzzy
 #| msgid "Incorrect password"
 msgid "Incorrect password."
 msgstr "パスワード不正"
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:115
 #, fuzzy
 #| msgid "Password reset"
 msgid "Password changed"
 msgstr "パスワード再設定"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
 msgstr ""
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 #, fuzzy
 #| msgid "Profile"
 msgid "Profile updated"
 msgstr "プロファイル"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
+msgstr ""
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
 msgstr ""
 
 #: snikket_web/templates/_footer.html:4
@@ -426,8 +533,9 @@ msgid "Members"
 msgstr "サークル員"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "操作"
 
@@ -498,12 +606,12 @@ msgid "Copy complete output"
 msgstr ""
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "%(user_name)s を削除"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "ユーザー削除"
 
@@ -511,11 +619,6 @@ msgstr "ユーザー削除"
 msgid "Are you sure you want to delete the following user?"
 msgstr "本当にこのユーザーを削除していいですか？"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "ロゲイン名"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "警告"
@@ -581,28 +684,37 @@ msgstr "サークルを削除しても会員は削除されまんせん。"
 msgid "Circle members"
 msgstr "サークル会員"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "%(username)s をサークルから外す"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "会員を紹介する"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "ユーザー追加"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr ""
 
@@ -652,12 +764,96 @@ msgstr ""
 msgid "Created"
 msgstr "作成時"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
 #, fuzzy
 #| msgid "New invitation link"
 msgid "Return to invitation list"
 msgstr "新しい紹介状"
 
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, python-format
+msgid "Edit user %(user_name)s"
+msgstr "%(user_name)s を更新"
+
+#: snikket_web/templates/admin_edit_user.html:22
+#, fuzzy
+#| msgid "Add user"
+msgid "Edit user"
+msgstr "ユーザーを追加する"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:50
+#, fuzzy
+#| msgid "New invitation link"
+msgid "Return to user list"
+msgstr "新しい紹介状"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:60
+#, fuzzy
+#| msgid "Change your password"
+msgid "Reset password"
+msgstr "パスワード変更"
+
+#: snikket_web/templates/admin_edit_user.html:63
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:68
+#, fuzzy
+#| msgid "User information"
+msgid "Debug information"
+msgstr "ユーザー詳細"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:74
+#, fuzzy
+#| msgid "User information"
+msgid "Show debug information"
+msgstr "ユーザー詳細"
+
 #: snikket_web/templates/admin_home.html:4
 #, fuzzy
 #| msgid "Back to the main page"
@@ -707,13 +903,32 @@ msgstr "紹介状を作成、削除、表示。"
 msgid "Manage invitations"
 msgstr "紹介状管理"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+#, fuzzy
+#| msgid "Manage users"
+msgid "Manage system"
+msgstr "ユーザー管理"
+
+#: snikket_web/templates/admin_home.html:48
 #, fuzzy
 #| msgid "Go back to your user’s web portal page."
 msgid "Go back to your user's web portal page."
 msgstr "ホームページに戻る。"
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr ""
 
@@ -764,14 +979,102 @@ msgstr "このリンクはパスワードを一回きり再設定可能にする
 msgid "Destroy link"
 msgstr "リンク取り消す"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
 msgstr ""
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:50
+#, fuzzy
+#| msgid "Snikket Web Portal"
+msgid "Snikket server status"
+msgstr "Snikket ホームページ"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:19
+#, fuzzy
+#| msgid "The username is not valid"
+msgid "The user is an administrator."
+msgstr "ユーザー名が不正"
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:22
+#, fuzzy
+#| msgid "The username is not valid"
+msgid "The user is restricted."
+msgstr "ユーザー名が不正"
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
 msgstr ""
 
 #: snikket_web/templates/app.html:4
@@ -931,7 +1234,6 @@ msgid "You can now log in using your new password."
 msgstr ""
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr ""
 
@@ -1015,6 +1317,41 @@ msgid ""
 "password you chose during registration."
 msgstr ""
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:21
+#, fuzzy
+#| msgid "Password reset"
+msgid "Import successful"
+msgstr "パスワード再設定"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:26
+#, fuzzy
+#| msgid "About Snikket"
+msgid "Moving to Snikket?"
+msgstr "Snikketについて"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr ""
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1124,12 +1461,12 @@ msgstr ""
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
 msgstr ""
 
 #: snikket_web/templates/invite_view.html:103
@@ -1162,10 +1499,6 @@ msgstr "リンクをコピーする"
 msgid "Invalid input"
 msgstr "入力不正"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr ""
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
@@ -1226,17 +1559,24 @@ msgstr "談話室アドレス"
 msgid "Edit profile"
 msgstr "プロファイル管理"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+#, fuzzy
+#| msgid "Manage users"
+msgid "Manage your data"
+msgstr "ユーザー管理"
+
+#: snikket_web/templates/user_home.html:39
 #, fuzzy
 #| msgid "About Snikket"
 msgid "Your Snikket"
 msgstr "Snikketについて"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr ""
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 #, fuzzy
 #| msgid "Admin area"
 msgid "Admin panel"
@@ -1252,6 +1592,18 @@ msgid ""
 "other connected devices."
 msgstr ""
 
+#: snikket_web/templates/user_manage_data.html:8
+#, fuzzy
+#| msgid "Create account"
+msgid "Export account"
+msgstr "アカウント作成"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "パスワード変更"
@@ -1289,12 +1641,6 @@ msgid ""
 "like avatar and nickname."
 msgstr ""
 
-#~ msgid "Edit user %(user_name)s"
-#~ msgstr "%(user_name)s を更新"
-
-#~ msgid "User information"
-#~ msgstr "ユーザー詳細"
-
 #~ msgid "This circle cannot be modified"
 #~ msgstr "このサークルの更新ができません"
 

snikket_web/translations/messages.pot

@@ -1,313 +1,373 @@
 # Translations template for PROJECT.
-# Copyright (C) 2021 ORGANIZATION
+# Copyright (C) 2022 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-25 17:32+0100\n"
+"POT-Creation-Date: 2022-06-06 19:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.10.1\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:69 snikket_web/templates/admin_delete_user.html:10
-msgid "Limited"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr ""
-
-#: snikket_web/admin.py:64 snikket_web/templates/admin_delete_user.html:10
 #: snikket_web/templates/admin_users.html:8
 msgid "Login name"
 msgstr ""
 
-#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/admin.py:73 snikket_web/templates/admin_delete_user.html:12
-#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:61
+#: snikket_web/templates/admin_edit_circle.html:60
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
 msgid "Display name"
 msgstr ""
 
-#: snikket_web/admin.py:72 snikket_web/templates/admin_edit_user.html:33
+#: snikket_web/admin.py:77 snikket_web/templates/admin_edit_user.html:32
 msgid "Access Level"
 msgstr ""
 
-#: snikket_web/admin.py:77
+#: snikket_web/admin.py:79
+msgid "Limited"
+msgstr ""
+
+#: snikket_web/admin.py:80
 msgid "Normal user"
 msgstr ""
 
-#: snikket_web/admin.py:78
+#: snikket_web/admin.py:81
 msgid "Administrator"
 msgstr ""
 
-#: snikket_web/admin.py:83
+#: snikket_web/admin.py:86
 msgid "Update user"
 msgstr ""
 
-#: snikket_web/admin.py:87
+#: snikket_web/admin.py:90
 msgid "Create password reset link"
 msgstr ""
 
-#: snikket_web/admin.py:105
+#: snikket_web/admin.py:108
 msgid "Password reset link created"
 msgstr ""
 
-#: snikket_web/admin.py:120
+#: snikket_web/admin.py:123
 msgid "User information updated."
 msgstr ""
 
-#: snikket_web/admin.py:142
+#: snikket_web/admin.py:145
 msgid "Delete user permanently"
 msgstr ""
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:158
 msgid "User deleted"
 msgstr ""
 
-#: snikket_web/admin.py:193
+#: snikket_web/admin.py:196
 msgid "Password reset link not found"
 msgstr ""
 
-#: snikket_web/admin.py:205
+#: snikket_web/admin.py:208
 msgid "Password reset link deleted"
 msgstr ""
 
-#: snikket_web/admin.py:225
+#: snikket_web/admin.py:228
 msgid "Invite to circle"
 msgstr ""
 
-#: snikket_web/admin.py:231
+#: snikket_web/admin.py:234
 msgid "At least one circle must be selected"
 msgstr ""
 
-#: snikket_web/admin.py:236
+#: snikket_web/admin.py:239
 msgid "Valid for"
 msgstr ""
 
-#: snikket_web/admin.py:238
+#: snikket_web/admin.py:241
 msgid "One hour"
 msgstr ""
 
-#: snikket_web/admin.py:239
+#: snikket_web/admin.py:242
 msgid "Twelve hours"
 msgstr ""
 
-#: snikket_web/admin.py:240
+#: snikket_web/admin.py:243
 msgid "One day"
 msgstr ""
 
-#: snikket_web/admin.py:241
+#: snikket_web/admin.py:244
 msgid "One week"
 msgstr ""
 
-#: snikket_web/admin.py:242
+#: snikket_web/admin.py:245
 msgid "Four weeks"
 msgstr ""
 
-#: snikket_web/admin.py:248 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:251 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr ""
 
-#: snikket_web/admin.py:250 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr ""
 
-#: snikket_web/admin.py:251 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:254 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr ""
 
-#: snikket_web/admin.py:257
+#: snikket_web/admin.py:260
 msgid "New invitation link"
 msgstr ""
 
-#: snikket_web/admin.py:319
+#: snikket_web/admin.py:322
 msgid "Revoke"
 msgstr ""
 
-#: snikket_web/admin.py:343
+#: snikket_web/admin.py:346
 msgid "Invitation created"
 msgstr ""
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:362
 msgid "No such invitation exists"
 msgstr ""
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:377
 msgid "Invitation revoked"
 msgstr ""
 
-#: snikket_web/admin.py:391 snikket_web/admin.py:439
+#: snikket_web/admin.py:394 snikket_web/admin.py:442
 msgid "Name"
 msgstr ""
 
-#: snikket_web/admin.py:396 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:399 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr ""
 
-#: snikket_web/admin.py:426
+#: snikket_web/admin.py:429
 msgid "Circle created"
 msgstr ""
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:447
 msgid "Select user"
 msgstr ""
 
-#: snikket_web/admin.py:449
+#: snikket_web/admin.py:452
 msgid "Update circle"
 msgstr ""
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:456
 msgid "Delete circle permanently"
 msgstr ""
 
-#: snikket_web/admin.py:459
+#: snikket_web/admin.py:462
 msgid "Add user"
 msgstr ""
 
-#: snikket_web/admin.py:475
+#: snikket_web/admin.py:478
 msgid "No such circle exists"
 msgstr ""
 
-#: snikket_web/admin.py:512
+#: snikket_web/admin.py:515
 msgid "Circle data updated"
 msgstr ""
 
-#: snikket_web/admin.py:518
+#: snikket_web/admin.py:521
 msgid "Circle deleted"
 msgstr ""
 
-#: snikket_web/admin.py:529
+#: snikket_web/admin.py:532
 msgid "User added to circle"
 msgstr ""
 
-#: snikket_web/admin.py:538
+#: snikket_web/admin.py:541
 msgid "User removed from circle"
 msgstr ""
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:610
+msgid "Message contents"
+msgstr ""
+
+#: snikket_web/admin.py:616
+msgid "Only send to online users"
+msgstr ""
+
+#: snikket_web/admin.py:620
+msgid "Post to all users"
+msgstr ""
+
+#: snikket_web/admin.py:624
+msgid "Send preview to yourself"
+msgstr ""
+
+#: snikket_web/admin.py:646
+msgid "Announcement sent!"
+msgstr ""
+
+#: snikket_web/infra.py:53
 msgid "Main"
 msgstr ""
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:35
+msgid ""
+"The account data you tried to import is too large to upload. Please "
+"contact your Snikket operator."
+msgstr ""
+
+#: snikket_web/invite.py:114
 msgid "Username"
 msgstr ""
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:118 snikket_web/invite.py:186 snikket_web/main.py:43
 msgid "Password"
 msgstr ""
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:122 snikket_web/invite.py:190
 msgid "Confirm password"
 msgstr ""
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:126 snikket_web/invite.py:194
 msgid "The passwords must match."
 msgstr ""
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:131
 msgid "Create account"
 msgstr ""
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:158
 msgid "That username is already taken."
 msgstr ""
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:162 snikket_web/invite.py:227
 msgid "Registration was declined for unknown reasons."
 msgstr ""
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:166
 msgid "The username is not valid."
 msgstr ""
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:199 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr ""
 
-#: snikket_web/main.py:36
+#: snikket_web/invite.py:246
+msgid "Account data file"
+msgstr ""
+
+#: snikket_web/invite.py:250
+msgid "Import data"
+msgstr ""
+
+#: snikket_web/invite.py:271
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please "
+"upload an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+
+#: snikket_web/invite.py:291 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr ""
+
+#: snikket_web/main.py:38
 msgid "Address"
 msgstr ""
 
-#: snikket_web/main.py:46
+#: snikket_web/main.py:48
 msgid "Sign in"
 msgstr ""
 
-#: snikket_web/main.py:55
+#: snikket_web/main.py:57
 msgid "Invalid username or password."
 msgstr ""
 
-#: snikket_web/main.py:83
+#: snikket_web/main.py:85
 msgid "Login successful!"
 msgstr ""
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr ""
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr ""
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr ""
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
 msgid "The new passwords must match."
 msgstr ""
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr ""
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr ""
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr ""
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr ""
 
-#: snikket_web/user.py:65
+#: snikket_web/user.py:67
 msgid "Avatar"
 msgstr ""
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr ""
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr ""
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
-msgid "Incorrect password."
+msgid "Account data"
 msgstr ""
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:86
-msgid "Password changed"
+msgid "Upload"
 msgstr ""
 
 #: snikket_web/user.py:111
+msgid "Incorrect password."
+msgstr ""
+
+#: snikket_web/user.py:115
+msgid "Password changed"
+msgstr ""
+
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please"
 " use the app."
 msgstr ""
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 msgid "Profile updated"
 msgstr ""
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
+msgstr ""
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
 msgstr ""
 
 #: snikket_web/templates/_footer.html:4
@@ -385,7 +445,7 @@ msgstr ""
 msgid "Software Versions"
 msgstr ""
 
-#: snikket_web/templates/about.html:29
+#: snikket_web/templates/about.html:32
 msgid "Back to the main page"
 msgstr ""
 
@@ -420,6 +480,7 @@ msgid "Members"
 msgstr ""
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
 #: snikket_web/templates/admin_users.html:10
 msgid "Actions"
@@ -497,7 +558,7 @@ msgid "Delete user %(user_name)s"
 msgstr ""
 
 #: snikket_web/templates/admin_delete_user.html:6
-#: snikket_web/templates/admin_edit_user.html:54
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr ""
 
@@ -519,6 +580,7 @@ msgstr ""
 #: snikket_web/templates/admin_delete_user.html:19
 #: snikket_web/templates/admin_reset_user_password.html:25
 #: snikket_web/templates/user_logout.html:10
+#: snikket_web/templates/user_manage_data.html:14
 #: snikket_web/templates/user_passwd.html:27
 #: snikket_web/templates/user_profile.html:32
 msgid "Back"
@@ -568,28 +630,37 @@ msgstr ""
 msgid "Circle members"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr ""
 
@@ -664,56 +735,56 @@ msgstr ""
 msgid "Edit user %(user_name)s"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:23
+#: snikket_web/templates/admin_edit_user.html:22
 msgid "Edit user"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:27
+#: snikket_web/templates/admin_edit_user.html:26
 msgid "The login name cannot be changed."
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:34
+#: snikket_web/templates/admin_edit_user.html:33
 msgid ""
 "The access level of a user determines what interactions are allowed for "
 "them on your Snikket service."
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:41
+#: snikket_web/templates/admin_edit_user.html:40
 #, python-format
 msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:51
+#: snikket_web/templates/admin_edit_user.html:50
 msgid "Return to user list"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:59
+#: snikket_web/templates/admin_edit_user.html:58
 msgid "Further actions"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:61
+#: snikket_web/templates/admin_edit_user.html:60
 msgid "Reset password"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:64
+#: snikket_web/templates/admin_edit_user.html:63
 msgid ""
 "If the user has lost their password, you can use the button below to "
 "create a special link which allows to change the password of the account,"
 " once."
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:69
+#: snikket_web/templates/admin_edit_user.html:68
 msgid "Debug information"
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:71
+#: snikket_web/templates/admin_edit_user.html:70
 msgid ""
 "In some cases, extended information about the user account and the "
 "connected devices is necessary to troubleshoot issues. The button below "
 "reveals this (sensitive) information."
 msgstr ""
 
-#: snikket_web/templates/admin_edit_user.html:75
+#: snikket_web/templates/admin_edit_user.html:74
 msgid "Show debug information"
 msgstr ""
 
@@ -756,11 +827,28 @@ msgstr ""
 msgid "Manage invitations"
 msgstr ""
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
-msgid "Go back to your user's web portal page."
+msgid "System health"
 msgstr ""
 
 #: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+msgid "Manage system"
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:48
+msgid "Go back to your user's web portal page."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr ""
 
@@ -811,6 +899,82 @@ msgstr ""
 msgid "Destroy link"
 msgstr ""
 
+#: snikket_web/templates/admin_system.html:6
+msgid "Overall system status"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:20
+#, python-format
+msgid ""
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:50
+msgid "Snikket server status"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on "
+"your Snikket server. Use it wisely."
+msgstr ""
+
 #: snikket_web/templates/admin_users.html:19
 msgid "The user is an administrator."
 msgstr ""
@@ -977,7 +1141,6 @@ msgid "You can now log in using your new password."
 msgstr ""
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr ""
 
@@ -1055,6 +1218,37 @@ msgid ""
 " password you chose during registration."
 msgstr ""
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a "
+"href=\"%(login_url)s\">manage your account</a>."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:21
+msgid "Import successful"
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:26
+msgid "Moving to Snikket?"
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile"
+" information, etc.) from your previous account. When you have exported "
+"the data from your previous account, upload it using the form below."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr ""
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1205,10 +1399,6 @@ msgstr ""
 msgid "Invalid input"
 msgstr ""
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr ""
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
@@ -1261,15 +1451,20 @@ msgstr ""
 msgid "Edit profile"
 msgstr ""
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+msgid "Manage your data"
+msgstr ""
+
+#: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
 msgstr ""
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr ""
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 msgid "Admin panel"
 msgstr ""
 
@@ -1283,6 +1478,16 @@ msgid ""
 "any other connected devices."
 msgstr ""
 
+#: snikket_web/templates/user_manage_data.html:8
+msgid "Export account"
+msgstr ""
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr ""

snikket_web/translations/pl/LC_MESSAGES/messages.po

@@ -6,198 +6,284 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"Report-Msgid-Bugs-To: translations@snikket.org\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
-"PO-Revision-Date: 2021-02-25 16:02+0000\n"
+"PO-Revision-Date: 2022-01-21 15:00+0000\n"
 "Last-Translator: misiek <migelazur@mailbox.org>\n"
-"Language-Team: Polish <https://i18n.sotecware.net/projects/snikket/web-"
+"Language-Team: Polish <http://i18n.sotecware.net/projects/snikket/web-portal/"
-"portal/pl/>\n"
+"pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 4.8.1\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "Usuń użytkownika bezpowrotnie"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "Login"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
-msgid "User deleted"
+#: snikket_web/templates/admin_edit_circle.html:60
-msgstr "Użytkownik został usunięty"
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "Nazwa wyświetlana"
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
+msgstr "Poziom dostępu"
+
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr "Ograniczony"
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr "Zwykły użytkownik"
+
+#: snikket_web/admin.py:80
+msgid "Administrator"
+msgstr "Administrator"
+
+#: snikket_web/admin.py:85
+msgid "Update user"
+msgstr "Zapisz ustawienia użytkownika"
+
+#: snikket_web/admin.py:89
+msgid "Create password reset link"
+msgstr "Stwórz link do zresetowania hasła"
+
+#: snikket_web/admin.py:107
 msgid "Password reset link created"
 msgstr "Utworzono link resetowania hasła"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+msgid "User information updated."
+msgstr "Zaktualizowano informacje o użytkowniku."
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "Usuń użytkownika bezpowrotnie"
+
+#: snikket_web/admin.py:157
+msgid "User deleted"
+msgstr "Użytkownik został usunięty"
+
+#: snikket_web/admin.py:195
+msgid "Password reset link not found"
+msgstr "Nie znaleziono linku do zresetowania hasła"
+
+#: snikket_web/admin.py:207
 msgid "Password reset link deleted"
 msgstr "Usunięto link resetowania hasła"
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "Zaproś do kręgu"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "Należy wybrać przynajmniej jeden krąg"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "Ważne przez"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "Godzinę"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "Dwanaście godzin"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "Dzień"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "Tydzień"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "Cztery tygodnie"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "Typ zaproszenia"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr "Indywidualne"
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr "Grupowe"
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "Nowy link z zaproszeniem"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "Unieważnij"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 msgid "Invitation created"
 msgstr "Utworzono zaproszenie"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 msgid "No such invitation exists"
 msgstr "Takie zaproszenie nie istnieje"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 msgid "Invitation revoked"
 msgstr "Unieważniono zaproszenie"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "Nazwa"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "Utwórz krąg"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 msgid "Circle created"
 msgstr "Utworzono krąg"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "Wybierz użytkownika"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 msgid "Update circle"
 msgstr "Zaktualizuj ustawienia kręgu"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "Usuń krąg bezpowrotnie"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "Dodaj użytkownika"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 msgid "No such circle exists"
 msgstr "Taki krąg nie istnieje"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 msgid "Circle data updated"
 msgstr "Zaktualizowano dane kręgu"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 msgid "Circle deleted"
 msgstr "Krąg został usunięty"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 msgid "User added to circle"
 msgstr "Dodano użytkownika do kręgu"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 msgid "User removed from circle"
 msgstr "Usunięto użytkownika z kręgu"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr "Treść wiadomości"
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr "Wyślij jedynie do użytkowników online"
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr "Wyślij do wszystkich użytkowników"
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr "Prześlij do siebie podgląd wiadomości"
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr "Komunikat wysłany!"
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "Główny"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+"Plik z danymi konta, które próbujesz zaimportować, jest zbyt duży. "
+"Skontaktuj się z administratorem twojego serwera Snikket."
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "Hasło"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 msgid "Confirm password"
 msgstr "Potwierdź hasło"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
-#, fuzzy
-#| msgid "The passwords must match"
 msgid "The passwords must match."
-msgstr "Hasła muszą się zgadzać"
+msgstr "Hasła muszą się zgadzać."
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 msgid "Create account"
 msgstr "Utwórz konto"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
-#, fuzzy
-#| msgid "That username is already taken"
 msgid "That username is already taken."
-msgstr "Ta nazwa użytkownika jest już zajęta"
+msgstr "Ta nazwa użytkownika jest już zajęta."
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
-#, fuzzy
-#| msgid "Registration was declined for unknown reasons"
 msgid "Registration was declined for unknown reasons."
-msgstr "Z nieznanych przyczyn rejestracja została odrzucona"
+msgstr "Z nieznanych przyczyn rejestracja została odrzucona."
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
-#, fuzzy
-#| msgid "The username is not valid"
 msgid "The username is not valid."
-msgstr "Ta nazwa użytkownika jest nieprawidłowa"
+msgstr "Ta nazwa użytkownika jest nieprawidłowa."
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "Zmień hasło"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr "Plik z danymi konta"
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr "Importuj dane"
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+"Dane konta, które próbujesz zaimportować, mają nieznany format. Proszę "
+"wybrać plik w formacie XML zgodnym z XEP-0227 (podany format: %(mimetype)s)."
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr "Błąd"
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "Adres"
@@ -214,80 +300,85 @@ msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 msgid "Login successful!"
 msgstr "Zalogowano się pomyślnie!"
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "Obecne hasło"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "Potwierdź nowe hasło"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
-#, fuzzy
-#| msgid "The new passwords must match"
 msgid "The new passwords must match."
-msgstr "Nowe hasła muszą się zgadzać"
+msgstr "Nowe hasła muszą się zgadzać."
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "Wyloguj się"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr "Nikt"
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "Tylko znajomi"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "Wszyscy"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "Nazwa wyświetlana"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "Awatar"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr "Widoczność profilu"
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "Zaktualizuj profil"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
-#, fuzzy
+msgid "Account data"
-#| msgid "Incorrect password"
+msgstr "Dane konta"
-msgid "Incorrect password."
-msgstr "Nieprawidłowe hasło"
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr "Prześlij"
+
+#: snikket_web/user.py:111
+msgid "Incorrect password."
+msgstr "Nieprawidłowe hasło."
+
+#: snikket_web/user.py:115
 msgid "Password changed"
 msgstr "Hasło zostało zmienione"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
 msgstr ""
+"Wybrany awatar jest zbyt duży. Awatary o większych rozmiarach możesz ustawić "
+"korzystając z aplikacji."
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
-msgstr "Błąd"
+msgstr "Eksportuj"
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
+msgstr "Obecnie nie masz danych konta, które można wyeksportować."
 
 #: snikket_web/templates/_footer.html:4
 #, python-format
@@ -322,7 +413,7 @@ msgstr "O tej usłudze"
 #: snikket_web/templates/about.html:12
 #, python-format
 msgid "This is the Snikket service <em>%(site_name)s</em>."
-msgstr "To serwer Snikket: <em>%(site_name)s</em>."
+msgstr "Ten serwer Snikket to: <em>%(site_name)s</em>."
 
 #: snikket_web/templates/about.html:13
 msgid "Licenses"
@@ -420,8 +511,9 @@ msgid "Members"
 msgstr "Członkowie"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "Akcje"
 
@@ -496,12 +588,12 @@ msgid "Copy complete output"
 msgstr "Skopiuj całą zawartość"
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "Usuń użytkownika %(user_name)s"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "Usuń użytkownika"
 
@@ -509,11 +601,6 @@ msgstr "Usuń użytkownika"
 msgid "Are you sure you want to delete the following user?"
 msgstr "Czy na pewno chcesz usunąć tego użytkownika?"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "Login"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "Uwaga"
@@ -568,7 +655,7 @@ msgstr "Ten krąg nie jest powiązany z żadnym czatem grupowym."
 
 #: snikket_web/templates/admin_edit_circle.html:44
 msgid "Return to circle list"
-msgstr ""
+msgstr "Wróć do listy kręgów"
 
 #: snikket_web/templates/admin_edit_circle.html:48
 msgid "Delete circle"
@@ -582,28 +669,37 @@ msgstr "Usunięcie kręgu nie usunie z serwera jego użytkowników."
 msgid "Circle members"
 msgstr "Członkowie kręgu"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr "Użytkownik został usunięty z serwera."
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr "usunięty"
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Usuń z kręgu użytkownika %(username)s"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr "Ten krąg nie ma obecnie członków."
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "Zaproś więcej użytkowników"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "Dodaj istniejącego użytkownika"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr "Wszyscy użytkownicy dodani"
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr "Wszyscy użytkownicy tego serwera są obecnie w tym kręgu."
 
@@ -657,11 +753,97 @@ msgstr "Użytkownik zostanie dodany jako kontakt %(peer_jid)s."
 msgid "Created"
 msgstr "Utworzono"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
-#, fuzzy
-#| msgid "New invitation link"
 msgid "Return to invitation list"
-msgstr "Nowy link z zaproszeniem"
+msgstr "Wróć do listy zaproszeń"
+
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+"Użytkownicy z ograniczonym dostępem mogą wchodzić w interakcje z innymi "
+"użytkownikami na tym samym serwerze Snikket oraz być członkami kręgów."
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+"Jak użytkownicy z ograniczonym dostępem, ale dodatkowo mogą wchodzić w "
+"interakcje z użytkownikami innych serwerów Snikket."
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr ""
+"Jak zwykli użytkownicy, ale dodatkowo mają dostęp do panelu "
+"administracyjnego w portalu użytkownika Snikket."
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, python-format
+msgid "Edit user %(user_name)s"
+msgstr "Edytuj użytkownika %(user_name)s"
+
+#: snikket_web/templates/admin_edit_user.html:22
+msgid "Edit user"
+msgstr "Edytuj użytkownika"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr "Login nie może zostać zmieniony."
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+"Poziom dostępu użytkownika określa, jakie interakcje są dla niego dozwolone "
+"na Twoim serwerze Snikket."
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+
+#: snikket_web/templates/admin_edit_user.html:50
+msgid "Return to user list"
+msgstr "Wróć do listy użytkowników"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr "Dodatkowe funkcje"
+
+#: snikket_web/templates/admin_edit_user.html:60
+msgid "Reset password"
+msgstr "Resetowanie hasła"
+
+#: snikket_web/templates/admin_edit_user.html:63
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+"Jeśli użytkownik utraci swoje hasło, za pomocą poniższego przycisku "
+"wygenerujesz dla niego link do jego zresetowania. Odnośnik pozwoli na "
+"jednorazową zmianę hasła na nowe."
+
+#: snikket_web/templates/admin_edit_user.html:68
+msgid "Debug information"
+msgstr "Informacje debugowania"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+"W niektórych przypadkach do rozwiązania problemu wymagane są dodatkowe "
+"informacje o użytkowniku oraz podłączonych urządzeniach. Poniższy przycisk "
+"ujawni te (wrażliwe) informacje."
+
+#: snikket_web/templates/admin_edit_user.html:74
+msgid "Show debug information"
+msgstr "Pokaż informacje debugowania"
 
 #: snikket_web/templates/admin_home.html:4
 msgid "Welcome to the admin panel!"
@@ -702,11 +884,29 @@ msgstr "Utwórz, unieważnij lub kopiuj zaproszenia."
 msgid "Manage invitations"
 msgstr "Zarządzaj zaproszeniami"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr "Stan systemu"
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr ""
+"Podejrzyj status serwera lub prześlij komunikat do wszystkich użytkowników."
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr "Prześlij komunikat do wszystkich użytkowników."
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+msgid "Manage system"
+msgstr "Zarządzaj systemem"
+
+#: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
 msgstr "Wróć do swojej strony użytkownika."
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr "Wyjdź z panelu administracyjnego"
 
@@ -759,15 +959,101 @@ msgstr ""
 msgid "Destroy link"
 msgstr "Zniszcz link"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
+msgstr "Ogólny status systemu"
-msgstr "Pokaż informacje debugowania dla %(user_name)s"
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr "Obciążenie systemu (dla ostatnich 5 minut)"
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr "nieznane"
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr "Wykorzystanie pamięci"
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
-msgstr "Utwórz link resetowania hasła dla %(user_name)s"
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+"%(percentage_global)s z %(mem_available)s. Z tego Snikket używa "
+"%(percentage_snikket)s."
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr "Status portalu internetowego"
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr "Wersja"
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr "Pokaż wszystkie wersje"
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr "Średnie użycie CPU"
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr "Bieżące użycie pamięci"
+
+#: snikket_web/templates/admin_system.html:50
+msgid "Snikket server status"
+msgstr "Status serwera Snikket"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr "Miejsce wykorzystane przez przesłane pliki"
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr "Podłączone urządzenia"
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr "Wiadomość globalna"
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+"Ten formularz pozwala na wysłanie wiadomości do wszystkich użytkowników, "
+"którzy obecnie są online na twoim serwerze Snikket. Używaj go z rozwagą."
+
+#: snikket_web/templates/admin_users.html:19
+msgid "The user is an administrator."
+msgstr "Użytkownik jest administratorem."
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr " (Administrator)"
+
+#: snikket_web/templates/admin_users.html:22
+msgid "The user is restricted."
+msgstr "Użytkownik ma konto z ograniczonym dostępem."
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
+msgstr " (Ograniczony)"
 
 #: snikket_web/templates/app.html:4
 msgid "Snikket Web Portal"
@@ -933,7 +1219,6 @@ msgid "You can now log in using your new password."
 msgstr "Możesz się zalogować z wykorzystaniem twojego nowego hasła."
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr "Możesz teraz bezpiecznie zamknąć tę stronę."
 
@@ -1027,6 +1312,44 @@ msgstr ""
 "Możesz teraz skonfigurować swojego starszego klienta XMPP za pomocą "
 "powyższego adresu i hasła, które podałeś podczas rejestracji."
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+"Możesz bezpiecznie zamknąć tę stronę lub zalogować się do Portalu "
+"Użytkownika Snikket, aby <a href=\"%(login_url)s\">zarządzać swoim "
+"kontem</a>."
+
+#: snikket_web/templates/invite_success.html:21
+msgid "Import successful"
+msgstr "Import zakończony sukcesem"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr "Gratulacje! Dane twojego konta zostały prawidłowo zaimportowane."
+
+#: snikket_web/templates/invite_success.html:26
+msgid "Moving to Snikket?"
+msgstr "Przenosisz się na Snikket?"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+"Jeśli przenosisz się z innego serwera Snikket lub kompatybilnej usługi XMPP, "
+"możesz opcjonalnie zaimportować dane (kontakty, informacje o profilu, itp.) "
+"ze swojego poprzedniego konta. Gdy wyeksportujesz dane z poprzedniej usługi, "
+"możesz je przesłać za pomocą poniższego formularza."
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr "Prześlij dane konta"
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1081,7 +1404,7 @@ msgstr "Pobierz w App Store"
 
 #: snikket_web/templates/invite_view.html:32
 msgid "Get it on F-Droid"
-msgstr ""
+msgstr "Pobierz z F-Droid"
 
 #: snikket_web/templates/invite_view.html:35
 msgid "Send to mobile device"
@@ -1154,17 +1477,21 @@ msgstr ""
 
 #: snikket_web/templates/invite_view.html:93
 msgid "Install on iOS"
-msgstr ""
+msgstr "Zainstaluj na iOS"
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
+"Po pobraniu aplikacji Snikket z App Store musisz wrócić do tego linku z "
+"zaproszeniem, następnie kliknąć \"Otwórz aplikację\", aby kontynuować."
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
 msgstr ""
+"Najpierw pobierz aplikację Snikket z App Store za pomocą poniższego "
+"przycisku:"
 
 #: snikket_web/templates/invite_view.html:103
 #: snikket_web/templates/invite_view.html:131
@@ -1172,21 +1499,28 @@ msgid ""
 "After the installation is complete, you can return to this page and tap the "
 "\"Open the app\" button to continue with the setup:"
 msgstr ""
+"Po zakończeniu instalacji możesz wrócić do tej strony i kliknąć przycisk "
+"\"Otwórz aplikację\", aby kontynuować:"
 
 #: snikket_web/templates/invite_view.html:121
 #: snikket_web/templates/invite_view.html:130
 msgid "Install via F-Droid"
-msgstr ""
+msgstr "Zainstaluj przez F-Droid"
 
 #: snikket_web/templates/invite_view.html:127
 msgid ""
 "After installing Snikket via F-Droid, you have to return to this invite link "
 "and tap on \"Open the app\" to proceed."
 msgstr ""
+"Po zainstalowaniu aplikacji Snikket przez F-Droid, możesz wrócić do tego "
+"linku z zaproszeniem, następnie kliknąć \"Otwórz aplikację\", aby "
+"kontynuować."
 
 #: snikket_web/templates/invite_view.html:129
 msgid "First install Snikket from F-Droid using the button below:"
 msgstr ""
+"Najpierw zainstaluj aplikację Snikket z F-Droid, korzystając z poniższego "
+"przycisku:"
 
 #: snikket_web/templates/library.j2:18
 msgid "Copy link"
@@ -1196,10 +1530,6 @@ msgstr "Skopiuj link"
 msgid "Invalid input"
 msgstr "Dane nieprawidłowe"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr "usunięty"
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
@@ -1257,16 +1587,21 @@ msgstr "Twój adres XMPP"
 msgid "Edit profile"
 msgstr "Edytuj profil"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+msgid "Manage your data"
+msgstr "Zarządzaj danymi konta"
+
+#: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
 msgstr "Twój Snikket"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr ""
 "Zarządzaj użytkownikami, zaproszeniami oraz kręgami na tym serwerze Snikket."
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 msgid "Admin panel"
 msgstr "Panel administracyjny"
 
@@ -1282,6 +1617,18 @@ msgstr ""
 "Kliknij poniżej, aby wylogować się z portalu. Nie wpłynie to na pozostałe "
 "podłączone urządzenia."
 
+#: snikket_web/templates/user_manage_data.html:8
+msgid "Export account"
+msgstr "Wyeksportuj swoje dane"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+"Pobierz dane swojego konta jako plik w celu backupu lub przeniesienia konta "
+"na inną usługę."
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "Zmień swoje hasło"
@@ -1322,29 +1669,15 @@ msgstr ""
 "Ta sekcja pozwoli ci na zarządzenie widocznością informacji o twoim profilu "
 "przez innych, jak awatar lub pseudonim."
 
+#~ msgid "Create password reset link for %(user_name)s"
+#~ msgstr "Utwórz link resetowania hasła dla %(user_name)s"
+
 #~ msgid "Login failed"
 #~ msgstr "Logowanie nie powiodło się"
 
 #~ msgid "Not on mobile?"
 #~ msgstr "Nie korzystasz obecnie ze smartfona?"
 
-#~ msgid "Edit user %(user_name)s"
-#~ msgstr "Edytuj użytkownika %(user_name)s"
-
-#~ msgid "User information"
-#~ msgstr "Informacje o użytkowniku"
-
-#~ msgid ""
-#~ "If the user has forgotten their password, use the below button to create "
-#~ "a password reset link. The password reset link can be used once to change "
-#~ "the password of the account. Transmit the link to the user via a secure "
-#~ "channel."
-#~ msgstr ""
-#~ "Jeśli użytkownik zapomni swojego hasła, za pomocą poniższego przycisku "
-#~ "wygenerujesz dla niego link do zresetowania hasła. Link może być "
-#~ "wykorzystany jednorazowo do jego zmiany. Prześlij go do użytkownika za "
-#~ "pomocą bezpiecznej formy kontaktu."
-
 #~ msgid "<label for=\"link-field\">Link</label>"
 #~ msgstr "<label for=\"link-field\">Link</label>"
 

snikket_web/translations/ru/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
 "PO-Revision-Date: 2021-03-12 23:04+0000\n"
 "Last-Translator: GodGoldfish <godgoldfish@pm.me>\n"
 "Language-Team: Russian <https://i18n.sotecware.net/projects/snikket/web-"
@@ -21,183 +21,283 @@ msgstr ""
 "X-Generator: Weblate 4.5.1\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "Удалить пользователя навсегда"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "Логин"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
-msgid "User deleted"
+#: snikket_web/templates/admin_edit_circle.html:60
-msgstr "удалённый"
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "Отображаемое имя"
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
+msgstr ""
+
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr ""
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr ""
+
+#: snikket_web/admin.py:80
+#, fuzzy
+#| msgid "Admin area"
+msgid "Administrator"
+msgstr "Административная зона"
+
+#: snikket_web/admin.py:85
+#, fuzzy
+#| msgid "Update circle"
+msgid "Update user"
+msgstr "Обновить крук"
+
+#: snikket_web/admin.py:89
+#, fuzzy
+#| msgid "Create password reset links or delete users."
+msgid "Create password reset link"
+msgstr "Создайте ссылки для сброса пароля или удалите пользователей."
+
+#: snikket_web/admin.py:107
 msgid "Password reset link created"
 msgstr "Ссылка на сброс пароля для %(user_name)s"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+#, fuzzy
+#| msgid "Circle information"
+msgid "User information updated."
+msgstr "Информация о круге"
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "Удалить пользователя навсегда"
+
+#: snikket_web/admin.py:157
+msgid "User deleted"
+msgstr "удалённый"
+
+#: snikket_web/admin.py:195
+#, fuzzy
+#| msgid "Password reset link created"
+msgid "Password reset link not found"
+msgstr "Ссылка на сброс пароля для %(user_name)s"
+
+#: snikket_web/admin.py:207
 msgid "Password reset link deleted"
 msgstr "Создайте ссылки для сброса пароля или удалите пользователей"
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "Пригласить в круг"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "Необходимо выбрать хотя бы один круг"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "Действителен в течении"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "Один час"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "Двенадцать часов"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "Один день"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "Одна неделя"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "Четыре недели"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "Вид приглашения"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr "Индивидуальный"
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr "Группа"
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "Новая ссылка на приглашение"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "Aннулировать"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 msgid "Invitation created"
 msgstr "Вид приглашения"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 msgid "No such invitation exists"
 msgstr "Новая ссылка на приглашение"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 msgid "Invitation revoked"
 msgstr "Вид приглашения"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "Имя"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "Создать крук"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 msgid "Circle created"
 msgstr "Имя круга"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "Выврать пользователя"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 msgid "Update circle"
 msgstr "Обновить крук"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "Удалить круг навсегда"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "Добавить пользователя"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 msgid "No such circle exists"
 msgstr "Нет кругов"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 msgid "Circle data updated"
 msgstr "Имя круга"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 msgid "Circle deleted"
 msgstr "удалённый"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 msgid "User added to circle"
 msgstr "Пригласить в круг"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 msgid "User removed from circle"
 msgstr "Удалить пользователя %(username)s из круга"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr ""
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr ""
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr ""
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr ""
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr ""
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "Основное"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "Пароль"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 msgid "Confirm password"
 msgstr "Повторите пароль"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
 #, fuzzy
 #| msgid "The passwords must match"
 msgid "The passwords must match."
 msgstr "Паролт должны совпадать"
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 msgid "Create account"
 msgstr "Создать аккунт"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
 #, fuzzy
 #| msgid "That username is already taken"
 msgid "That username is already taken."
 msgstr "Это имя пользователя уже используется"
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
 #, fuzzy
 #| msgid "Registration was declined for unknown reasons"
 msgid "Registration was declined for unknown reasons."
 msgstr "Регистрация была отклонена по неизвестным причинам"
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
 #, fuzzy
 #| msgid "The username is not valid"
 msgid "The username is not valid."
 msgstr "Имя пользователя недействительно"
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "Изменить пароль"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr ""
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr ""
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr "Ошибка"
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "Адрес"
@@ -214,80 +314,87 @@ msgstr "Неверное имя пользователя или пароль."
 msgid "Login successful!"
 msgstr "Войти успешно!"
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "Новый пароль"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "Подтвердить новый пароль"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
 #, fuzzy
 #| msgid "The new passwords must match"
 msgid "The new passwords must match."
 msgstr "Новые пароли должны совпадать"
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "Выйти"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr "Никто"
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "Только друзья"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "Все"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "Отображаемое имя"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "Аватар"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr "Видимость профиля"
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "Обновить профиль"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
+msgid "Account data"
+msgstr ""
+
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr ""
+
+#: snikket_web/user.py:111
 #, fuzzy
 #| msgid "Incorrect password"
 msgid "Incorrect password."
 msgstr "Неправильный пароль"
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:115
 msgid "Password changed"
 msgstr "Смена пароля"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
 msgstr ""
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 msgid "Profile updated"
 msgstr "Профиль"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
-msgstr "Ошибка"
+msgstr ""
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
+msgstr ""
 
 #: snikket_web/templates/_footer.html:4
 #, python-format
@@ -421,8 +528,9 @@ msgid "Members"
 msgstr "Участники"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "Действия"
 
@@ -498,12 +606,12 @@ msgid "Copy complete output"
 msgstr "Копировать полный вывод"
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "Удалить пользователя %(user_name)s"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "Удалить пользователя"
 
@@ -511,11 +619,6 @@ msgstr "Удалить пользователя"
 msgid "Are you sure you want to delete the following user?"
 msgstr "Вы уверены, что хотите удалить следующего пользователя?"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "Логин"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "Опасность"
@@ -582,28 +685,37 @@ msgstr "Удаление круга не приводит к удалению п
 msgid "Circle members"
 msgstr "Участники круга"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr "удалённый"
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Удалить пользователя %(username)s из круга"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr "У этого круга пока нет участников."
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "Пригласить других участников"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "Добавить существующего пользователя"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr "Все пользователи добавлены"
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr "Все пользователи этого сервиса уже находятся в этом кругу."
 
@@ -657,12 +769,97 @@ msgstr "Пользователь будет добавлен как контак
 msgid "Created"
 msgstr "Создано"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
 #, fuzzy
 #| msgid "New invitation link"
 msgid "Return to invitation list"
 msgstr "Новая ссылка на приглашение"
 
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, fuzzy, python-format
+#| msgid "Delete user %(user_name)s"
+msgid "Edit user %(user_name)s"
+msgstr "Удалить пользователя %(user_name)s"
+
+#: snikket_web/templates/admin_edit_user.html:22
+#, fuzzy
+#| msgid "Add user"
+msgid "Edit user"
+msgstr "Добавить пользователя"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:50
+#, fuzzy
+#| msgid "New invitation link"
+msgid "Return to user list"
+msgstr "Новая ссылка на приглашение"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:60
+#, fuzzy
+#| msgid "Reset your password"
+msgid "Reset password"
+msgstr "Сброс пароля"
+
+#: snikket_web/templates/admin_edit_user.html:63
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:68
+#, fuzzy
+#| msgid "Circle information"
+msgid "Debug information"
+msgstr "Информация о круге"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+
+#: snikket_web/templates/admin_edit_user.html:74
+#, fuzzy
+#| msgid "Show debug information for %(user_name)s"
+msgid "Show debug information"
+msgstr "Показать отладочную информацию для %(user_name)s"
+
 #: snikket_web/templates/admin_home.html:4
 msgid "Welcome to the admin panel!"
 msgstr "Добро пожаловать в административную панель!"
@@ -704,11 +901,30 @@ msgstr "Создавайте, отзывайте или копируйте пр
 msgid "Manage invitations"
 msgstr "Управление приглашениями"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr ""
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+#, fuzzy
+#| msgid "Manage users"
+msgid "Manage system"
+msgstr "Управлять пользователями"
+
+#: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
 msgstr "Вернитесь на веб-портал своего пользователя."
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr "Покидая административную панель"
 
@@ -761,15 +977,103 @@ msgstr ""
 msgid "Destroy link"
 msgstr "Удалить ссылку"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
+msgstr ""
-msgstr "Показать отладочную информацию для %(user_name)s"
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
-msgstr "Создать ссылку сброса пароля для %(user_name)s"
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:50
+#, fuzzy
+#| msgid "Snikket Web Portal"
+msgid "Snikket server status"
+msgstr "Сниккет веб-портал"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr ""
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:19
+#, fuzzy
+#| msgid "The username is not valid"
+msgid "The user is an administrator."
+msgstr "Имя пользователя недействительно"
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr ""
+
+#: snikket_web/templates/admin_users.html:22
+#, fuzzy
+#| msgid "The username is not valid"
+msgid "The user is restricted."
+msgstr "Имя пользователя недействительно"
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
+msgstr ""
 
 #: snikket_web/templates/app.html:4
 msgid "Snikket Web Portal"
@@ -937,7 +1241,6 @@ msgid "You can now log in using your new password."
 msgstr "Теперь вы можете войти в систему, используя новый пароль."
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr "Теперь вы можете безопасно закрыть эту страницу."
 
@@ -1030,6 +1333,41 @@ msgstr ""
 "Теперь вы можете настроить ваш старый XMPP клиент с указанным выше адресом и "
 "паролем, который вы выбрали при регистрации."
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:21
+#, fuzzy
+#| msgid "Operation successful"
+msgid "Import successful"
+msgstr "Операция прошла успешно"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:26
+#, fuzzy
+#| msgid "Using the Snikket app"
+msgid "Moving to Snikket?"
+msgstr "Использование приложения Сниккет"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr ""
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1159,12 +1497,12 @@ msgstr ""
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
 msgstr ""
 
 #: snikket_web/templates/invite_view.html:103
@@ -1197,10 +1535,6 @@ msgstr "Ссылка на копирование"
 msgid "Invalid input"
 msgstr "Недействительный вход"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr "удалённый"
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
@@ -1259,16 +1593,23 @@ msgstr "Ваш адрес XMPP"
 msgid "Edit profile"
 msgstr "реадктировать профиль"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+#, fuzzy
+#| msgid "Manage users"
+msgid "Manage your data"
+msgstr "Управлять пользователями"
+
+#: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
 msgstr "Ваш Сниккет"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr ""
 "Управляйте пользователями, приглашениями и кругами вашего сервиса Сниккет."
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 msgid "Admin panel"
 msgstr "Административная панель"
 
@@ -1284,6 +1625,18 @@ msgstr ""
 "Нажмите ниже, чтобы выйти из веб-портала. Это не влияет на другие "
 "подключенные устройства."
 
+#: snikket_web/templates/user_manage_data.html:8
+#, fuzzy
+#| msgid "Your account"
+msgid "Export account"
+msgstr "Ваш аккаунт"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "Изменить пароль"
@@ -1326,6 +1679,9 @@ msgstr ""
 "Этот раздел позволяет вам контролировать, кто может видеть информацию вашего "
 "профиля, например, аватар и ник."
 
+#~ msgid "Create password reset link for %(user_name)s"
+#~ msgstr "Создать ссылку сброса пароля для %(user_name)s"
+
 #~ msgid "Login failed"
 #~ msgstr "Логин не удался"
 

snikket_web/translations/sv/LC_MESSAGES/messages.po

@@ -6,189 +6,283 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"Report-Msgid-Bugs-To: translations@snikket.org\n"
-"POT-Creation-Date: 2021-03-22 15:08+0100\n"
+"POT-Creation-Date: 2022-01-17 17:27+0100\n"
-"PO-Revision-Date: 2021-03-23 15:00+0000\n"
+"PO-Revision-Date: 2022-01-18 09:21+0000\n"
 "Last-Translator: Kim Alvefur <zash@zash.se>\n"
-"Language-Team: Swedish <https://i18n.sotecware.net/projects/snikket/"
+"Language-Team: Swedish <http://i18n.sotecware.net/projects/snikket/"
 "web-portal/sv/>\n"
 "Language: sv\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.5.1\n"
+"X-Generator: Weblate 4.8.1\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: snikket_web/admin.py:59
+#: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
-msgid "Delete user permanently"
+#: snikket_web/templates/admin_edit_circle.html:59
-msgstr "Radera användare permanent"
+#: snikket_web/templates/admin_users.html:8
+msgid "Login name"
+msgstr "Inloggningsnamn"
 
-#: snikket_web/admin.py:72
+#: snikket_web/admin.py:72 snikket_web/templates/admin_delete_user.html:12
-msgid "User deleted"
+#: snikket_web/templates/admin_edit_circle.html:60
-msgstr "Användare raderad"
+#: snikket_web/templates/admin_users.html:9 snikket_web/user.py:63
+msgid "Display name"
+msgstr "Visningsnamn"
 
-#: snikket_web/admin.py:115
+#: snikket_web/admin.py:76 snikket_web/templates/admin_edit_user.html:32
+msgid "Access Level"
+msgstr "Användarnivåer"
+
+#: snikket_web/admin.py:78
+msgid "Limited"
+msgstr "Begränsad"
+
+#: snikket_web/admin.py:79
+msgid "Normal user"
+msgstr "Vanlig användare"
+
+#: snikket_web/admin.py:80
+msgid "Administrator"
+msgstr "Administratör"
+
+#: snikket_web/admin.py:85
+msgid "Update user"
+msgstr "Uppdatera användare"
+
+#: snikket_web/admin.py:89
+msgid "Create password reset link"
+msgstr "Skapa länk för återställning av lösenord"
+
+#: snikket_web/admin.py:107
 msgid "Password reset link created"
 msgstr "Skapade länk för att återställa lösenord"
 
-#: snikket_web/admin.py:121
+#: snikket_web/admin.py:122
+msgid "User information updated."
+msgstr "Användarinformation uppdaterad."
+
+#: snikket_web/admin.py:144
+msgid "Delete user permanently"
+msgstr "Radera användare permanent"
+
+#: snikket_web/admin.py:157
+msgid "User deleted"
+msgstr "Användare raderad"
+
+#: snikket_web/admin.py:195
+msgid "Password reset link not found"
+msgstr "Länk för återställning av lösenord hittades inte"
+
+#: snikket_web/admin.py:207
 msgid "Password reset link deleted"
 msgstr "Länk för återställning av lösenord raderad"
 
-#: snikket_web/admin.py:140
+#: snikket_web/admin.py:227
 msgid "Invite to circle"
 msgstr "Bjud in till krets"
 
-#: snikket_web/admin.py:146
+#: snikket_web/admin.py:233
 msgid "At least one circle must be selected"
 msgstr "Minst en krets behöver väljas"
 
-#: snikket_web/admin.py:151
+#: snikket_web/admin.py:238
 msgid "Valid for"
 msgstr "Giltig i"
 
-#: snikket_web/admin.py:153
+#: snikket_web/admin.py:240
 msgid "One hour"
 msgstr "En timme"
 
-#: snikket_web/admin.py:154
+#: snikket_web/admin.py:241
 msgid "Twelve hours"
 msgstr "Tolv timmar"
 
-#: snikket_web/admin.py:155
+#: snikket_web/admin.py:242
 msgid "One day"
 msgstr "En dag"
 
-#: snikket_web/admin.py:156
+#: snikket_web/admin.py:243
 msgid "One week"
 msgstr "En vecka"
 
-#: snikket_web/admin.py:157
+#: snikket_web/admin.py:244
 msgid "Four weeks"
 msgstr "Fyra veckor"
 
-#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17
+#: snikket_web/admin.py:250 snikket_web/templates/admin_edit_invite.html:17
 msgid "Invitation type"
 msgstr "Typ av inbjudan"
 
-#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116
+#: snikket_web/admin.py:252 snikket_web/templates/library.j2:116
 msgid "Individual"
 msgstr "Individuell"
 
-#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114
+#: snikket_web/admin.py:253 snikket_web/templates/library.j2:114
 msgid "Group"
 msgstr "Grupp"
 
-#: snikket_web/admin.py:172
+#: snikket_web/admin.py:259
 msgid "New invitation link"
 msgstr "Ny inbjudanslänk"
 
-#: snikket_web/admin.py:234
+#: snikket_web/admin.py:321
 msgid "Revoke"
 msgstr "Återkalla"
 
-#: snikket_web/admin.py:258
+#: snikket_web/admin.py:345
 msgid "Invitation created"
 msgstr "Inbjudan skapad"
 
-#: snikket_web/admin.py:274
+#: snikket_web/admin.py:361
 msgid "No such invitation exists"
 msgstr "Inbjudanslänken finns inte"
 
-#: snikket_web/admin.py:289
+#: snikket_web/admin.py:376
 msgid "Invitation revoked"
 msgstr "Inbjudan återkallad"
 
-#: snikket_web/admin.py:306 snikket_web/admin.py:354
+#: snikket_web/admin.py:393 snikket_web/admin.py:441
 msgid "Name"
 msgstr "Namn"
 
-#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47
+#: snikket_web/admin.py:398 snikket_web/templates/admin_circles.html:47
 msgid "Create circle"
 msgstr "Skapa krets"
 
-#: snikket_web/admin.py:341
+#: snikket_web/admin.py:428
 msgid "Circle created"
 msgstr "Krets skapad"
 
-#: snikket_web/admin.py:359
+#: snikket_web/admin.py:446
 msgid "Select user"
 msgstr "Välj användare"
 
-#: snikket_web/admin.py:364
+#: snikket_web/admin.py:451
 msgid "Update circle"
 msgstr "Uppdatera krets"
 
-#: snikket_web/admin.py:368
+#: snikket_web/admin.py:455
 msgid "Delete circle permanently"
 msgstr "Radera krets permanent"
 
-#: snikket_web/admin.py:374
+#: snikket_web/admin.py:461
 msgid "Add user"
 msgstr "Lägg till användare"
 
-#: snikket_web/admin.py:390
+#: snikket_web/admin.py:477
 msgid "No such circle exists"
 msgstr "Kretsen finns inte"
 
-#: snikket_web/admin.py:427
+#: snikket_web/admin.py:514
 msgid "Circle data updated"
 msgstr "Kretsen uppdaterades"
 
-#: snikket_web/admin.py:433
+#: snikket_web/admin.py:520
 msgid "Circle deleted"
 msgstr "Krets raderad"
 
-#: snikket_web/admin.py:444
+#: snikket_web/admin.py:531
 msgid "User added to circle"
 msgstr "Användare tillagd i krets"
 
-#: snikket_web/admin.py:453
+#: snikket_web/admin.py:540
 msgid "User removed from circle"
 msgstr "Användaren %(username)s borttagen från krets"
 
-#: snikket_web/infra.py:41
+#: snikket_web/admin.py:609
+msgid "Message contents"
+msgstr "Meddelandeinnehåll"
+
+#: snikket_web/admin.py:615
+msgid "Only send to online users"
+msgstr "Skicka bara till användare som är online"
+
+#: snikket_web/admin.py:619
+msgid "Post to all users"
+msgstr "Skicka till alla användare"
+
+#: snikket_web/admin.py:623
+msgid "Send preview to yourself"
+msgstr "Skicka förhandsvisning till dig själv"
+
+#: snikket_web/admin.py:645
+msgid "Announcement sent!"
+msgstr "Tillkännagivande skickat!"
+
+#: snikket_web/infra.py:51
 msgid "Main"
 msgstr "Allmän"
 
-#: snikket_web/invite.py:106
+#: snikket_web/invite.py:33
+msgid ""
+"The account data you tried to import is too large to upload. Please contact "
+"your Snikket operator."
+msgstr ""
+"Kontot du försökte importera är för stort för att ladda upp. Vänligen "
+"kontakta din Snikket-operatör."
+
+#: snikket_web/invite.py:112
 msgid "Username"
 msgstr "Användarnamn"
 
-#: snikket_web/invite.py:110 snikket_web/invite.py:177 snikket_web/main.py:41
+#: snikket_web/invite.py:116 snikket_web/invite.py:184 snikket_web/main.py:41
 msgid "Password"
 msgstr "Lösenord"
 
-#: snikket_web/invite.py:114 snikket_web/invite.py:181
+#: snikket_web/invite.py:120 snikket_web/invite.py:188
 msgid "Confirm password"
 msgstr "Bekräfta lösenord"
 
-#: snikket_web/invite.py:118 snikket_web/invite.py:185
+#: snikket_web/invite.py:124 snikket_web/invite.py:192
 msgid "The passwords must match."
 msgstr "Lösenorden måste vara identiska."
 
-#: snikket_web/invite.py:123
+#: snikket_web/invite.py:129
 msgid "Create account"
 msgstr "Skapa konto"
 
-#: snikket_web/invite.py:150
+#: snikket_web/invite.py:156
 msgid "That username is already taken."
 msgstr "Det användarnamnet är redan taget."
 
-#: snikket_web/invite.py:154 snikket_web/invite.py:218
+#: snikket_web/invite.py:160 snikket_web/invite.py:225
 msgid "Registration was declined for unknown reasons."
 msgstr "Registreringen nekades av okänd anledning."
 
-#: snikket_web/invite.py:158
+#: snikket_web/invite.py:164
 msgid "The username is not valid."
 msgstr "Användarnamnet är ogiltigt."
 
-#: snikket_web/invite.py:190 snikket_web/templates/user_home.html:32
+#: snikket_web/invite.py:197 snikket_web/templates/user_home.html:32
 #: snikket_web/templates/user_passwd.html:29
 msgid "Change password"
 msgstr "Ändra lösenord"
 
+#: snikket_web/invite.py:244
+msgid "Account data file"
+msgstr "Kontodatafil"
+
+#: snikket_web/invite.py:248
+msgid "Import data"
+msgstr "Importera data"
+
+#: snikket_web/invite.py:269
+#, python-format
+msgid ""
+"The account data you tried to import is in an unknown format. Please upload "
+"an XML file in XEP-0227 format (provided format: %(mimetype)s)."
+msgstr ""
+"Kontot du försökte importera är i ett okänt format. Vänligen ladda upp en "
+"XML-fil i XEP-0227-format (angivet format: %(mimetype)s)."
+
+#: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
+#: snikket_web/user.py:178
+msgid "Error"
+msgstr "Fel"
+
 #: snikket_web/main.py:36
 msgid "Address"
 msgstr "Adress"
@@ -205,64 +299,67 @@ msgstr "Ogiltigt användarnamn eller lösenord."
 msgid "Login successful!"
 msgstr "Inloggning lyckades!"
 
-#: snikket_web/user.py:27
+#: snikket_web/user.py:29
 msgid "Current password"
 msgstr "Nuvarande lösenord"
 
-#: snikket_web/user.py:32
+#: snikket_web/user.py:34
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: snikket_web/user.py:37
+#: snikket_web/user.py:39
 msgid "Confirm new password"
 msgstr "Bekräfta nytt lösenord"
 
-#: snikket_web/user.py:41
+#: snikket_web/user.py:43
 msgid "The new passwords must match."
 msgstr "De nya lösenorden måste vara identiska."
 
-#: snikket_web/user.py:48
+#: snikket_web/user.py:50
 msgid "Sign out"
 msgstr "Logga ut"
 
-#: snikket_web/user.py:53
+#: snikket_web/user.py:55
 msgid "Nobody"
 msgstr "Ingen"
 
-#: snikket_web/user.py:54
+#: snikket_web/user.py:56
 msgid "Friends only"
 msgstr "Endast vänner"
 
-#: snikket_web/user.py:55
+#: snikket_web/user.py:57
 msgid "Everyone"
 msgstr "Alla"
 
-#: snikket_web/templates/admin_delete_user.html:12
+#: snikket_web/user.py:67
-#: snikket_web/templates/admin_users.html:11 snikket_web/user.py:61
-msgid "Display name"
-msgstr "Visningsnamn"
-
-#: snikket_web/user.py:65
 msgid "Avatar"
 msgstr "Profilbild"
 
-#: snikket_web/user.py:69
+#: snikket_web/user.py:71
 msgid "Profile visibility"
 msgstr "Synlighet av profil"
 
-#: snikket_web/user.py:74
+#: snikket_web/user.py:76
 msgid "Update profile"
 msgstr "Uppdatera profil"
 
-#: snikket_web/user.py:99
+#: snikket_web/user.py:82
+msgid "Account data"
+msgstr "Kontodata"
+
+#: snikket_web/user.py:86
+msgid "Upload"
+msgstr "Ladda upp"
+
+#: snikket_web/user.py:111
 msgid "Incorrect password."
 msgstr "Fel lösenord."
 
-#: snikket_web/user.py:103
+#: snikket_web/user.py:115
 msgid "Password changed"
 msgstr "Lösenord ändrat"
 
-#: snikket_web/user.py:111
+#: snikket_web/user.py:123
 msgid ""
 "The chosen avatar is too big. To be able to upload larger avatars, please "
 "use the app."
@@ -270,13 +367,17 @@ msgstr ""
 "Den valda profilbilden är för stor. Vänligen använd appen för att kunna "
 "välja större bilder."
 
-#: snikket_web/user.py:159
+#: snikket_web/user.py:170
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
-#: snikket_web/templates/unauth.html:18 snikket_web/user.py:167
+#: snikket_web/user.py:184
-msgid "Error"
+msgid "Export"
-msgstr "Fel"
+msgstr "Exportera"
+
+#: snikket_web/user.py:202
+msgid "You currently have no account data to export."
+msgstr "Du har för närvarande inget data att exportera."
 
 #: snikket_web/templates/_footer.html:4
 #, python-format
@@ -407,8 +508,9 @@ msgid "Members"
 msgstr "Medlemmar"
 
 #: snikket_web/templates/admin_circles.html:15
+#: snikket_web/templates/admin_edit_circle.html:61
 #: snikket_web/templates/admin_invites.html:24
-#: snikket_web/templates/admin_users.html:12
+#: snikket_web/templates/admin_users.html:10
 msgid "Actions"
 msgstr "Handlingar"
 
@@ -483,12 +585,12 @@ msgid "Copy complete output"
 msgstr "Kopiera allt"
 
 #: snikket_web/templates/admin_delete_user.html:4
-#: snikket_web/templates/admin_users.html:22
 #, python-format
 msgid "Delete user %(user_name)s"
 msgstr "Radera användaren %(user_name)s"
 
 #: snikket_web/templates/admin_delete_user.html:6
+#: snikket_web/templates/admin_edit_user.html:53
 msgid "Delete user"
 msgstr "Radera användare"
 
@@ -496,11 +598,6 @@ msgstr "Radera användare"
 msgid "Are you sure you want to delete the following user?"
 msgstr "Är du säker på att du vill radera denna användare?"
 
-#: snikket_web/templates/admin_delete_user.html:10
-#: snikket_web/templates/admin_users.html:10
-msgid "Login name"
-msgstr "Inloggningsnamn"
-
 #: snikket_web/templates/admin_delete_user.html:15
 msgid "Danger"
 msgstr "Fara"
@@ -567,28 +664,37 @@ msgstr "Användare i en krets raderas inte när kretsen raderas."
 msgid "Circle members"
 msgstr "Medlemmar i krets"
 
-#: snikket_web/templates/admin_edit_circle.html:70
+#: snikket_web/templates/admin_edit_circle.html:71
+msgid "The user has been deleted from the server."
+msgstr "Användaren har raderats från servern."
+
+#: snikket_web/templates/admin_edit_circle.html:71
+#: snikket_web/templates/library.j2:108
+msgid "deleted"
+msgstr "raderad"
+
+#: snikket_web/templates/admin_edit_circle.html:77
 #, python-format
 msgid "Remove user %(username)s from circle"
 msgstr "Radera användaren %(username)s från krets"
 
-#: snikket_web/templates/admin_edit_circle.html:78
+#: snikket_web/templates/admin_edit_circle.html:85
 msgid "This circle currently has no members."
 msgstr "Denna krets har för närvarande inga medlemmar."
 
-#: snikket_web/templates/admin_edit_circle.html:80
+#: snikket_web/templates/admin_edit_circle.html:87
 msgid "Invite more members"
 msgstr "Bjud in fler medlemmar"
 
-#: snikket_web/templates/admin_edit_circle.html:83
+#: snikket_web/templates/admin_edit_circle.html:90
 msgid "Add existing user"
 msgstr "Lägg till befintlig användare"
 
-#: snikket_web/templates/admin_edit_circle.html:94
+#: snikket_web/templates/admin_edit_circle.html:101
 msgid "All users added"
 msgstr "Alla användare tillagda"
 
-#: snikket_web/templates/admin_edit_circle.html:95
+#: snikket_web/templates/admin_edit_circle.html:102
 msgid "All users on this service are already in this circle."
 msgstr "Alla användare på den här tjänsten är redan i denna krets."
 
@@ -641,10 +747,95 @@ msgstr "Användaren läggs till som kontakt för %(peer_jid)s."
 msgid "Created"
 msgstr "Skapad"
 
-#: snikket_web/templates/admin_edit_invite.html:49
+#: snikket_web/templates/admin_edit_invite.html:48
 msgid "Return to invitation list"
 msgstr "Tillbaka till inbjudningarna"
 
+#: snikket_web/templates/admin_edit_user.html:5
+msgid ""
+"Limited users can interact with users on the same Snikket service and be "
+"members of circles."
+msgstr ""
+"Begränsade användare kan interagera med andra användare på samma Snikket-"
+"tjänst och vara medlemmar av kretsar."
+
+#: snikket_web/templates/admin_edit_user.html:7
+msgid ""
+"Like limited users and can also interact with users on other Snikket "
+"services."
+msgstr ""
+"Som begränsade användare samt kan även interagera med användare på andra "
+"Snikket-tjänster."
+
+#: snikket_web/templates/admin_edit_user.html:9
+msgid "Like normal users and can access the admin panel in the web portal."
+msgstr ""
+"Som vanliga användare samt har även tillgång till administrationspanelen."
+
+#: snikket_web/templates/admin_edit_user.html:20
+#: snikket_web/templates/admin_users.html:28
+#, python-format
+msgid "Edit user %(user_name)s"
+msgstr "Redigera användaren %(user_name)s"
+
+#: snikket_web/templates/admin_edit_user.html:22
+msgid "Edit user"
+msgstr "Redigera användare"
+
+#: snikket_web/templates/admin_edit_user.html:26
+msgid "The login name cannot be changed."
+msgstr "Inloggningsnamnet kan inte ändras."
+
+#: snikket_web/templates/admin_edit_user.html:33
+msgid ""
+"The access level of a user determines what interactions are allowed for them "
+"on your Snikket service."
+msgstr ""
+"Användarnivåer bestämmer vilka interaktioner är tillåtna för användare på "
+"din Snikket-tjänst."
+
+#: snikket_web/templates/admin_edit_user.html:40
+#, python-format
+msgid "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+msgstr "<strong>%(title)s%(icon)s</strong><p>%(description)s</p>"
+
+#: snikket_web/templates/admin_edit_user.html:50
+msgid "Return to user list"
+msgstr "Tillbaka till användarlistan"
+
+#: snikket_web/templates/admin_edit_user.html:58
+msgid "Further actions"
+msgstr "Fler handlingar"
+
+#: snikket_web/templates/admin_edit_user.html:60
+msgid "Reset password"
+msgstr "Återställ lösenord"
+
+#: snikket_web/templates/admin_edit_user.html:63
+msgid ""
+"If the user has lost their password, you can use the button below to create "
+"a special link which allows to change the password of the account, once."
+msgstr ""
+"Om användaren har tappat bort sitt lösenord så kan du använda knappen nedan "
+"för att skapa en speciell engångslänk som låter dem ange ett nytt lösenord."
+
+#: snikket_web/templates/admin_edit_user.html:68
+msgid "Debug information"
+msgstr "Felsökningsinformation"
+
+#: snikket_web/templates/admin_edit_user.html:70
+msgid ""
+"In some cases, extended information about the user account and the connected "
+"devices is necessary to troubleshoot issues. The button below reveals this "
+"(sensitive) information."
+msgstr ""
+"Ibland behövs utökad information om användarkontot och anslutna enheter för "
+"att felsöka problem. Knappen nedan visar denna (känsliga) information."
+
+#: snikket_web/templates/admin_edit_user.html:74
+msgid "Show debug information"
+msgstr "Visa felsökningsinformation"
+
 #: snikket_web/templates/admin_home.html:4
 msgid "Welcome to the admin panel!"
 msgstr "Välkommen till administrationspanelen!"
@@ -684,11 +875,28 @@ msgstr "Skapa, återkalla och kopiera inbjudningar."
 msgid "Manage invitations"
 msgstr "Hantera inbjudningar"
 
-#: snikket_web/templates/admin_home.html:36
+#: snikket_web/templates/admin_home.html:35
+msgid "System health"
+msgstr "Systemhälsa"
+
+#: snikket_web/templates/admin_home.html:38
+msgid "View the server status or send a broadcast message to all users."
+msgstr "Visa serverns status eller skicka meddelande till alla användare."
+
+#: snikket_web/templates/admin_home.html:40
+msgid "Send a broadcast message to all users."
+msgstr "Skicka ett meddelande till alla användare."
+
+#: snikket_web/templates/admin_home.html:43
+#: snikket_web/templates/admin_system.html:4
+msgid "Manage system"
+msgstr "Hantera system"
+
+#: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
 msgstr "Gå tillbaka till din användares webbportalsida."
 
-#: snikket_web/templates/admin_home.html:38
+#: snikket_web/templates/admin_home.html:50
 msgid "Exit admin panel"
 msgstr "Lämna administrationspanelen"
 
@@ -741,15 +949,101 @@ msgstr ""
 msgid "Destroy link"
 msgstr "Förstör länk"
 
-#: snikket_web/templates/admin_users.html:25
+#: snikket_web/templates/admin_system.html:6
-#, python-format
+msgid "Overall system status"
-msgid "Show debug information for %(user_name)s"
+msgstr "Övergripande systemstatus"
-msgstr "Visa felsökningsinformation för %(user_name)s"
 
-#: snikket_web/templates/admin_users.html:28
+#: snikket_web/templates/admin_system.html:9
+msgid "System load (5 minute average)"
+msgstr "Systemlast (5 minuters medelvärde)"
+
+#: snikket_web/templates/admin_system.html:14
+#: snikket_web/templates/admin_system.html:22
+#: snikket_web/templates/admin_system.html:37
+#: snikket_web/templates/admin_system.html:45
+#: snikket_web/templates/admin_system.html:60
+#: snikket_web/templates/admin_system.html:68
+#: snikket_web/templates/admin_system.html:76
+#: snikket_web/templates/admin_system.html:84
+msgid "unknown"
+msgstr "okänd"
+
+#: snikket_web/templates/admin_system.html:17
+msgid "Memory use"
+msgstr "Minnesanvändning"
+
+#: snikket_web/templates/admin_system.html:20
 #, python-format
-msgid "Create password reset link for %(user_name)s"
+msgid ""
-msgstr "Skapa länk för att återställa lösenord för %(user_name)s"
+"%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
+"%(percentage_snikket)s."
+msgstr ""
+"%(percentage_global)s av %(mem_available)s. Av det använder Snikket "
+"%(percentage_snikket)s."
+
+#: snikket_web/templates/admin_system.html:27
+msgid "Web portal status"
+msgstr "Webbportalstatus"
+
+#: snikket_web/templates/admin_system.html:30
+#: snikket_web/templates/admin_system.html:53
+msgid "Version"
+msgstr "Version"
+
+#: snikket_web/templates/admin_system.html:31
+#: snikket_web/templates/admin_system.html:54
+msgid "View all versions"
+msgstr "Visa alla versioner"
+
+#: snikket_web/templates/admin_system.html:32
+#: snikket_web/templates/admin_system.html:55
+msgid "Average CPU use"
+msgstr "Genomsnittlig processoranvändning"
+
+#: snikket_web/templates/admin_system.html:40
+#: snikket_web/templates/admin_system.html:63
+msgid "Current memory use"
+msgstr "Nuvarande minnesanvändning"
+
+#: snikket_web/templates/admin_system.html:50
+msgid "Snikket server status"
+msgstr "Snikket-serverstatus"
+
+#: snikket_web/templates/admin_system.html:71
+msgid "Storage used by shared files"
+msgstr "Utrymme används av delade filer"
+
+#: snikket_web/templates/admin_system.html:79
+msgid "Connected devices"
+msgstr "Anslutna enheter"
+
+#: snikket_web/templates/admin_system.html:90
+msgid "Broadcast message"
+msgstr "Tillkännagivande"
+
+#: snikket_web/templates/admin_system.html:92
+msgid ""
+"This form allows you to send a message to all users currently online on your "
+"Snikket server. Use it wisely."
+msgstr ""
+"Det här formuläret låter dig skicka ett tillkännagivande till alla användare "
+"som just nu är online på din Snikket-server. Använd det med vishet."
+
+#: snikket_web/templates/admin_users.html:19
+msgid "The user is an administrator."
+msgstr "Användaren är en administratör."
+
+#: snikket_web/templates/admin_users.html:19
+msgid " (Administrator)"
+msgstr " (Administratör)"
+
+#: snikket_web/templates/admin_users.html:22
+msgid "The user is restricted."
+msgstr "Begränsad användare."
+
+#: snikket_web/templates/admin_users.html:22
+msgid " (Restricted)"
+msgstr " (Begränsad)"
 
 #: snikket_web/templates/app.html:4
 msgid "Snikket Web Portal"
@@ -912,7 +1206,6 @@ msgid "You can now log in using your new password."
 msgstr "Nu kan du logga in med ditt nya lösenord."
 
 #: snikket_web/templates/invite_reset_success.html:12
-#: snikket_web/templates/invite_success.html:18
 msgid "You can now safely close this page."
 msgstr "Du kan nu stänga den här sidan utan risk."
 
@@ -1002,6 +1295,43 @@ msgstr ""
 "Nu kan du sätta upp din generiska XMPP-klient med ovanstående adress och "
 "lösenordet du angav vid registrering."
 
+#: snikket_web/templates/invite_success.html:18
+#, python-format
+msgid ""
+"You can now safely close this page, or log in to the web portal to <a href="
+"\"%(login_url)s\">manage your account</a>."
+msgstr ""
+"Du kan nu stänga den här sidan utan risk, eller logga in till webbportalen "
+"för att <a href=\"%(login_url)s\">hantera ditt konto</a>."
+
+#: snikket_web/templates/invite_success.html:21
+msgid "Import successful"
+msgstr "Importen lyckades"
+
+#: snikket_web/templates/invite_success.html:22
+msgid "Congratulations! Your account data has been successfully imported."
+msgstr "Grattulerar! Importen av ditt kontodata lyckades."
+
+#: snikket_web/templates/invite_success.html:26
+msgid "Moving to Snikket?"
+msgstr "Flyttar till Snikket?"
+
+#: snikket_web/templates/invite_success.html:27
+msgid ""
+"If you are moving from a different Snikket instance or another XMPP-"
+"compatible service, you may optionally import the data (contacts, profile "
+"information, etc.) from your previous account. When you have exported the "
+"data from your previous account, upload it using the form below."
+msgstr ""
+"Om du flyttar från en annan Snikket-instans eller annan XMPP-kompatibel "
+"tjänst så kan du om du vill importera data (kontakter, profilinformation, "
+"etc.) från ditt förra konto. När du exporterat data från förra kontot, ladda "
+"upp det med formuläret nedan."
+
+#: snikket_web/templates/invite_success.html:30
+msgid "Upload account data"
+msgstr "Ladda upp kontodata"
+
 #: snikket_web/templates/invite_view.html:6
 #, python-format
 msgid "Invite to %(site_name)s | Snikket"
@@ -1128,14 +1458,14 @@ msgstr "Installera på iOS"
 
 #: snikket_web/templates/invite_view.html:99
 msgid ""
-"After downloading Snikket from the app store, you have to return to this "
+"After downloading Snikket from the App Store, you have to return to this "
 "invite link and tap on \"Open the app\" to proceed."
 msgstr ""
 "Efter att ha laddat ner Snikket från App Store behöver du komma tillbaka "
 "till den här inbjudan och klicka på \"Öppna appen\" för att fortsätta."
 
 #: snikket_web/templates/invite_view.html:101
-msgid "First download Snikket from the app store using the button below:"
+msgid "First download Snikket from the App Store using the button below:"
 msgstr "Ladda först ner Snikket från App Store med knappen nedan:"
 
 #: snikket_web/templates/invite_view.html:103
@@ -1172,10 +1502,6 @@ msgstr "Kopiera länk"
 msgid "Invalid input"
 msgstr "Ogiltigt indata"
 
-#: snikket_web/templates/library.j2:108
-msgid "deleted"
-msgstr "raderad"
-
 #: snikket_web/templates/library.j2:122
 msgid "Can be used multiple times to create accounts on this Snikket service."
 msgstr ""
@@ -1232,15 +1558,20 @@ msgstr "Din XMPP-adress"
 msgid "Edit profile"
 msgstr "Redigera profil"
 
-#: snikket_web/templates/user_home.html:38
+#: snikket_web/templates/user_home.html:33
+#: snikket_web/templates/user_manage_data.html:4
+msgid "Manage your data"
+msgstr "Hantera ditt data"
+
+#: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
 msgstr "Ditt Snikket"
 
-#: snikket_web/templates/user_home.html:40
+#: snikket_web/templates/user_home.html:41
 msgid "Manage users, invitations and circles of your Snikket service."
 msgstr "Hantera användare, inbjudningar och kretsar i din Snikket-tjänst."
 
-#: snikket_web/templates/user_home.html:42
+#: snikket_web/templates/user_home.html:43
 msgid "Admin panel"
 msgstr "Administrationspanel"
 
@@ -1256,6 +1587,18 @@ msgstr ""
 "Klicka nedanför för att logga ut dig ur webbportalen. Detta påverkar inte "
 "några av dina anslutna enheter."
 
+#: snikket_web/templates/user_manage_data.html:8
+msgid "Export account"
+msgstr "Exportera konto"
+
+#: snikket_web/templates/user_manage_data.html:9
+msgid ""
+"Download your account data as a file for backup purposes or to move your "
+"account to another service."
+msgstr ""
+"Ladda ner ditt kontodata som en fil att ha som säkerhetskopia eller om du "
+"vill flytta ditt konto till en annan tjänst."
+
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"
 msgstr "Ändra ditt lösenord"
@@ -1298,6 +1641,9 @@ msgstr ""
 "Den här avdelningen låter dig hantera vilka som kan se din profil, såsom din "
 "profilbild och visningsnamn."
 
+#~ msgid "Create password reset link for %(user_name)s"
+#~ msgstr "Skapa länk för att återställa lösenord för %(user_name)s"
+
 #~ msgid "Login failed"
 #~ msgstr "Inloggning misslyckades"
 

snikket_web/user.py

@@ -1,9 +1,11 @@
 import asyncio
 import typing
+import urllib
 
 import quart.flask_patch
 from quart import (
     Blueprint,
+    Response,
     render_template,
     request,
     redirect,
@@ -11,7 +13,7 @@ from quart import (
     flash,
     current_app,
 )
-import quart.exceptions
+import werkzeug.exceptions
 
 import wtforms
 
@@ -57,7 +59,7 @@ _ACCESS_MODEL_CHOICES = [
 
 
 class ProfileForm(BaseForm):
-    nickname = wtforms.TextField(
+    nickname = wtforms.StringField(
         _l("Display name"),
     )
 
@@ -75,6 +77,16 @@ class ProfileForm(BaseForm):
     )
 
 
+class ImportAccountDataForm(BaseForm):
+    account_data_file = wtforms.FileField(
+        _l("Account data")
+    )
+
+    action_upload = wtforms.SubmitField(
+        _l("Upload"),
+    )
+
+
 @bp.route("/")
 @client.require_session()
 async def index() -> str:
@@ -84,7 +96,7 @@ async def index() -> str:
 
 @bp.route('/passwd', methods=["GET", "POST"])
 @client.require_session()
-async def change_pw() -> typing.Union[str, quart.Response]:
+async def change_pw() -> typing.Union[str, werkzeug.Response]:
     form = ChangePasswordForm()
     if form.validate_on_submit():
         try:
@@ -92,8 +104,8 @@ async def change_pw() -> typing.Union[str, quart.Response]:
                 form.current_password.data,
                 form.new_password.data,
             )
-        except (quart.exceptions.Unauthorized,
+        except (werkzeug.exceptions.Unauthorized,
-                quart.exceptions.Forbidden):
+                werkzeug.exceptions.Forbidden):
             # server refused current password, set an appropriate error
             form.current_password.errors.append(
                 _("Incorrect password."),
@@ -116,7 +128,7 @@ EAVATARTOOBIG = _l(
 
 @bp.route("/profile", methods=["GET", "POST"])
 @client.require_session()
-async def profile() -> typing.Union[str, quart.Response]:
+async def profile() -> typing.Union[str, werkzeug.Response]:
     max_avatar_size = current_app.config["MAX_AVATAR_SIZE"]
 
     form = ProfileForm()
@@ -138,7 +150,6 @@ async def profile() -> typing.Union[str, quart.Response]:
             mimetype = file_info.mimetype
             data = file_info.stream.read()
             if len(data) > max_avatar_size:
-                print(len(data), max_avatar_size)
                 form.avatar.errors.append(EAVATARTOOBIG)
                 ok = False
             elif len(data) > 0:
@@ -168,9 +179,49 @@ async def profile() -> typing.Union[str, quart.Response]:
                                  avatar_too_big_warning=EAVATARTOOBIG)
 
 
+class DataExportForm(BaseForm):
+    action_export = wtforms.SubmitField(
+        _l("Export")
+    )
+
+
+@bp.route("/manage_data", methods=["GET", "POST"])
+@client.require_session()
+async def manage_data() -> typing.Union[str, quart.Response]:
+    form = DataExportForm()
+
+    if form.validate_on_submit():
+        user_info = await client.get_user_info()
+        # The UTF-8 version of the filename needs to be percent-encoded
+        encoded_address = urllib.parse.quote(
+            user_info["address"].encode(encoding='utf-8', errors='strict')
+        )
+        account_data = await client.export_account_data()
+        if account_data is None:
+            await flash(
+                _("You currently have no account data to export."),
+                "alert"
+            )
+        else:
+            return Response(account_data,
+                            mimetype="application/xml",
+                            headers={
+                                # We provide the UTF-8 filename, but the ASCII
+                                # one will be used as a fallback for legacy
+                                # browsers (RFC 5987)
+                                "Content-Disposition": (
+                                    'attachment; filename="account-data.xml"; '
+                                    'filename*="UTF-8\'\'account-data-{}.xml"'
+                                ).format(encoded_address)
+                            })
+    return await render_template("user_manage_data.html",
+                                 form=form,
+                                 )
+
+
 @bp.route("/logout", methods=["GET", "POST"])
 @client.require_session()
-async def logout() -> typing.Union[quart.Response, str]:
+async def logout() -> typing.Union[werkzeug.Response, str]:
     form = LogoutForm()
     if form.validate_on_submit():
         await client.logout()

snikket_web/xmpputil.py

@@ -4,7 +4,7 @@ import typing
 import xml.etree.ElementTree as ET
 
 from quart import abort
-import quart.exceptions
+import werkzeug.exceptions
 
 
 TAG_XMPP_ERROR = "error"
@@ -207,7 +207,7 @@ def make_avatar_metadata_set_request(
         item,
         "metadata", xmlns=NS_USER_AVATAR_METADATA)
 
-    attr: typing.MutableMapping[str, str] = {
+    attr: typing.Dict[str, str] = {
         "id": id_,
         "bytes": str(size),
         "type": mimetype,
@@ -217,7 +217,12 @@ def make_avatar_metadata_set_request(
     if height is not None:
         attr["height"] = str(height)
 
-    ET.SubElement(metadata_wrap, "info", xmlns=NS_USER_AVATAR_METADATA, **attr)
+    ET.SubElement(
+        metadata_wrap,
+        "info",
+        xmlns=NS_USER_AVATAR_METADATA,
+        **attr,  # type: ignore
+    )
     return req
 
 
@@ -234,7 +239,7 @@ def extract_pubsub_item_get_reply(
         ) -> typing.Optional[ET.Element]:
     try:
         pubsub = extract_iq_reply(iq_tree, TAG_PUBSUB)
-    except quart.exceptions.NotFound:
+    except werkzeug.exceptions.NotFound:
         return None
 
     if pubsub is None:

tools/icons.list

@@ -6,13 +6,19 @@ action/logout:logout
 action/login:login
 action/exit_to_app:exit_to_app
 action/lock:lock
+communication/import_export:import_export
 communication/qr_code:qrcode
 communication/vpn_key:passwd
+communication/rss_feed:broadcast
 content/add_circle_outline:add
 content/add_link:create_link
 content/remove_circle_outline:remove
 content/content_copy:copy
 content/link_off:remove_link
+content/send:send
+file/file_download:download
+file/file_upload:upload
+file/folder:folder
 navigation/arrow_back:back
 navigation/arrow_forward:forward
 navigation/cancel:cancel
@@ -26,3 +32,4 @@ navigation/close:close
 image/edit:edit
 action/admin_panel_settings:admin
 content/link:link
+content/insights:insights