Synchronise master with upstream

cloudkittydashboard/dashboards/admin/hashmap/templates/hashmap/_field_create.html

@@ -3,5 +3,5 @@
 
 {% block modal-body-right %}
     <h3>{% trans "Description:" %}</h3>
-    <p>{% trans "A field is referring to a metadata field of a resource. " %}</p>
+    <p>{% trans "A field is referring to a metadata field of a resource." %}</p>
 {% endblock %}

cloudkittydashboard/dashboards/admin/hashmap/templates/hashmap/_group_create.html

@@ -3,5 +3,11 @@
 
 {% block modal-body-right %}
     <h3>{% trans "Description:" %}</h3>
-    <p>{% trans "A group is a way to group calculations of mappings." %}</p>
+    <p>{% blocktrans trimmed %}
+       A group lets you organize mapping calculations into separate sets.
+       For example, you might create one group with rules for rating instance uptime
+       and another for evaluating block storage volumes. Keeping them in separate
+       groups ensures the calculations remain independent and don’t interfere
+       with each other.
+       {% endblocktrans %}</p>
 {% endblock %}

cloudkittydashboard/dashboards/admin/hashmap/templates/hashmap/_mapping_create.html

@@ -3,5 +3,5 @@
 
 {% block modal-body-right %}
     <h3>{% trans "Description:" %}</h3>
-    <p>{% trans "A mapping is the final object, it’s what triggers calculation." %}</p>
+    <p>{% trans "A mapping is the final object that triggers calculation." %}</p>
 {% endblock %}

cloudkittydashboard/dashboards/admin/hashmap/templates/hashmap/group_details.html

@@ -6,7 +6,7 @@
 <div class="row">
   <div class="col-sm-12">
       <div class="detail">
-          <dl>
+          <dl class="dl-horizontal">
               <dt>{% trans "Id" %}</dt>
               <dd>{{ group.group_id }}</dd>
               <dt>{% trans "Name" %}</dt>
@@ -18,7 +18,7 @@ <h3>{% trans "Mappings" %}</h3>
               {% if mappings.services %}
               <h4>{% trans "Services" %}</h4>
                 {% for service in mappings.services %}
-                  <dl>
+                  <dl class="dl-horizontal">
                       <dt>{% trans "Mapping ID" %}</dt>
                       <dd>{{ service.mapping_id }}</dd>
                       <dt>{% trans "Service ID" %}</dt>
@@ -33,7 +33,7 @@ <h4>{% trans "Services" %}</h4>
               {% if mappings.fields %}
               <h4>{% trans "Fields" %}</h4>
                 {% for field in mappings.fields %}
-                  <dl>
+                  <dl class="dl-horizontal">
                       <dt>{% trans "Mapping ID" %}</dt>
                       <dd>{{ field.mapping_id }}</dd>
                       <dt>{% trans "Field ID" %}</dt>
@@ -53,7 +53,7 @@ <h3>{% trans "Thresholds" %}</h3>
               {% if thresholds.services %}
               <h4>{% trans "Services" %}</h4>
                 {% for service in thresholds.services %}
-                  <dl>
+                  <dl class="dl-horizontal">
                       <dt>{% trans "Service ID" %}</dt>
                       <dd>{{ service.service_id }}</dd>
                       <dt>{% trans "Level" %}</dt>
@@ -68,7 +68,7 @@ <h4>{% trans "Services" %}</h4>
               {% if thresholds.fields %}
               <h4>{% trans "Fields" %}</h4>
                 {% for field in thresholds.fields %}
-                  <dl>
+                  <dl class="dl-horizontal">
                       <dt>{% trans "Field ID" %}</dt>
                       <dd>{{ field.field_id }}</dd>
                       <dt>{% trans "Level" %}</dt>

cloudkittydashboard/dashboards/admin/hashmap/templates/hashmap/service_details.html

@@ -7,9 +7,11 @@
   <div class="span12">
 
 {% if service_period %}
-  {% blocktrans with service_period as period %}
-   <p>Usage data are collected every {{ period }} seconds.</p>
-  {% endblocktrans %}
+    <p>
+      {% blocktrans trimmed with service_period as period %}
+        Usage data is collected every {{ period }} seconds.
+      {% endblocktrans %}
+    </p>
 {% endif %}
 
   {{ tab_group.render }}

cloudkittydashboard/dashboards/admin/hashmap/views.py

@@ -189,8 +189,8 @@ def get_success_url(self, **kwargs):
 class FieldMappingCreateView(forms.ModalFormView):
     form_class = hashmap_forms.CreateFieldMappingForm
     form_id = "create_field_mapping"
-    modal_header = _("Create Field Mapping")
-    page_title = _("Create field Mapping")
+    modal_header = _("Create field mapping")
+    page_title = _("Create field mapping")
     template_name = 'admin/hashmap/mapping_create.html'
     submit_url = 'horizon:admin:hashmap:field_mapping_create'
     success_url = 'horizon:admin:hashmap:field_mapping_create'

