From 405a7d0662afa1efa7db857d376857da40d263fa Mon Sep 17 00:00:00 2001 From: Faalagorn Date: Fri, 29 Apr 2022 02:19:59 +0200 Subject: [PATCH] Unify keybindings and menus (#57125) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Unify keybindings * Update World selection header * Try to fix Help header * Mouse View → Mouse view Co-authored-by: David Seguin --- data/core/tips.json | 4 +- data/help/texts.json | 10 +- data/json/snippets/tutorial.json | 2 +- data/raw/keybindings.json | 336 +++++++++++++++---------------- src/activity_actor.cpp | 2 +- src/armor_layers.cpp | 2 +- src/auto_note.cpp | 2 +- src/auto_pickup.cpp | 34 ++-- src/avatar_action.cpp | 10 +- src/bionics_ui.cpp | 2 +- src/color.cpp | 2 +- src/debug_menu.cpp | 2 +- src/game.cpp | 46 ++--- src/help.cpp | 4 +- src/live_view.cpp | 2 +- src/medical_ui.cpp | 4 +- src/mutation_ui.cpp | 14 +- src/options.cpp | 2 +- src/overmap_ui.cpp | 2 +- src/panels.cpp | 2 +- src/safemode_ui.cpp | 10 +- src/worldfactory.cpp | 4 +- 22 files changed, 249 insertions(+), 249 deletions(-) diff --git a/data/core/tips.json b/data/core/tips.json index 769ec0a4dc758..0fc3e9f3cd881 100644 --- a/data/core/tips.json +++ b/data/core/tips.json @@ -337,7 +337,7 @@ { "type": "snippet", "category": "tip", - "text": [ "You can make your own Safe Mode rules in the pause menu." ] + "text": [ "You can make your own safe mode rules in the pause menu." ] }, { "type": "snippet", @@ -427,7 +427,7 @@ { "type": "snippet", "category": "tip", - "text": [ "Long trip ahead? Autotravel and autodrive to your desired destination." ] + "text": [ "Long trip ahead? Auto travel and auto drive to your desired destination." ] }, { "type": "snippet", diff --git a/data/help/texts.json b/data/help/texts.json index ad0ec7ae8594a..a7ea19875add6 100644 --- a/data/help/texts.json +++ b/data/help/texts.json @@ -20,7 +20,7 @@ "Each step will take 100 movement points (or more, depending on the terrain); you will then replenish a variable amount of movement points, depending on many factors (press to see the exact amount).", "To attempt to hit a monster with your weapon, simply move into it.", "You may find doors, ('+'); these may be opened with or closed with . Some doors are locked. Locked doors, windows, and some other obstacles can be destroyed by smashing them (, then choose a direction). Smashing down obstacles is much easier with a good weapon or a strong character.", - "There may be times when you want to move more quickly by holding down a movement key. However, fast movement in this fashion may lead to the player getting into a dangerous situation or even killed before they have a chance to react. Pressing will toggle \"Safe Mode.\" While this is on, any movement will be ignored if new monsters enter the player's view." + "There may be times when you want to move more quickly by holding down a movement key. However, fast movement in this fashion may lead to the player getting into a dangerous situation or even killed before they have a chance to react. Pressing will toggle \"safe mode.\" While this is on, any movement will be ignored if new monsters enter the player's view." ] }, { @@ -28,7 +28,7 @@ "order": 2, "name": ": Viewing", "messages": [ - "The player can often see more than can be displayed on the screen at a time. Pressing enters \"Look Around\" mode, which allows you to scroll around using the movement keys and view items on the map as well as monsters and their stance toward the character. Pressing provides a list of nearby visible items, though items shut away in crates, cupboards, refrigerators and the like won't be displayed until you are close enough. Pressing Shift+vikeys (h,j,k,l,y,u,b,n) will scroll the view persistently, allowing you to keep an eye on things as you move around.", + "The player can often see more than can be displayed on the screen at a time. Pressing enters \"Look around\" mode, which allows you to scroll around using the movement keys and view items on the map as well as monsters and their stance toward the character. Pressing provides a list of nearby visible items, though items shut away in crates, cupboards, refrigerators and the like won't be displayed until you are close enough. Pressing Shift+vikeys (h,j,k,l,y,u,b,n) will scroll the view persistently, allowing you to keep an eye on things as you move around.", "Places outside of your view but seen previously and still memorized can be visualized, but they will be covered by the \"fog of war.\"" ] }, @@ -156,7 +156,7 @@ "name": ": Items overview", "messages": [ "There is a wide variety of items available for your use. You may find them lying on the ground; if so, simply press to pick up items on the same tile. Some items are found inside a container, which may be drawn as a { with a blue background. Pressing , then a direction key, will allow you to examine these containers and loot their contents.", - "Pressing opens a comparison menu, where you can see two items side-by-side with their attributes color-coded to indicate which is superior. You can also access the item comparison menu by pressing C after to open the \"View Nearby Items\" menu and selecting an item.", + "Pressing opens a comparison menu, where you can see two items side-by-side with their attributes color-coded to indicate which is superior. You can also access the item comparison menu by pressing C after to open the \"List all items around the player\" menu and selecting an item.", "Almost any item may be used as a melee weapon, though some are better than others. You can check the melee attributes of an item you're carrying by pressing to enter your inventory, then pressing the letter of the item. There are 5 melee values: to-hit bonus (or penalty), moves per attack, and bash, cut, and pierce damage. The to-hit bonus adjusts the chance of an attack connecting with a monster and the chance of a successful attack becoming a critical hit. Moves per attack represents how many moves it takes to attack with the weapon, with 100 moves equaling one second. Bash damage can stun a monster, preventing it from counter-attacking, but is governed by your strength. Cut damage is usually greater than bash damage, but many monsters have natural armor against it. Pierce damage usually penetrates armor better than cut damage, but does less damage overall, especially if you do not have a lot of skill in piercing weapons. It, too, may be reduced by a monster's natural armor. The typical damage per second values are for your survivor and account for moves per attack, encumbrance, missed strikes, weapon skill, critical hits, and target armor. The 'Best' value is against an unarmored target with no Dodging skill. The 'Vs. Agile' value is against an unarmored target with a high Dodging skill. The 'Vs. Armored' value is against a target with more than 15 Bash and 20 Cut resistance but no Dodging skill. These are typical values to let you assess the effectiveness of weapons; the amount of damage you actually inflict will vary depending on the situation.", "To wield an item as a weapon, press , then the appropriate letter. Wielding the item you are currently wielding will unwield it, leaving your hands empty. A wielded weapon will not contribute to your volume carried, so holding a large item in your hands may be a good option for travel. When unwielding your weapon, you will be given a choice of what to do with it.", "To wear a piece of clothing, press , then the appropriate letter. Armor reduces damage, and can help you resist things like smoke. To take off an item, press , then the appropriate letter. Clothing and armor are worn in distinct layers, and provide different coverage, protection and warmth. Each piece has its own encumbrance, and wearing too much on any given layer can significantly hamper your movement and other abilities, especially during combat. You can view and sort worn items by pressing .", @@ -181,7 +181,7 @@ "Magazine descriptions also list compatible ammo.", "Note that while several ammo types exist for a given caliber and magazine type, you can't mix and match these types into a single magazine. You can't, for example, load 9x19mm JHP and 9x19mm FMJ ammo into the same magazine, since a magazine always requires identical rounds to be loaded in it.", "Magazines can be stored inside several worn accessories for quicker access, such as chest rigs and ammo pouches. All compatible storage items that can hold a given magazine are listed in its description. To store a magazine in a clothing item, activate () the desired clothing item, at which point you'll get to choose which magazine to store.", - "To fire, press , move the cursor to the desired tile, press '.' to improve your aim, and then 'f' to fire. Additionally, you may want to fire at predefined aim levels using 'a', 'c' or 'p'. Some guns have alternate firing modes, such as burst fire; to cycle modes, press . Firing continuously, especially in bursts, will severely reduce accuracy.", + "To fire, press , move the cursor to the desired tile, press '.' to improve your aim, and then 'f' to fire. Additionally, you may want to fire at predefined aim levels using 'a', 'c' or 'p'. Some guns have alternate firing modes, such as burst-fire; to cycle modes, press . Firing continuously, especially in bursts, will severely reduce accuracy.", "The key is not reserved exclusively for guns. It also works for other ranged weapons like spears or launchers, but the aiming options may vary.", "Fleeing will often be a solid tactic, especially when overwhelmed by a swarm of zombies. Try to avoid getting cornered inside a building. Ducking down into the subways or sewers is often an excellent escape tactic." ] @@ -323,7 +323,7 @@ "order": 21, "name": "<4>: FAQ (contains spoilers!)", "messages": [ - "Q: What is Safe Mode, and why does it prevent me from moving?\nA: Safe Mode is a way to guarantee that you won't die by holding a movement key down. When a monster comes into view, your movement will be ignored until Safe Mode is turned off with the key. This ensures that the sudden appearance of a monster won't catch you off guard.", + "Q: What is safe mode, and why does it prevent me from moving?\nA: Safe mode is a way to guarantee that you won't die by holding a movement key down. When a monster comes into view, your movement will be ignored until safe mode is turned off with the key. This ensures that the sudden appearance of a monster won't catch you off guard.", "Q: It seems like everything I eat makes me sick! What's wrong?\nA: Lots of the food found in towns is perishable and will only last a few days after the start of a new game. The electricity went out several days ago, so fruit, milk, and similar foods are the first to go bad. After the first couple of days, you should switch to canned food, jerky, and hunting. Also, you should make sure to cook any food and purify any water you come across, as it may contain parasites or otherwise be unsafe.", "Q: How can I remove boards from boarded-up windows and doors?\nA: Use a hammer and choose the direction of the boarded-up window or door to remove the boards.", "Q: The game just told me to quit, and other weird stuff is happening.\nA: You have the \"Kaluptic Psychosis\" trait, which might make the game seem buggy.", diff --git a/data/json/snippets/tutorial.json b/data/json/snippets/tutorial.json index db42c23231fed..ad808d31e58e7 100644 --- a/data/json/snippets/tutorial.json +++ b/data/json/snippets/tutorial.json @@ -17,7 +17,7 @@ }, { "id": "LESSON_LOOK", - "text": "You can also use the mouse to see things around you. The Mouse View window will appear on the sidebar, and you'll be able to get information on the terrain, monsters, and items in the world around you. Alternatively, you can press to open the Look Around window." + "text": "You can also use the mouse to see things around you. The Mouse view window will appear on the sidebar, and you'll be able to get information on the terrain, monsters, and items in the world around you. Alternatively, you can press to open the Look Around window." }, { "id": "LESSON_OPEN", diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json index 1264be79fb10a..59fbe7658ec5e 100644 --- a/data/raw/keybindings.json +++ b/data/raw/keybindings.json @@ -287,7 +287,7 @@ "type": "keybinding", "id": "ENABLE_MAPEXTRA_NOTE", "category": "AUTO_NOTES", - "name": "Enable auto note for map extra", + "name": "Enable auto notes for map extras", "bindings": [ { "input_method": "keyboard_any", "key": "e" }, { "input_method": "keyboard_char", "key": "E" }, @@ -309,7 +309,7 @@ "type": "keybinding", "id": "DISABLE_MAPEXTRA_NOTE", "category": "AUTO_NOTES", - "name": "Disable auto note for map extra", + "name": "Disable auto notes for map extras", "bindings": [ { "input_method": "keyboard_any", "key": "d" }, { "input_method": "keyboard_char", "key": "D" }, @@ -546,7 +546,7 @@ "type": "keybinding", "id": "USAGE_HELP", "category": "SORT_ARMOR", - "name": "Display Usage Help", + "name": "Display usage help", "bindings": [ { "input_method": "keyboard_any", "key": "F1" } ] }, { @@ -749,7 +749,7 @@ { "type": "keybinding", "id": "LEVEL_UP", - "name": "Go Up", + "name": "Go up", "bindings": [ { "input_method": "keyboard_any", "key": "PPAGE" }, { "input_method": "keyboard_char", "key": "<" }, @@ -759,7 +759,7 @@ { "type": "keybinding", "id": "LEVEL_DOWN", - "name": "Go Down", + "name": "Go down", "bindings": [ { "input_method": "keyboard_any", "key": "NPAGE" }, { "input_method": "keyboard_char", "key": ">" }, @@ -802,14 +802,14 @@ "type": "keybinding", "id": "NEW", "category": "MINESWEEPER", - "name": "Create New level", + "name": "Create new level", "bindings": [ { "input_method": "keyboard_any", "key": "n" } ] }, { "type": "keybinding", "id": "FLAG", "category": "MINESWEEPER", - "name": "Toggle Flag", + "name": "Toggle flag", "bindings": [ { "input_method": "keyboard_any", "key": "f" } ] }, { @@ -836,7 +836,7 @@ { "type": "keybinding", "id": "CONFIRM", - "name": "Confirm Choice", + "name": "Confirm choice", "bindings": [ { "input_method": "keyboard_any", "key": "RETURN" }, { "input_method": "keyboard_any", "key": "KEYPAD_ENTER" } ] }, { @@ -908,145 +908,145 @@ "type": "keybinding", "id": "ZOOM_OUT", "category": "OVERMAP", - "name": "Zoom Out", + "name": "Zoom out", "bindings": [ { "input_method": "keyboard_char", "key": "Z" }, { "input_method": "keyboard_code", "key": "z", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "ZOOM_IN", "category": "OVERMAP", - "name": "Zoom In", + "name": "Zoom in", "bindings": [ { "input_method": "keyboard_any", "key": "z" } ] }, { "type": "keybinding", "id": "DELETE_NOTE", "category": "OVERMAP_NOTES", - "name": "Delete Note", + "name": "Delete note", "bindings": [ { "input_method": "keyboard_char", "key": "D" }, { "input_method": "keyboard_code", "key": "d", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "EDIT_NOTE", "category": "OVERMAP_NOTES", - "name": "Edit Note", + "name": "Edit note", "bindings": [ { "input_method": "keyboard_char", "key": "E" }, { "input_method": "keyboard_code", "key": "e", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "MARK_DANGER", "category": "OVERMAP_NOTES", - "name": "Mark as Dangerous", + "name": "Mark as dangerous", "bindings": [ { "input_method": "keyboard_char", "key": "M" }, { "input_method": "keyboard_code", "key": "m", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "DELETE_NOTE", "category": "OVERMAP", - "name": "Delete Note", + "name": "Delete note", "bindings": [ { "input_method": "keyboard_char", "key": "D" }, { "input_method": "keyboard_code", "key": "d", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "CREATE_NOTE", "category": "OVERMAP", - "name": "Create/Edit Note", + "name": "Create/edit note", "bindings": [ { "input_method": "keyboard_char", "key": "N" }, { "input_method": "keyboard_code", "key": "n", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "LIST_NOTES", "category": "OVERMAP", - "name": "List Notes", + "name": "List notes", "bindings": [ { "input_method": "keyboard_char", "key": "L" }, { "input_method": "keyboard_code", "key": "l", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "TOGGLE_BLINKING", "category": "OVERMAP", - "name": "Toggle Blinking", + "name": "Toggle blinking", "bindings": [ { "input_method": "keyboard_char", "key": "B" }, { "input_method": "keyboard_code", "key": "b", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "TOGGLE_OVERLAYS", "category": "OVERMAP", - "name": "Toggle Overlays", + "name": "Toggle overlays", "bindings": [ { "input_method": "keyboard_char", "key": "O" }, { "input_method": "keyboard_code", "key": "o", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "TOGGLE_LAND_USE_CODES", "category": "OVERMAP", - "name": "Toggle Land Use Codes", + "name": "Toggle land use codes", "bindings": [ { "input_method": "keyboard_char", "key": "A" }, { "input_method": "keyboard_code", "key": "a", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "TOGGLE_MAP_NOTES", "category": "OVERMAP", - "name": "Toggle Map Notes", + "name": "Toggle map notes", "bindings": [ { "input_method": "keyboard_char", "key": "G" }, { "input_method": "keyboard_code", "key": "g", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "TOGGLE_CITY_LABELS", "category": "OVERMAP", - "name": "Toggle City Labels", + "name": "Toggle city labels", "bindings": [ { "input_method": "keyboard_char", "key": "C" }, { "input_method": "keyboard_code", "key": "c", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "TOGGLE_HORDES", "category": "OVERMAP", - "name": "Toggle Hordes", + "name": "Toggle hordes", "bindings": [ { "input_method": "keyboard_char", "key": "H" }, { "input_method": "keyboard_code", "key": "h", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "TOGGLE_OVERMAP_WEATHER", "category": "OVERMAP", - "name": "Toggle Visible Weather", + "name": "Toggle visible weather", "bindings": [ { "input_method": "keyboard_any", "key": "w" } ] }, { "type": "keybinding", "id": "TOGGLE_FOREST_TRAILS", "category": "OVERMAP", - "name": "Toggle Forest Trails", + "name": "Toggle forest trails", "bindings": [ { "input_method": "keyboard_char", "key": "T" }, { "input_method": "keyboard_code", "key": "t", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "TOGGLE_EXPLORED", "category": "OVERMAP", - "name": "Toggle Explored", + "name": "Toggle explored", "bindings": [ { "input_method": "keyboard_char", "key": "E" }, { "input_method": "keyboard_code", "key": "e", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "PLACE_TERRAIN", "category": "OVERMAP", - "name": "Place Overmap Terrain", + "name": "Place overmap terrain", "bindings": [ { "input_method": "keyboard_any", "key": "t" } ] }, { "type": "keybinding", "id": "PLACE_SPECIAL", "category": "OVERMAP", - "name": "Place Overmap Special", + "name": "Place overmap special", "bindings": [ { "input_method": "keyboard_any", "key": "s" } ] }, { "type": "keybinding", "id": "SET_SPECIAL_ARGS", "category": "OVERMAP", - "name": "Set Overmap Special Arguments", + "name": "Set overmap special arguments", "bindings": [ { "input_method": "keyboard_any", "key": "a" } ] }, { "type": "keybinding", - "name": "View Missions", + "name": "View missions", "category": "OVERMAP", "id": "MISSIONS", "bindings": [ { "input_method": "keyboard_char", "key": "M" }, { "input_method": "keyboard_code", "key": "m", "mod": [ "shift" ] } ] @@ -1086,7 +1086,7 @@ "type": "keybinding", "id": "FIRE", "category": "TARGET", - "name": "Fire Weapon", + "name": "Fire weapon", "bindings": [ { "input_method": "keyboard_any", "key": "f" }, { "input_method": "keyboard_any", "key": "RETURN" }, @@ -1098,7 +1098,7 @@ "type": "keybinding", "id": "PREV_TARGET", "category": "TARGET", - "name": "Prev Target", + "name": "Previous target", "bindings": [ { "input_method": "keyboard_char", "key": "BACKTAB" }, { "input_method": "keyboard_code", "key": "TAB", "mod": [ "shift" ] }, @@ -1110,7 +1110,7 @@ "type": "keybinding", "id": "NEXT_TARGET", "category": "TARGET", - "name": "Next Target", + "name": "Next target", "bindings": [ { "input_method": "keyboard_any", "key": "TAB" }, { "input_method": "mouse", "key": "SCROLL_DOWN" }, @@ -1133,21 +1133,21 @@ "type": "keybinding", "id": "AIMED_SHOT", "category": "TARGET", - "name": "Aimed Shot", + "name": "Aimed shot", "bindings": [ { "input_method": "keyboard_any", "key": "a" } ] }, { "type": "keybinding", "id": "CAREFUL_SHOT", "category": "TARGET", - "name": "Careful Shot", + "name": "Careful shot", "bindings": [ { "input_method": "keyboard_any", "key": "c" } ] }, { "type": "keybinding", "id": "PRECISE_SHOT", "category": "TARGET", - "name": "Precise Shot", + "name": "Precise shot", "bindings": [ { "input_method": "keyboard_any", "key": "p" } ] }, { @@ -1161,7 +1161,7 @@ "type": "keybinding", "id": "SWITCH_MODE", "category": "TARGET", - "name": "Switch Firing Mode", + "name": "Switch firing modes", "bindings": [ { "input_method": "keyboard_any", "key": "s" }, { "input_method": "keyboard_char", "key": "F" }, @@ -1179,7 +1179,7 @@ "type": "keybinding", "id": "TOGGLE_SNAP_TO_TARGET", "category": "TARGET", - "name": "Toggle Snap to Target", + "name": "Toggle snap-to-target", "bindings": [ { "input_method": "keyboard_char", "key": "*" }, { "input_method": "keyboard_code", "key": "KEYPAD_MULTIPLY" }, @@ -1190,7 +1190,7 @@ "type": "keybinding", "id": "TOGGLE_MOVE_CURSOR_VIEW", "category": "TARGET", - "name": "Toggle moving view / cursor", + "name": "Toggle shift view / move cursor", "bindings": [ { "input_method": "keyboard_any", "key": "v" } ] }, { @@ -1202,13 +1202,13 @@ { "type": "keybinding", "id": "SEC_SELECT", - "name": "Secondary Select", + "name": "Secondary select", "bindings": [ { "input_method": "mouse", "key": "MOUSE_RIGHT" } ] }, { "type": "keybinding", "id": "MOUSE_MOVE", - "name": "Mouse Move", + "name": "Mouse move", "bindings": [ { "input_method": "mouse", "key": "MOUSE_MOVE" } ] }, { @@ -1220,7 +1220,7 @@ { "type": "keybinding", "id": "PREV_TAB", - "name": "Go to prev tab", + "name": "Go to previous tab", "bindings": [ { "input_method": "keyboard_char", "key": "BACKTAB" }, { "input_method": "keyboard_code", "key": "TAB", "mod": [ "shift" ] } @@ -1229,7 +1229,7 @@ { "type": "keybinding", "id": "TOGGLE_FAST_SCROLL", - "name": "Toggle Fast Scroll", + "name": "Toggle fast scroll", "bindings": [ { "input_method": "keyboard_any", "key": "f" } ] }, { @@ -1253,14 +1253,14 @@ { "type": "keybinding", "id": "CENTER", - "name": "Center On Character", + "name": "Center on character", "bindings": [ { "input_method": "keyboard_any", "key": "0" }, { "input_method": "keyboard_code", "key": "KEYPAD_0" } ] }, { "type": "keybinding", "id": "HELP", "category": "CARAVAN", - "name": "Display Help", + "name": "Display help", "bindings": [ { "input_method": "keyboard_any", "key": "0" }, { "input_method": "keyboard_code", "key": "KEYPAD_0" } ] }, { @@ -1278,7 +1278,7 @@ { "type": "keybinding", "id": "MEDICAL_MENU", - "name": "Open Medical Menu", + "name": "Open medical menu", "bindings": [ { "input_method": "keyboard_char", "key": "@" }, { "input_method": "keyboard_code", "key": "2", "mod": [ "shift" ] } ] }, { @@ -1313,14 +1313,14 @@ "type": "keybinding", "id": "REROLL_CHARACTER", "category": "NEW_CHAR_DESCRIPTION", - "name": "Reroll Random Character", + "name": "Reroll random character", "bindings": [ { "input_method": "keyboard_char", "key": "%" }, { "input_method": "keyboard_code", "key": "5", "mod": [ "shift" ] } ] }, { "type": "keybinding", "id": "REROLL_CHARACTER_WITH_SCENARIO", "category": "NEW_CHAR_DESCRIPTION", - "name": "Reroll Random Character With Scenario", + "name": "Reroll random character with scenario", "bindings": [ { "input_method": "keyboard_char", "key": "^" }, { "input_method": "keyboard_code", "key": "6", "mod": [ "shift" ] } ] }, { @@ -1345,14 +1345,14 @@ "type": "keybinding", "id": "CHOOSE_CITY", "category": "NEW_CHAR_DESCRIPTION", - "name": "Choose character start city", + "name": "Choose character starting city", "bindings": [ { "input_method": "keyboard_any", "key": "C" } ] }, { "type": "keybinding", "id": "CHOOSE_LOCATION", "category": "NEW_CHAR_DESCRIPTION", - "name": "Choose character start location", + "name": "Choose character starting location", "bindings": [ { "input_method": "keyboard_any", "key": "/" }, { "input_method": "keyboard_code", "key": "KEYPAD_DIVIDE" } ] }, { @@ -1562,7 +1562,7 @@ "type": "keybinding", "id": "PREV_TAB", "category": "VEH_INTERACT", - "name": "Go to prev tab", + "name": "Go to previous tab", "bindings": [ { "input_method": "keyboard_char", "key": "BACKTAB" }, { "input_method": "keyboard_code", "key": "TAB", "mod": [ "shift" ] } @@ -1641,7 +1641,7 @@ "type": "keybinding", "id": "CONFIRM_QUIT", "category": "EDITMAP_FEATURE", - "name": "Confirm & quit", + "name": "Confirm and quit", "bindings": [ { "input_method": "keyboard_any", "key": "e" }, { "input_method": "keyboard_any", "key": "u" }, @@ -1713,7 +1713,7 @@ "type": "keybinding", "id": "EDIT_OVERMAP", "category": "EDITMAP", - "name": "Edit overmap / mapgen", + "name": "Edit overmap/mapgen", "bindings": [ { "input_method": "keyboard_any", "key": "o" } ] }, { @@ -1810,7 +1810,7 @@ "type": "keybinding", "id": "EXAMINE_CONTENTS", "category": "INVENTORY", - "name": "Examine Contents", + "name": "Examine contents", "bindings": [ { "input_method": "keyboard_any", "key": "o" } ] }, { @@ -1890,7 +1890,7 @@ "type": "keybinding", "id": "APPLY", "category": "MEDICAL", - "name": "Apply and/or Use Item", + "name": "Use item", "bindings": [ { "input_method": "keyboard_char", "key": "A" }, { "input_method": "keyboard_code", "key": "a", "mod": [ "shift" ] } ] }, { @@ -1908,13 +1908,13 @@ }, { "type": "keybinding", - "name": "Toggle Map Memory", + "name": "Toggle map memory", "category": "DEFAULTMODE", "id": "toggle_map_memory" }, { "type": "keybinding", - "name": "Center View", + "name": "Center view", "category": "DEFAULTMODE", "id": "center", "bindings": [ @@ -1925,7 +1925,7 @@ }, { "type": "keybinding", - "name": "Move View North", + "name": "Move view north", "category": "DEFAULTMODE", "id": "shift_n", "bindings": [ @@ -1936,7 +1936,7 @@ }, { "type": "keybinding", - "name": "Move View East", + "name": "Move view east", "category": "DEFAULTMODE", "id": "shift_e", "bindings": [ @@ -1947,7 +1947,7 @@ }, { "type": "keybinding", - "name": "Move View South", + "name": "Move view south", "category": "DEFAULTMODE", "id": "shift_s", "bindings": [ @@ -1958,7 +1958,7 @@ }, { "type": "keybinding", - "name": "Move View West", + "name": "Move view west", "category": "DEFAULTMODE", "id": "shift_w", "bindings": [ @@ -1969,21 +1969,21 @@ }, { "type": "keybinding", - "name": "Open Door", + "name": "Open door", "category": "DEFAULTMODE", "id": "open", "bindings": [ { "input_method": "keyboard_any", "key": "o" } ] }, { "type": "keybinding", - "name": "Close Door", + "name": "Close door", "category": "DEFAULTMODE", "id": "close", "bindings": [ { "input_method": "keyboard_any", "key": "c" } ] }, { "type": "keybinding", - "name": "Smash Nearby Terrain", + "name": "Smash nearby terrain", "category": "DEFAULTMODE", "id": "smash", "bindings": [ { "input_method": "keyboard_any", "key": "s" } ] @@ -2004,7 +2004,7 @@ }, { "type": "keybinding", - "name": "Advanced Inventory management", + "name": "Advanced Inventory Manager", "category": "DEFAULTMODE", "id": "advinv", "bindings": [ { "input_method": "keyboard_any", "key": "/" }, { "input_method": "keyboard_code", "key": "KEYPAD_DIVIDE" } ] @@ -2059,7 +2059,7 @@ }, { "type": "keybinding", - "name": "Look Around", + "name": "Look around", "category": "DEFAULTMODE", "id": "look", "bindings": [ @@ -2076,7 +2076,7 @@ }, { "type": "keybinding", - "name": "Peek Around Corners", + "name": "Peek around corners", "category": "DEFAULTMODE", "id": "peek", "bindings": [ { "input_method": "keyboard_char", "key": "X" }, { "input_method": "keyboard_code", "key": "x", "mod": [ "shift" ] } ] @@ -2090,56 +2090,56 @@ }, { "type": "keybinding", - "name": "Manage zones", + "name": "Zones manager", "category": "DEFAULTMODE", "id": "zones", "bindings": [ { "input_method": "keyboard_char", "key": "Y" }, { "input_method": "keyboard_code", "key": "y", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Open Inventory", + "name": "Open inventory", "category": "DEFAULTMODE", "id": "inventory", "bindings": [ { "input_method": "keyboard_any", "key": "i" }, { "input_method": "gamepad", "key": "JOY_5" } ] }, { "type": "keybinding", - "name": "Compare two Items", + "name": "Compare two items", "category": "DEFAULTMODE", "id": "compare", "bindings": [ { "input_method": "keyboard_char", "key": "I" }, { "input_method": "keyboard_code", "key": "i", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Swap Inventory Letters", + "name": "Swap inventory letters", "category": "DEFAULTMODE", "id": "organize", "bindings": [ { "input_method": "keyboard_any", "key": "=" } ] }, { "type": "keybinding", - "name": "Apply or Use Item", + "name": "Use item", "category": "DEFAULTMODE", "id": "apply", "bindings": [ { "input_method": "keyboard_any", "key": "a" } ] }, { "type": "keybinding", - "name": "Apply or Use Wielded Item", + "name": "Use wielded item", "category": "DEFAULTMODE", "id": "apply_wielded", "bindings": [ { "input_method": "keyboard_char", "key": "A" }, { "input_method": "keyboard_code", "key": "a", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Wear Item", + "name": "Wear item", "category": "DEFAULTMODE", "id": "wear", "bindings": [ { "input_method": "keyboard_char", "key": "W" }, { "input_method": "keyboard_code", "key": "w", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Take Off Worn Item", + "name": "Take off worn item", "category": "DEFAULTMODE", "id": "take_off", "bindings": [ { "input_method": "keyboard_char", "key": "T" }, { "input_method": "keyboard_code", "key": "t", "mod": [ "shift" ] } ] @@ -2153,7 +2153,7 @@ }, { "type": "keybinding", - "name": "Consume Item Menu", + "name": "Consume item", "category": "DEFAULTMODE", "id": "open_consume" }, @@ -2173,61 +2173,61 @@ }, { "type": "keybinding", - "name": "Select Martial Arts Style", + "name": "Select martial arts style", "category": "DEFAULTMODE", "id": "pick_style", "bindings": [ { "input_method": "keyboard_char", "key": "_" }, { "input_method": "keyboard_code", "key": "-", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Reload Weapons", + "name": "Reload weapon", "category": "DEFAULTMODE", "id": "reload_weapon" }, { "type": "keybinding", - "name": "Reload Wielded Item", + "name": "Reload wielded item", "category": "DEFAULTMODE", "id": "reload_wielded" }, { "type": "keybinding", - "name": "Unload or Empty Wielded Item", + "name": "Unload item", "category": "DEFAULTMODE", "id": "unload", "bindings": [ { "input_method": "keyboard_char", "key": "U" }, { "input_method": "keyboard_code", "key": "u", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Throw Item", + "name": "Throw item", "category": "DEFAULTMODE", "id": "throw", "bindings": [ { "input_method": "keyboard_any", "key": "t" } ] }, { "type": "keybinding", - "name": "Blind Throw Item", + "name": "Blind throw item", "category": "LOOK", "id": "throw_blind", "bindings": [ { "input_method": "keyboard_any", "key": "t" } ] }, { "type": "keybinding", - "name": "Fire Wielded Item", + "name": "Fire wielded item", "category": "DEFAULTMODE", "id": "fire", "bindings": [ { "input_method": "keyboard_any", "key": "f" }, { "input_method": "gamepad", "key": "JOY_3" } ] }, { "type": "keybinding", - "name": "Toggle attack mode of Wielded Item", + "name": "Toggle attack mode of wielded item", "category": "DEFAULTMODE", "id": "select_fire_mode", "bindings": [ { "input_method": "keyboard_char", "key": "F" }, { "input_method": "keyboard_code", "key": "f", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Drop Item", + "name": "Drop item", "category": "DEFAULTMODE", "id": "drop", "bindings": [ { "input_method": "keyboard_any", "key": "d" } ] @@ -2240,35 +2240,35 @@ }, { "type": "keybinding", - "name": "Drop Item to Adjacent Tile", + "name": "Drop item to adjacent tile", "category": "DEFAULTMODE", "id": "drop_adj", "bindings": [ { "input_method": "keyboard_char", "key": "D" }, { "input_method": "keyboard_code", "key": "d", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "View/Activate Bionics", + "name": "View/activate bionics", "category": "DEFAULTMODE", "id": "bionics", "bindings": [ { "input_method": "keyboard_any", "key": "p" } ] }, { "type": "keybinding", - "name": "View/Activate Mutations", + "name": "View/activate mutations", "category": "DEFAULTMODE", "id": "mutations", "bindings": [ { "input_method": "keyboard_any", "key": "[" } ] }, { "type": "keybinding", - "name": "View Medical", + "name": "View medical", "category": "DEFAULTMODE", "id": "medical", "bindings": [ { "input_method": "keyboard_char", "key": "N" }, { "input_method": "keyboard_code", "key": "n", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Re-layer armor/clothing", + "name": "Sort armor", "category": "DEFAULTMODE", "id": "sort_armor", "bindings": [ @@ -2279,7 +2279,7 @@ }, { "type": "keybinding", - "name": "Wait for Several Minutes", + "name": "Wait for several minutes", "category": "DEFAULTMODE", "id": "wait", "bindings": [ @@ -2289,7 +2289,7 @@ }, { "type": "keybinding", - "name": "Craft Items", + "name": "Craft items", "category": "DEFAULTMODE", "id": "craft", "bindings": [ { "input_method": "keyboard_char", "key": "&" }, { "input_method": "keyboard_code", "key": "7", "mod": [ "shift" ] } ] @@ -2303,7 +2303,7 @@ }, { "type": "keybinding", - "name": "Construct Terrain", + "name": "Construct terrain", "category": "DEFAULTMODE", "id": "construct", "bindings": [ @@ -2328,26 +2328,26 @@ }, { "type": "keybinding", - "name": "Work Out", + "name": "Workout", "category": "DEFAULTMODE", "id": "workout" }, { "type": "keybinding", - "name": "Control Vehicle", + "name": "Control vehicle", "category": "DEFAULTMODE", "id": "control_vehicle", "bindings": [ { "input_method": "keyboard_char", "key": "^" }, { "input_method": "keyboard_code", "key": "6", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Toggle Auto Travel Mode", + "name": "Toggle auto travel mode", "category": "DEFAULTMODE", "id": "auto_travel_mode" }, { "type": "keybinding", - "name": "Toggle Safe Mode", + "name": "Toggle safe mode", "category": "DEFAULTMODE", "id": "safemode", "bindings": [ @@ -2358,7 +2358,7 @@ }, { "type": "keybinding", - "name": "Ignore Nearby Enemy", + "name": "Ignore nearby enemy", "category": "DEFAULTMODE", "id": "ignore_enemy", "bindings": [ { "input_method": "keyboard_any", "key": "'" } ] @@ -2372,28 +2372,28 @@ }, { "type": "keybinding", - "name": "Save and Quit", + "name": "Save and quit", "category": "DEFAULTMODE", "id": "save", "bindings": [ { "input_method": "keyboard_char", "key": "S" }, { "input_method": "keyboard_code", "key": "s", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Commit Suicide", + "name": "Abandon character", "category": "DEFAULTMODE", "id": "SUICIDE", "bindings": [ { "input_method": "keyboard_char", "key": "Q" }, { "input_method": "keyboard_code", "key": "q", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "View Player Info", + "name": "View player info", "category": "DEFAULTMODE", "id": "player_data", "bindings": [ { "input_method": "keyboard_char", "key": "@" }, { "input_method": "keyboard_code", "key": "2", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "View Map", + "name": "View map", "category": "DEFAULTMODE", "id": "map", "bindings": [ { "input_method": "keyboard_any", "key": "m" } ] @@ -2406,109 +2406,109 @@ }, { "type": "keybinding", - "name": "View Missions", + "name": "View missions", "category": "DEFAULTMODE", "id": "missions", "bindings": [ { "input_method": "keyboard_char", "key": "M" }, { "input_method": "keyboard_code", "key": "m", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "View Factions", + "name": "View factions", "category": "DEFAULTMODE", "id": "factions", "bindings": [ { "input_method": "keyboard_char", "key": "#" }, { "input_method": "keyboard_code", "key": "3", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "View Achievements, Scores, and Kills", + "name": "View achievements, scores, and kills", "category": "DEFAULTMODE", "id": "scores", "bindings": [ { "input_method": "keyboard_char", "key": ")" }, { "input_method": "keyboard_code", "key": "0", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "View Morale", + "name": "View morale", "category": "DEFAULTMODE", "id": "morale", "bindings": [ { "input_method": "keyboard_any", "key": "v" } ] }, { "type": "keybinding", - "name": "View Message Log", + "name": "View message log", "category": "DEFAULTMODE", "id": "messages", "bindings": [ { "input_method": "keyboard_char", "key": "P" }, { "input_method": "keyboard_code", "key": "p", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "View Help", + "name": "View help", "category": "DEFAULTMODE", "id": "help", "bindings": [ { "input_method": "keyboard_any", "key": "0" }, { "input_method": "keyboard_code", "key": "KEYPAD_0" } ] }, { "type": "keybinding", - "name": "Zoom In", + "name": "Zoom in", "id": "zoom_in", "bindings": [ { "input_method": "keyboard_any", "key": "z" }, { "input_method": "gamepad", "key": "JOY_30" } ] }, { "type": "keybinding", - "name": "Zoom Out", + "name": "Zoom out", "id": "zoom_out", "bindings": [ { "input_method": "keyboard_char", "key": "Z" }, { "input_method": "keyboard_code", "key": "z", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Toggle Debug Mode", + "name": "Toggle debug mode", "category": "DEFAULTMODE", "id": "debug_mode" }, { "type": "keybinding", - "name": "Debug Menu", + "name": "Debug menu", "category": "DEFAULTMODE", "id": "debug" }, { "type": "keybinding", - "name": "View Scentmap", + "name": "View scent map", "category": "DEFAULTMODE", "id": "debug_scent" }, { "type": "keybinding", - "name": "View Scent Type", + "name": "View scent type", "category": "DEFAULTMODE", "id": "debug_scent_type" }, { "type": "keybinding", - "name": "View Temperature Map", + "name": "View temperature map", "category": "DEFAULTMODE", "id": "debug_temp" }, { "type": "keybinding", - "name": "View Visibility Map", + "name": "View visibility map", "category": "DEFAULTMODE", "id": "debug_visibility" }, { "type": "keybinding", - "name": "View Lighting Map", + "name": "View lighting map", "category": "DEFAULTMODE", "id": "debug_lighting" }, { "type": "keybinding", - "name": "View Radiation Map", + "name": "View radiation map", "category": "DEFAULTMODE", "id": "debug_radiation" }, { "type": "keybinding", - "name": "Toggle Hour Timer", + "name": "Toggle hour timer", "category": "DEFAULTMODE", "id": "debug_hour_timer" }, @@ -2535,81 +2535,81 @@ }, { "type": "keybinding", - "name": "Switch Sidebar Style", + "name": "Switch sidebar style", "category": "DEFAULTMODE", "id": "toggle_sidebar_style" }, { "type": "keybinding", - "name": "Toggle Fullscreen mode", + "name": "Toggle fullscreen mode", "category": "DEFAULTMODE", "id": "toggle_fullscreen" }, { "type": "keybinding", - "name": "Toggle Minimap", + "name": "Toggle minimap", "id": "toggle_pixel_minimap" }, { "type": "keybinding", - "name": "Sidebar Options", + "name": "Sidebar options", "category": "DEFAULTMODE", "id": "toggle_panel_adm", "bindings": [ { "input_method": "keyboard_char", "key": "}" }, { "input_method": "keyboard_code", "key": "]", "mod": [ "shift" ] } ] }, { "type": "keybinding", - "name": "Reload Item", + "name": "Reload item", "category": "DEFAULTMODE", "id": "reload_item", "bindings": [ { "input_method": "keyboard_any", "key": "r" } ] }, { "type": "keybinding", - "name": "Reload Tileset", + "name": "Reload tileset", "category": "DEFAULTMODE", "id": "reload_tileset" }, { "type": "keybinding", - "name": "Toggle Auto Features", + "name": "Toggle auto features", "category": "DEFAULTMODE", "id": "toggle_auto_features" }, { "type": "keybinding", - "name": "Toggle Auto Pulp/Butcher", + "name": "Toggle auto pulp or butcher", "category": "DEFAULTMODE", "id": "toggle_auto_pulp_butcher" }, { "type": "keybinding", - "name": "Toggle Auto Mining", + "name": "Toggle auto mining", "category": "DEFAULTMODE", "id": "toggle_auto_mining" }, { "type": "keybinding", - "name": "Toggle Auto Foraging", + "name": "Toggle auto foraging", "category": "DEFAULTMODE", "id": "toggle_auto_foraging" }, { "type": "keybinding", - "name": "Toggle Auto Pickup", + "name": "Toggle auto pickup", "category": "DEFAULTMODE", "id": "toggle_auto_pickup" }, { "type": "keybinding", - "name": "Action Menu", + "name": "Action menu", "category": "DEFAULTMODE", "id": "action_menu", "bindings": [ { "input_method": "keyboard_any", "key": "RETURN" }, { "input_method": "keyboard_any", "key": "KEYPAD_ENTER" } ] }, { "type": "keybinding", - "name": "Item Action Menu", + "name": "Item action menu", "category": "DEFAULTMODE", "id": "item_action_menu", "bindings": [ @@ -2632,35 +2632,35 @@ }, { "type": "keybinding", - "name": "Move View Northeast", + "name": "Move view northeast", "category": "DEFAULTMODE", "id": "shift_ne", "bindings": [ { "input_method": "gamepad", "key": "JOY_25" } ] }, { "type": "keybinding", - "name": "Move View Southeast", + "name": "Move view southeast", "category": "DEFAULTMODE", "id": "shift_se", "bindings": [ { "input_method": "gamepad", "key": "JOY_26" } ] }, { "type": "keybinding", - "name": "Move View Southwest", + "name": "Move view southwest", "category": "DEFAULTMODE", "id": "shift_sw", "bindings": [ { "input_method": "gamepad", "key": "JOY_27" } ] }, { "type": "keybinding", - "name": "Move View Northwest", + "name": "Move view northwest", "category": "DEFAULTMODE", "id": "shift_nw", "bindings": [ { "input_method": "gamepad", "key": "JOY_28" } ] }, { "type": "keybinding", - "name": "Burst-Fire Wielded Item", + "name": "Burst-fire wielded item", "category": "DEFAULTMODE", "id": "fire_burst" }, @@ -2672,7 +2672,7 @@ }, { "type": "keybinding", - "name": "Toggle Auto-Safemode", + "name": "Toggle auto safe mode", "category": "DEFAULTMODE", "id": "autosafe" }, @@ -2685,7 +2685,7 @@ }, { "type": "keybinding", - "name": "Main Menu", + "name": "Main menu", "category": "DEFAULTMODE", "id": "main_menu", "bindings": [ { "input_method": "keyboard_any", "key": "ESC" } ] @@ -2698,19 +2698,19 @@ }, { "type": "keybinding", - "name": "Autopickup manager", + "name": "Auto pickup manager", "category": "DEFAULTMODE", "id": "open_autopickup" }, { "type": "keybinding", - "name": "Autonotes manager", + "name": "Auto notes manager", "category": "DEFAULTMODE", "id": "open_autonotes" }, { "type": "keybinding", - "name": "Safe Mode manager", + "name": "Safe mode manager", "category": "DEFAULTMODE", "id": "open_safemode" }, @@ -2722,38 +2722,38 @@ }, { "type": "keybinding", - "name": "Active World Mods", + "name": "Active world mods", "category": "DEFAULTMODE", "id": "open_world_mods" }, { "type": "keybinding", - "name": "Cycle move mode (run/walk/crouch)", + "name": "Cycle movement mode", "category": "DEFAULTMODE", "id": "cycle_move", "bindings": [ { "input_method": "gamepad", "key": "JOY_10" } ] }, { "type": "keybinding", - "name": "Reset Movement to Walk", + "name": "Reset movement to walk", "category": "DEFAULTMODE", "id": "reset_move" }, { "type": "keybinding", - "name": "Toggle Run", + "name": "Toggle run", "category": "DEFAULTMODE", "id": "toggle_run" }, { "type": "keybinding", - "name": "Toggle Crouch", + "name": "Toggle crouch", "category": "DEFAULTMODE", "id": "toggle_crouch" }, { "type": "keybinding", - "name": "Movement Mode Menu", + "name": "Movement mode menu", "category": "DEFAULTMODE", "id": "open_movement", "bindings": [ @@ -2770,7 +2770,7 @@ { "type": "keybinding", "id": "diary", - "name": "Open Diary", + "name": "Open diary", "category": "DEFAULTMODE" }, { @@ -2844,28 +2844,28 @@ "type": "keybinding", "id": "SAFEMODE_BLACKLIST_ADD", "category": "LIST_MONSTERS", - "name": "Add to safemode blacklist", + "name": "Add to safe mode blacklist", "bindings": [ { "input_method": "keyboard_any", "key": "a" } ] }, { "type": "keybinding", "id": "SAFEMODE_BLACKLIST_REMOVE", "category": "LIST_MONSTERS", - "name": "Remove from safemode blacklist", + "name": "Remove from safe mode blacklist", "bindings": [ { "input_method": "keyboard_any", "key": "r" } ] }, { "type": "keybinding", "id": "look", "category": "LIST_MONSTERS", - "name": "look around", + "name": "Look around", "bindings": [ { "input_method": "keyboard_any", "key": "x" } ] }, { "type": "keybinding", "id": "fire", "category": "LIST_MONSTERS", - "name": { "ctxt": "verb", "str": "fire" }, + "name": { "ctxt": "verb", "str": "Fire" }, "bindings": [ { "input_method": "keyboard_any", "key": "f" } ] }, { @@ -2879,7 +2879,7 @@ "type": "keybinding", "id": "REASSIGN", "category": "BIONICS", - "name": "Reassign invlet", + "name": "Reassign inventory letter", "bindings": [ { "input_method": "keyboard_any", "key": "=" } ] }, { @@ -2910,7 +2910,7 @@ "type": "keybinding", "id": "REASSIGN", "category": "MUTATIONS", - "name": "Reassign invlet", + "name": "Reassign inventory letter", "bindings": [ { "input_method": "keyboard_any", "key": "=" } ] }, { @@ -2970,7 +2970,7 @@ "type": "keybinding", "id": "REMOVE", "category": "HELP_KEYBINDINGS", - "name": "Remove bindings", + "name": "Remove keybinding", "bindings": [ { "input_method": "keyboard_any", "key": "-" }, { "input_method": "keyboard_code", "key": "KEYPAD_MINUS" } ] }, { @@ -3203,7 +3203,7 @@ "type": "keybinding", "id": "TOGGLE_AUTO_PICKUP", "category": "ADVANCED_INVENTORY", - "name": "Toggle auto-pickup for item", + "name": "Toggle auto pickup for item", "bindings": [ { "input_method": "keyboard_any", "key": "p" } ] }, { @@ -3239,7 +3239,7 @@ "type": "keybinding", "id": "MOVE_VARIABLE_ITEM", "category": "ADVANCED_INVENTORY", - "name": "Move an amount of item", + "name": "Move some items", "bindings": [ { "input_method": "keyboard_any", "key": "m" } ] }, { @@ -3345,63 +3345,63 @@ "type": "keybinding", "id": "ITEMS_NW", "category": "ADVANCED_INVENTORY", - "name": "Select items @ North-West", + "name": "Select items at northwest", "bindings": [ { "input_method": "keyboard_any", "key": "7" }, { "input_method": "keyboard_code", "key": "KEYPAD_7" } ] }, { "type": "keybinding", "id": "ITEMS_N", "category": "ADVANCED_INVENTORY", - "name": "Select items @ North", + "name": "Select items at north", "bindings": [ { "input_method": "keyboard_any", "key": "8" }, { "input_method": "keyboard_code", "key": "KEYPAD_8" } ] }, { "type": "keybinding", "id": "ITEMS_NE", "category": "ADVANCED_INVENTORY", - "name": "Select items @ North-East", + "name": "Select items at northeast", "bindings": [ { "input_method": "keyboard_any", "key": "9" }, { "input_method": "keyboard_code", "key": "KEYPAD_9" } ] }, { "type": "keybinding", "id": "ITEMS_W", "category": "ADVANCED_INVENTORY", - "name": "Select items @ West", + "name": "Select items at west", "bindings": [ { "input_method": "keyboard_any", "key": "4" }, { "input_method": "keyboard_code", "key": "KEYPAD_4" } ] }, { "type": "keybinding", "id": "ITEMS_CE", "category": "ADVANCED_INVENTORY", - "name": "Select items @ center", + "name": "Select items at center", "bindings": [ { "input_method": "keyboard_any", "key": "5" }, { "input_method": "keyboard_code", "key": "KEYPAD_5" } ] }, { "type": "keybinding", "id": "ITEMS_E", "category": "ADVANCED_INVENTORY", - "name": "Select items @ East", + "name": "Select items at east", "bindings": [ { "input_method": "keyboard_any", "key": "6" }, { "input_method": "keyboard_code", "key": "KEYPAD_6" } ] }, { "type": "keybinding", "id": "ITEMS_SW", "category": "ADVANCED_INVENTORY", - "name": "Select items @ South-West", + "name": "Select items at southwest", "bindings": [ { "input_method": "keyboard_any", "key": "1" }, { "input_method": "keyboard_code", "key": "KEYPAD_1" } ] }, { "type": "keybinding", "id": "ITEMS_S", "category": "ADVANCED_INVENTORY", - "name": "Select items @ South", + "name": "Select items at south", "bindings": [ { "input_method": "keyboard_any", "key": "2" }, { "input_method": "keyboard_code", "key": "KEYPAD_2" } ] }, { "type": "keybinding", "id": "ITEMS_SE", "category": "ADVANCED_INVENTORY", - "name": "Select items @ South-East", + "name": "Select items at southeast", "bindings": [ { "input_method": "keyboard_any", "key": "3" }, { "input_method": "keyboard_code", "key": "KEYPAD_3" } ] }, { @@ -3421,7 +3421,7 @@ "type": "keybinding", "id": "ITEMS_AROUND", "category": "ADVANCED_INVENTORY", - "name": "Select items @ all 9 fields", + "name": "Select items at all 9 tiles", "bindings": [ { "input_method": "keyboard_any", "key": "a" }, { "input_method": "keyboard_char", "key": "A" }, @@ -3432,7 +3432,7 @@ "type": "keybinding", "id": "ITEMS_DRAGGED_CONTAINER", "category": "ADVANCED_INVENTORY", - "name": "Select items in dragged container", + "name": "Select items in dragged vehicle", "bindings": [ { "input_method": "keyboard_any", "key": "d" }, { "input_method": "keyboard_char", "key": "D" }, diff --git a/src/activity_actor.cpp b/src/activity_actor.cpp index 301b4ea6b528f..9b521f4b05a22 100644 --- a/src/activity_actor.cpp +++ b/src/activity_actor.cpp @@ -513,7 +513,7 @@ void autodrive_activity_actor::do_turn( player_activity &act, Character &who ) void autodrive_activity_actor::canceled( player_activity &act, Character &who ) { - who.add_msg_if_player( m_info, _( "Auto-drive canceled." ) ); + who.add_msg_if_player( m_info, _( "Auto drive canceled." ) ); who.omt_path.clear(); if( player_vehicle ) { player_vehicle->stop_autodriving( false ); diff --git a/src/armor_layers.cpp b/src/armor_layers.cpp index d158274a61bf9..dff392bc5ab3e 100644 --- a/src/armor_layers.cpp +++ b/src/armor_layers.cpp @@ -1026,7 +1026,7 @@ void outfit::sort_armor( Character &guy ) } } else if( action == "ASSIGN_INVLETS" ) { // prompt first before doing this (yes, yes, more popups...) - if( query_yn( _( "Reassign invlets for armor?" ) ) ) { + if( query_yn( _( "Reassign inventory letters for armor?" ) ) ) { // Start with last armor (the most unimportant one?) auto iiter = inv_chars.rbegin(); auto witer = worn.rbegin(); diff --git a/src/auto_note.cpp b/src/auto_note.cpp index 140dc1c8366ee..64a5540ae7d7a 100644 --- a/src/auto_note.cpp +++ b/src/auto_note.cpp @@ -356,7 +356,7 @@ void auto_note_manager_gui::show() ui.on_redraw( [&]( const ui_adaptor & ) { // == Draw border - draw_border( w_border, BORDER_COLOR, _( " AUTO NOTES MANAGER " ) ); + draw_border( w_border, BORDER_COLOR, _( "Auto notes manager" ) ); mvwputch( w_border, point( 0, iHeaderHeight - 1 ), c_light_gray, LINE_XXXO ); mvwputch( w_border, point( 79, iHeaderHeight - 1 ), c_light_gray, LINE_XOXX ); mvwputch( w_border, point( 52, FULL_SCREEN_HEIGHT - 1 ), c_light_gray, LINE_XXOX ); diff --git a/src/auto_pickup.cpp b/src/auto_pickup.cpp index 63a438b942777..a3277b4bddf87 100644 --- a/src/auto_pickup.cpp +++ b/src/auto_pickup.cpp @@ -48,7 +48,7 @@ auto_pickup::player_settings &get_auto_pickup() /** * The function will return `true` if the user has set all limits to a value of 0. * @param pickup_item item to check. - * @return `true` if given item's weight and volume is within autopickup user configured limits. + * @return `true` if given item's weight and volume is within auto pickup user configured limits. */ static bool within_autopickup_limits( const item *pickup_item ) { @@ -62,7 +62,7 @@ static bool within_autopickup_limits( const item *pickup_item ) } /** - * @param pickup_item item to get the autopickup rule for. + * @param pickup_item item to get the auto pickup rule for. * @return `rule_state` associated with the given item. */ static rule_state get_autopickup_rule( const item *pickup_item ) @@ -86,7 +86,7 @@ static rule_state get_autopickup_rule( const item *pickup_item ) } /** - * Drop all items from the given container that match special autopickup rules. + * Drop all items from the given container that match special auto pickup rules. * The items will be removed from the container and dropped in the designated location. * * @param from container to drop items from. @@ -107,9 +107,9 @@ static void empty_autopickup_target( item *what, tripoint where ) } /** - * Iterate through every item inside the container to find items that match autopickup rules. + * Iterate through every item inside the container to find items that match auto pickup rules. * In most cases whitelisted items will be included and blacklisted one will be excluded however - * there are special cases. Below is an overview of selection rules for container autopickup. + * there are special cases. Below is an overview of selection rules for container auto pickup. * * Containers and items will **never** be picked up when: * @@ -132,18 +132,18 @@ static void empty_autopickup_target( item *what, tripoint where ) * * - the parent container is non-rigid and the item is not whitelisted. * - * @param from item to search for items to autopickup from. - * @return sequence of items to autopickup from given container. + * @param from item to search for items to auto pickup from. + * @return sequence of items to auto pickup from given container. */ static std::vector get_autopickup_items( item_location &from ) { item *container_item = from.get_item(); - // items sealed in containers should never be unsealed by autopickup + // items sealed in containers should never be unsealed by auto pickup bool force_pick_container = container_item->any_pockets_sealed(); bool pick_all_items = true; std::vector result; - // do not autopickup owned containers or items + // do not auto pickup owned containers or items if( !get_option( "AUTO_PICKUP_OWNED" ) && container_item->is_owned_by( get_player_character() ) ) { return result; @@ -193,7 +193,7 @@ static std::vector get_autopickup_items( item_location &from ) } // all items in container were approved for pickup if( !contents.empty() && ( pick_all_items || force_pick_container ) ) { - // only autopickup corpses if they are whitelisted + // only auto pickup corpses if they are whitelisted // blacklisted containers should still have their contents picked up but themselves should be excluded. // If all items inside blacklisted container match then just pickup the items without the container rule_state pickup_state = get_autopickup_rule( container_item ); @@ -242,7 +242,7 @@ drop_locations auto_pickup::select_items( // iterate over all item stacks found in location for( const item_stack::iterator &stack : from ) { item *item_entry = &*stack; - // do not autopickup owned containers or items + // do not auto pickup owned containers or items if( !get_option( "AUTO_PICKUP_OWNED" ) && item_entry->is_owned_by( get_player_character() ) ) { continue; @@ -260,13 +260,13 @@ drop_locations auto_pickup::select_items( if( !within_autopickup_limits( item_entry ) ) { continue; } - int it_count = 0; // TODO: factor in autopickup max_quantity here + int it_count = 0; // TODO: factor in auto pickup max_quantity here item_location it_location = item_location( map_location, item_entry ); result.emplace_back( std::make_pair( it_location, it_count ) ); } else if( is_container || item_entry->ammo_capacity( ammo_battery ) ) { item_location container_location = item_location( map_location, item_entry ); for( const item_location &add_item : get_autopickup_items( container_location ) ) { - int it_count = 0; // TODO: factor in autopickup max_quantity here + int it_count = 0; // TODO: factor in auto pickup max_quantity here result.emplace_back( std::make_pair( add_item, it_count ) ); } } @@ -647,7 +647,7 @@ void player_settings::show() user_interface ui; Character &player_character = get_player_character(); - ui.title = _( " AUTO PICKUP MANAGER " ); + ui.title = _( "Auto pickup manager" ); ui.tabs.emplace_back( _( "[]" ), global_rules ); if( !player_character.name.empty() ) { ui.tabs.emplace_back( _( "[]" ), character_rules ); @@ -820,7 +820,7 @@ void player_settings::add_rule( const item *it, bool include ) create_rule( it ); if( !get_option( "AUTO_PICKUP" ) && - query_yn( _( "Autopickup is not enabled in the options. Enable it now?" ) ) ) { + query_yn( _( "Auto pickup is not enabled in the options. Enable it now?" ) ) ) { get_options().get_option( "AUTO_PICKUP" ).setNext(); get_options().save(); } @@ -878,7 +878,7 @@ bool check_special_rule( const std::map &materials, const std: return false; } -//Special case. Required for NPC harvest autopickup. Ignores material rules. +//Special case. Required for NPC harvest auto pickup. Ignores material rules. void npc_settings::create_rule( const std::string &to_match ) { rules.create_rule( map_items, to_match ); @@ -1009,7 +1009,7 @@ bool player_settings::save( const bool bCharacter ) return write_to_file( savefile, [&]( std::ostream & fout ) { JsonOut jout( fout, true ); ( bCharacter ? character_rules : global_rules ).serialize( jout ); - }, _( "autopickup configuration" ) ); + }, _( "auto pickup configuration" ) ); } void player_settings::load_character() diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp index c2f0a4fba21d8..dda9153b959f9 100644 --- a/src/avatar_action.cpp +++ b/src/avatar_action.cpp @@ -333,7 +333,7 @@ bool avatar_action::move( avatar &you, map &m, const tripoint &d ) if( critter.friendly == 0 && !critter.has_effect( effect_pet ) ) { if( you.is_auto_moving() ) { - add_msg( m_warning, _( "Monster in the way. Auto-move canceled." ) ); + add_msg( m_warning, _( "Monster in the way. Auto move canceled." ) ); add_msg( m_info, _( "Move into the monster to attack." ) ); you.clear_destination(); return false; @@ -364,7 +364,7 @@ bool avatar_action::move( avatar &you, map &m, const tripoint &d ) if( npc *const np_ = creatures.creature_at( dest_loc ) ) { npc &np = *np_; if( you.is_auto_moving() ) { - add_msg( _( "NPC in the way, Auto-move canceled." ) ); + add_msg( _( "NPC in the way, Auto move canceled." ) ); add_msg( m_info, _( "Move into the NPC to interact or attack." ) ); you.clear_destination(); return false; @@ -459,7 +459,7 @@ bool avatar_action::move( avatar &you, map &m, const tripoint &d ) && m.open_door( dest_loc, !m.is_outside( you.pos() ) ) ) { you.moves -= 100; you.add_msg_if_player( _( "You open the %s." ), door_name ); - // if auto-move is on, continue moving next turn + // if auto move is on, continue moving next turn if( you.is_auto_moving() ) { you.defer_move( dest_loc ); } @@ -485,7 +485,7 @@ bool avatar_action::move( avatar &you, map &m, const tripoint &d ) you.add_msg_if_player( _( "You open the %1$s's %2$s." ), veh1->name, door_name ); } you.moves -= 100; - // if auto-move is on, continue moving next turn + // if auto move is on, continue moving next turn if( you.is_auto_moving() ) { you.defer_move( dest_loc ); } @@ -500,7 +500,7 @@ bool avatar_action::move( avatar &you, map &m, const tripoint &d ) } else { you.add_msg_if_player( _( "You open the %s." ), door_name ); } - // if auto-move is on, continue moving next turn + // if auto move is on, continue moving next turn if( you.is_auto_moving() ) { you.defer_move( dest_loc ); } diff --git a/src/bionics_ui.cpp b/src/bionics_ui.cpp index e4a8403189a8b..0023ad9d71c01 100644 --- a/src/bionics_ui.cpp +++ b/src/bionics_ui.cpp @@ -266,7 +266,7 @@ static void draw_bionics_titlebar( const catacurses::window &window, avatar *p, mvwputch( window, point( i, 0 ), BORDER_COLOR, LINE_OXOX ); // - } mvwputch( window, point( pwr_str_pos - 1, 0 ), BORDER_COLOR, LINE_OXXX ); // ^|^ - center_print( window, 0, c_light_red, _( " BIONICS " ) ); + center_print( window, 0, c_light_red, _( "Bionics" ) ); std::string desc_append = string_format( _( "[%s] Reassign, [%s] Switch tabs, " diff --git a/src/color.cpp b/src/color.cpp index 73148859e9cc7..d131f59718acd 100644 --- a/src/color.cpp +++ b/src/color.cpp @@ -787,7 +787,7 @@ void color_manager::show_gui() } ui.on_redraw( [&]( const ui_adaptor & ) { - draw_border( w_colors_border, BORDER_COLOR, _( " COLOR MANAGER " ) ); + draw_border( w_colors_border, BORDER_COLOR, _( "Color manager" ) ); mvwputch( w_colors_border, point( 0, 3 ), BORDER_COLOR, LINE_XXXO ); // |- mvwputch( w_colors_border, point( getmaxx( w_colors_border ) - 1, 3 ), BORDER_COLOR, LINE_XOXX ); // -| diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp index 58cb9f58efea2..3f240806eab81 100644 --- a/src/debug_menu.cpp +++ b/src/debug_menu.cpp @@ -272,7 +272,7 @@ static int player_uilist() { uilist_entry( debug_menu_index::EDIT_PLAYER, true, 'p', _( "Edit player/NPC" ) ) }, { uilist_entry( debug_menu_index::DAMAGE_SELF, true, 'd', _( "Damage self" ) ) }, { uilist_entry( debug_menu_index::BLEED_SELF, true, 'b', _( "Bleed self" ) ) }, - { uilist_entry( debug_menu_index::SET_AUTOMOVE, true, 'a', _( "Set automove route" ) ) }, + { uilist_entry( debug_menu_index::SET_AUTOMOVE, true, 'a', _( "Set auto move route" ) ) }, { uilist_entry( debug_menu_index::CONTROL_NPC, true, 'x', _( "Control NPC follower" ) ) }, }; if( !spell_type::get_all().empty() ) { diff --git a/src/game.cpp b/src/game.cpp index 19141dc532750..dd51d684e0cc4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1276,8 +1276,8 @@ static bool cancel_auto_move( Character &you, const std::string &text ) return false; } g->invalidate_main_ui_adaptor(); - if( query_yn( _( "%s Cancel auto-move?" ), text ) ) { - add_msg( m_warning, _( "%s Auto-move canceled." ), text ); + if( query_yn( _( "%s Cancel auto move?" ), text ) ) { + add_msg( m_warning, _( "%s Auto move canceled." ), text ); if( !you.omt_path.empty() ) { you.omt_path.clear(); } @@ -1898,7 +1898,7 @@ int game::inventory_item_menu( item_location locThisItem, if( oThisItem.num_item_stacks() > 0 ) { addentry( 'o', pgettext( "action", "open" ), hint_rating::good ); } - addentry( 'v', pgettext( "action", "pocket autopickup settings" ), hint_rating::good ); + addentry( 'v', pgettext( "action", "pocket auto pickup settings" ), hint_rating::good ); } if( oThisItem.is_favorite ) { @@ -1913,9 +1913,9 @@ int game::inventory_item_menu( item_location locThisItem, addentry( '=', pgettext( "action", "reassign" ), hint_rating::good ); if( bHPR ) { - addentry( '-', _( "Autopickup" ), hint_rating::iffy ); + addentry( '-', _( "Auto pickup" ), hint_rating::iffy ); } else { - addentry( '+', _( "Autopickup" ), hint_rating::good ); + addentry( '+', _( "Auto pickup" ), hint_rating::good ); } int iScrollPos = 0; @@ -2254,17 +2254,17 @@ input_context get_default_mode_input_context() input_context ctxt( "DEFAULTMODE", keyboard_mode::keycode ); // Because those keys move the character, they don't pan, as their original name says ctxt.set_iso( true ); - ctxt.register_action( "UP", to_translation( "Move North" ) ); - ctxt.register_action( "RIGHTUP", to_translation( "Move Northeast" ) ); - ctxt.register_action( "RIGHT", to_translation( "Move East" ) ); - ctxt.register_action( "RIGHTDOWN", to_translation( "Move Southeast" ) ); - ctxt.register_action( "DOWN", to_translation( "Move South" ) ); - ctxt.register_action( "LEFTDOWN", to_translation( "Move Southwest" ) ); - ctxt.register_action( "LEFT", to_translation( "Move West" ) ); - ctxt.register_action( "LEFTUP", to_translation( "Move Northwest" ) ); + ctxt.register_action( "UP", to_translation( "Move north" ) ); + ctxt.register_action( "RIGHTUP", to_translation( "Move northeast" ) ); + ctxt.register_action( "RIGHT", to_translation( "Move east" ) ); + ctxt.register_action( "RIGHTDOWN", to_translation( "Move southeast" ) ); + ctxt.register_action( "DOWN", to_translation( "Move south" ) ); + ctxt.register_action( "LEFTDOWN", to_translation( "Move southwest" ) ); + ctxt.register_action( "LEFT", to_translation( "Move west" ) ); + ctxt.register_action( "LEFTUP", to_translation( "Move northwest" ) ); ctxt.register_action( "pause" ); - ctxt.register_action( "LEVEL_DOWN", to_translation( "Descend Stairs" ) ); - ctxt.register_action( "LEVEL_UP", to_translation( "Ascend Stairs" ) ); + ctxt.register_action( "LEVEL_DOWN", to_translation( "Descend stairs" ) ); + ctxt.register_action( "LEVEL_UP", to_translation( "Ascend stairs" ) ); ctxt.register_action( "toggle_map_memory" ); ctxt.register_action( "center" ); ctxt.register_action( "shift_n" ); @@ -2476,9 +2476,9 @@ bool game::try_get_right_click_action( action_id &act, const tripoint &mouse_tar destination_preview.clear(); if( cleared_destination ) { - // Produce no-op if auto-move had just been cleared on this action + // Produce no-op if auto move had just been cleared on this action // e.g. from a previous single left mouse click. This has the effect - // of right-click canceling an auto-move before it is initiated. + // of right-click canceling an auto move before it is initiated. return false; } @@ -3524,7 +3524,7 @@ void game::draw_ter( const tripoint ¢er, const bool looking, const bool draw } if( !destination_preview.empty() && u.view_offset.z == 0 ) { - // Draw auto-move preview trail + // Draw auto move preview trail const tripoint &final_destination = destination_preview.back(); tripoint line_center = u.pos() + u.view_offset; draw_line( final_destination, line_center, destination_preview, true ); @@ -4163,7 +4163,7 @@ void game::mon_info_update( ) set_safe_mode( SAFE_MODE_STOP ); } } else if( calendar::turn > previous_turn && get_option( "AUTOSAFEMODE" ) && - newseen == 0 ) { // Auto-safe mode, but only if it's a new turn + newseen == 0 ) { // Auto safe mode, but only if it's a new turn turnssincelastmon += calendar::turn - previous_turn; time_duration auto_safe_mode = time_duration::from_turns( get_option( "AUTOSAFEMODETURNS" ) ); @@ -6881,7 +6881,7 @@ look_around_result game::look_around( const bool show_window, tripoint ¢er, werase( w_info ); draw_border( w_info ); - center_print( w_info, 0, c_white, string_format( _( "< Look Around >" ) ) ); + center_print( w_info, 0, c_white, string_format( _( "< Look around >" ) ) ); creature_tracker &creatures = get_creature_tracker(); @@ -8164,9 +8164,9 @@ game::vmenu_ret game::list_monsters( const std::vector &monster_list std::string sSafemode; if( get_safemode().has_rule( monName, Creature::Attitude::ANY ) ) { - sSafemode = _( "emove from safemode Blacklist" ); + sSafemode = _( "emove from safe mode blacklist" ); } else { - sSafemode = _( "dd to safemode Blacklist" ); + sSafemode = _( "dd to safe mode blacklist" ); } shortcut_print( w_monsters, point( 2, getmaxy( w_monsters ) - 1 ), @@ -10039,7 +10039,7 @@ point game::place_player( const tripoint &dest_loc ) } } - //Autopickup + // Auto pickup if( !u.is_mounted() && get_option( "AUTO_PICKUP" ) && !u.is_hauling() && ( !get_option( "AUTO_PICKUP_SAFEMODE" ) || mostseen == 0 ) && ( m.has_items( u.pos() ) || get_option( "AUTO_PICKUP_ADJACENT" ) ) ) { diff --git a/src/help.cpp b/src/help.cpp index 210c2887a9e0b..a98f9d3b276e5 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -159,7 +159,7 @@ void help::display_help() const std::string action; ui.on_redraw( [&]( const ui_adaptor & ) { - draw_border( w_help_border, BORDER_COLOR, _( " HELP " ), c_black_white ); + draw_border( w_help_border, BORDER_COLOR, _( "Help" ) ); wnoutrefresh( w_help_border ); draw_menu( w_help ); } ); @@ -219,7 +219,7 @@ void help::display_help() const return w_help_border; }; - scrollable_text( get_w_help_border, _( " HELP " ), + scrollable_text( get_w_help_border, _( "Help" ), std::accumulate( i18n_help_texts.begin() + 1, i18n_help_texts.end(), i18n_help_texts.front(), []( std::string lhs, const std::string & rhs ) { diff --git a/src/live_view.cpp b/src/live_view.cpp index d58764c1dc812..b461e3362369e 100644 --- a/src/live_view.cpp +++ b/src/live_view.cpp @@ -66,7 +66,7 @@ void live_view::show( const tripoint &p ) int line_out = START_LINE; g->pre_print_all_tile_info( mouse_position, win, line_out, getmaxy( win ) - 2, cache ); draw_border( win ); - center_print( win, 0, c_white, _( "< Mouse View >" ) ); + center_print( win, 0, c_white, _( "< Mouse view >" ) ); wnoutrefresh( win ); } ); } diff --git a/src/medical_ui.cpp b/src/medical_ui.cpp index 1d92f8247addc..169382b77cc3a 100644 --- a/src/medical_ui.cpp +++ b/src/medical_ui.cpp @@ -315,7 +315,7 @@ static void draw_medical_titlebar( const catacurses::window &window, avatar *pla // Hotkey Helper std::string desc; desc = string_format( _( - "[%s/%s]Scroll Info [%s]Apply Item [%s]Keybindings" ), + "[%s/%s] Scroll info [%s] Use item [%s] Keybindings" ), ctxt.get_desc( "SCROLL_INFOBOX_UP" ), ctxt.get_desc( "SCROLL_INFOBOX_DOWN" ), ctxt.get_desc( "APPLY" ), ctxt.get_desc( "HELP_KEYBINDINGS" ) ); @@ -326,7 +326,7 @@ static void draw_medical_titlebar( const catacurses::window &window, avatar *pla right_print( window, 1, right_indent, c_white, desc ); } - const std::string TITLE_STR = " MEDICAL "; + const std::string TITLE_STR = "Medical"; // Window Title if( WIDTH - ( details_width + utf8_width( TITLE_STR ) > WIDTH / 2 ) ) { diff --git a/src/mutation_ui.cpp b/src/mutation_ui.cpp index fa019e5ecf7d9..7344922b57652 100644 --- a/src/mutation_ui.cpp +++ b/src/mutation_ui.cpp @@ -72,23 +72,23 @@ static void show_mutations_titlebar( const catacurses::window &window, } if( menu_mode == mutation_menu_mode::activating ) { desc += colorize( _( "Activating" ), - c_green ) + " " + shortcut_desc( _( "%s to examine mutation, " ), + c_green ) + " " + shortcut_desc( _( "%s Examine, " ), ctxt.get_desc( "TOGGLE_EXAMINE" ) ); } if( menu_mode == mutation_menu_mode::examining ) { desc += colorize( _( "Examining" ), - c_light_blue ) + " " + shortcut_desc( _( "%s to activate mutation, " ), + c_light_blue ) + " " + shortcut_desc( _( "%s Activate, " ), ctxt.get_desc( "TOGGLE_EXAMINE" ) ); } if( menu_mode == mutation_menu_mode::hiding ) { - desc += colorize( _( "Hidding" ), c_cyan ) + " " + shortcut_desc( _( "%s to activate mutation, " ), + desc += colorize( _( "Hidding" ), c_cyan ) + " " + shortcut_desc( _( "%s Activate, " ), ctxt.get_desc( "TOGGLE_EXAMINE" ) ); } if( menu_mode != mutation_menu_mode::reassigning ) { - desc += shortcut_desc( _( "%s to reassign invlet, " ), ctxt.get_desc( "REASSIGN" ) ); + desc += shortcut_desc( _( "%s Reassign, " ), ctxt.get_desc( "REASSIGN" ) ); } - desc += shortcut_desc( _( "%s to toggle sprite visibility, " ), ctxt.get_desc( "TOGGLE_SPRITE" ) ); - desc += shortcut_desc( _( "%s to change keybindings." ), ctxt.get_desc( "HELP_KEYBINDINGS" ) ); + desc += shortcut_desc( _( "%s Toggle sprite visibility, " ), ctxt.get_desc( "TOGGLE_SPRITE" ) ); + desc += shortcut_desc( _( "%s Change keybindings." ), ctxt.get_desc( "HELP_KEYBINDINGS" ) ); // NOLINTNEXTLINE(cata-use-named-point-constants) fold_and_print( window, point( 1, 0 ), getmaxx( window ) - 1, c_white, desc ); wnoutrefresh( window ); @@ -227,7 +227,7 @@ void avatar::power_mutations() ui.on_redraw( [&]( const ui_adaptor & ) { werase( wBio ); - draw_border( wBio, BORDER_COLOR, _( " MUTATIONS " ) ); + draw_border( wBio, BORDER_COLOR, _( "Mutations" ) ); // Draw line under title mvwhline( wBio, point( 1, HEADER_LINE_Y ), LINE_OXOX, WIDTH - 2 ); // Draw symbols to connect additional lines to border diff --git a/src/options.cpp b/src/options.cpp index d892bb0da1fea..3c857e7052a66 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -2667,7 +2667,7 @@ static void draw_borders_external( const bool world_options_only ) { if( !world_options_only ) { - draw_border( w, BORDER_COLOR, _( " OPTIONS " ) ); + draw_border( w, BORDER_COLOR, _( "Options" ) ); } // intersections mvwputch( w, point( 0, horizontal_level ), BORDER_COLOR, LINE_XXXO ); // |- diff --git a/src/overmap_ui.cpp b/src/overmap_ui.cpp index 947e5437ebed9..495b8e926dcd5 100644 --- a/src/overmap_ui.cpp +++ b/src/overmap_ui.cpp @@ -409,7 +409,7 @@ class map_notes_callback : public uilist_callback } if( action == "MARK_DANGER" ) { // NOLINTNEXTLINE(cata-text-style): No need for two whitespaces - if( query_yn( _( "Mark area as dangerous ( to avoid on automove paths? )" ) ) ) { + if( query_yn( _( "Mark area as dangerous ( to avoid on auto move paths? )" ) ) ) { const int max_amount = 20; // NOLINTNEXTLINE(cata-text-style): No need for two whitespaces const std::string popupmsg = _( "Danger radius in overmap squares? ( 0-20 )" ); diff --git a/src/panels.cpp b/src/panels.cpp index 48c8f7640419d..caefab8495bc2 100644 --- a/src/panels.cpp +++ b/src/panels.cpp @@ -2120,7 +2120,7 @@ static void draw_border_win( catacurses::window &w, const std::vector &colu int popup_height ) { werase( w ); - decorate_panel( _( "SIDEBAR OPTIONS" ), w ); + decorate_panel( _( "Sidebar options" ), w ); // Draw vertical separators mvwvline( w, point( column_widths[0] + 1, 1 ), 0, popup_height - 2 ); mvwvline( w, point( column_widths[0] + column_widths[1] + 2, 1 ), 0, popup_height - 2 ); diff --git a/src/safemode_ui.cpp b/src/safemode_ui.cpp index a819db24f42e9..4c450a97a5220 100644 --- a/src/safemode_ui.cpp +++ b/src/safemode_ui.cpp @@ -35,7 +35,7 @@ safemode &get_safemode() void safemode::show() { - show( _( " SAFE MODE MANAGER " ), true ); + show( _( "Safe mode manager" ), true ); } std::string safemode::npc_type_name() @@ -182,7 +182,7 @@ void safemode::show( const std::string &custom_name_in, bool is_safemode_in ) ( tab == CHARACTER_TAB ) ? hilite( c_white ) : c_white, _( "[]" ) ); locx = 55; - mvwprintz( w_header, point( locx, 0 ), c_white, _( "Safe Mode enabled:" ) ); + mvwprintz( w_header, point( locx, 0 ), c_white, _( "Safe mode enabled:" ) ); locx += shortcut_print( w_header, point( locx, 1 ), ( get_option( "SAFEMODE" ) ? c_light_green : c_light_red ), c_white, ( get_option( "SAFEMODE" ) ? _( "True" ) : _( "False" ) ) ); @@ -209,7 +209,7 @@ void safemode::show( const std::string &custom_name_in, bool is_safemode_in ) character_rules.clear(); mvwprintz( w, point( 15, 8 ), c_white, _( "Please load a character first to use this page!" ) ); } else if( empty() ) { - mvwprintz( w, point( 15, 8 ), c_white, _( "Safe Mode manager currently inactive." ) ); + mvwprintz( w, point( 15, 8 ), c_white, _( "Safe mode manager is currently inactive." ) ); mvwprintz( w, point( 15, 9 ), c_white, _( "Default rules are used. Add a rule to activate." ) ); mvwprintz( w, point( 15, 10 ), c_white, _( "Press ~ to add a default ruleset to get started." ) ); } @@ -664,7 +664,7 @@ void safemode::add_rule( const std::string &rule_in, const Creature::Attitude at create_rules(); if( !get_option( "SAFEMODE" ) && - query_yn( _( "Safe Mode is not enabled in the options. Enable it now?" ) ) ) { + query_yn( _( "Safe mode is not enabled in the options. Enable it now?" ) ) ) { get_options().get_option( "SAFEMODE" ).setNext(); get_options().save(); } @@ -854,7 +854,7 @@ bool safemode::save( const bool is_character_in ) if( !is_character ) { create_rules(); } - }, _( "safemode configuration" ) ); + }, _( "safe mode configuration" ) ); } void safemode::load_character() diff --git a/src/worldfactory.cpp b/src/worldfactory.cpp index ff78a06182abf..9709e2bc28f87 100644 --- a/src/worldfactory.cpp +++ b/src/worldfactory.cpp @@ -456,7 +456,7 @@ WORLDPTR worldfactory::pick_world( bool show_prompt, bool empty_only ) ui.on_screen_resize( init_windows ); ui.on_redraw( [&]( const ui_adaptor & ) { - draw_border( w_worlds_border, BORDER_COLOR, _( " WORLD SELECTION " ) ); + draw_border( w_worlds_border, BORDER_COLOR, _( "World selection" ) ); mvwputch( w_worlds_border, point( 0, 4 ), BORDER_COLOR, LINE_XXXO ); // |- mvwputch( w_worlds_border, point( iMinScreenWidth - 1, 4 ), BORDER_COLOR, LINE_XOXX ); // -| @@ -837,7 +837,7 @@ void worldfactory::show_active_world_mods( const std::vector &world_mods ctxt.register_action( "HELP_KEYBINDINGS" ); ui.on_redraw( [&]( const ui_adaptor & ) { - draw_border( w_border, BORDER_COLOR, _( " ACTIVE WORLD MODS " ) ); + draw_border( w_border, BORDER_COLOR, _( "Active world mods" ) ); wnoutrefresh( w_border ); draw_mod_list( w_mods, start, static_cast( cursor ), world_mods,