mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #856 from ThomasdenH/develop

Browse source 
Resolve string conflict
This commit is contained in:
Ted John 2015-02-22 16:55:04 +00:00
commit 1bfbec6abe
3 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/language/english_uk.txt
View file

@ -2687,11 +2687,11 @@ STR_2681 :???
STR_2682 :???
STR_2683 :???
STR_2684 :???
STR_2685 :???
STR_2686 :???
STR_2687 :???
STR_2688 :???
STR_2689 :???
STR_2685 :Simplex Noise Parameters
STR_2686 :{WINDOW_COLOUR_2}Low:
STR_2687 :{WINDOW_COLOUR_2}High:
STR_2688 :{WINDOW_COLOUR_2}Base Frequency:
STR_2689 :{WINDOW_COLOUR_2}Octaves:
STR_2690 :Map Generation
STR_2691 :{WINDOW_COLOUR_2}Base height:
STR_2692 :{WINDOW_COLOUR_2}Water level:

24
data/language/english_us.txt
View file

@ -2687,11 +2687,11 @@ STR_2681 :???
STR_2682 :???
STR_2683 :???
STR_2684 :???
STR_2685 :???
STR_2686 :???
STR_2687 :???
STR_2688 :???
STR_2689 :???
STR_2685 :Simplex Noise Parameters
STR_2686 :{WINDOW_COLOUR_2}Low:
STR_2687 :{WINDOW_COLOUR_2}High:
STR_2688 :{WINDOW_COLOUR_2}Base Frequency:
STR_2689 :{WINDOW_COLOUR_2}Octaves:
STR_2690 :Map Generation
STR_2691 :{WINDOW_COLOUR_2}Base height:
STR_2692 :{WINDOW_COLOUR_2}Water level:
@ -2702,13 +2702,13 @@ STR_2696 :Place trees
STR_2697 :???
STR_2698 :???
STR_2699 :???
STR_2700 :Simplex Noise Parameters
STR_2701 :{WINDOW_COLOUR_2}Low:
STR_2702 :{WINDOW_COLOUR_2}High:
STR_2703 :{WINDOW_COLOUR_2}Base Frequency:
STR_2704 :{WINDOW_COLOUR_2}Octaves:
STR_2705 :???
STR_2706 :???
STR_2700 :Autosave frequency
STR_2701 :Every week
STR_2702 :Every 2 weeks
STR_2703 :Every month
STR_2704 :Every 4 months
STR_2705 :Every year
STR_2706 :Never
STR_2707 :Open new window
STR_2708 :{WINDOW_COLOUR_1}Are you sure you want to overwrite {STRINGID}?
STR_2709 :Overwrite

10
src/windows/mapgen.c
View file

@ -139,7 +139,7 @@ static rct_widget window_mapgen_simplex_widgets[] = {
{ WWT_DROPDOWN_BUTTON, 1, 104, 198, 52, 63, 2694, STR_NONE },
{ WWT_12, 1, 4, 141, 52, 63, 2700, STR_NONE },
{ WWT_12, 1, 4, 141, 52, 63, 2685, STR_NONE },
{ WWT_SPINNER, 1, 104, 198, 70, 81, STR_NONE, STR_NONE },
{ WWT_DROPDOWN_BUTTON, 1, 187, 197, 71, 75, STR_NUMERIC_UP, STR_NONE },
@ -946,10 +946,10 @@ static void window_mapgen_simplex_paint()
window_draw_widgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
gfx_draw_string_left(dpi, 2701, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_LOW].top + 1);
gfx_draw_string_left(dpi, 2702, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_HIGH].top + 1);
gfx_draw_string_left(dpi, 2703, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_BASE_FREQ].top + 1);
gfx_draw_string_left(dpi, 2704, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_OCTAVES].top + 1);
gfx_draw_string_left(dpi, 2686, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_LOW].top + 1);
gfx_draw_string_left(dpi, 2687, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_HIGH].top + 1);
gfx_draw_string_left(dpi, 2688, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_BASE_FREQ].top + 1);
gfx_draw_string_left(dpi, 2689, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_OCTAVES].top + 1);
gfx_draw_string_left(dpi, STR_MAP_SIZE, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_MAP_SIZE].top + 1);
gfx_draw_string_left(dpi, 2692, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_WATER_LEVEL].top + 1);