From b99e6bebf48ea9e1089a322173831c80bbdbeb6f Mon Sep 17 00:00:00 2001
From: Mark <git@mark.ivanowich.dev>
Date: Sun, 27 Apr 2025 13:49:47 -0500
Subject: [PATCH] Add translation queues for upload conflicts

---
 tinyfilemanager.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tinyfilemanager.php b/tinyfilemanager.php
index 14c171c..6b6cc96 100644
--- a/tinyfilemanager.php
+++ b/tinyfilemanager.php
@@ -4953,7 +4953,7 @@ function fm_show_header_login()
                 if (remaining_count > 0) {
                     $('.conflict-checkbox-container').show();
                     $('#conflict_checkbox').prop('checked', false);
-                    $('.conflict-checkbox-container label').html('<?php echo lng('Apply choice to remaining ') ?> <b>' + remaining_count + '</b>');
+                    $('.conflict-checkbox-container label').html('<?php echo lng('Apply choice to remaining') ?> <b>' + remaining_count + '</b>');
                 } else {
                     $('.conflict-checkbox-container').hide();
                     $('#conflict_checkbox').prop('checked', false);
@@ -5708,6 +5708,12 @@ function fm_show_header_login()
         $tr['en']['Actions']        = 'Actions';
         $tr['en']['Folder is empty'] = 'Folder is empty';
         $tr['en']['Upload']         = 'Upload';
+        $tr['en']['File conflict detected'] = 'File conflict detected';
+        $tr['en']['Conflict detected for'] = 'Conflict detected for';
+        $tr['en']['New Filename'] = 'New Filename';
+        $tr['en']['Rename Old'] = 'Rename Old';
+        $tr['en']['Apply choice to remaining'] = 'Apply choice to remaining';
+        $tr['en']['Replace'] = 'Replace';
         $tr['en']['Cancel']         = 'Cancel';
         $tr['en']['InvertSelection'] = 'Invert Selection';
         $tr['en']['DestinationFolder']  = 'Destination Folder';