diff --git a/templates/generate_item.html.twig b/templates/generate_item.html.twig
index af31c5804e..3606fad34d 100644
--- a/templates/generate_item.html.twig
+++ b/templates/generate_item.html.twig
@@ -36,7 +36,7 @@
     <table class='table'>
         <thead>
             <tr>
-                <th colspan='{{ colspan }}'>{{ __s("Mass value filling", "order") }}</th>
+                <th colspan='{{ colspan }}'>{{ __("Mass value filling", "order") }}</th>
             </tr>
 
             <tr>
@@ -112,19 +112,19 @@
             </tr>
 
             <tr>
-                <th>{{ __s("Product reference", "order") }}</th>
-                <th>{{ __s("Name") }}</th>
-                <th>{{ __s("Serial number") }}</th>
-                <th>{{ __s("Inventory number") }}</th>
+                <th>{{ __("Product reference", "order") }}</th>
+                <th>{{ __("Name") }}</th>
+                <th>{{ __("Serial number") }}</th>
+                <th>{{ __("Inventory number") }}</th>
                 {% if config.canAddImmobilizationNumber() %}
-                    <th>{{ __s("Immobilization number") }}</th>
+                    <th>{{ __("Immobilization number") }}</th>
                 {% endif %}
                 {% if is_multi_entities_mode and active_entities|length > 1 %}
-                    <th>{{ __s("Entity") }}</th>
+                    <th>{{ __("Entity") }}</th>
                 {% endif %}
-                <th>{{ __s("Location") }}</th>
-                <th>{{ __s("Group") }}</th>
-                <th>{{ __s("Status") }}</th>
+                <th>{{ __("Location") }}</th>
+                <th>{{ __("Group") }}</th>
+                <th>{{ __("Status") }}</th>
             </tr>
         </thead>
 
@@ -447,11 +447,11 @@
                     $(field).addClass('is-invalid');
                     // Create field type label for the message
                     let fieldTypeLabel = '';
-                    if (fieldType === 'name') fieldTypeLabel = "{{ __s('name') }}";
-                    if (fieldType === 'serial') fieldTypeLabel = "{{ __s('serial number') }}";
+                    if (fieldType === 'name') fieldTypeLabel = "{{ __('name') }}";
+                    if (fieldType === 'serial') fieldTypeLabel = "{{ __('serial number') }}";
 
                     // Add error message after the input
-                    $(field).after('<div class="invalid-feedback"> {{ __s("An asset with this value already exists") }} </div>');
+                    $(field).after('<div class="invalid-feedback"> {{ __("An asset with this value already exists") }} </div>');
 
                     // Add required attribute for visual indication
                     $(field).attr('required', 'required');
diff --git a/templates/order_getitems.html.twig b/templates/order_getitems.html.twig
index afc6b1e49c..718876d0dd 100644
--- a/templates/order_getitems.html.twig
+++ b/templates/order_getitems.html.twig
@@ -49,10 +49,10 @@
     <button id="toggle-table-{{ datatable_id }}" class="btn btn-link btn-sm mb-2" type="button">
         {% if table_visible %}
             <i class="ti ti-sort-ascending"></i>
-            <span>{{ __s('Collapse all', 'order') }}</span>
+            <span>{{ __('Collapse all', 'order') }}</span>
         {% else %}
             <i class="ti ti-sort-descending"></i>
-            <span>{{ __s('Expand all', 'order') }}</span>
+            <span>{{ __('Expand all', 'order') }}</span>
         {% endif %}
     </button>
     <input type="hidden" name="{{ countainer_name }}" value="true">
@@ -83,7 +83,7 @@
             <tr>
                 <td>
                     <div class="alert alert-info">
-                        {{ __s('No results found') }}
+                        {{ __('No results found') }}
                     </div>
                 </td>
             </tr>
@@ -114,7 +114,7 @@
                             <th style="width: 30px;">
                                 <div>
                                     <input class="form-check-input massive_action_checkbox" type="checkbox" id="checkall_{{ massiveactionparams['container'] }}"
-                                        value="" aria-label="{{ __s('Check all') }}"
+                                        value="" aria-label="{{ __('Check all') }}"
                                         onclick="checkAsCheckboxes(this, '{{ massiveactionparams['container'] }}', '.massive_action_checkbox');" />
                                 </div>
                             </th>
@@ -149,13 +149,13 @@
                                    {% if nofilter is not defined %}
                                        <button class="btn btn-sm show_filters {{ filters|length > 0 ? 'btn-secondary active' : 'btn-outline-secondary' }}">
                                            <i class="fas fa-filter"></i>
-                                           <span class="d-none d-xl-block">{{ __s('Filter') }}</span>
+                                           <span class="d-none d-xl-block">{{ __('Filter') }}</span>
                                        </button>
                                    {% endif %}
                                    {% if csv_url|length %}
                                        <a href="{{ csv_url }}" class="btn btn-sm text-capitalize btn-outline-secondary">
                                            <i class="fas fa-file-download"></i>
