Merge 4.x into 5.x

sonata-project · Mar 11, 2023 · 6130c9c · 6130c9c
2 parents 57e7447 + e46dedf
commit 6130c9c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -99,6 +99,6 @@ jobs:
               run: make coverage
 
             - name: Send coverage to Codecov
-              uses: codecov/codecov-action@v2
+              uses: codecov/codecov-action@v3
               with:
-                  file: build/logs/clover.xml
+                  files: build/logs/clover.xml
diff --git a/src/Resources/translations/SonataMediaBundle.en.xliff b/src/Resources/translations/SonataMediaBundle.en.xliff
@@ -14,6 +14,10 @@
         <source>gallery</source>
         <target>Gallery</target>
       </trans-unit>
+      <trans-unit id="gallery_item">
+        <source>gallery_item</source>
+        <target>Gallery item</target>
+      </trans-unit>
       <trans-unit id="sonata_media">
         <source>sonata_media</source>
         <target>Media Library</target>

diff --git a/src/Resources/translations/SonataMediaBundle.it.xliff b/src/Resources/translations/SonataMediaBundle.it.xliff
@@ -14,17 +14,9 @@
         <source>gallery</source>
         <target>Gallerie</target>
       </trans-unit>
-      <trans-unit id="gallery_">
-        <source>Gallery</source>
-        <target>Galleria</target>
-      </trans-unit>
-      <trans-unit id="options">
-        <source>Options</source>
-        <target>Opzioni</target>
-      </trans-unit>
-      <trans-unit id="reference">
-        <source>reference</source>
-        <target>Riferimento</target>
+      <trans-unit id="gallery_item">
+        <source>gallery_item</source>
+        <target>Associazione media-gallerie</target>
       </trans-unit>
       <trans-unit id="sonata_media">
         <source>sonata_media</source>
@@ -134,10 +126,6 @@
         <source>filter.label_content_type</source>
         <target>Tipo di contenuto</target>
       </trans-unit>
-      <trans-unit id="form.group_media">
-        <source>form.group_media</source>
-        <target>Media</target>
-      </trans-unit>
       <trans-unit id="form.label_enabled">
         <source>form.label_enabled</source>
         <target>Pubblicato</target>
@@ -474,10 +462,6 @@
         <source>form.label_start_paused</source>
         <target>Avvio in pausa</target>
       </trans-unit>
-      <trans-unit id="form.label_wrap">
-        <source>form.label_wrap</source>
-        <target>Decorazione</target>
-      </trans-unit>
       <trans-unit id="form.label_orientation_left">
         <source>form.label_orientation_left</source>
         <target>Sinistra</target>
@@ -566,6 +550,18 @@
         <source>error.image_too_small</source>
         <target>Immagine troppo piccola, la grandezza richiesta è minimo %min_width% x %min_height%.</target>
       </trans-unit>
+      <trans-unit id="form.group_media">
+        <source>form.group_media</source>
+        <target>Media</target>
+      </trans-unit>
+      <trans-unit id="form.group_gallery">
+        <source>form.group_gallery</source>
+        <target>Gallerie</target>
+      </trans-unit>
+      <trans-unit id="form.group_options">
+        <source>form.group_options</source>
+        <target>Opzioni</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>