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

Fix conflicting strings (#3534)

Browse source
This commit is contained in:
Matte A 2016-05-08 22:55:04 +02:00 committed by Ted John
parent 76cca7ad2e
commit c7c3923556
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/language/en-GB.txt
View file

@ -4122,8 +4122,6 @@ STR_5813 :{OPENQUOTES}{STRING}{ENDQUOTES}
STR_5814 :{WINDOW_COLOUR_1}{OPENQUOTES}{STRING}{ENDQUOTES}
#tooltips
STR_5813 :{SMALLFONT}{BLACK}Use GPU for displaying instead of CPU. Improves compatibility with screen capture software. May slightly decrease performance.
STR_5814 :{SMALLFONT}{BLACK}Enables frame tweening for visually{NEWLINE}smoother gameplay. When disabled,{NEWLINE}the game will run at 40 FPS.
STR_5815 :{SMALLFONT}{BLACK}Display FPS counter in-game
STR_5816 :{SMALLFONT}{BLACK}Sets ratio to scale the game by.{NEWLINE}Most useful when playing in{NEWLINE}high resolutions
STR_5817 :{SMALLFONT}{BLACK}[Requires hardware display]{NEWLINE}Sets UI scaling type
@ -4167,6 +4165,8 @@ STR_5854 :{SMALLFONT}{BLACK}Enable/disable ride music
STR_5855 :{SMALLFONT}{BLACK}Set fullscreen, windowed,{NEWLINE}or borderless display
STR_5856 :{SMALLFONT}{BLACK}Set game resolution when in fullscreen mode
STR_5857 :{SMALLFONT}{BLACK}Game options
STR_5858 :{SMALLFONT}{BLACK}Use GPU for displaying instead of CPU. Improves compatibility with screen capture software. May slightly decrease performance.
STR_5859 :{SMALLFONT}{BLACK}Enables frame tweening for visually{NEWLINE}smoother gameplay. When disabled,{NEWLINE}the game will run at 40 FPS.
#############
# Scenarios #

4
src/localisation/string_ids.h
View file

@ -2461,9 +2461,9 @@ enum {
STR_SHORTCUT_SHOW_MULTIPLAYER = 5812,
STR_HARDWARE_DISPLAY_TIP = 5813,
STR_HARDWARE_DISPLAY_TIP = 5858,
STR_SHOW_FPS_TIP = 5815,
STR_UNCAP_FPS_TIP = 5814,
STR_UNCAP_FPS_TIP = 5859,
STR_WINDOW_SCALE_TIP = 5816,
STR_SCALE_QUALITY_TIP = 5817,
STR_USE_NN_AT_INTEGER_SCALE_TIP = 5818,