Merge upstream/master and resolve translation conflict

Merged new Conrad info provider and generic web provider translations
from upstream while keeping Update Manager translations.

templates/_navbar.html.twig

@@ -10,9 +10,9 @@
                 <!-- <span class="navbar-toggler-icon"></span> -->
                 <i class="fas fa-folder-open fa-lg fa-fw"></i>
             </button>
-            {% if is_granted("@tools.label_scanner") %}        
+            {% if is_granted("@tools.label_scanner") %}
                 <a href="{{ path('scan_dialog') }}" class="navbar-toggler nav-link ms-3">
-                       <i class="fas fa-camera-retro fa-fw"></i>
+                    <i class="fas fa-camera-retro fa-fw"></i>
                 </a>
             {% endif %}
         </div>
@@ -52,6 +52,14 @@
                                             {% trans %}info_providers.search.title{% endtrans %}
                                         </a>
                                     </li>
+                                    {% if settings_instance('generic_web_provider').enabled %}
+                                        <li>
+                                            <a class="dropdown-item" href="{{ path('info_providers_from_url') }}">
+                                                <i class="fa-fw fa-solid fa-book-atlas"></i>
+                                                {% trans %}info_providers.from_url.title{% endtrans %}
+                                            </a>
+                                        </li>
+                                    {% endif %}
                                 {% endif %}
 
                                 {% if is_granted('@parts.import') %}
@@ -69,7 +77,7 @@
             {% if is_granted('@parts.read') %}
                 {{ search.search_form("navbar") }}
 
-            {# {% include "_navbar_search.html.twig" %} #}
+                {# {% include "_navbar_search.html.twig" %} #}
             {% endif %}
 
 
@@ -158,4 +166,4 @@
             </ul>
         </div>
     </div>
-</nav>
+</nav>

templates/info_providers/from_url/from_url.html.twig

@@ -0,0 +1,21 @@
+{% extends "main_card.html.twig" %}
+
+{% import "info_providers/providers.macro.html.twig" as providers_macro %}
+{% import "helper.twig" as helper %}
+
+{% block title %}
+    {% trans %}info_providers.from_url.title{% endtrans %}
+{% endblock %}
+
+{% block card_title %}
+    <i class="fas fa-book-atlas"></i> {% trans %}info_providers.from_url.title{% endtrans %}
+{% endblock %}
+
+{% block card_content %}
+    <p class="text-muted offset-3">{% trans %}info_providers.from_url.help{% endtrans %}</p>
+
+    {{ form_start(form) }}
+    {{ form_row(form.url) }}
+    {{ form_row(form.submit) }}
+    {{ form_end(form) }}
+{% endblock %}

templates/info_providers/settings/provider_settings.html.twig

@@ -10,7 +10,7 @@
 {% block card_content %}
     <div class="offset-sm-3">
         <h3>
-            {% if info_provider_info.url %}
+            {% if info_provider_info.url is defined %}
                 <a href="{{ info_provider_info.url }}" class="link-external" target="_blank" rel="nofollow">{{ info_provider_info.name }}</a>
             {% else %}
                 {{ info_provider_info.name }}

templates/parts/info/_part_lots.html.twig

@@ -19,7 +19,7 @@
 
         <tbody>
         {% for lot in part.partLots %}
-            <tr>
+            <tr {% if lot.id == highlightLotId %}class="table-primary row-highlight row-pulse"{% endif %}>
                 <td>{{ lot.description }}</td>
                 <td>
                     {% if lot.storageLocation %}
@@ -117,4 +117,4 @@
         </tbody>
 
     </table>
-</div>
+</div>