Merge branch '4.90-bug-fixes' into develop

Author: skoshelev

src/Libraries/Nop.Services/Localization/LocalizationService.cs

@@ -514,7 +514,7 @@ public virtual async Task ImportResourcesFromXmlAsync(Language language, StreamR
             lsNamesList[localeStringResource.ResourceName.ToLowerInvariant()] = localeStringResource;
         }
 
-        var lrsToUpdateList = new List<LocaleStringResource>();
+        var lrsToUpdateList = new Dictionary<string, LocaleStringResource>();
         var lrsToInsertList = new Dictionary<string, LocaleStringResource>();
 
         foreach (var (name, value) in LoadLocaleResourcesFromStream(xmlStreamReader))
@@ -524,9 +524,8 @@ public virtual async Task ImportResourcesFromXmlAsync(Language language, StreamR
                 if (!updateExistingResources)
                     continue;
 
-                var lsr = localString;
-                lsr.ResourceValue = value;
-                lrsToUpdateList.Add(lsr);
+                localString.ResourceValue = value;
+                lrsToUpdateList[name] = localString;
             }
             else
             {
@@ -535,7 +534,7 @@ public virtual async Task ImportResourcesFromXmlAsync(Language language, StreamR
             }
         }
 
-        await _lsrRepository.UpdateAsync(lrsToUpdateList, false);
+        await _lsrRepository.UpdateAsync(lrsToUpdateList.Values.ToList(), false);
         await _lsrRepository.InsertAsync(lrsToInsertList.Values.ToList(), false);
 
         //clear cache