Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Localization: added more missing strings/moved to .properties #2166

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ end

function ENT:GetOverlayText()

local txt = "Force: " .. math.floor( self:GetForce() )
local txt = language.GetPhrase ( "tool.balloon.force" ) .. " " .. math.floor( self:GetForce() )

if ( txt == "" ) then return "" end
if ( game.SinglePlayer() ) then return txt end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,12 @@ spawnmenu.AddContentType( "entity", function( container, obj )
-- Generate a nice tooltip with extra info.
local ENTinfo = scripted_ents.Get( obj.spawnname )
local toolTip = language.GetPhrase( obj.nicename )
local l10n_author = language.GetPhrase ( "entityinfo.author" )
if ( !ENTinfo ) then ENTinfo = list.Get( "SpawnableEntities" )[ obj.spawnname ] end
if ( ENTinfo ) then
local extraInfo = ""
if ( ENTinfo.Information and ENTinfo.Information != "" ) then extraInfo = extraInfo .. "\n" .. ENTinfo.Information end
if ( ENTinfo.Author and ENTinfo.Author != "" ) then extraInfo = extraInfo .. "\nAuthor: " .. ENTinfo.Author end
if ( ENTinfo.Author and ENTinfo.Author != "" ) then extraInfo = extraInfo .. "\n" .. l10n_author .. " ".. ENTinfo.Author end
if ( #extraInfo > 0 ) then toolTip = toolTip .. "\n" .. extraInfo end
end

Expand Down Expand Up @@ -278,11 +279,12 @@ spawnmenu.AddContentType( "vehicle", function( container, obj )

-- Generate a nice tooltip with extra info
local VehicleInfo = list.Get( "Vehicles" )[ obj.spawnname ]
local l10n_author = language.GetPhrase ( "entityinfo.author" )
if ( VehicleInfo ) then
local toolTip = language.GetPhrase( VehicleInfo.Name ) .. "\n"
if ( VehicleInfo.Information and VehicleInfo.Information != "" ) then toolTip = toolTip .. "\n" .. VehicleInfo.Information end

if ( VehicleInfo.Author and VehicleInfo.Author != "" ) then toolTip = toolTip .. "\nAuthor: " .. VehicleInfo.Author end
if ( VehicleInfo.Author and VehicleInfo.Author != "" ) then toolTip = toolTip .. "\n" .. l10n_author .. " " .. VehicleInfo.Author end

icon:SetTooltip( toolTip )
end
Expand Down Expand Up @@ -400,14 +402,15 @@ spawnmenu.AddContentType( "weapon", function( container, obj )
-- Generate a nice tooltip with extra info.
local SWEPinfo = weapons.Get( obj.spawnname )
local toolTip = language.GetPhrase( obj.nicename )
local l10n_author = language.GetPhrase ( "entityinfo.author" )
if ( !SWEPinfo ) then SWEPinfo = list.Get( "Weapon" )[ obj.spawnname ] end
if ( SWEPinfo ) then
toolTip = toolTip .. "\n"
-- These 2 really should be one
if ( SWEPinfo.Purpose and SWEPinfo.Purpose != "" ) then toolTip = toolTip .. "\n" .. SWEPinfo.Purpose end
if ( SWEPinfo.Instructions and SWEPinfo.Instructions != "" ) then toolTip = toolTip .. "\n" .. SWEPinfo.Instructions end

if ( SWEPinfo.Author and SWEPinfo.Author != "" ) then toolTip = toolTip .. "\nAuthor: " .. SWEPinfo.Author end
if ( SWEPinfo.Author and SWEPinfo.Author != "" ) then toolTip = toolTip .. "\n" .. l10n_author .. " " .. SWEPinfo.Author end
end

toolTip = toolTip .. "\n\n" .. language.GetPhrase( "spawnmenu.mmb_weapons" )
Expand Down
Binary file modified garrysmod/resource/garrysmod_english.txt
Binary file not shown.
Binary file removed garrysmod/resource/language/npc-ents_english.txt
Binary file not shown.
232 changes: 231 additions & 1 deletion garrysmod/resource/localization/en/entities.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,34 @@ edit_sky=Sky Editor
edit_sun=Sun Editor
sent_ball=Bouncy Ball

## are not in spawnmenu (map entities/created externally), displayed in kill feed, etc.
base_ai=Base SNPC
base_anim=Animated Entity
base_brush=Brush Entity
base_edit=Editor
base_entity=Entity
base_gmodentity=Entity
base_nextbot=Nextbot
gmod_anchor=Anchor
gmod_balloon=Balloon
gmod_button=Button
gmod_cameraprop=Camera
gmod_dynamite=Dynamite
gmod_emitter=Emitter
gmod_ghost=Ghost
gmod_hoverball=Hoverball
gmod_lamp=Lamp
gmod_light=Light
gmod_thruster=Thruster
gmod_wheel=Wheel
prop_effect=Effect
ragdoll_motion=Ragdoll Controller
sent_ai=SNPC
sent_anim=Animated Entity
sent_brush=Brush Entity
sent_nextbot=Nextbot
weapon_swep=Scripted Weapon

# Half-Life 2 weapons
weapon_357=.357 Magnum
weapon_alyxgun=Alyx's Gun
Expand Down Expand Up @@ -59,6 +87,20 @@ item_large_box_srounds=Pistol Ammo Box (Large)
item_ml_grenade=RPG Rocket
item_rpg_round=RPG Rocket

# Half-Life 2 ammo (picking up notifications)
357_ammo=357 Ammo
AlyxGun_ammo=Alyx Gun Ammo
AR2_ammo=AR2 Ammo
AR2AltFire_ammo=AR2 Energy Orbs
Buckshot_ammo=Shotgun Ammo
Grenade_ammo=Frag Grenades
Pistol_ammo=Pistol Ammo
RPG_Round_ammo=RPG Rockets
slam_ammo=S.L.A.M.
SMG1_ammo=SMG Ammo
SMG1_Grenade_ammo=SMG Grenades
XBowBolt_ammo=Crossbow Bolts

# Half-Life 2 pickups
item_battery=Suit Battery
item_grubnugget=Grub Nugget
Expand All @@ -76,6 +118,46 @@ prop_thumper=Thumper
npc_grenade_frag=Live Grenade
grenade_helicopter=Helicopter Bomb

## are not in spawnmenu (map entities/created externally), displayed in kill feed, etc.
combine_bouncemine=Combine Bouncy Mine
concussiveblast=Concussion Explosion
crane_tip=Crane Magnet
crossbow_bolt=Crossbow Bolt
ent_watery_leech=Water Leech
env_headcrabcanister=Headcrab Canister
func_recharge=Suit Recharger
func_tank=Mounted Gun
func_tank_combine_cannon=Combine Autogun
func_tankairboatgun=Airboat Gun
func_tankapcrocket=APC Rocket
grenade_ar2=SMG Grenade
grenade_homer=Homing Grenade
grenade_pathfollower=Pathfollowing Grenade
grenade_spit=Antlion Spit
hl2mp_ragdoll=Ragdoll
hunter_flechette=Flechette
item_ammo_crate=Ammo Crate
item_item_crate=Item Crate
mortarshell=Combine Suppression Device
npc_bullseye=Target
npc_grenade_bugbait=Bugbait
npc_launcher=Launcher
npc_satchel=Satchel Charge
npc_tripmine=Tripmine
prop_combine_ball=Combine Ball
prop_dropship_container=Dropship Container
prop_vehicle_airboat=Airboat
prop_vehicle_apc=Combine APC
prop_vehicle_crane=Crane
prop_vehicle_jeep=Vehicle
prop_vehicle_jeep_old=Vehicle
prop_vehicle_prisoner_pod=Pod
rpg_missile=RPG Missile
trigger_waterydeath=Water Leeches
script_conditions=Script
scripted_sequence=Scripted Sequence
item_dynamic_resupply=Dynamic Resupply

# Half-Life 2 NPCs
npc_alyx=Alyx Vance
npc_antlion=Antlion
Expand Down Expand Up @@ -140,6 +222,18 @@ npc_fastzombie_torso=Fast Zombie Torso
npc_poisonzombie=Poison Zombie
npc_zombine=Zombine

## are not in spawnmenu (map entities/created externally), displayed in kill feed, etc.
npc_advisor=Advisor
npc_barnacle_tongue_tip=Barnacle Tongue
npc_combine=Combine
npc_enemyfinder=Enemy Finder
npc_enemyfinder_combinecannon=Combine Cannon
npc_furniture=Actor
npc_missiledefense=Missile Defense
npc_turret_ground=Ground Turret
npc_apcdriver=Combine APC
proto_sniper=Sniper

# Half-Life: Source weapons
weapon_357_hl1=.357 Handgun
weapon_crossbow_hl1=Oldschool Crossbow
Expand Down Expand Up @@ -171,6 +265,21 @@ ammo_egonclip=Uranium Ammo Box
ammo_gaussclip=Uranium Ammo Box
ammo_rpgclip=RPG Rockets

# Half-Life: Source ammo (picking up notification)
9mmRound_ammo=9mm Ammo
12mmRound_ammo=12mm Ammo
357Round_ammo=Oldschool 357 Ammo
BuckshotHL1_ammo=SPAS-12 Ammo
GrenadeHL1_ammo=Hand Grenades
Hornet_ammo=Hornets
MP5_Grenade_ammo=MP5 Grenades
RPG_Rocket_ammo=Oldschool RPG Rockets
Satchel_ammo=Satchel Charges
Snark_ammo=Snarks
TripMine_ammo=Tripmines
Uranium_ammo=Uranium
XBowBoltHL1_ammo=Oldschool Crossbow Bolts

# Half-Life: Source pickups
item_longjump=Long Jump Module
weaponbox=Weapon Box
Expand Down Expand Up @@ -202,7 +311,50 @@ monster_bullchicken=Bullsquid
monster_headcrab=Classic Headcrab
monster_cockroach=Cockroach

# Half-Life: Source entities
## are not in spawnmenu (map entities/created externally), displayed in kill feed, etc.
monster_apache=Apache Helicopter
monster_barney_dead=Dead Security Officer
monster_bloater=Floater
monster_flyer=Flyer
monster_flyer_flock=Flyer Flock
monster_furniture=Actor
monster_generic=Actor
monster_grunt_repel=Repelling Grunt
monster_hevsuit_dead=Dead Researcher
monster_hgrunt_dead=Dead Grunt
monster_leech=Leech
monster_mortar=Mortar
monster_osprey=Osprey
monster_scientist_dead=Dead Scientist

# Half-Life: Source entities (are not in spawnmenu (map entities/created externally), displayed in kill feed, etc.)
bmortar=Big Momma Mortar Shot
controller_energy_ball=Energy Ball
controller_head_ball=Energy Ball
crossbow_bolt_hl1=Crossbow Bolt
func_pendulum=Pendulum
func_tanklaser=Tank Laser
func_tankrocket=Tank Rocket
func_tankmortar=Tank Mortar
func_tankphyscannister=Tank Canister
func_tankpulselaser=Tank Pulse
garg_stomp=Energy
grenade_mp5=MP5 Grenade
grenade_hand=Hand Grenade
hornet=Hornet
monster_satchel=Satchel Charge
monster_tripmine=Tripmine
nihilanth_energy_ball=Energy Ball
rpg_rocket=RPG Rocket
speaker=Speaker
squidspit=Bullsquid Spit
xen_hair=Xen Hair
xen_hull=Large Xen Spore
xen_spore_small=Small Xen Spore
xen_spore_medium=Medium Xen Spore
xen_spore_large=Large Xen Spore
xen_tree=Xen Tree
xen_plantlight=Xen Plant Light

# Portal entities
prop_energy_ball=High Energy Pellet
Expand All @@ -216,3 +368,81 @@ prop_glados_core_morality=Morality Core
npc_portal_turret_floor=Sentry Turret
npc_rocket_turret=Rocket Turret
npc_security_camera=Security Camera

# Source entities (are not in spawnmenu (map entities/created externally), displayed in kill feed, etc.)
bounce_bomb=Bouncy Grenade
dynamic_prop=Dynamic Prop
entityflame=Fire
env_beam=Beam
env_fire=Fire
env_explosion=Explosion
env_laser=Laser
env_physexplosion=Physics Explosion
env_physimpact=Impact
env_physwire=Wire
func_brush=Brush
func_button=Button
func_conveyor=Conveyer
func_door=Door
func_door_rotating=Door
func_movelinear=Moving Object
func_physbox=Physics Object
func_physbox_multiplayer=Physics Object
func_plat=Moving Object
func_platrot=Moving Object
func_pushable=Physics Object
func_rot_button=Button
func_rotating=Moving Object
func_tracktrain=Moving Object
func_train=Moving Object
func_wall=Wall
func_wall_toggle=Wall
generic_actor=Generic Actor
cycler_actor=Generic Actor
grenade=Grenade
grenade_beam=Mortar Beam
momentary_rot_button=Button
momentary_door=Door
npc_concussiongrenade=Concussion Grenade
npc_contactgrenade=Contact Grenade
npc_handgrenade=Grenade
phys_magnet=Magnet
physics_cannister=Cannister
physics_prop=Physics Prop
physics_prop_ragdoll=Ragdoll
player=Player
point_hurt=Point Hurt
prop_door_rotating=Door
prop_dynamic=Dynamic Prop
prop_dynamic_ornament=Dynamic Prop
prop_dynamic_override=Dynamic Prop
prop_physics=Physics Prop
prop_physics_multiplayer=Physics Prop
prop_physics_override=Physics Prop
prop_physics_respawnable=Physics Prop
prop_ragdoll=Ragdoll
prop_ragdoll_attached=Ragdoll
prop_sphere=Sphere
prop_vehicle=Vehicle
prop_vehicle_choreo_generic=Vehicle
prop_vehicle_driveable=Vehicle
simple_bot=Bot
simple_physics_brush=Brush
simple_physics_prop=Physics Prop
trigger=Trigger
trigger_hurt=Trigger Hurt
trigger_impact=Impact
trigger_vphysics_motion=Moving Object
worldspawn=World
logic_choreographed_scene=Choreographed Scene
env_entity_dissolver=Entity Dissolver
point_template=Entity Template
npc_antlion_template_maker=Antlion Spawner
helicopter_chunk=Helicopter Chunk

# Base Weapons (TODO: Do we need these here?)
basehlcombatweapon=Weapon
basehl2mpcombatweapon=Weapon
basehl1combatweapon=Weapon
basehl1mpcombatweapon=Weapon
weapon_hl2mp_base=Weapon
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_357.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
WeaponData
{
// Weapon data is loaded by both the Game and Client DLLs.
"printname" "#HL2_357Handgun"
"printname" "#weapon_357"
"viewmodel" "models/weapons/c_357.mdl"
"playermodel" "models/weapons/w_357.mdl"
"anim_prefix" "python"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_357_hl1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
WeaponData
{
// Weapon data is loaded by both the Game and Client DLLs.
"printname" "#HL1_357"
"printname" "#weapon_357_hl1"
"viewmodel" "models/v_357.mdl"
"playermodel" "models/weapons/w_357_hls.mdl"
"anim_prefix" "python"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_alyxgun.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
WeaponData
{
// Weapon data is loaded by both the Game and Client DLLs.
"printname" "#HL2_AlyxGun"
"printname" "#weapon_alyxgun"
"viewmodel" "models/weapons/c_pistol.mdl"
"playermodel" "models/weapons/w_alyx_gun.mdl" //FIXME:
"anim_prefix" "alyxgun"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_annabelle.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
WeaponData
{
// Weapon data is loaded by both the Game and Client DLLs.
"printname" "#HL2_Annabelle"
"printname" "#weapon_annabelle"
"viewmodel" "models/weapons/c_shotgun.mdl"
"playermodel" "models/weapons/w_annabelle.mdl"
"anim_prefix" "shotgun"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_ar2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
WeaponData
{
// Weapon data is loaded by both the Game and Client DLLs.
"printname" "#HL2_Pulse_Rifle"
"printname" "#weapon_ar2"
"viewmodel" "models/weapons/c_irifle.mdl"
"playermodel" "models/weapons/w_irifle.mdl"
"anim_prefix" "ar2"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_bugbait.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
WeaponData
{
// Weapon data is loaded by both the Game and Client DLLs.
"printname" "#HL2_Bugbait"
"printname" "#weapon_bugbait"
"viewmodel" "models/weapons/c_bugbait.mdl"
"playermodel" "models/weapons/w_bugbait.mdl"
"anim_prefix" "Grenade"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_citizenpackage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
WeaponData
{
// Weapon data is loaded by both the Game and Client DLLs.
"printname" "#HL2_Package"
"printname" "#weapon_citizenpackage"
"viewmodel" "models/weapons/w_package.mdl"
"playermodel" "models/weapons/w_package.mdl"
"anim_prefix" "smg2"
Expand Down
Loading