Merge branch 'main' of https://git.getmemy.coffee/nico/fforte

2024-04-24 17:45:49 +02:00
parent 5e8ed05c41 d6ae86598d
commit e3609deb5f
7 changed files with 234 additions and 86 deletions
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -85,6 +85,11 @@
    "open": "öffnen",
    "date": "Datum",
    "location": "Standort",
+<<<<<<< HEAD
    "sendfile": "Datei zum Server schicken",
    "pickfile": "Datei auswählen"
+=======
+    "placedata": "Standortdaten",
+    "sent": "Gesendet"
+>>>>>>> d6ae86598dd9d031af9fe29680dc050c5bb2946f
 }