Merge remote-tracking branch 'origin/4.6'

Author: OstafinL

src/bundle/Resources/translations/ibexa_content_create.en.xliff

@@ -32,8 +32,8 @@
         <note>key: on_the_fly.cancel</note>
       </trans-unit>
       <trans-unit id="d466f97702d045f02d8b55379a9c6ea5270ecfef" resname="on_the_fly.confirm">
-        <source>Save and close</source>
-        <target state="new">Save and close</target>
+        <source>Publish</source>
+        <target state="new">Publish</target>
         <note>key: on_the_fly.confirm</note>
       </trans-unit>
     </body>

src/bundle/Resources/translations/ibexa_content_edit.en.xliff

@@ -47,8 +47,8 @@
         <note>key: on_the_fly.cancel</note>
       </trans-unit>
       <trans-unit id="d466f97702d045f02d8b55379a9c6ea5270ecfef" resname="on_the_fly.confirm">
-        <source>Save and close</source>
-        <target state="new">Save and close</target>
+        <source>Publish</source>
+        <target state="new">Publish</target>
         <note>key: on_the_fly.confirm</note>
       </trans-unit>
     </body>

src/bundle/Resources/views/themes/admin/ui/on_the_fly/create_on_the_fly.html.twig

@@ -12,7 +12,7 @@
     {% set menu_items %}
         <li class="ibexa-context-menu__item ibexa-adaptive-items__item">
             <button class="btn ibexa-btn ibexa-btn--primary ibexa-btn--confirm">
-                <span class="ibexa-btn__label">{{ 'on_the_fly.confirm'|trans()|desc('Save and close') }}</span>
+                <span class="ibexa-btn__label">{{ 'on_the_fly.confirm'|trans()|desc('Publish') }}</span>
             </button>
         </li>
         <li class="ibexa-context-menu__item ibexa-adaptive-items__item">

src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig

@@ -12,7 +12,7 @@
     {% set menu_items %}
         <li class="ibexa-context-menu__item ibexa-adaptive-items__item">
             <button class="btn ibexa-btn ibexa-btn--primary ibexa-btn--confirm">
-                <span class="ibexa-btn__label">{{ 'on_the_fly.confirm'|trans()|desc('Save and close') }}</span>
+                <span class="ibexa-btn__label">{{ 'on_the_fly.confirm'|trans()|desc('Publish') }}</span>
             </button>
         </li>
         <li class="ibexa-context-menu__item ibexa-adaptive-items__item">