diff --git a/apps/statistics/base.de.i18n b/apps/statistics/base.de.i18n index ed222f8d4..3d106e375 100644 --- a/apps/statistics/base.de.i18n +++ b/apps/statistics/base.de.i18n @@ -5,20 +5,20 @@ BoxTab = "Boxplot" Values1 = "Werte V1" Values2 = "Werte V2" Values3 = "Werte V3" -Sizes1 = "Häufigkeiten N1" -Sizes2 = "Häufigkeiten N2" -Sizes3 = "Häufigkeiten N3" +Frequencies1 = "Häufigkeiten N1" +Frequencies2 = "Häufigkeiten N2" +Frequencies3 = "Häufigkeiten N3" ImportList = "Laden einer Liste" Interval = " Intervall" -Size = " Häufigkeit:" -Frequency = "Relative:" +Frequency = " Häufigkeit:" +RelativeFrequency = "Relative:" HistogramSet = "Einstellung des Histogramms" RectangleWidth = "Breite der Rechtecke" BarStart = "Beginn der Serie" FirstQuartile = "Unteres Quartil" Median = "Median" ThirdQuartile = "Oberes Quartil" -TotalSize = "Anzahl der Elemente" +TotalFrequency = "Anzahl der Elemente" Range = "Spannweite" StandardDeviationSigma = "Standardabweichung σ" SampleStandardDeviationS = "Standardabweichung s" diff --git a/apps/statistics/base.en.i18n b/apps/statistics/base.en.i18n index defc6b6f7..88d5cc9ae 100644 --- a/apps/statistics/base.en.i18n +++ b/apps/statistics/base.en.i18n @@ -5,20 +5,20 @@ BoxTab = "Box" Values1 = "Values V1" Values2 = "Values V2" Values3 = "Values V3" -Sizes1 = "Frequencies N1" -Sizes2 = "Frequencies N2" -Sizes3 = "Frequencies N3" +Frequencies1 = "Frequencies N1" +Frequencies2 = "Frequencies N2" +Frequencies3 = "Frequencies N3" ImportList = "Import from a list" Interval = " Interval " -Size = " Frequency:" -Frequency = "Relative:" +Frequency = " Frequency:" +RelativeFrequency = "Relative:" HistogramSet = "Histogram settings" RectangleWidth = "Bin width" BarStart = "X start" FirstQuartile = "First quartile" Median = "Median" ThirdQuartile = "Third quartile" -TotalSize = "Total frequency" +TotalFrequency = "Total frequency" Range = "Range" StandardDeviationSigma = "Standard deviation σ" SampleStandardDeviationS = "Sample std deviation s" diff --git a/apps/statistics/base.es.i18n b/apps/statistics/base.es.i18n index 5fd7103e0..adedc341b 100644 --- a/apps/statistics/base.es.i18n +++ b/apps/statistics/base.es.i18n @@ -5,20 +5,20 @@ BoxTab = "Caja" Values1 = "Valores V1" Values2 = "Valores V2" Values3 = "Valores V3" -Sizes1 = "Frecuencias N1" -Sizes2 = "Frecuencias N2" -Sizes3 = "Frecuencias N3" +Frequencies1 = "Frecuencias N1" +Frequencies2 = "Frecuencias N2" +Frequencies3 = "Frecuencias N3" ImportList = "Importar una lista" Interval = " Intervalo" -Size = " Frecuencia:" -Frequency = "Relativa:" +Frequency = " Frecuencia:" +RelativeFrequency = "Relativa:" HistogramSet = "Parámetros del histograma" RectangleWidth = "Ancho del rectangulo" BarStart = "Principio de la serie" FirstQuartile = "Primer cuartil" Median = "Mediana" ThirdQuartile = "Tercer cuartil" -TotalSize = "Población" +TotalFrequency = "Población" Range = "Rango" StandardDeviationSigma = "Desviación típica σ" SampleStandardDeviationS = "Desviación típica s" diff --git a/apps/statistics/base.fr.i18n b/apps/statistics/base.fr.i18n index 05892eb4b..500967191 100644 --- a/apps/statistics/base.fr.i18n +++ b/apps/statistics/base.fr.i18n @@ -5,20 +5,20 @@ BoxTab = "Boîte" Values1 = "Valeurs V1" Values2 = "Valeurs V2" Values3 = "Valeurs V3" -Sizes1 = "Effectifs N1" -Sizes2 = "Effectifs N2" -Sizes3 = "Effectifs N3" +Frequencies1 = "Effectifs N1" +Frequencies2 = "Effectifs N2" +Frequencies3 = "Effectifs N3" ImportList = "Importer une liste" Interval = " Intervalle " -Size = " Effectif:" -Frequency = "Fréquence:" +Frequency = " Effectif:" +RelativeFrequency = "Fréquence:" HistogramSet = "Réglage de l'histogramme" RectangleWidth = "Largeur des rectangles" BarStart = "Début de la série" FirstQuartile = "Premier quartile" Median = "Médiane" ThirdQuartile = "Troisième quartile" -TotalSize = "Effectif total" +TotalFrequency = "Effectif total" Range = "Étendue" StandardDeviationSigma = "Écart type" SampleStandardDeviationS = "Écart type échantillon" diff --git a/apps/statistics/base.it.i18n b/apps/statistics/base.it.i18n index c2b01ac97..a7159cf61 100644 --- a/apps/statistics/base.it.i18n +++ b/apps/statistics/base.it.i18n @@ -5,20 +5,20 @@ BoxTab = "Box Plot" Values1 = "Valori V1" Values2 = "Valori V2" Values3 = "Valori V3" -Sizes1 = "Frequenze N1" -Sizes2 = "Frequenze N2" -Sizes3 = "Frequenze N3" +Frequencies1 = "Frequenze N1" +Frequencies2 = "Frequenze N2" +Frequencies3 = "Frequenze N3" ImportList = "Importare una lista" Interval = " Intervallo " -Size = " Frequenza:" -Frequency = "Relativa:" +Frequency = " Frequenza:" +RelativeFrequency = "Relativa:" HistogramSet = "Regolazione dell'istogramma" RectangleWidth = "Larghezza dei rettangoli" BarStart = "Inizio della serie" FirstQuartile = "Primo quartile" Median = "Mediana" ThirdQuartile = "Terzo quartile" -TotalSize = "Dimensione totale" +TotalFrequency = "Dimensione totale" Range = "Ampiezza" StandardDeviationSigma = "Deviazione standard σ" SampleStandardDeviationS = "Dev. std campionaria s" diff --git a/apps/statistics/base.nl.i18n b/apps/statistics/base.nl.i18n index 884aad2c4..aaf3b7f8c 100644 --- a/apps/statistics/base.nl.i18n +++ b/apps/statistics/base.nl.i18n @@ -5,20 +5,20 @@ BoxTab = "Box" Values1 = "Waarden V1" Values2 = "Waarden V2" Values3 = "Waarden V3" -Sizes1 = "Frequenties N1" -Sizes2 = "Frequenties N2" -Sizes3 = "Frequenties N3" +Frequencies1 = "Frequenties N1" +Frequencies2 = "Frequenties N2" +Frequencies3 = "Frequenties N3" ImportList = "Importeren uit een lijst" Interval = " Interval " -Size = " Frequentie:" -Frequency = "Proportie:" +Frequency = " Frequentie:" +RelativeFrequency = "Proportie:" HistogramSet = "Histogram instellingen" RectangleWidth = "Kolombreedte" BarStart = "X start" FirstQuartile = "Eerste kwartiel" Median = "Mediaan" ThirdQuartile = "Derde kwartiel" -TotalSize = "Totale omvang" +TotalFrequency = "Totale omvang" Range = "Bereik" StandardDeviationSigma = "Standaardafwijking σ" SampleStandardDeviationS = "Standaardafwijking s" diff --git a/apps/statistics/base.pt.i18n b/apps/statistics/base.pt.i18n index 505efa06f..9d46b27cf 100644 --- a/apps/statistics/base.pt.i18n +++ b/apps/statistics/base.pt.i18n @@ -5,20 +5,20 @@ BoxTab = "Caixa" Values1 = "Valores V1" Values2 = "Valores V2" Values3 = "Valores V3" -Sizes1 = "Frequências N1" -Sizes2 = "Frequências N2" -Sizes3 = "Frequências N3" +Frequencies1 = "Frequências N1" +Frequencies2 = "Frequências N2" +Frequencies3 = "Frequências N3" ImportList = "Importar de uma lista" Interval = " Intervalo" -Size = " Frequência:" -Frequency = "Relativa:" +Frequency = " Frequência:" +RelativeFrequency = "Relativa:" HistogramSet = "Configurando o histograma" RectangleWidth = "Largura dos retângulos" BarStart = "Início da série" FirstQuartile = "Primeiro quartil" Median = "Mediana" ThirdQuartile = "Terceiro quartil" -TotalSize = "Dimensão" +TotalFrequency = "Dimensão" Range = "Amplitude" StandardDeviationSigma = "Desvio padrão σ" SampleStandardDeviationS = "Desvio padrão amostral s" diff --git a/apps/statistics/calculation_controller.cpp b/apps/statistics/calculation_controller.cpp index 2a0f52e0a..da22e200f 100644 --- a/apps/statistics/calculation_controller.cpp +++ b/apps/statistics/calculation_controller.cpp @@ -74,7 +74,7 @@ void CalculationController::willDisplayCellAtLocation(HighlightCell * cell, int if (i == 0) { // Display a calculation title cell I18n::Message titles[k_totalNumberOfRows] = { - I18n::Message::TotalSize, + I18n::Message::TotalFrequency, I18n::Message::Minimum, I18n::Message::Maximum, I18n::Message::Range, diff --git a/apps/statistics/histogram_banner_view.cpp b/apps/statistics/histogram_banner_view.cpp index ccfc19d0d..2bd704f47 100644 --- a/apps/statistics/histogram_banner_view.cpp +++ b/apps/statistics/histogram_banner_view.cpp @@ -7,9 +7,9 @@ namespace Statistics { HistogramBannerView::HistogramBannerView() : m_intervalLegendView(Font(), I18n::Message::Interval, 0.0f, 0.5f, TextColor(), BackgroundColor()), m_intervalView(Font(), 0.0f, 0.5f, TextColor(), BackgroundColor()), - m_sizeLegendView(Font(), I18n::Message::Size, 0.0f, 0.5f, TextColor(), BackgroundColor()), + m_sizeLegendView(Font(), I18n::Message::Frequency, 0.0f, 0.5f, TextColor(), BackgroundColor()), m_sizeView(Font(), 0.0f, 0.5f, TextColor(), BackgroundColor()), - m_frequencyLegendView(Font(), I18n::Message::Frequency, 0.0f, 0.5f, TextColor(), BackgroundColor()), + m_frequencyLegendView(Font(), I18n::Message::RelativeFrequency, 0.0f, 0.5f, TextColor(), BackgroundColor()), m_frequencyView(Font(), 0.0f, 0.5f, TextColor(), BackgroundColor()) { } diff --git a/apps/statistics/store_controller.cpp b/apps/statistics/store_controller.cpp index ad7ae5a49..dce6f5d76 100644 --- a/apps/statistics/store_controller.cpp +++ b/apps/statistics/store_controller.cpp @@ -46,7 +46,7 @@ void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int I18n::Message valuesMessages[] = {I18n::Message::Values1, I18n::Message::Values2, I18n::Message::Values3}; mytitleCell->setText(I18n::translate(valuesMessages[seriesIndex])); } else { - I18n::Message sizesMessages[] = {I18n::Message::Sizes1, I18n::Message::Sizes2, I18n::Message::Sizes3}; + I18n::Message sizesMessages[] = {I18n::Message::Frequencies1, I18n::Message::Frequencies2, I18n::Message::Frequencies3}; mytitleCell->setText(I18n::translate(sizesMessages[seriesIndex])); } mytitleCell->setColor(m_store->numberOfPairsOfSeries(seriesIndex) == 0 ? Palette::GrayDark : Store::colorOfSeriesAtIndex(seriesIndex)); // TODO Share GrayDark with graph/list_controller