cloudkittydashboard/dashboards/admin/modules/templates/rating_modules/_priority_edit.html

@@ -4,7 +4,7 @@
 {% block modal-body-right %}
     <h3>{% trans "Description:" %}</h3>
     <p>
-      {% blocktrans with module_id=module_id %}
+      {% blocktrans trimmed with module_id=module_id %}
         Edit the priority for the <i>{{ module_id }}</i> module.
       {% endblocktrans %}
     </p>

cloudkittydashboard/dashboards/admin/modules/templates/rating_modules/details.html

@@ -6,7 +6,7 @@
 <div class="row">
   <div class="col-sm-12">
       <div class="detail">
-          <dl>
+          <dl class="dl-horizontal">
               <dt>{% trans "Id" %}</dt>
               <dd>{{ module.module_id }}</dd>
               <dt>{% trans "Description" %}</dt>

cloudkittydashboard/dashboards/admin/pyscripts/templates/pyscripts/details.html

@@ -6,7 +6,7 @@
 <div class="row">
   <div class="col-sm-12">
       <div class="detail">
-          <dl>
+          <dl class="dl-horizontal">
               <dt>{{ _("Id") }}</dt>
               <dd>{{ script.script_id }}</dd>
               <dt>{{ _("Name") }}</dt>

cloudkittydashboard/dashboards/admin/pyscripts/views.py

@@ -81,7 +81,7 @@ def get_success_url(self, **kwargs):
 
 class ScriptDetailsView(views.APIView):
     template_name = 'admin/pyscripts/details.html'
-    page_title = _("Script Details : {{ script.name }}")
+    page_title = _("Script details: {{ script.name }}")
 
     def get_data(self, request, context, *args, **kwargs):
         script_id = kwargs.get("script_id")

cloudkittydashboard/dashboards/admin/summary/views.py

@@ -55,7 +55,7 @@ def get_data(self):
 class TenantDetailsView(tables.DataTableView):
     template_name = 'admin/rating_summary/details.html'
     table_class = sum_tables.TenantSummaryTable
