From b02f1c147d9472cd93088e973f196d45bb28f961 Mon Sep 17 00:00:00 2001 From: Herafia Date: Mon, 2 Mar 2026 14:20:26 +0100 Subject: [PATCH 1/2] update locales --- inc/other.class.php | 2 +- locales/en_GB.po | 6 +++++- locales/fr_FR.po | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/inc/other.class.php b/inc/other.class.php index eacfbaf889..0f0a0d5965 100644 --- a/inc/other.class.php +++ b/inc/other.class.php @@ -37,7 +37,7 @@ class PluginOrderOther extends CommonDBTM public static function getTypeName($nb = 0) { - return __s("Other kind of items"); + return __("Other kind of items"); } diff --git a/locales/en_GB.po b/locales/en_GB.po index a5211a8933..bd35df132d 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Cédric Anne, 2018,2021-2022 # 06c8e5f1ec78ded2ceb41498ec52b068, 2015 @@ -659,6 +659,10 @@ msgstr "Display analytic nature on item form" msgid "Set analytic nature as mandatory on item form" msgstr "Set analytic nature as mandatory on item form" +#: inc/other.class.php:40 +msgid "Other kind of items" +msgstr "Other kind of items" + #: inc/config.class.php:278 msgid "Asked" msgstr "Asked" diff --git a/locales/fr_FR.po b/locales/fr_FR.po index afccdb7627..5bf82272d6 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # alexandre delaunay , 2018 # Cédric Anne, 2018,2021-2022 @@ -151,6 +151,10 @@ msgstr "Commandes" msgid "Products references" msgstr "Références produits" +#: inc/other.class.php:40 +msgid "Other kind of items" +msgstr "Autres types d'articles" + #: inc/profile.class.php:204 inc/order_item.class.php:1612 front/menu.php:75 msgid "Bills" msgstr "Factures" From a8283b04963ad0fa0175a027071f0ed435b140dd Mon Sep 17 00:00:00 2001 From: Herafia Date: Mon, 2 Mar 2026 14:35:10 +0100 Subject: [PATCH 2/2] CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d1c12ae38..1e8623a4b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [UNRELEASED] + +- Update locales + ## [2.12.6] - 2026-02-23 - Fix SQL query error when displaying deliveries