From 448e53bf1fed0dce0b9d35956ae241315f880035 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 12 Nov 2023 13:48:32 +0100
Subject: [PATCH 1/2] Improve packet upload tooltip text

---
 config/locales/de.yml | 6 +++---
 config/locales/en.yml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/locales/de.yml b/config/locales/de.yml
index a378ff103..017f6fbdb 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2894,8 +2894,8 @@ de:
       info:
         general_info: >
           Hier kannst Du mehrere Korrekturen gleichzeitig hochladen.
-          Damit diese von MaMpf zugeordnet werden können, sollten die Dateinamen
-          idealerweise mit den Dateinamen der Abgaben übereinstimmen.
+          Damit diese von MaMpf zugeordnet werden können, darfst Du die mit dem
+          Paketdownload heruntergeladenen Dateien nicht umbenennen.
         invalid_filenames: >
           Hier sind die Namen derjenigen hochgeladenen Dateien aufgelistet,
           die nicht in das von MaMpf vorgegebene Namensschema passen.
@@ -3206,6 +3206,7 @@ de:
     thyme_editor: 'Editor'
     screenshot: 'Screenshot'
     file: 'Datei'
+    files: 'Dateien'
     size: 'Größe'
     please_wait: 'Bitte warten...'
     access_rights: 'Zugriffsrechte'
@@ -3297,7 +3298,6 @@ de:
     deadline: 'Abgabetermin'
     tutorial: 'Tutorium'
     code: 'Code'
-    files: 'Dateien'
     partners: 'PartnerInnen'
     team: 'Team'
     expired: 'abgelaufen'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8dbc5f8b4..c0c0ec46a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2718,9 +2718,9 @@ en:
       files_in_cache: file(s) successfully uploaded to temporary storage
       info:
         general_info: >
-          Here you can upload several corrections. In order that MaMpf can
-          associate them to the correct submissions it would be ideal if
-          the filenames would match the filenames of the submissions.
+          Here you can upload several corrections. To ensure they can be assigned
+          correctly, you must not rename the files obtained via the package
+          download.
         invalid_filenames: >
           This is the list of all uploaded files that do not
           fit into the naming scheme that is provided by MaMpf.
@@ -3023,6 +3023,7 @@ en:
     thyme_editor: 'Editor'
     screenshot: 'Screenshot'
     file: 'File'
+    files: 'Files'
     size: 'Size'
     please_wait: 'Please wait...'
     access_rights: 'Access rights'
@@ -3113,7 +3114,6 @@ en:
     deadline: 'Due date'
     tutorial: 'Tutorial'
     code: 'Code'
-    files: 'Files'
     partners: 'Partners'
     team: 'Team'
     expired: 'expired'

From 9ffe3263ca0a4eca9e1aa5bb1ab2f8a41c6c3d32 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 12 Nov 2023 13:48:48 +0100
Subject: [PATCH 2/2] Use "files" instead of "file"

---
 app/views/tutorials/_bulk_correction_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/tutorials/_bulk_correction_form.html.erb b/app/views/tutorials/_bulk_correction_form.html.erb
index 7980c387d..4381755de 100644
--- a/app/views/tutorials/_bulk_correction_form.html.erb
+++ b/app/views/tutorials/_bulk_correction_form.html.erb
@@ -28,7 +28,7 @@
     <div id="bulk-uploadButton-button"
        class="btn btn-sm btn-outline-secondary"
        >
-       <%= t('basics.file')%></div>
+       <%= t('basics.files')%></div>
             <button id="bulk-uploadButton-button-actual"
                     data-tr-success="<%= t('buttons.upload_success') %>"
                     data-tr-failure="<%= t('submission.upload_failure')%>"