rebased and made more chnges

Author: rohinish404

invokeai/frontend/web/src/features/gallery/components/Boards/BoardAutoAddSelect.tsx

@@ -17,7 +17,7 @@ const BoardAutoAddSelect = () => {
     selectFromResult: ({ data }) => {
       const options: ComboboxOption[] = [
         {
-          label: 'None',
+          label: t('controlnet.none'),
           value: 'none',
         },
       ].concat(

invokeai/frontend/web/src/features/gallery/components/ImageGrid/GalleryImageGrid.tsx

@@ -126,7 +126,7 @@ const GalleryImageGrid = () => {
           loadingText={t('gallery.loading')}
           flexShrink={0}
         >
-          {`Load More (${currentData.ids.length} of ${currentViewTotal})`}
+          {`${t('accessibility.loadMore')} (${currentData.ids.length} of ${currentViewTotal})`}
         </Button>
       </>
     );

invokeai/frontend/web/src/features/parameters/components/Canvas/Compositing/MaskAdjustment/ParamMaskBlurMethod.tsx

@@ -7,16 +7,19 @@ import { isParameterMaskBlurMethod } from 'features/parameters/types/parameterSc
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-const options: ComboboxOption[] = [
-  { label: 'Box Blur', value: 'box' },
-  { label: 'Gaussian Blur', value: 'gaussian' },
-];
-
 const ParamMaskBlurMethod = () => {
   const maskBlurMethod = useAppSelector((s) => s.generation.maskBlurMethod);
   const dispatch = useAppDispatch();
   const { t } = useTranslation();
 
+  const options: ComboboxOption[] = useMemo(
+    () => [
+      { label: t('parameters.boxBlur'), value: 'box' },
+      { label: t('parameters.gaussianBlur'), value: 'gaussian' },
+    ],
+    [t]
+  );
+
   const onChange = useCallback<ComboboxOnChange>(
     (v) => {
       if (!isParameterMaskBlurMethod(v?.value)) {

invokeai/frontend/web/src/features/parameters/components/ImageToImage/InitialImageDisplay.tsx

@@ -75,8 +75,8 @@ const InitialImageDisplay = () => {
         </Text>
         <Spacer />
         <IconButton
-          tooltip="Upload Initial Image"
-          aria-label="Upload Initial Image"
+          tooltip={t('toast.uploadInitialImage')}
+          aria-label={t('toast.uploadInitialImage')}
           icon={<PiUploadSimpleBold />}
           {...getUploadButtonProps()}
         />
@@ -87,15 +87,9 @@ const InitialImageDisplay = () => {
           onClick={handleUseSizeInitialImage}
           isDisabled={!initialImage}
         />
-<<<<<<< HEAD
         <IconButton
-          tooltip="Reset Initial Image"
-          aria-label="Reset Initial Image"
-=======
-        <InvIconButton
           tooltip={t('toast.resetInitialImage')}
           aria-label={t('toast.resetInitialImage')}
->>>>>>> a94e09658 (more strings and translations added)
           icon={<PiArrowCounterClockwiseBold />}
           onClick={handleReset}
           isDisabled={!initialImage}