mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-08-20 09:57:09 +00:00
fix merged changes
This commit is contained in:
Alexandra-Myers
parent
88f6f11c01
commit
ea0055b563
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
// Auto-generated by StringTable builder — do not edit manually.
|
// Auto-generated by StringTable builder — do not edit manually.
|
||||||
// Source language: en-US
|
// Source language: en-US
|
||||||
// Total strings: 2288
|
// Total strings: 2289
|
||||||
|
|
||||||
#define IDS_NULL 0
|
#define IDS_NULL 0
|
||||||
#define IDS_OK 1
|
#define IDS_OK 1
|
||||||
|
|
@ -2167,127 +2167,128 @@
|
||||||
#define IDS_TUTORIAL_TASK_MINECART_PUSHING 2161
|
#define IDS_TUTORIAL_TASK_MINECART_PUSHING 2161
|
||||||
#define IDS_CONNECTION_FAILED_NO_SD_SPLITSCREEN 2162
|
#define IDS_CONNECTION_FAILED_NO_SD_SPLITSCREEN 2162
|
||||||
#define IDS_TOOLTIPS_CURE 2163
|
#define IDS_TOOLTIPS_CURE 2163
|
||||||
#define IDS_LANG_SYSTEM 2164
|
#define IDS_WINDOWS_EXIT 2164
|
||||||
#define IDS_LANG_ENGLISH 2165
|
#define IDS_LANG_SYSTEM 2165
|
||||||
#define IDS_LANG_GERMAN 2166
|
#define IDS_LANG_ENGLISH 2166
|
||||||
#define IDS_LANG_SPANISH 2167
|
#define IDS_LANG_GERMAN 2167
|
||||||
#define IDS_LANG_SPANISH_SPAIN 2168
|
#define IDS_LANG_SPANISH 2168
|
||||||
#define IDS_LANG_SPANISH_LATIN_AMERICA 2169
|
#define IDS_LANG_SPANISH_SPAIN 2169
|
||||||
#define IDS_LANG_FRENCH 2170
|
#define IDS_LANG_SPANISH_LATIN_AMERICA 2170
|
||||||
#define IDS_LANG_ITALIAN 2171
|
#define IDS_LANG_FRENCH 2171
|
||||||
#define IDS_LANG_PORTUGUESE 2172
|
#define IDS_LANG_ITALIAN 2172
|
||||||
#define IDS_LANG_PORTUGUESE_PORTUGAL 2173
|
#define IDS_LANG_PORTUGUESE 2173
|
||||||
#define IDS_LANG_PORTUGUESE_BRAZIL 2174
|
#define IDS_LANG_PORTUGUESE_PORTUGAL 2174
|
||||||
#define IDS_LANG_JAPANESE 2175
|
#define IDS_LANG_PORTUGUESE_BRAZIL 2175
|
||||||
#define IDS_LANG_KOREAN 2176
|
#define IDS_LANG_JAPANESE 2176
|
||||||
#define IDS_LANG_CHINESE_TRADITIONAL 2177
|
#define IDS_LANG_KOREAN 2177
|
||||||
#define IDS_LANG_CHINESE_SIMPLIFIED 2178
|
#define IDS_LANG_CHINESE_TRADITIONAL 2178
|
||||||
#define IDS_LANG_DANISH 2179
|
#define IDS_LANG_CHINESE_SIMPLIFIED 2179
|
||||||
#define IDS_LANG_FINISH 2180
|
#define IDS_LANG_DANISH 2180
|
||||||
#define IDS_LANG_DUTCH 2181
|
#define IDS_LANG_FINISH 2181
|
||||||
#define IDS_LANG_POLISH 2182
|
#define IDS_LANG_DUTCH 2182
|
||||||
#define IDS_LANG_RUSSIAN 2183
|
#define IDS_LANG_POLISH 2183
|
||||||
#define IDS_LANG_SWEDISH 2184
|
#define IDS_LANG_RUSSIAN 2184
|
||||||
#define IDS_LANG_NORWEGIAN 2185
|
#define IDS_LANG_SWEDISH 2185
|
||||||
#define IDS_LANG_GREEK 2186
|
#define IDS_LANG_NORWEGIAN 2186
|
||||||
#define IDS_LANG_TURKISH 2187
|
#define IDS_LANG_GREEK 2187
|
||||||
#define IDS_LEADERBOARD_KILLS_EASY 2188
|
#define IDS_LANG_TURKISH 2188
|
||||||
#define IDS_LEADERBOARD_KILLS_NORMAL 2189
|
#define IDS_LEADERBOARD_KILLS_EASY 2189
|
||||||
#define IDS_LEADERBOARD_KILLS_HARD 2190
|
#define IDS_LEADERBOARD_KILLS_NORMAL 2190
|
||||||
#define IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL 2191
|
#define IDS_LEADERBOARD_KILLS_HARD 2191
|
||||||
#define IDS_LEADERBOARD_MINING_BLOCKS_EASY 2192
|
#define IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL 2192
|
||||||
#define IDS_LEADERBOARD_MINING_BLOCKS_NORMAL 2193
|
#define IDS_LEADERBOARD_MINING_BLOCKS_EASY 2193
|
||||||
#define IDS_LEADERBOARD_MINING_BLOCKS_HARD 2194
|
#define IDS_LEADERBOARD_MINING_BLOCKS_NORMAL 2194
|
||||||
#define IDS_LEADERBOARD_FARMING_PEACEFUL 2195
|
#define IDS_LEADERBOARD_MINING_BLOCKS_HARD 2195
|
||||||
#define IDS_LEADERBOARD_FARMING_EASY 2196
|
#define IDS_LEADERBOARD_FARMING_PEACEFUL 2196
|
||||||
#define IDS_LEADERBOARD_FARMING_NORMAL 2197
|
#define IDS_LEADERBOARD_FARMING_EASY 2197
|
||||||
#define IDS_LEADERBOARD_FARMING_HARD 2198
|
#define IDS_LEADERBOARD_FARMING_NORMAL 2198
|
||||||
#define IDS_LEADERBOARD_TRAVELLING_PEACEFUL 2199
|
#define IDS_LEADERBOARD_FARMING_HARD 2199
|
||||||
#define IDS_LEADERBOARD_TRAVELLING_EASY 2200
|
#define IDS_LEADERBOARD_TRAVELLING_PEACEFUL 2200
|
||||||
#define IDS_LEADERBOARD_TRAVELLING_NORMAL 2201
|
#define IDS_LEADERBOARD_TRAVELLING_EASY 2201
|
||||||
#define IDS_LEADERBOARD_TRAVELLING_HARD 2202
|
#define IDS_LEADERBOARD_TRAVELLING_NORMAL 2202
|
||||||
#define IDS_TIPS_GAMETIP_0 2203
|
#define IDS_LEADERBOARD_TRAVELLING_HARD 2203
|
||||||
#define IDS_TIPS_GAMETIP_1 2204
|
#define IDS_TIPS_GAMETIP_0 2204
|
||||||
#define IDS_TIPS_GAMETIP_48 2205
|
#define IDS_TIPS_GAMETIP_1 2205
|
||||||
#define IDS_TIPS_GAMETIP_44 2206
|
#define IDS_TIPS_GAMETIP_48 2206
|
||||||
#define IDS_TIPS_GAMETIP_45 2207
|
#define IDS_TIPS_GAMETIP_44 2207
|
||||||
#define IDS_TIPS_TRIVIA_4 2208
|
#define IDS_TIPS_GAMETIP_45 2208
|
||||||
#define IDS_TIPS_TRIVIA_17 2209
|
#define IDS_TIPS_TRIVIA_4 2209
|
||||||
#define IDS_HOW_TO_PLAY_MULTIPLAYER 2210
|
#define IDS_TIPS_TRIVIA_17 2210
|
||||||
#define IDS_HOW_TO_PLAY_SOCIALMEDIA 2211
|
#define IDS_HOW_TO_PLAY_MULTIPLAYER 2211
|
||||||
#define IDS_HOW_TO_PLAY_CREATIVE 2212
|
#define IDS_HOW_TO_PLAY_SOCIALMEDIA 2212
|
||||||
#define IDS_TUTORIAL_TASK_FLY 2213
|
#define IDS_HOW_TO_PLAY_CREATIVE 2213
|
||||||
#define IDS_TOOLTIPS_SELECTDEVICE 2214
|
#define IDS_TUTORIAL_TASK_FLY 2214
|
||||||
#define IDS_TOOLTIPS_CHANGEDEVICE 2215
|
#define IDS_TOOLTIPS_SELECTDEVICE 2215
|
||||||
#define IDS_TOOLTIPS_VIEW_GAMERCARD 2216
|
#define IDS_TOOLTIPS_CHANGEDEVICE 2216
|
||||||
#define IDS_TOOLTIPS_VIEW_GAMERPROFILE 2217
|
#define IDS_TOOLTIPS_VIEW_GAMERCARD 2217
|
||||||
#define IDS_TOOLTIPS_INVITE_PARTY 2218
|
#define IDS_TOOLTIPS_VIEW_GAMERPROFILE 2218
|
||||||
#define IDS_CONFIRM_START_CREATIVE 2219
|
#define IDS_TOOLTIPS_INVITE_PARTY 2219
|
||||||
#define IDS_CONFIRM_START_SAVEDINCREATIVE 2220
|
#define IDS_CONFIRM_START_CREATIVE 2220
|
||||||
#define IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE 2221
|
#define IDS_CONFIRM_START_SAVEDINCREATIVE 2221
|
||||||
#define IDS_CONFIRM_START_HOST_PRIVILEGES 2222
|
#define IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE 2222
|
||||||
#define IDS_CONNECTION_LOST_LIVE 2223
|
#define IDS_CONFIRM_START_HOST_PRIVILEGES 2223
|
||||||
#define IDS_CONNECTION_LOST_LIVE_NO_EXIT 2224
|
#define IDS_CONNECTION_LOST_LIVE 2224
|
||||||
#define IDS_AWARD_AVATAR1 2225
|
#define IDS_CONNECTION_LOST_LIVE_NO_EXIT 2225
|
||||||
#define IDS_AWARD_AVATAR2 2226
|
#define IDS_AWARD_AVATAR1 2226
|
||||||
#define IDS_AWARD_AVATAR3 2227
|
#define IDS_AWARD_AVATAR2 2227
|
||||||
#define IDS_AWARD_THEME 2228
|
#define IDS_AWARD_AVATAR3 2228
|
||||||
#define IDS_UNLOCK_ACHIEVEMENT_TEXT 2229
|
#define IDS_AWARD_THEME 2229
|
||||||
#define IDS_UNLOCK_AVATAR_TEXT 2230
|
#define IDS_UNLOCK_ACHIEVEMENT_TEXT 2230
|
||||||
#define IDS_UNLOCK_GAMERPIC_TEXT 2231
|
#define IDS_UNLOCK_AVATAR_TEXT 2231
|
||||||
#define IDS_UNLOCK_THEME_TEXT 2232
|
#define IDS_UNLOCK_GAMERPIC_TEXT 2232
|
||||||
#define IDS_UNLOCK_ACCEPT_INVITE 2233
|
#define IDS_UNLOCK_THEME_TEXT 2233
|
||||||
#define IDS_UNLOCK_GUEST_TEXT 2234
|
#define IDS_UNLOCK_ACCEPT_INVITE 2234
|
||||||
#define IDS_LEADERBOARD_GAMERTAG 2235
|
#define IDS_UNLOCK_GUEST_TEXT 2235
|
||||||
#define IDS_GROUPNAME_POTIONS_480 2236
|
#define IDS_LEADERBOARD_GAMERTAG 2236
|
||||||
#define IDS_RETURNEDTOTITLESCREEN_TEXT 2237
|
#define IDS_GROUPNAME_POTIONS_480 2237
|
||||||
#define IDS_TRIALOVER_TEXT 2238
|
#define IDS_RETURNEDTOTITLESCREEN_TEXT 2238
|
||||||
#define IDS_FATAL_ERROR_TEXT 2239
|
#define IDS_TRIALOVER_TEXT 2239
|
||||||
#define IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT 2240
|
#define IDS_FATAL_ERROR_TEXT 2240
|
||||||
#define IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT 2241
|
#define IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT 2241
|
||||||
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL 2242
|
#define IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT 2242
|
||||||
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL 2243
|
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL 2243
|
||||||
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE 2244
|
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL 2244
|
||||||
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE 2245
|
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE 2245
|
||||||
#define IDS_SAVE_ICON_MESSAGE 2246
|
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE 2246
|
||||||
#define IDS_GAMEOPTION_HOST_PRIVILEGES 2247
|
#define IDS_SAVE_ICON_MESSAGE 2247
|
||||||
#define IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS 2248
|
#define IDS_GAMEOPTION_HOST_PRIVILEGES 2248
|
||||||
#define IDS_ACHIEVEMENTS 2249
|
#define IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS 2249
|
||||||
#define IDS_LABEL_GAMERTAGS 2250
|
#define IDS_ACHIEVEMENTS 2250
|
||||||
#define IDS_IN_GAME_GAMERTAGS 2251
|
#define IDS_LABEL_GAMERTAGS 2251
|
||||||
#define IDS_SOCIAL_DEFAULT_DESCRIPTION 2252
|
#define IDS_IN_GAME_GAMERTAGS 2252
|
||||||
#define IDS_TITLE_UPDATE_NAME 2253
|
#define IDS_SOCIAL_DEFAULT_DESCRIPTION 2253
|
||||||
#define IDS_PLATFORM_NAME 2254
|
#define IDS_TITLE_UPDATE_NAME 2254
|
||||||
#define IDS_BACK_BUTTON 2255
|
#define IDS_PLATFORM_NAME 2255
|
||||||
#define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS 2256
|
#define IDS_BACK_BUTTON 2256
|
||||||
#define IDS_KICK_PLAYER_DESCRIPTION 2257
|
#define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS 2257
|
||||||
#define IDS_USING_TRIAL_TEXUREPACK_WARNING 2258
|
#define IDS_KICK_PLAYER_DESCRIPTION 2258
|
||||||
#define IDS_WORLD_SIZE_TITLE_SMALL 2259
|
#define IDS_USING_TRIAL_TEXUREPACK_WARNING 2259
|
||||||
#define IDS_WORLD_SIZE_TITLE_MEDIUM 2260
|
#define IDS_WORLD_SIZE_TITLE_SMALL 2260
|
||||||
#define IDS_WORLD_SIZE_TITLE_LARGE 2261
|
#define IDS_WORLD_SIZE_TITLE_MEDIUM 2261
|
||||||
#define IDS_WORLD_SIZE_TITLE_CLASSIC 2262
|
#define IDS_WORLD_SIZE_TITLE_LARGE 2262
|
||||||
#define IDS_WORLD_SIZE 2263
|
#define IDS_WORLD_SIZE_TITLE_CLASSIC 2263
|
||||||
#define IDS_GAMEOPTION_WORLD_SIZE 2264
|
#define IDS_WORLD_SIZE 2264
|
||||||
#define IDS_DISABLE_SAVING 2265
|
#define IDS_GAMEOPTION_WORLD_SIZE 2265
|
||||||
#define IDS_GAMEOPTION_DISABLE_SAVING 2266
|
#define IDS_DISABLE_SAVING 2266
|
||||||
#define IDS_RICHPRESENCE_GAMESTATE 2267
|
#define IDS_GAMEOPTION_DISABLE_SAVING 2267
|
||||||
#define IDS_RICHPRESENCE_IDLE 2268
|
#define IDS_RICHPRESENCE_GAMESTATE 2268
|
||||||
#define IDS_RICHPRESENCE_MENUS 2269
|
#define IDS_RICHPRESENCE_IDLE 2269
|
||||||
#define IDS_RICHPRESENCE_MULTIPLAYER 2270
|
#define IDS_RICHPRESENCE_MENUS 2270
|
||||||
#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE 2271
|
#define IDS_RICHPRESENCE_MULTIPLAYER 2271
|
||||||
#define IDS_RICHPRESENCE_MULTIPLAYER_1P 2272
|
#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE 2272
|
||||||
#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE 2273
|
#define IDS_RICHPRESENCE_MULTIPLAYER_1P 2273
|
||||||
#define IDS_RICHPRESENCESTATE_BLANK 2274
|
#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE 2274
|
||||||
#define IDS_RICHPRESENCESTATE_RIDING_PIG 2275
|
#define IDS_RICHPRESENCESTATE_BLANK 2275
|
||||||
#define IDS_RICHPRESENCESTATE_RIDING_MINECART 2276
|
#define IDS_RICHPRESENCESTATE_RIDING_PIG 2276
|
||||||
#define IDS_RICHPRESENCESTATE_BOATING 2277
|
#define IDS_RICHPRESENCESTATE_RIDING_MINECART 2277
|
||||||
#define IDS_RICHPRESENCESTATE_FISHING 2278
|
#define IDS_RICHPRESENCESTATE_BOATING 2278
|
||||||
#define IDS_RICHPRESENCESTATE_CRAFTING 2279
|
#define IDS_RICHPRESENCESTATE_FISHING 2279
|
||||||
#define IDS_RICHPRESENCESTATE_FORGING 2280
|
#define IDS_RICHPRESENCESTATE_CRAFTING 2280
|
||||||
#define IDS_RICHPRESENCESTATE_NETHER 2281
|
#define IDS_RICHPRESENCESTATE_FORGING 2281
|
||||||
#define IDS_RICHPRESENCESTATE_CD 2282
|
#define IDS_RICHPRESENCESTATE_NETHER 2282
|
||||||
#define IDS_RICHPRESENCESTATE_MAP 2283
|
#define IDS_RICHPRESENCESTATE_CD 2283
|
||||||
#define IDS_RICHPRESENCESTATE_ENCHANTING 2284
|
#define IDS_RICHPRESENCESTATE_MAP 2284
|
||||||
#define IDS_RICHPRESENCESTATE_BREWING 2285
|
#define IDS_RICHPRESENCESTATE_ENCHANTING 2285
|
||||||
#define IDS_RICHPRESENCESTATE_ANVIL 2286
|
#define IDS_RICHPRESENCESTATE_BREWING 2286
|
||||||
#define IDS_RICHPRESENCESTATE_TRADING 2287
|
#define IDS_RICHPRESENCESTATE_ANVIL 2287
|
||||||
|
#define IDS_RICHPRESENCESTATE_TRADING 2288
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue