From e6b996c7edf8bc082872b84c07ec5dfe9a1e63dd Mon Sep 17 00:00:00 2001 From: Herafia Date: Mon, 2 Mar 2026 14:20:26 +0100 Subject: [PATCH 1/7] 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 e699d3026fb76be683c62d224211c5550e5727fc Mon Sep 17 00:00:00 2001 From: Herafia Date: Mon, 2 Mar 2026 14:35:10 +0100 Subject: [PATCH 2/7] CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a2f364761..b4b58477d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,14 @@ 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] ### Fixed + - Fix generate associated item massive action +- Update locales + ## [2.12.6] - 2026-02-23 From ad62899b36d9e56737ffd48625b26d6b8d804dc6 Mon Sep 17 00:00:00 2001 From: "Romain B." <8530352+Rom1-B@users.noreply.github.com> Date: Thu, 12 Mar 2026 09:40:36 +0100 Subject: [PATCH 3/7] Apply suggestion from @Rom1-B --- inc/other.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/other.class.php b/inc/other.class.php index 0f0a0d5965..20e0682e53 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 __("Other kind of items"); + return __("Other kind of items", 'order'); } From 108fe972264a56a067ee104b5fcedb93066467b3 Mon Sep 17 00:00:00 2001 From: Stanislas Date: Thu, 12 Mar 2026 09:46:31 +0100 Subject: [PATCH 4/7] Update locales/en_GB.po --- locales/en_GB.po | 3 --- 1 file changed, 3 deletions(-) diff --git a/locales/en_GB.po b/locales/en_GB.po index bd35df132d..96d8722820 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -659,9 +659,6 @@ 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" From 40877237772ad6ba326129edeaca5fec21884aea Mon Sep 17 00:00:00 2001 From: Stanislas Date: Thu, 12 Mar 2026 09:46:36 +0100 Subject: [PATCH 5/7] Update locales/fr_FR.po --- locales/fr_FR.po | 4 ---- 1 file changed, 4 deletions(-) diff --git a/locales/fr_FR.po b/locales/fr_FR.po index 5bf82272d6..743495cf13 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -151,10 +151,6 @@ 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 76c64d3855eaf0876f11e66817033aec919a92c0 Mon Sep 17 00:00:00 2001 From: Stanislas Date: Thu, 12 Mar 2026 09:47:08 +0100 Subject: [PATCH 6/7] Update locales/en_GB.po --- locales/en_GB.po | 1 - 1 file changed, 1 deletion(-) diff --git a/locales/en_GB.po b/locales/en_GB.po index 96d8722820..46315e0de3 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -659,7 +659,6 @@ 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/config.class.php:278 msgid "Asked" msgstr "Asked" From 7c17ed6f76f5f36a1ccda82d5578e1c43a0fc053 Mon Sep 17 00:00:00 2001 From: Stanislas Kita Date: Thu, 12 Mar 2026 09:48:56 +0100 Subject: [PATCH 7/7] revert --- CHANGELOG.md | 1 - locales/en_GB.po | 2 +- locales/fr_FR.po | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4b58477d2..233952fe40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,6 @@ 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] ### Fixed diff --git a/locales/en_GB.po b/locales/en_GB.po index 46315e0de3..a5211a8933 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 diff --git a/locales/fr_FR.po b/locales/fr_FR.po index 743495cf13..afccdb7627 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