-                                           <span class="d-none d-xl-block">{{ __s('Export') }}</span>
+                                           <span class="d-none d-xl-block">{{ __('Export') }}</span>
                                        </a>
                                    {% endif %}
                                </span>
@@ -210,12 +210,12 @@
                                         {# Cannot be filtered #}
                                     {% elseif formatter == 'yesno' %}
                                         <select name="filters[{{ colkey }}]" class="form-select">
-                                            <option value="">{{ __s('All') }}</option>
+                                            <option value="">{{ __('All') }}</option>
                                             <option value="1" {{ filters[colkey] == '1' ? 'selected' : '' }}>
-                                                {{ __s('Yes') }}
+                                                {{ __('Yes') }}
                                             </option>
                                             <option value="0" {{ filters[colkey] == '0' ? 'selected' : '' }}>
-                                                {{ __s('No') }}
+                                                {{ __('No') }}
                                             </option>
                                         </select>
                                     {% else %}
@@ -242,7 +242,7 @@
                                 <td style="width: 10px">
                                     {% if entry['skip_ma'] is not defined or entry['skip_ma'] == false %}
                                         <input class="form-check-input massive_action_checkbox" type="checkbox" data-glpicore-ma-tags="common"
-                                               value="1" aria-label="{{ __s("Select item") }}"
+                                               value="1" aria-label="{{ __("Select item") }}"
                                                name="item[{{ entry['itemtype'] }}][{{ entry['id'] }}]" />
                                     {% endif %}
                                 </td>
@@ -318,7 +318,7 @@
                     <tr>
                         <td colspan="{{ total_cols }}">
                             <div class="alert alert-info">
-                                {{ __s('No results found') }}
+                                {{ __('No results found') }}
                             </div>
                         </td>
                     </tr>
@@ -346,7 +346,7 @@
         {% if not nopager and total_number > 0 %}
             <div class="d-flex justify-content-between align-items-center my-2">
                 <div>
-                    {{ __s('Showing %s to %s of %s entries', 'order')|format(
+                    {{ __('Showing %s to %s of %s entries', 'order')|format(
                         start + 1,
                         (start + displayed_count > total_number ? total_number : start + displayed_count),
                         total_number
@@ -354,7 +354,7 @@
                 </div>
                 <div class="d-flex align-items-center">
                     <div class="d-inline-flex align-items-center me-4">
-                        {{ __s('Entries to show:', 'order') }}
+                        {{ __('Entries to show:', 'order') }}
                         {% include 'components/dropdown/limit.html.twig' with {
                             'is_tab': true,
                             'right': true,
@@ -429,13 +429,13 @@
                 if (!isVisible) {
                     div_table.show();
                     icon.removeClass('ti-sort-descending').addClass('ti-sort-ascending');
-                    textSpan.text('{{ __s("Collapse all", "order") }}');
+                    textSpan.text('{{ __("Collapse all", "order") }}');
                     countainer_name.val('true');
                     isVisible = true;
                 } else {
                     div_table.hide();
                     icon.removeClass('ti-sort-ascending').addClass('ti-sort-descending');
-                    textSpan.text('{{ __s("Expand all", "order") }}');
+                    textSpan.text('{{ __("Expand all", "order") }}');
                     countainer_name.val('false');
                     isVisible = false;
                 }
diff --git a/templates/order_infocom.html.twig b/templates/order_infocom.html.twig
index 21ab4ea115..3a9c501f4b 100644
--- a/templates/order_infocom.html.twig
+++ b/templates/order_infocom.html.twig
@@ -29,14 +29,14 @@
 {% import 'components/form/fields_macros.html.twig' as fields %}
 
 {{ fields.largeTitle(
-   __s("Order informations", "order"),
+   __("Order informations", "order"),
    '',
    false
 ) }}
 
 <div class="form-field row col-12 col-sm-6  mb-2 col-auto p-1">
    <label class="col-form-label col-xxl-5 text-xxl-end" for="order_name">
-      {{ __s("Order name", "order") }}
+      {{ __("Order name", "order") }}
    </label>
    <div class="col-form-label col-xxl-7  field-container">
       {{ order_link|raw }}
@@ -45,7 +45,7 @@
 
 <div class="form-field row col-12 col-sm-6  mb-2 col-auto p-1">
    <label class="col-form-label col-xxl-5 text-xxl-end" for="reference">
-      {{ __s("Reference") }}
+      {{ __("Reference") }}
    </label>
    <div class="col-form-label col-xxl-7  field-container">
       {{ reference_link|raw }}
@@ -54,7 +54,7 @@
 
 <div class="form-field row col-12 col-sm-6  mb-2 col-auto p-1">
    <label class="col-form-label col-xxl-5 text-xxl-end" for="delivery_date">
-      {{ __s("Delivery date") }}
+      {{ __("Delivery date") }}
    </label>
    <div class="col-form-label col-xxl-7  field-container">
       {{ delivery_date|raw }}
diff --git a/templates/order_link_item.html.twig b/templates/order_link_item.html.twig
index 87baf0b3b0..d0bf17d867 100644
--- a/templates/order_link_item.html.twig
+++ b/templates/order_link_item.html.twig
@@ -35,16 +35,16 @@
 {% if numref == 0 %}
     <table class='tab_cadre_fixe'>
         <tr>
-            <th>{{ __s("No item to take delivery of", "order") }}</th>
+            <th>{{ __("No item to take delivery of", "order") }}</th>
         </tr>
     </table>
 {% else %}
     <table class="table mb-1">
         <thead>
             <tr>
-                <th>{{ __s('Assets') }}</th>
-                <th>{{ __s('Manufacturer') }}</th>
-                <th>{{ __s('Product reference', 'order') }}</th>
+                <th>{{ __('Assets') }}</th>
+                <th>{{ __('Manufacturer') }}</th>
+                <th>{{ __('Product reference', 'order') }}</th>
             </tr>
         </thead>
         <tbody>
@@ -60,10 +60,10 @@
         <button id="toggle-table-{{ datatable_id }}" class="btn btn-link btn-sm mb-2" type="button">
             {% if table_visible %}
                 <i class="ti ti-sort-ascending"></i>
-                <span>{{ __s('Collapse all', 'order') }}</span>
+                <span>{{ __('Collapse all', 'order') }}</span>
             {% else %}
                 <i class="ti ti-sort-descending"></i>
-                <span>{{ __s('Expand all', 'order') }}</span>
+                <span>{{ __('Expand all', 'order') }}</span>
             {% endif %}
         </button>
         <input type="hidden" name="{{ countainer_name }}" value="true">
@@ -73,7 +73,7 @@
     {% if total_count < 1 %}
         <div name="{{ datatable_id }}" {% if not table_visible %}style="display: none;"{% endif %}>
             <div class="alert alert-info m-2">
-                {{ __s('No results found') }}
+                {{ __('No results found') }}
             </div>
         </div>
     {% else %}
@@ -92,7 +92,7 @@
                             ]
                         ) %}
                         <button type='button' class='btn btn-secondary btn-sm' onclick='selectNItems("mass{{ classname }}{{ rand }}", "dropdown_nb_items_to_check_top_{{ rand }}")'>
-                            {{ __s("Select") }}
+                            {{ __("Select") }}
                         </button>
                     </span>
                     <script>
@@ -130,7 +130,7 @@
                             <th style="width: 30px;">
                                 <div>
                                     <input class="form-check-input massive_action_checkbox" type="checkbox" id="checkall_{{ massiveactionparams['container'] }}"
-                                        value="" aria-label="{{ __s('Check all') }}"
+                                        value="" aria-label="{{ __('Check all') }}"
                                         onclick="checkAsCheckboxes(this, '{{ massiveactionparams['container'] }}', '.massive_action_checkbox');" />
                                 </div>
                             </th>
@@ -169,7 +169,7 @@
                                     <td style="width: 10px">
                                         {% if entry['skip_ma'] is not defined or entry['skip_ma'] == false %}
                                             <input class="form-check-input massive_action_checkbox" type="checkbox" data-glpicore-ma-tags="common"
-                                                value="1" aria-label="{{ __s("Select item") }}"
+                                                value="1" aria-label="{{ __("Select item") }}"
                                                 name="item[{{ entry['itemtype'] }}][{{ entry['id'] }}]" />
                                         {% endif %}
                                     </td>
@@ -192,7 +192,7 @@
                         <tr>
                             <td colspan="{{ total_cols }}">
                                 <div class="alert alert-info">
-                                    {{ __s('No results found') }}
+                                    {{ __('No results found') }}
                                 </div>
                             </td>
                         </tr>
@@ -222,7 +222,7 @@
             {% if not nopager and total_count > 0 %}
                 <div class="d-flex justify-content-between align-items-center my-2">
                     <div>
-                        {{ __s('Showing %s to %s of %s entries', 'order')|format(
+                        {{ __('Showing %s to %s of %s entries', 'order')|format(
                             start + 1,
                             (start + displayed_count > total_count ? total_count : start + displayed_count),
                             total_count
@@ -230,7 +230,7 @@
                     </div>
                     <div class="d-flex align-items-center">
                         <div class="d-inline-flex align-items-center me-4">
-                            {{ __s('Entries to show:', 'order') }}
+                            {{ __('Entries to show:', 'order') }}
                             {% include 'components/dropdown/limit.html.twig' with {
                                 'is_tab': true,
                                 'right': true,
@@ -303,13 +303,13 @@
                     if (!isVisible) {
                         div_table.show();
                         icon.removeClass('ti-sort-descending').addClass('ti-sort-ascending');
-                        textSpan.text('{{ __s("Collapse all", "order") }}');
+                        textSpan.text('{{ __("Collapse all", "order") }}');
                         countainer_name.val('true');
                         isVisible = true;
                     } else {
                         div_table.hide();
                         icon.removeClass('ti-sort-ascending').addClass('ti-sort-descending');
-                        textSpan.text('{{ __s("Expand all", "order") }}');
+                        textSpan.text('{{ __("Expand all", "order") }}');
                         countainer_name.val('false');
                         isVisible = false;
                     }