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_en.arb
+++ b/lib/l10n/app_en.arb
@@ -409,6 +409,7 @@
        "description": "Location text"
    },

+<<<<<<< HEAD
    "sendfile": "Send file to server",
    "@sendfile": {
        "description": "Send file to server button"
@@ -417,6 +418,16 @@
    "pickfile": "Pick file",
    "@pickfile": {
        "description": "Pick file button"
+=======
+    "placedata": "Placedata",
+    "@camdata": {
+        "description": "view data placedata header"
+    },
+
+    "sent": "Sent",
+    "@sent": {
+        "description": "view data sent header"
+>>>>>>> d6ae86598dd9d031af9fe29680dc050c5bb2946f
    }

 }