diff --git a/templates/config.html.twig b/templates/config.html.twig
index 17bdf74f..be1ec3de 100644
--- a/templates/config.html.twig
+++ b/templates/config.html.twig
@@ -36,21 +36,21 @@
     'currency',
     selected_currency,
     currency_options,
-    __s('Choose your international currency', 'pdf')
+    __('Choose your international currency', 'pdf')
 ) }}
 
 <input type="hidden" id="use_branding_logo_hidden" name="use_branding_logo" value="{{ (use_branding_logo and is_branding_active) ? 1 : 0 }}" />
 <div class="form-field row align-items-center col-12 col-sm-6  mb-2">
     <label class="col-form-label col-xxl-5 text-xxl-end ">
         <span class="d-inline-flex align-items-center">
-            <span>{{ __s('Use logo from Branding plugin', 'pdf') }}</span>
+            <span>{{ __('Use logo from Branding plugin', 'pdf') }}</span>
         </span>
     </label>
     <div class ="col-1 field-container">
         {% if is_branding_active %}
             <label class="form-switch mt-1" style="padding-left: 1rem;"
                 data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-trigger="hover"
-                title="{{ __s('The logo will be used in the header of generated PDFs.', 'pdf') }}">
+                title="{{ __('The logo will be used in the header of generated PDFs.', 'pdf') }}">
                 <input type="checkbox" class="form-check-input ms-0 me-1 mt-0" id="use_branding_logo_checkbox"
                     {{ use_branding_logo ? 'checked' : '' }} />
             </label>
@@ -62,7 +62,7 @@
         {% else %}
             <label class="form-switch mt-1" style="padding-left: 1rem;"
                 data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-trigger="hover"
-                title="{{ __s('The Branding plugin is either disabled, missing, or its version is below 3.0.0.', 'pdf') }}">
+                title="{{ __('The Branding plugin is either disabled, missing, or its version is below 3.0.0.', 'pdf') }}">
                 <input type="checkbox" class="form-check-input ms-0 me-1 mt-0" disabled />
             </label>
         {% endif %}
@@ -72,7 +72,7 @@
 {{ fields.textareaField(
     'add_text',
     add_text,
-    __s('Text to add at the end of the PDF generation', 'pdf'),
+    __('Text to add at the end of the PDF generation', 'pdf'),
     {
         'rows': 5,
         'style': 'width:95%'
diff --git a/templates/preference_form.html.twig b/templates/preference_form.html.twig
index 1d6ed580..5dc01bb7 100644
--- a/templates/preference_form.html.twig
+++ b/templates/preference_form.html.twig
@@ -34,7 +34,7 @@
         <div class="card-header">
             <h4 class="card-title d-flex align-items-center">
                 <i class="ti ti-file-type-pdf me-2 text-danger"></i>
-                {{ __s('%1$s: %2$s')|format(__s('Choose the tables to print in pdf', 'pdf'), item_type_name) }}
+                {{ __('%1$s: %2$s')|format(__('Choose the tables to print in pdf', 'pdf'), item_type_name) }}
             </h4>
         </div>
 
@@ -42,7 +42,7 @@
             {% if debug_mode %}
                 <div class="alert alert-info mb-3">
                     <i class="ti ti-info-circle me-2"></i>
-                    {{ __s('Debug mode enabled - showing internal references') }}
+                    {{ __('Debug mode enabled - showing internal references') }}
                 </div>
             {% endif %}
 
@@ -51,21 +51,21 @@
                     <fieldset class="border p-3 mb-3 rounded">
                         <legend class="fs-6 fw-bold mb-3 px-2">
                             <i class="ti ti-table me-1"></i>
-                            {{ __s('Available tables', 'pdf') }}
+                            {{ __('Available tables', 'pdf') }}
                         </legend>
 
                         <div class="mb-3 d-flex flex-wrap gap-2">
                             <button type="button" class="btn btn-sm btn-outline-success" onclick="selectAllCheckboxes('{{ form_id }}')">
                                 <i class="ti ti-check me-1"></i>
-                                {{ __s('Check all') }}
+                                {{ __('Check all') }}
                             </button>
                             <button type="button" class="btn btn-sm btn-outline-secondary" onclick="selectNoCheckboxes('{{ form_id }}')">
                                 <i class="ti ti-x me-1"></i>
-                                {{ __s('Uncheck all') }}
+                                {{ __('Uncheck all') }}
                             </button>
                             <small class="text-muted d-flex align-items-center ms-auto">
                                 <i class="ti ti-info-circle me-1"></i>
-                                {{ __s('Select tables to include in PDF export', 'pdf') }}
+                                {{ __('Select tables to include in PDF export', 'pdf') }}
                             </small>
                         </div>
 
@@ -99,16 +99,16 @@
                     <div class="mb-3">
                         <label for="page_{{ form_id }}" class="form-label">
                             <i class="ti ti-rotate me-1"></i>
-                            {{ __s('Page orientation', 'pdf') }}
+                            {{ __('Page orientation', 'pdf') }}
                         </label>
                         <select name="page" id="page_{{ form_id }}" class="form-select">
                             <option value="0" {{ not landscape ? 'selected' : '' }}>
                                 <i class="ti ti-rectangle-vertical"></i>
-                                {{ __s('Portrait', 'pdf') }}
+                                {{ __('Portrait', 'pdf') }}
                             </option>
                             <option value="1" {{ landscape ? 'selected' : '' }}>
                                 <i class="ti ti-rectangle"></i>
-                                {{ __s('Landscape', 'pdf') }}
+                                {{ __('Landscape', 'pdf') }}
                             </option>
                         </select>
                     </div>
@@ -119,7 +119,7 @@
                         <div class="mb-3">
                             <label class="form-label">
                                 <i class="ti ti-list-numbers me-1"></i>
-                                {{ __s('Display (number of items)') }}
+                                {{ __('Display (number of items)') }}
                             </label>
                             <div class="dropdown-container">
                                 {{ call('Dropdown::showListLimit', [
@@ -136,9 +136,9 @@
         <div class="card-footer d-flex justify-content-between align-items-center">
             <div class="text-muted d-flex align-items-center">
                 <i class="ti ti-info-circle me-1"></i>
-                <span>{{ __s('Total options: %d')|format(options|length) }}</span>
+                <span>{{ __('Total options: %d')|format(options|length) }}</span>
                 <span class="ms-2">|
-                    {{ __s('Selected:') }}
+                    {{ __('Selected:') }}
                     <span id="selected-count-{{ form_id }}">{{ values|length }}</span>
                 </span>
             </div>
@@ -152,12 +152,12 @@
                     <input type="hidden" name="itemID" value="{{ item_id }}">
                     <button type="submit" name="generate" class="btn btn-primary">
                         <i class="ti ti-printer me-2"></i>
-                        {{ __s('Print', 'pdf') }}
+                        {{ __('Print', 'pdf') }}
                     </button>
                 {% else %}
                     <button type="submit" name="plugin_pdf_user_preferences_save" class="btn btn-primary">
                         <i class="ti ti-device-floppy me-2"></i>
-                        {{ __s('Save') }}
+                        {{ __('Save') }}
                     </button>
                 {% endif %}
             </div>