diff options
64 files changed, 147 insertions, 143 deletions
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 04c3a7581..79c548e9c 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -165,10 +165,15 @@ struct ValuesInterval { struct BaseGraphWindow : Window { protected: static const int GRAPH_MAX_DATASETS = 64; + static const int GRAPH_BASE_COLOUR = GREY_SCALE(2); + static const int GRAPH_GRID_COLOUR = GREY_SCALE(3); static const int GRAPH_AXIS_LINE_COLOUR = GREY_SCALE(1); static const int GRAPH_ZERO_LINE_COLOUR = GREY_SCALE(8); + static const int GRAPH_YEAR_LINE_COLOUR = GREY_SCALE(5); static const int GRAPH_NUM_MONTHS = 24; ///< Number of months displayed in the graph. + static const TextColour GRAPH_AXIS_LABEL_COLOUR = TC_BLACK; ///< colour of the graph axis label. + static const int MIN_GRAPH_NUM_LINES_Y = 9; ///< Minimal number of horizontal lines to draw. static const int MIN_GRID_PIXEL_SIZE = 20; ///< Minimum distance between graph lines. @@ -176,7 +181,6 @@ protected: byte num_dataset; byte num_on_x_axis; byte num_vert_lines; - static const TextColour graph_axis_label_colour = TC_BLACK; ///< colour of the graph axis label. /* The starting month and year that values are plotted against. If month is * 0xFF, use x_values_start and x_values_increment below instead. */ @@ -293,12 +297,10 @@ protected: static_assert(GRAPH_MAX_DATASETS >= (int)NUM_CARGO && GRAPH_MAX_DATASETS >= (int)MAX_COMPANIES); assert(this->num_vert_lines > 0); - byte grid_colour = GREY_SCALE(3); - /* Rect r will be adjusted to contain just the graph, with labels being * placed outside the area. */ r.top += 5 + GetCharacterHeight(FS_SMALL) / 2; - r.bottom -= (this->month == 0xFF ? 1 : 3) * GetCharacterHeight(FS_SMALL) + 4; + r.bottom -= (this->month == 0xFF ? 1 : 2) * GetCharacterHeight(FS_SMALL) + 4; r.left += 9; r.right -= 5; @@ -327,7 +329,7 @@ protected: x_axis_offset = (int)((r.bottom - r.top) * (double)interval.highest / (double)interval_size); /* Draw the background of the graph itself. */ - GfxFillRect(r.left, r.top, r.right, r.bottom, GREY_SCALE(2)); + GfxFillRect(r.left, r.top, r.right, r.bottom, GRAPH_BASE_COLOUR); /* Draw the vertical grid lines. */ @@ -335,7 +337,7 @@ protected: x = r.left + x_sep; for (int i = 0; i < this->num_vert_lines; i++) { - GfxFillRect(x, r.top, x, r.bottom, grid_colour); + GfxFillRect(x, r.top, x, r.bottom, GRAPH_GRID_COLOUR); x += x_sep; } @@ -344,7 +346,7 @@ protected: for (int i = 0; i < (num_hori_lines + 1); i++) { GfxFillRect(r.left - 3, y, r.left - 1, y, GRAPH_AXIS_LINE_COLOUR); - GfxFillRect(r.left, y, r.right, y, grid_colour); + GfxFillRect(r.left, y, r.right, y, GRAPH_GRID_COLOUR); y -= y_sep; } @@ -370,13 +372,13 @@ protected: for (int i = 0; i < (num_hori_lines + 1); i++) { SetDParam(0, this->format_str_y_axis); SetDParam(1, y_label); - DrawString(r.left - label_width - 4, r.left - 4, y, STR_GRAPH_Y_LABEL, graph_axis_label_colour, SA_RIGHT); + DrawString(r.left - label_width - 4, r.left - 4, y, STR_GRAPH_Y_LABEL, GRAPH_AXIS_LABEL_COLOUR, SA_RIGHT); y_label -= y_label_separation; y += y_sep; } - /* draw strings on the x axis */ + /* Draw x-axis labels and markings for graphs based on financial quarters and years. */ if (this->month != 0xFF) { x = r.left; y = r.bottom + 2; @@ -384,26 +386,28 @@ protected: Year year = this->year; for (int i = 0; i < this->num_on_x_axis; i++) { SetDParam(0, month + STR_MONTH_ABBREV_JAN); - SetDParam(1, month + STR_MONTH_ABBREV_JAN + 2); - SetDParam(2, year); - DrawStringMultiLine(x, x + x_sep, y, this->height, month == 0 ? STR_GRAPH_X_LABEL_MONTH_YEAR : STR_GRAPH_X_LABEL_MONTH, graph_axis_label_colour); + SetDParam(1, year); + DrawStringMultiLine(x, x + x_sep, y, this->height, month == 0 ? STR_GRAPH_X_LABEL_MONTH_YEAR : STR_GRAPH_X_LABEL_MONTH, GRAPH_AXIS_LABEL_COLOUR, SA_LEFT); month += 3; if (month >= 12) { month = 0; year++; + + /* Draw a lighter grid line between years. Top and bottom adjustments ensure we don't draw over top and bottom horizontal grid lines. */ + GfxFillRect(x + x_sep, r.top + 1, x + x_sep, r.bottom - 1, GRAPH_YEAR_LINE_COLOUR); } x += x_sep; } } else { - /* Draw the label under the data point rather than on the grid line. */ + /* Draw x-axis labels for graphs not based on quarterly performance (cargo payment rates). */ x = r.left; y = r.bottom + 2; uint16 label = this->x_values_start; for (int i = 0; i < this->num_on_x_axis; i++) { SetDParam(0, label); - DrawString(x + 1, x + x_sep - 1, y, STR_GRAPH_Y_LABEL_NUMBER, graph_axis_label_colour, SA_HOR_CENTER); + DrawString(x + 1, x + x_sep - 1, y, STR_GRAPH_Y_LABEL_NUMBER, GRAPH_AXIS_LABEL_COLOUR, SA_HOR_CENTER); label += this->x_values_increment; x += x_sep; @@ -493,13 +497,13 @@ public: uint x_label_width = 0; + /* Draw x-axis labels and markings for graphs based on financial quarters and years. */ if (this->month != 0xFF) { byte month = this->month; Year year = this->year; for (int i = 0; i < this->num_on_x_axis; i++) { SetDParam(0, month + STR_MONTH_ABBREV_JAN); - SetDParam(1, month + STR_MONTH_ABBREV_JAN + 2); - SetDParam(2, year); + SetDParam(1, year); x_label_width = std::max(x_label_width, GetStringBoundingBox(month == 0 ? STR_GRAPH_X_LABEL_MONTH_YEAR : STR_GRAPH_X_LABEL_MONTH).width); month += 3; @@ -509,7 +513,7 @@ public: } } } else { - /* Draw the label under the data point rather than on the grid line. */ + /* Draw x-axis labels for graphs not based on quarterly performance (cargo payment rates). */ SetDParamMaxValue(0, this->x_values_start + this->num_on_x_axis * this->x_values_increment, 0, FS_SMALL); x_label_width = GetStringBoundingBox(STR_GRAPH_Y_LABEL_NUMBER).width; } diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index bfaea6bf9..e853dea6f 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -569,8 +569,8 @@ STR_MONTH_DEC :Desember # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Sleutel STR_GRAPH_KEY_TOOLTIP :{BLACK}Wys sleutel van grafieke -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 3fdaf5cdd..49c0a7b11 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -538,8 +538,8 @@ STR_MONTH_DEC :ديسمبر # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}مفتاح STR_GRAPH_KEY_TOOLTIP :{BLACK}اظهار مفتاح الرسم البياني -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 1a011dbb3..c3c9af1fe 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -555,8 +555,8 @@ STR_MONTH_DEC :Abendua # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Giltza STR_GRAPH_KEY_TOOLTIP :{BLACK}Erakutsi giltza grafikoetan -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 3aa602c9a..01ce0bba9 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -878,8 +878,8 @@ STR_MONTH_DEC :Сьнежан # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Леґенда STR_GRAPH_KEY_TOOLTIP :{BLACK}Паказаць леґенду да ґрафікаў -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index b86aca3ae..52906826e 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -569,8 +569,8 @@ STR_MONTH_DEC :Dezembro # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Chave STR_GRAPH_KEY_TOOLTIP :{BLACK}Exibir chave aos gráficos -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{} {NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 6b53d9323..45e93466e 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -561,8 +561,8 @@ STR_MONTH_DEC :Декемвр # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Легенда STR_GRAPH_KEY_TOOLTIP :{BLACK}Покажи легендата на графиката -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index cf041cd8f..49c737866 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -577,8 +577,8 @@ STR_MONTH_DEC :Desembre # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Llegenda STR_GRAPH_KEY_TOOLTIP :{BLACK}Mostra la llegenda dels gràfics -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index baa79fff3..e9c5d1d02 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -664,8 +664,8 @@ STR_MONTH_DEC :Prosinac # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Ključ STR_GRAPH_KEY_TOOLTIP :{BLACK}Pokaži ključeve na grafikonima -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 5202ae6e1..cb6990ac2 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -655,8 +655,8 @@ STR_MONTH_DEC.gen :prosince # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Legenda STR_GRAPH_KEY_TOOLTIP :{BLACK}Zobrazit legendu ke grafům -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/danish.txt b/src/lang/danish.txt index fa08cdc2d..9b01ad2c9 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -568,8 +568,8 @@ STR_MONTH_DEC :december # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Nøgle STR_GRAPH_KEY_TOOLTIP :{BLACK}Vis nøglen til grafer -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 7dec5e449..5ab8d67f3 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -576,8 +576,8 @@ STR_MONTH_DEC :December # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Legenda STR_GRAPH_KEY_TOOLTIP :{BLACK}Legenda bij deze grafiek weergeven -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/english.txt b/src/lang/english.txt index 365383077..524dbbd2c 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -576,8 +576,8 @@ STR_MONTH_DEC :December # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Key STR_GRAPH_KEY_TOOLTIP :{BLACK}Show key to graphs -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING2} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 9ea557a21..1c8d244ae 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -550,8 +550,8 @@ STR_MONTH_DEC :December # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Key STR_GRAPH_KEY_TOOLTIP :{BLACK}Show key to graphs -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 88ae9d022..0917ca169 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -576,8 +576,8 @@ STR_MONTH_DEC :December # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Key STR_GRAPH_KEY_TOOLTIP :{BLACK}Show key to graphs -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 2cabb46a1..321d5b344 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -553,8 +553,8 @@ STR_MONTH_DEC :Decembro # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Ŝlosilo STR_GRAPH_KEY_TOOLTIP :{BLACK}Montru ŝlosilon al grafikoj -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 7cfde85ea..344d64873 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -633,8 +633,8 @@ STR_MONTH_DEC :Detsember # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Selgitus STR_GRAPH_KEY_TOOLTIP :{BLACK}Näita selgitust graafikute juures -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 0666e3492..bffc07888 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -538,8 +538,8 @@ STR_MONTH_DEC :Desembur # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Lykil STR_GRAPH_KEY_TOOLTIP :{BLACK}Vís lykil til graf -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 077297d50..11802c515 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -576,8 +576,8 @@ STR_MONTH_DEC :Joulukuu # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Selite STR_GRAPH_KEY_TOOLTIP :{BLACK}Näytä kuvaajan selite -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/french.txt b/src/lang/french.txt index c45d3dd71..0f40467a9 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -577,8 +577,8 @@ STR_MONTH_DEC :Décembre # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Légende STR_GRAPH_KEY_TOOLTIP :{BLACK}Afficher la légende -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index d4f09bd1b..f5995d3a2 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -758,8 +758,8 @@ STR_MONTH_DEC.dat :Dùbhlachd # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Iuchair STR_GRAPH_KEY_TOOLTIP :{BLACK}Seall iuchair nan graf -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index daddb2bf5..e12c3f401 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -569,8 +569,8 @@ STR_MONTH_DEC :Decembro # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Lenda STR_GRAPH_KEY_TOOLTIP :{BLACK}Amosa-la lenda das gráficas -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/german.txt b/src/lang/german.txt index e8c2d0718..8f48725d8 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -577,8 +577,8 @@ STR_MONTH_DEC :Dezember # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Legende STR_GRAPH_KEY_TOOLTIP :{BLACK}Legende des Diagramms anzeigen -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/greek.txt b/src/lang/greek.txt index efff2947b..1d0d80126 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -670,8 +670,8 @@ STR_MONTH_DEC :Δεκέμβρ # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Υπόμνημα STR_GRAPH_KEY_TOOLTIP :{BLACK}Εμφάνιση υπομνήματος στα γραφήματα -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index ceae1679d..a20b9f459 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -574,8 +574,8 @@ STR_MONTH_DEC :דצמבר # Graph window STR_GRAPH_KEY_BUTTON :{BLACK} STR_GRAPH_KEY_TOOLTIP :{BLACK}הצג מפתחות לגרפים -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 1ae020bf6..0386fb04a 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -631,8 +631,8 @@ STR_MONTH_DEC :december # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Jelkulcs STR_GRAPH_KEY_TOOLTIP :{BLACK}A grafikonok jelmagyarázata -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 99727dffb..fdc36722c 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -537,8 +537,8 @@ STR_MONTH_DEC :Desember # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Lykill STR_GRAPH_KEY_TOOLTIP :{BLACK}Sýna lykilmynd -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 0fda7dfdf..e7312750b 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -576,8 +576,8 @@ STR_MONTH_DEC :Desember # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Item STR_GRAPH_KEY_TOOLTIP :{BLACK}Tampilkan grafik item -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 68db8dd26..a98a1a497 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -559,8 +559,8 @@ STR_MONTH_DEC :Nollaig # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Eochair STR_GRAPH_KEY_TOOLTIP :{BLACK}Taispeáin eochair na ngraf -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 7db8a24d1..8052c9666 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -570,8 +570,8 @@ STR_MONTH_DEC :Dicembre # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Legenda STR_GRAPH_KEY_TOOLTIP :{BLACK}Mostra la legenda del grafico -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 18cbf92ed..28e997c08 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -577,8 +577,8 @@ STR_MONTH_DEC :{G=m}12월 # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}범례 STR_GRAPH_KEY_TOOLTIP :{BLACK}그래프의 범례를 보여줍니다. -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/latin.txt b/src/lang/latin.txt index ccbbbe97c..94208f6bd 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -750,8 +750,8 @@ STR_MONTH_DEC :Decembris # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Clavis STR_GRAPH_KEY_TOOLTIP :{BLACK}Monstrare formularum clavem -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 492047bff..ff091a55b 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -578,8 +578,8 @@ STR_MONTH_DEC :Decembris # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Apzīmējumu atslēga STR_GRAPH_KEY_TOOLTIP :{BLACK}Diagrammās rādīt apzīmējumu atslēgas -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index af89a3bf5..3e215c955 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -755,8 +755,8 @@ STR_MONTH_DEC :Gruodis # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Spalva STR_GRAPH_KEY_TOOLTIP :{BLACK}Rodo žaidėjų spalvas -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 1bac4dfa3..e5ffb113b 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -568,8 +568,8 @@ STR_MONTH_DEC :Dezember # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Legend STR_GRAPH_KEY_TOOLTIP :{BLACK}Weis d'Legend vun der Grafik -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 10c417cc8..86e5c7d7c 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -541,8 +541,8 @@ STR_MONTH_DEC :Disember # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Kunci STR_GRAPH_KEY_TOOLTIP :{BLACK}Tunjukkan kunci kepada graf -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 75d3a22a3..c1271764a 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -578,8 +578,8 @@ STR_MONTH_DEC :desember # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Nøkkel STR_GRAPH_KEY_TOOLTIP :{BLACK}Vis nøkkel for grafene -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 4f518caaa..5f8ccf038 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -561,8 +561,8 @@ STR_MONTH_DEC :desember # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Nøkkel STR_GRAPH_KEY_TOOLTIP :{BLACK}Syne nøkkel til grafer -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 2999ccd63..cf422cf11 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -955,8 +955,8 @@ STR_MONTH_DEC :Grudzień # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Legenda STR_GRAPH_KEY_TOOLTIP :{BLACK}Pokaż legendę na wykresie -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 264623f6a..9bf686b79 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -571,8 +571,8 @@ STR_MONTH_DEC :Dezembro # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Chave STR_GRAPH_KEY_TOOLTIP :{BLACK}Mostrar chave dos gráficos -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index e97decc4c..98c784a02 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -563,8 +563,8 @@ STR_MONTH_DEC :decembrie # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Legendă STR_GRAPH_KEY_TOOLTIP :{BLACK}Afişează legenda graficelor -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 97594c8a2..69497c9b0 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -714,8 +714,8 @@ STR_MONTH_DEC :Декабрь # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Легенда STR_GRAPH_KEY_TOOLTIP :{BLACK}Показать легенду к графикам -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index b673c738d..8b354f6b3 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -747,8 +747,8 @@ STR_MONTH_DEC :Decembar # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Legenda STR_GRAPH_KEY_TOOLTIP :{BLACK}Prikaži legendu -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index c3fc02132..c3f0d91e8 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -568,8 +568,8 @@ STR_MONTH_DEC :12月 # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}索引 STR_GRAPH_KEY_TOOLTIP :{BLACK}显示图表的公司索引 -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 194e4393c..216e5d879 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -640,8 +640,8 @@ STR_MONTH_DEC :December # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Vyb. STR_GRAPH_KEY_TOOLTIP :{BLACK}Vybrať položky na grafe -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 20d161724..ef98334b3 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -712,8 +712,8 @@ STR_MONTH_DEC :December # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Ključ STR_GRAPH_KEY_TOOLTIP :{BLACK}Prikaži ključe grafov -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index adc38eebb..3b884dc54 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -577,8 +577,8 @@ STR_MONTH_DEC :Diciembre # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Leyenda STR_GRAPH_KEY_TOOLTIP :{BLACK}Mostrar leyenda en gráficos -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index cdc083730..14f44aef3 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -577,8 +577,8 @@ STR_MONTH_DEC :Diciembre # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Leyenda STR_GRAPH_KEY_TOOLTIP :{BLACK}Mostrar leyenda de gráficas -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 57211acd6..37e759e92 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -568,8 +568,8 @@ STR_MONTH_DEC :december # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Nyckel STR_GRAPH_KEY_TOOLTIP :{BLACK}Visa nyckel till grafer -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index a35bf4b36..889af7ce1 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -560,8 +560,8 @@ STR_MONTH_DEC :டிசம் # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}பட விளக்கக் குறிப்பு STR_GRAPH_KEY_TOOLTIP :{BLACK}பட விளக்கக் குறிப்பு காண்பி -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 85779fe77..602260b57 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -551,8 +551,8 @@ STR_MONTH_DEC :ธันวา # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}ตัวเลือก STR_GRAPH_KEY_TOOLTIP :{BLACK}แสดงตัวเลือกกราฟ -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 33243085c..86f13bb82 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -560,8 +560,8 @@ STR_MONTH_DEC :十二月 # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}圖例 STR_GRAPH_KEY_TOOLTIP :{BLACK}顯示圖例 -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index aef3eb4c5..166f45649 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -569,8 +569,8 @@ STR_MONTH_DEC :Aralık # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Anahtar STR_GRAPH_KEY_TOOLTIP :{BLACK}Grafik anahtarını göster -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index ea2c76e92..bdb65958c 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -696,8 +696,8 @@ STR_MONTH_DEC :Грудень # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Легенда STR_GRAPH_KEY_TOOLTIP :{BLACK}Показати легенду графіка -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index af6448e0e..e877aa922 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -358,8 +358,8 @@ STR_MONTH_DEC :Раштав # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Уҫӑ -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 50a5d849a..474dd47f1 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -559,8 +559,8 @@ STR_MONTH_DEC :Desimber # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Kaai STR_GRAPH_KEY_TOOLTIP :{BLACK}Lit kaai foar grafyk sjen -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index 2c0511af3..bd0f5485c 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -349,8 +349,8 @@ STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Livrita kargajo ############ range for months ends # Graph window -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 774ac60b0..eb210b69a 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -532,8 +532,8 @@ STR_MONTH_DEC :декемвр # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Клучни STR_GRAPH_KEY_TOOLTIP :{BLACK}Прикажи клуч за графикони -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt index fcb0cebb3..5920bfd6f 100644 --- a/src/lang/unfinished/maltese.txt +++ b/src/lang/unfinished/maltese.txt @@ -318,8 +318,8 @@ STR_FILE_MENU_SEPARATOR : ############ range for months ends # Graph window -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt index 34e71bbdb..afae5e406 100644 --- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -522,8 +522,8 @@ STR_MONTH_DEC :डिसें # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}किल्ली STR_GRAPH_KEY_TOOLTIP :{BLACK}आलेख दर्शवा की -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index 02799129f..06e962c89 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -551,8 +551,8 @@ STR_MONTH_DEC :دسامبر # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}کلید STR_GRAPH_KEY_TOOLTIP :{BLACK}نمایش راهنمای نمودار -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 51a486a2a..7a25135ad 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -541,8 +541,8 @@ STR_MONTH_DEC :دسمبر # Graph window STR_GRAPH_KEY_BUTTON :{BLACK} کلید STR_GRAPH_KEY_TOOLTIP :{BLACK}مخطط کی کلیدیں دکھائیں -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index d40a49793..2e2e708e0 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -568,8 +568,8 @@ STR_MONTH_DEC :Tháng Mười # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Nút STR_GRAPH_KEY_TOOLTIP :{BLACK}Hiện khóa trên biểu đồ -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 5b524cf3f..13e847ad3 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -559,8 +559,8 @@ STR_MONTH_DEC :Rhagfyr # Graph window STR_GRAPH_KEY_BUTTON :{BLACK}Allwedd STR_GRAPH_KEY_TOOLTIP :{BLACK}Dangos allwedd i'r graffiau -STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING} -STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM} +STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING} +STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING} STR_GRAPH_Y_LABEL_NUMBER :{TINY_FONT}{COMMA} |