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 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -14,7 +14,7 @@ SWEP.Secondary.DefaultClip = -1
SWEP.Secondary.Automatic = true
SWEP.Secondary.Ammo = "none"

SWEP.PrintName = "#GMOD_Camera"
SWEP.PrintName = "#gmod_camera"
SWEP.Author = "Facepunch"

SWEP.Slot = 5
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

-- Variables that are used on both client and server

SWEP.PrintName = "#GMOD_ToolGun"
SWEP.PrintName = "#gmod_tool"
SWEP.Author = "Facepunch"
SWEP.Contact = ""
SWEP.Purpose = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SWEP.Weight = 5
SWEP.AutoSwitchTo = false
SWEP.AutoSwitchFrom = false

SWEP.PrintName = "#GMOD_ManhackGun"
SWEP.PrintName = "#manhack_welder"
SWEP.Slot = 3
SWEP.SlotPos = 1
SWEP.DrawAmmo = false
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 ( "spawnmenu.itemtooltip.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 ( "spawnmenu.itemtooltip.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 ( "spawnmenu.itemtooltip.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
2 changes: 1 addition & 1 deletion garrysmod/lua/weapons/weapon_fists.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

AddCSLuaFile()

SWEP.PrintName = "#GMOD_Fists"
SWEP.PrintName = "#weapon_fists"
SWEP.Author = "Kilburn, robotboy655, MaxOfS2D & Tenrys"
SWEP.Purpose = "Well we sure as hell didn't use guns! We would just wrestle Hunters to the ground with our bare hands! I used to kill ten, twenty a day, just using my fists."

Expand Down
2 changes: 1 addition & 1 deletion garrysmod/lua/weapons/weapon_flechettegun.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if ( !IsMounted( "ep2" ) ) then return end

AddCSLuaFile()

SWEP.PrintName = "#GMOD_FlechetteGun"
SWEP.PrintName = "#weapon_flechettegun"
SWEP.Author = "garry"
SWEP.Purpose = "Shoot flechettes with primary attack."

Expand Down
2 changes: 1 addition & 1 deletion garrysmod/lua/weapons/weapon_medkit.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

AddCSLuaFile()

SWEP.PrintName = "#GMOD_MedKit"
SWEP.PrintName = "#weapon_medkit"
SWEP.Author = "robotboy655, MaxOfS2D, code_gs"
SWEP.Purpose = "Heal other people with primary attack, heal yourself with secondary attack."

Expand Down
Binary file modified garrysmod/resource/garrysmod_english.txt
Binary file not shown.
29 changes: 29 additions & 0 deletions garrysmod/resource/localization/en/entities.properties
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,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 Down Expand Up @@ -169,6 +183,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=Oldchool 357 Ammo
Satton2 marked this conversation as resolved.
Show resolved Hide resolved
BuckshotHL1_ammo=SPAS-12 Ammo
GrenadeHL1_ammo=Hand Grenades
Hornet_ammo=Hornets
MP5_Grenade_ammo=MP5 Grenades
RPG_Rocket_ammo=Oldchool RPG Rockets
Satton2 marked this conversation as resolved.
Show resolved Hide resolved
Satchel_ammo=Satchel Charges
Snark_ammo=Snarks
TripMine_ammo=Tripmines
Uranium_ammo=Uranium
XBowBoltHL1_ammo=Oldchool Crossbow Bolts
Satton2 marked this conversation as resolved.
Show resolved Hide resolved

# Half-Life: Source pickups
item_longjump=Long Jump Module
weaponbox=Weapon Box
Expand Down
1 change: 1 addition & 0 deletions garrysmod/resource/localization/en/spawnmenu.properties
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ spawnmenu.mountablegame=a mountable game
spawnmenu.createautospawnlist=Create a spawnlist from this folder
spawnmenu.openaddononworkshop=Open on Steam Workshop
spawnmenu.mmb_weapons=You can use middle mouse click to spawn weapon(s) at your crosshair.
spawnmenu.itemtooltip.author=Author\:

spawnmenu.utilities_tab=Utilities
spawnmenu.utilities.user=User
Expand Down
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
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_citizensuitcase.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_Suitcase"
"printname" "#weapon_citizensuitcase"
"viewmodel" "models/weapons/w_suitcase_passenger.mdl"
"playermodel" "models/weapons/w_suitcase_passenger.mdl"
"anim_prefix" "smg2"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_crossbow.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_Crossbow"
"printname" "#weapon_crossbow"
"viewmodel" "models/weapons/c_crossbow.mdl"
"playermodel" "models/weapons/w_crossbow.mdl"
"anim_prefix" "bow"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_crossbow_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_Crossbow"
"printname" "#weapon_crossbow_hl1"
"viewmodel" "models/v_crossbow.mdl"
"playermodel" "models/weapons/w_crossbow_hls.mdl"
"anim_prefix" "bow"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_crowbar.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_Crowbar"
"printname" "#weapon_crowbar"
"viewmodel" "models/weapons/c_crowbar.mdl"
"playermodel" "models/weapons/w_crowbar.mdl"
"anim_prefix" "crowbar"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_crowbar_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_Crowbar"
"printname" "#weapon_crowbar_hl1"
"viewmodel" "models/v_crowbar.mdl"
"playermodel" "models/weapons/w_crowbar_hls.mdl"
"anim_prefix" "crowbar"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_cubemap.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_Cubemap"
"printname" "#weapon_cubemap"
"viewmodel" "models/shadertest/envballs.mdl"
"playermodel" "models/shadertest/envballs.mdl"
"anim_prefix" "envballs"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_egon.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_GluonGun"
"printname" "#weapon_egon"
"viewmodel" "models/v_egon.mdl"
"playermodel" "models/weapons/w_egon_hls.mdl"
"anim_prefix" "egon"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_frag.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
WeaponData
{
// Weapon data is loaded by both the Game and Client DLLs.
"printname" "#HL2_Grenade"
"printname" "#weapon_frag"
"viewmodel" "models/weapons/c_grenade.mdl"
"playermodel" "models/weapons/w_grenade.mdl"
"anim_prefix" "Grenade"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_gauss.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_TauCannon"
"printname" "#weapon_gauss"
"viewmodel" "models/v_gauss.mdl"
"playermodel" "models/weapons/w_gauss_hls.mdl"
"anim_prefix" "gauss"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_glock_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_Glock"
"printname" "#weapon_glock_hl1"
"viewmodel" "models/v_9mmhandgun.mdl"
"playermodel" "models/weapons/w_9mmhandgun.mdl"
"anim_prefix" "glock"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_handgrenade.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_HandGrenade"
"printname" "#weapon_handgrenade"
"viewmodel" "models/v_grenade.mdl"
"playermodel" "models/weapons/w_grenade_hls.mdl"
"anim_prefix" "crowbar"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_hornetgun.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_HornetGun"
"printname" "#weapon_hornetgun"
"viewmodel" "models/v_hgun.mdl"
"playermodel" "models/weapons/w_hgun_hls.mdl"
"anim_prefix" "hive"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_mp5_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_MP5"
"printname" "#weapon_mp5_hl1"
"viewmodel" "models/v_9mmAR.mdl"
"playermodel" "models/weapons/w_9mmar.mdl"
"anim_prefix" "mp5"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_oldmanharpoon.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
WeaponData
{
// Weapon data is loaded by both the Game and Client DLLs.
"printname" "#HL2_Harpoon"
"printname" "#weapon_oldmanharpoon"
"viewmodel" "models/lostcoast/fisherman/harpoon.mdl"
"playermodel" "models/lostcoast/fisherman/harpoon.mdl"
"anim_prefix" "smg2"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_physcannon.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_GravityGun"
"printname" "#weapon_physcannon"
"viewmodel" "models/weapons/c_physcannon.mdl"
"playermodel" "models/weapons/w_Physics.mdl"
"anim_prefix" "gauss"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_physgun.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" "#GMOD_Physgun"
"printname" "#weapon_physgun"
"viewmodel" "models/weapons/c_superphyscannon.mdl"
"playermodel" "models/weapons/w_Physics.mdl"
"anim_prefix" "pistol"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_pistol.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_Pistol"
"printname" "#weapon_pistol"
"viewmodel" "models/weapons/c_pistol.mdl"
"playermodel" "models/weapons/w_pistol.mdl"
"anim_prefix" "pistol"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_rpg.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_RPG"
"printname" "#weapon_rpg"
"viewmodel" "models/weapons/c_rpg.mdl"
"playermodel" "models/weapons/w_rocket_launcher.mdl"
"anim_prefix" "missile launcher"
Expand Down
2 changes: 1 addition & 1 deletion garrysmod/scripts/weapons/weapon_rpg_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_RPGLauncher"
"printname" "#weapon_rpg_hl1"
"viewmodel" "models/v_rpg.mdl"
"playermodel" "models/weapons/w_rpg_hls.mdl"
"anim_prefix" "rpg"
Expand Down
Loading