-    page_title = _("Script Details : {{ table.project_id }}")
+    page_title = _("Script details: {{ table.project_id }}")
 
     def _get_cloud_total_summary(self):
         return api.cloudkittyclient(self.request).report.get_summary(

cloudkittydashboard/locale/en_GB/LC_MESSAGES/django.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cloudkitty-dashboard VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2025-08-07 10:33+0000\n"
+"POT-Creation-Date: 2025-11-24 11:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -16,35 +16,9 @@ msgstr ""
 "X-Generator: Zanata 4.3.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#, python-format
-msgid ""
-"\n"
-"        Edit the priority for the <i>%(module_id)s</i> module.\n"
-"      "
-msgstr ""
-"\n"
-"        Edit the priority for the <i>%(module_id)s</i> module.\n"
-"      "
-
-#, python-format
-msgid ""
-"\n"
-"   <p>Usage data are collected every %(period)s seconds.</p>\n"
-"  "
-msgstr ""
-"\n"
-"   <p>Usage data are collected every %(period)s seconds.</p>\n"
-"  "
-
 msgid "$"
 msgstr "$"
 
-msgid "A field is referring to a metadata field of a resource. "
-msgstr "A field is referring to a metadata field of a resource. "
-
-msgid "A group is a way to group calculations of mappings."
-msgstr "A group is a way to group calculations of mappings."
-
 msgid "A mapping is the final object, it’s what triggers calculation."
 msgstr "A mapping is the final object, it’s what triggers calculation."
 
@@ -76,9 +50,6 @@ msgstr "Cost Per Service Per Hour"
 msgid "Create Field"
 msgstr "Create Field"
 
-msgid "Create Field Mapping"
-msgstr "Create Field Mapping"
-
 msgid "Create Field Threshold"
 msgstr "Create Field Threshold"
 
@@ -100,9 +71,6 @@ msgstr "Create Service Threshold"
 msgid "Create a new rating script."
 msgstr "Create a new rating script."
 
-msgid "Create field Mapping"
-msgstr "Create field Mapping"
-
 msgid "Create new Field"
 msgstr "Create new Field"
 
@@ -400,12 +368,6 @@ msgstr "Script Data"
 msgid "Script Details"
 msgstr "Script Details"
 
-msgid "Script Details : {{ script.name }}"
-msgstr "Script Details : {{ script.name }}"
-
-msgid "Script Details : {{ table.project_id }}"
-msgstr "Script Details : {{ table.project_id }}"
-
 msgid "Script File"
 msgstr "Script File"
 

cloudkittydashboard/locale/fr/LC_MESSAGES/django.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cloudkitty-dashboard VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2022-08-08 15:59+0000\n"
+"POT-Creation-Date: 2025-11-24 11:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -14,37 +14,10 @@ msgstr ""
 "X-Generator: Zanata 4.3.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#, python-format
-msgid ""
-"\n"
-"        Edit the priority for the <i>%(module_id)s</i> module.\n"
-"      "
-msgstr ""
-"\n"
-"        Éditer la priorité pour le module <i>%(module_id)s</i>.\n"
-"      "
-
-#, python-format
-msgid ""
-"\n"
-"   <p>Usage data are collected every %(period)s seconds.</p>\n"
-"  "
-msgstr ""
-"\n"
-"   <p>Les données d'utilisation sont collectées toutes %(period)s secondes.</"
-"p>\n"
-"  "
-
 #, fuzzy
 msgid "$"
 msgstr "€"
 
-msgid "A field is referring to a metadata field of a resource. "
-msgstr "Un champ fait référence à un champ de métadonnées d'une ressource."
-
-msgid "A group is a way to group calculations of mappings."
-msgstr "Un groupe permet de regrouper les calculs propres à des mappings."
-
 msgid "A mapping is the final object, it’s what triggers calculation."
 msgstr "Un mapping est l'objet final : c'est ce qui déclenche le calcul."
 
@@ -65,9 +38,6 @@ msgstr "Coût par service par heure"
 msgid "Create Field"
 msgstr "Créer un champ"
 
-msgid "Create Field Mapping"
-msgstr "Créer un mapping du champ"
-
 msgid "Create Field Threshold"
 msgstr "Créer un seuil du champ"
 
@@ -86,9 +56,6 @@ msgstr "Créer un service"
 msgid "Create Service Threshold"
 msgstr "Créer un seuil du service"
 
-msgid "Create field Mapping"
-msgstr "Créer un mapping du champ"
-
 msgid "Create new Field"
 msgstr "Créer un nouveau champ"
 
@@ -344,12 +311,6 @@ msgstr "Données du script"
 msgid "Script Details"
 msgstr "Détails du script"
 
-msgid "Script Details : {{ script.name }}"
-msgstr "Détails du script : {{ script.name }}"
-
-msgid "Script Details : {{ table.project_id }}"
-msgstr "Détails du script : {{ table.project_id }}"
-
 #, fuzzy
 msgid "Script File"
 msgstr "Fichier (script)"

cloudkittydashboard/locale/ru/LC_MESSAGES/django.po

@@ -4,47 +4,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cloudkitty-dashboard VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2025-08-26 13:56+0000\n"
+"POT-Creation-Date: 2025-11-24 11:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2025-08-26 07:18+0000\n"
+"PO-Revision-Date: 2025-11-24 11:30+0000\n"
 "Last-Translator: Ivan Anfimov <lazekteam@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "X-Generator: Zanata 4.3.3\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#, python-format
-msgid ""
-"\n"
-"        Edit the priority for the <i>%(module_id)s</i> module.\n"
-"      "
-msgstr ""
-"\n"
-"        Изменить приоритет для модуля <i>%(module_id)s</i>.\n"
-"      "
-
-#, python-format
-msgid ""
-"\n"
-"   <p>Usage data are collected every %(period)s seconds.</p>\n"
-"  "
-msgstr ""
-"\n"
-"   <p>Данные о потреблении собираются каждые %(period)s сек..</p>\n"
-"  "
-
 msgid "$"
 msgstr "$"
 
-msgid "A field is referring to a metadata field of a resource. "
-msgstr "Поле ссылается на поле метаданных ресурса."
-
-msgid "A group is a way to group calculations of mappings."
-msgstr "Группа — это способ группировки вычисления сопоставлений."
-
 msgid "A mapping is the final object, it’s what triggers calculation."
 msgstr "Сопоставление — это конечный объект, именно он запускает расчет."
 
@@ -79,9 +53,6 @@ msgstr "Стоимость услуги в час"
 msgid "Create Field"
 msgstr "Создать поле"
 
-msgid "Create Field Mapping"
-msgstr "Создать сопоставление поля"
-
 msgid "Create Field Threshold"
 msgstr "Создать порог поля"
 
@@ -103,7 +74,7 @@ msgstr "Создать порог услуги"
 msgid "Create a new rating script."
 msgstr "Создать новый скрипт оценки."
 
-msgid "Create field Mapping"
+msgid "Create field mapping"
 msgstr "Создать сопоставление поля"
 
 msgid "Create new Field"
@@ -428,18 +399,18 @@ msgstr "Данные скрипта"
 msgid "Script Details"
 msgstr "Подробности скрипта"
 
-msgid "Script Details : {{ script.name }}"
-msgstr "Подробности скрипта : {{ script.name }}"
-
-msgid "Script Details : {{ table.project_id }}"
-msgstr "Подробности скрипта : {{ table.project_id }}"
-
 msgid "Script File"
 msgstr "Файл скрипта"
 
 msgid "Script ID"
 msgstr "ID скрипта"
 
+msgid "Script details: {{ script.name }}"
+msgstr "Подробности скрипта: {{ script.name }}"
+
+msgid "Script details: {{ table.project_id }}"
+msgstr "Подробности скрипта: {{ table.project_id }}"
+
 msgid "Service"
 msgstr "Услуга"