From 4331686818912187fe243ff3bc9a308d7e6ef6f3 Mon Sep 17 00:00:00 2001 From: Hugo Saint-Vignes Date: Tue, 7 Jul 2020 18:05:17 +0200 Subject: [PATCH] [apps/toolbox] Update toolbox and additional result text for matrices Change-Id: I59e1561dcb97c75e57f0c24cfe1953ff594daf92 --- .../additional_outputs/matrix_list_controller.cpp | 10 +++++----- apps/calculation/base.de.i18n | 5 +++++ apps/calculation/base.en.i18n | 5 +++++ apps/calculation/base.es.i18n | 5 +++++ apps/calculation/base.fr.i18n | 5 +++++ apps/calculation/base.it.i18n | 5 +++++ apps/calculation/base.nl.i18n | 5 +++++ apps/calculation/base.pt.i18n | 5 +++++ apps/toolbox.fr.i18n | 4 ++-- 9 files changed, 42 insertions(+), 7 deletions(-) diff --git a/apps/calculation/additional_outputs/matrix_list_controller.cpp b/apps/calculation/additional_outputs/matrix_list_controller.cpp index 274c0a125..6ab5e6a6e 100644 --- a/apps/calculation/additional_outputs/matrix_list_controller.cpp +++ b/apps/calculation/additional_outputs/matrix_list_controller.cpp @@ -92,11 +92,11 @@ I18n::Message MatrixListController::messageAtIndex(int index) { // Message index is mapped in setExpression because it depends on the Matrix. assert(index < k_maxNumberOfOutputRows && index >=0); I18n::Message messages[k_maxNumberOfOutputRows] = { - I18n::Message::Determinant, - I18n::Message::Inverse, - I18n::Message::RowEchelonForm, - I18n::Message::ReducedRowEchelonForm, - I18n::Message::Trace}; + I18n::Message::AdditionalDeterminant, + I18n::Message::AdditionalInverse, + I18n::Message::AdditionalRowEchelonForm, + I18n::Message::AdditionalReducedRowEchelonForm, + I18n::Message::AdditionalTrace}; return messages[m_indexMessageMap[index]]; } diff --git a/apps/calculation/base.de.i18n b/apps/calculation/base.de.i18n index 18aab0374..406f27e84 100644 --- a/apps/calculation/base.de.i18n +++ b/apps/calculation/base.de.i18n @@ -7,3 +7,8 @@ BinaryBase = "Binär" PrimeFactors = "Primfaktoren" MixedFraction = "Gemischte Zahl" EuclideanDivision = "Division mit Rest" +AdditionalDeterminant = "Determinante" +AdditionalInverse = "Inverse" +AdditionalRowEchelonForm = "Stufenform" +AdditionalReducedRowEchelonForm = "Reduzierte Stufenform" +AdditionalTrace = "Spur" \ No newline at end of file diff --git a/apps/calculation/base.en.i18n b/apps/calculation/base.en.i18n index 399532fb7..0e54f24cf 100644 --- a/apps/calculation/base.en.i18n +++ b/apps/calculation/base.en.i18n @@ -7,3 +7,8 @@ BinaryBase = "Binary" PrimeFactors = "Prime factors" MixedFraction = "Mixed fraction" EuclideanDivision = "Euclidean division" +AdditionalDeterminant = "Determinant" +AdditionalInverse = "Inverse" +AdditionalRowEchelonForm = "Row echelon form" +AdditionalReducedRowEchelonForm = "Reduced row echelon form" +AdditionalTrace = "Trace" \ No newline at end of file diff --git a/apps/calculation/base.es.i18n b/apps/calculation/base.es.i18n index 25c3c5035..057481a0d 100644 --- a/apps/calculation/base.es.i18n +++ b/apps/calculation/base.es.i18n @@ -7,3 +7,8 @@ BinaryBase = "Binario" PrimeFactors = "Factores primos" MixedFraction = "Fracción mixta" EuclideanDivision = "División euclidiana" +AdditionalDeterminant = "Determinante" +AdditionalInverse = "Inversa" +AdditionalRowEchelonForm = "Matriz escalonada" +AdditionalReducedRowEchelonForm = "Matriz escalonada reducida" +AdditionalTrace = "Traza" \ No newline at end of file diff --git a/apps/calculation/base.fr.i18n b/apps/calculation/base.fr.i18n index ca8e28739..0e155e294 100644 --- a/apps/calculation/base.fr.i18n +++ b/apps/calculation/base.fr.i18n @@ -7,3 +7,8 @@ BinaryBase = "Binaire" PrimeFactors = "Facteurs premiers" MixedFraction = "Fraction mixte" EuclideanDivision = "Division euclidienne" +AdditionalDeterminant = "Déterminant" +AdditionalInverse = "Inverse" +AdditionalRowEchelonForm = "Forme échelonnée" +AdditionalReducedRowEchelonForm = "Forme échelonnée réduite" +AdditionalTrace = "Trace" \ No newline at end of file diff --git a/apps/calculation/base.it.i18n b/apps/calculation/base.it.i18n index 6544c6622..6e60f0964 100644 --- a/apps/calculation/base.it.i18n +++ b/apps/calculation/base.it.i18n @@ -7,3 +7,8 @@ BinaryBase = "Binario" PrimeFactors = "Fattori primi" MixedFraction = "Frazione mista" EuclideanDivision = "Divisione euclidea" +AdditionalDeterminant = "Determinante" +AdditionalInverse = "Inversa" +AdditionalRowEchelonForm = "Matrice a scalini" +AdditionalReducedRowEchelonForm = "Matrice ridotta a scalini" +AdditionalTrace = "Traccia" \ No newline at end of file diff --git a/apps/calculation/base.nl.i18n b/apps/calculation/base.nl.i18n index 0ae59c24a..742f8bdab 100644 --- a/apps/calculation/base.nl.i18n +++ b/apps/calculation/base.nl.i18n @@ -7,3 +7,8 @@ BinaryBase = "Binaire" PrimeFactors = "Priemfactoren" MixedFraction = "Gemengde breuk" EuclideanDivision = "Geheeltallige deling" +AdditionalDeterminant = "Determinant" +AdditionalInverse = "Inverse" +AdditionalRowEchelonForm = "Echelonvorm" +AdditionalReducedRowEchelonForm = "Gereduceerde echelonvorm" +AdditionalTrace = "Spoor" \ No newline at end of file diff --git a/apps/calculation/base.pt.i18n b/apps/calculation/base.pt.i18n index b8e8717aa..2f5720e5e 100644 --- a/apps/calculation/base.pt.i18n +++ b/apps/calculation/base.pt.i18n @@ -7,3 +7,8 @@ BinaryBase = "Binário" PrimeFactors = "Fatores primos" MixedFraction = "Fração mista" EuclideanDivision = "Divisão euclidiana" +AdditionalDeterminant = "Determinante" +AdditionalInverse = "Matriz inversa" +AdditionalRowEchelonForm = "Matriz escalonada" +AdditionalReducedRowEchelonForm = "Matriz escalonada reduzida" +AdditionalTrace = "Traço" \ No newline at end of file diff --git a/apps/toolbox.fr.i18n b/apps/toolbox.fr.i18n index fe354064d..06c358f94 100644 --- a/apps/toolbox.fr.i18n +++ b/apps/toolbox.fr.i18n @@ -134,8 +134,8 @@ Determinant = "Déterminant de M" Transpose = "Transposée de M" Trace = "Trace de M" Dimension = "Taille de M" -RowEchelonForm = "Forme échelonnée" -ReducedRowEchelonForm = "Forme échelonnée réduite" +RowEchelonForm = "Forme échelonnée de M" +ReducedRowEchelonForm = "Forme échelonnée réduite de M" Sort = "Tri croissant" InvSort = "Tri décroissant" Maximum = "Maximum"