diff --git a/apps/i18n.cpp b/apps/i18n.cpp
index a9a672a09..29883e651 100644
--- a/apps/i18n.cpp
+++ b/apps/i18n.cpp
@@ -25,7 +25,7 @@ constexpr static char deviationSpanishDefinition[] = {Ion::Charset::SmallSigma,
 constexpr static char deviationGermanDefinition[] = {Ion::Charset::SmallSigma, ' ', ':', ' ', 'S', 't', 'a', 'n', 'd', 'a', 'r', 'd', 'a', 'b', 'w', 'e', 'i', 'c', 'h', 'u', 'n', 'g', 0};
 constexpr static char deviationPortugueseDefinition[] = {Ion::Charset::SmallSigma, ' ', ':', ' ', 'D', 'e','s','v','i','o',' ','p','a','d','r','a','o', 0};
 
-const char * messages[225][5] {
+const char * messages[231][5] {
   {"Attention", "Warning", "Cuidado", "Achtung", "Atencao"},
   {"Valider", "Confirm", "Confirmar", "Bestatigen", "Confirmar"},
   {"Annuler", "Cancel", "Cancelar", "Abbrechen", "Cancelar"},
@@ -83,6 +83,12 @@ const char * messages[225][5] {
   {"Partie fractionnaire", "Fractional part", "Parte fraccionaria", "Bruchanteil" , "Parte fraccionaria"},
   {"Plafond", "Ceiling", "Techo", "Obergrenze", "Teto"},
   {"Arrondi n chiffres", "Rounding to n digits", "Redondeo n digitos", "Runden", "Arredondar"},
+  {"Cosinus hyperbolique", "Hyperbolic cosine", "Coseno hiperbolico", "Kosinus hyperbolicus", "Cosseno hiperbolico"},
+  {"Sinus hyperbolique", "Hyperbolic sine", "Seno hiperbolico", "Sinus hyperbolicus", "Seno hiperbolico"},
+  {"Tangente hyperbolique", "Hyperbolic tangent", "Tangente hiperbolica", "Tangens hyperbolicus", "Tangente hiperbolica"},
+  {"Argument cosinus hyperbolique", "Inverse hyperbolic cosine", "Argumento coseno hiperbolico", "Areakosinus hyperbolicus", "Arco cosseno hiperbolico"},
+  {"Argument sinus hyperbolique", "Inverse hyperbolic sine", "Argumento seno hiperbolico", "Areasinus hyperbolicus", "Arco seno hiperbolico"},
+  {"Argument tangente hyperbolique", "Inverse hyperbolic tangent", "Argumento tangente hiperbolica", "Areatangens hyperbolicus", "Arco tangente hiperbolica"},
   {"Intervalle fluctuation 95% (Term)", "Prediction interval 95%", "Intervalo de prediccion 95%", "Schwankungsbereich 95%", "Intervalo de previsao 95%"},
   {"Intervalle fluctuation simple (2de)", "Simple prediction interval", "Intervalo de prediccion simple", "Einfaches Schwankungsbereich", "Intervalo de previsao simples"},
   {"Intervalle confiance", "Confidence interval", "Intervalo de confianza", "Konfidenzintervall", "Intervalo de confianca"},
@@ -299,7 +305,7 @@ constexpr static char leftIntegralFirstLegend[] = {'P', '(', 'X', Ion::Charset::
 constexpr static char finiteIntegralLegend[] = {Ion::Charset::LessEqual, 'X', Ion::Charset::LessEqual, 0};
 
 
-const char * universalMessages[244] {
+const char * universalMessages[238] {
   "",
   "alpha",
   "ALPHA",
@@ -315,13 +321,6 @@ const char * universalMessages[244] {
   "r",
   sxy,
 
-  "cosh",
-  "sinh",
-  "tanh",
-  "acosh",
-  "asinh",
-  "atanh",
-
   "Xmin",
   "Xmax",
   "Ymin",
diff --git a/apps/i18n.h b/apps/i18n.h
index 8d8ae0a0b..10af0b0a1 100644
--- a/apps/i18n.h
+++ b/apps/i18n.h
@@ -63,6 +63,12 @@ namespace I18n {
     FracPart,
     Ceiling,
     Rounding,
+    HyperbolicCosine,
+    HyperbolicSine,
+    HyperbolicTangent,
+    InverseHyperbolicCosine,
+    InverseHyperbolicSine,
+    InverseHyperbolicTangent,
     Prediction95,
     Prediction,
     Confidence,
@@ -270,13 +276,6 @@ namespace I18n {
     R,
     Sxy,
 
-    Cosh,
-    Sinh,
-    Tanh,
-    Acosh,
-    Asinh,
-    Atanh,
-
     XMin,
     XMax,
     YMin,
diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp
index cdf4e14b4..9f06ad683 100644
--- a/apps/math_toolbox.cpp
+++ b/apps/math_toolbox.cpp
@@ -18,7 +18,7 @@ const ToolboxNode matricesChildren[5] = {ToolboxNode(I18n::Message::InverseComma
 const ToolboxNode listesChildren[5] = {ToolboxNode(I18n::Message::SortCommandWithArg, I18n::Message::Sort, I18n::Message::SortCommand), ToolboxNode(I18n::Message::InvSortCommandWithArg, I18n::Message::InvSort, I18n::Message::InvSortCommand), ToolboxNode(I18n::Message::MaxCommandWithArg, I18n::Message::Maximum, I18n::Message::MaxCommand), ToolboxNode(I18n::Message::MinCommandWithArg, I18n::Message::Minimum, I18n::Message::MinCommand), ToolboxNode(I18n::Message::DimensionCommandWithArg, I18n::Message::Dimension, I18n::Message::DimensionCommand)};
 #endif
 const ToolboxNode approximationChildren[4] = {ToolboxNode(I18n::Message::FloorCommandWithArg, I18n::Message::Floor, I18n::Message::FloorCommand), ToolboxNode(I18n::Message::FracCommandWithArg, I18n::Message::FracPart, I18n::Message::FracCommand), ToolboxNode(I18n::Message::CeilCommandWithArg, I18n::Message::Ceiling, I18n::Message::CeilCommand), ToolboxNode(I18n::Message::RoundCommandWithArg, I18n::Message::Rounding, I18n::Message::RoundCommand)};
-const ToolboxNode trigonometryChildren[6] = {ToolboxNode(I18n::Message::CoshCommandWithArg, I18n::Message::Cosh, I18n::Message::CoshCommand), ToolboxNode(I18n::Message::SinhCommandWithArg, I18n::Message::Sinh, I18n::Message::SinhCommand), ToolboxNode(I18n::Message::TanhCommandWithArg, I18n::Message::Tanh, I18n::Message::TanhCommand), ToolboxNode(I18n::Message::AcoshCommandWithArg, I18n::Message::Acosh, I18n::Message::AcoshCommand), ToolboxNode(I18n::Message::AsinhCommandWithArg, I18n::Message::Asinh, I18n::Message::AsinhCommand), ToolboxNode(I18n::Message::AtanhCommandWithArg, I18n::Message::Atanh, I18n::Message::AtanhCommand)};
+const ToolboxNode trigonometryChildren[6] = {ToolboxNode(I18n::Message::CoshCommandWithArg, I18n::Message::HyperbolicCosine, I18n::Message::CoshCommand), ToolboxNode(I18n::Message::SinhCommandWithArg, I18n::Message::HyperbolicSine, I18n::Message::SinhCommand), ToolboxNode(I18n::Message::TanhCommandWithArg, I18n::Message::HyperbolicTangent, I18n::Message::TanhCommand), ToolboxNode(I18n::Message::AcoshCommandWithArg, I18n::Message::InverseHyperbolicCosine, I18n::Message::AcoshCommand), ToolboxNode(I18n::Message::AsinhCommandWithArg, I18n::Message::InverseHyperbolicSine, I18n::Message::AsinhCommand), ToolboxNode(I18n::Message::AtanhCommandWithArg, I18n::Message::InverseHyperbolicTangent, I18n::Message::AtanhCommand)};
 const ToolboxNode predictionChildren[3] = {ToolboxNode(I18n::Message::Prediction95CommandWithArg, I18n::Message::Prediction95, I18n::Message::Prediction95Command), ToolboxNode(I18n::Message::PredictionCommandWithArg, I18n::Message::Prediction, I18n::Message::PredictionCommand), ToolboxNode(I18n::Message::ConfidenceCommandWithArg, I18n::Message::Confidence, I18n::Message::ConfidenceCommand)};
 
 #if LIST_ARE_DEFINED