#1200

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -74,12 +74,15 @@ import Foundation
         
         if metadatasConflict.count == 1 {
             labelTitle.text = String(metadatasConflict.count) + " " + NSLocalizedString("_file_conflict_num_", comment: "")
+            labelSubTitle.text = NSLocalizedString("_file_conflict_desc_", comment: "")
+            labelNewFiles.text = NSLocalizedString("_file_conflict_new_", comment: "")
+            labelAlreadyExistingFiles.text = NSLocalizedString("_file_conflict_exists_", comment: "")
         } else {
-            labelTitle.text = String(metadatasConflict.count) + " " + NSLocalizedString("_file_conflicts_num_", comment: "")
+            labelTitle.text = String(metadatasConflict.count) + " " + NSLocalizedString("_files_conflict_num_", comment: "")
+            labelSubTitle.text = NSLocalizedString("_files_conflict_desc_", comment: "")
+            labelNewFiles.text = NSLocalizedString("_files_conflict_new_", comment: "")
+            labelAlreadyExistingFiles.text = NSLocalizedString("_files_conflict_exists_", comment: "")
         }
-        labelSubTitle.text = NSLocalizedString("_file_conflict_desc_", comment: "")
-        labelNewFiles.text = NSLocalizedString("_file_conflict_new_", comment: "")
-        labelAlreadyExistingFiles.text = NSLocalizedString("_file_conflict_exists_", comment: "")
         
         switchNewFiles.isOn = false
         switchAlreadyExistingFiles.isOn = false

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -126,10 +126,13 @@
 "_livephoto_save_"          = "Save Live Photo to photo album";
 "_livephoto_save_error_"    = "Error during save of Live Photo";
 "_file_conflict_num_"       = "file conflict";
-"_file_conflicts_num_"      = "file conflicts";
-"_file_conflict_desc_"      = "Which files do you want to keep?\nIf you select both versions, the copied file will have a number added to its name.";
-"_file_conflict_new_"       = "New files";
-"_file_conflict_exists_"    = "Already existing files";
+"_files_conflict_num_"      = "file conflicts";
+"_file_conflict_desc_"      = "Which file do you want to keep?\nIf you select both versions, the copied file will have a number added to its name.";
+"_files_conflict_desc_"     = "Which files do you want to keep?\nIf you select both versions, the copied files will have a number added to its name.";
+"_file_conflict_new_"       = "New file";
+"_files_conflict_new_"      = "New files";
+"_file_conflict_exists_"    = "Already existing file";
+"_files_conflict_exists_"   = "Already existing files";
 "_move_or_copy_"            = "Move or copy";
 "_copy_"                    = "Copy";