← Back to branch summary

~z-man/armagetronad/armagetronad-zones-v1v2

~z-man/armagetronad/armagetronad-zones-v1v2

« back to all changes in this revision

Viewing changes to language/english_base.txt

Committer: Manuel Moos
Date: 2009-02-17 09:33:16 UTC
mfrom: (833.1.8 armagetronad)
Revision ID: z-man@users.sf.net-20090217093316-d978fvxdnqtad5ra

Merge from trunk, including protobuf.

files added:
src/network/nBinary.cpp

src/network/nBinary.h

src/network/nProtoBuf.cpp

src/network/nProtoBuf.h

src/network/nProtoBufForward.h

src/network/nStreamMessage.cpp

src/network/nStreamMessage.h

src/protobuf

src/protobuf/eEventNotification.proto

src/protobuf/eLagCompensation.proto

src/protobuf/eNetGameObject.proto

src/protobuf/ePlayer.proto

src/protobuf/eTeam.proto

src/protobuf/eTimer.proto

src/protobuf/eVoter.proto

src/protobuf/gAIBase.proto

src/protobuf/gCycle.proto

src/protobuf/gGame.proto

src/protobuf/gWall.proto

src/protobuf/gZone.proto

src/protobuf/nAuthentication.proto

src/protobuf/nConfig.proto

src/protobuf/nNetObject.proto

src/protobuf/nNetObjectPrivate.proto

src/protobuf/nNetwork.proto

src/protobuf/nServerInfo.proto

src/protobuf/prototype.proto

src/protobuf/tColor.proto

src/protobuf/tCoord.proto

src/protobuf/tFunction.proto

src/protobuf/tPolynomial.proto

src/protobuf/zShape.proto

src/protobuf/zZone.proto

src/tools/tCoord.cpp

src/tools/tPolynomial.cpp

src/tools/tPolynomialMarshaler.cpp

src/tools/tPolynomialWithBase.cpp

win32/protobuf.bat

files modified:
.bzrignore

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

MacOS/shared.xcconfig

NEWS

acinclude.m4

config/settings.cfg

config/settings_dedicated.cfg

configure.ac

doc/installation.txt

language/english_base.txt

minor_version

src/Makefile.am

src/engine/eEventNotification.cpp

src/engine/eEventNotification.h

src/engine/eLagCompensation.cpp

src/engine/eLagCompensation.h

src/engine/eNetGameObject.cpp

src/engine/eNetGameObject.h

src/engine/ePath.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/engine/eTimer.h

src/engine/eVoter.cpp

src/network/nAuthentication.cpp

src/network/nAuthentication.h

src/network/nConfig.cpp

src/network/nConfig.h

src/network/nKrawall.cpp

src/network/nKrawall.h

src/network/nNetObject.cpp

src/network/nNetObject.h

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nPriorizing.cpp

src/network/nPriorizing.h

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSocket.cpp

src/render/rSysdep.cpp

src/tools/tColor.cpp

src/tools/tColor.h

src/tools/tConfiguration.cpp

src/tools/tConsole.cpp

src/tools/tCoord.h

src/tools/tFunction.cpp

src/tools/tFunction.h

src/tools/tPolynomial.h

src/tools/tPolynomialMarshaler.h

src/tools/tPolynomialWithBase.h

src/tools/tRecorder.cpp

src/tools/tString.cpp

src/tools/tString.h

src/tools/tSysTime.cpp

src/tron/gAIBase.cpp

src/tron/gAIBase.h

src/tron/gCycle.cpp

src/tron/gCycle.h

src/tron/gCycleMovement.cpp

src/tron/gCycleMovement.h

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gParser.cpp

src/tron/gParser.h

src/tron/gServerFavorites.cpp

src/tron/gWall.cpp

src/tron/gWall.h

src/tron/gWinZone.cpp

src/tron/gWinZone.h

src/tron/zone/zEffectGroup.cpp

src/tron/zone/zEffectGroup.h

src/tron/zone/zMonitor.cpp

src/tron/zone/zMonitor.h

src/tron/zone/zShape.cpp

src/tron/zone/zShape.hpp

src/tron/zone/zValidator.cpp

src/tron/zone/zValidator.h

src/tron/zone/zZone.cpp

src/tron/zone/zZone.h

src/tron/zone/zZoneInfluence.cpp

src/tron/zone/zZoneInfluence.h

win32/README.txt

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/ArmagetronAd.workspace

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

Show diffs side-by-side

added added

removed removed

language/english_base.txt

429

429

lag_fast_weight_help Extra weight lag reports from the server influence the fast lag compensation with.

430

430

431

431

lag_credit_help Maximal seconds of total lag credit.

432

lag_credit_single_help Maximal seconds of lag credit for a single lag event.

432

lag_credit_single_help Maximal seconds of lag credit for a single lag credit event.

433

lag_credit_single_help Maximal multiple of the lag variance for a single lag credit event.

433

434

lag_sweet_spot_help Sweet spot, the fill ratio of lag credit the server tries to keep the client at.

434

435

lag_credit_time_help Timescale lag credit is restored on.

435

436

436

437

lag_offset_client_help Extra amount of lag compensation, determined by the client.

437

438

lag_offset_server_help Extra amount of lag compensation, determined by the server.

438

lag_offset_legacy_help Extra amount of lag compensation for clients that don't support automatic compensation, determined by the server.

439

439

440

440

#********************************************

441

441

#********************************************

613

613

talk_to_master_help Announce this server on the internet?

614

614

max_out_rate_help Maximum network output rate

615

615

max_in_rate_help Maximum network input rate

616

message_cache_size_help Size of the network message cache in messages.

617

message_cache_effort_help Effort taken to compress network messages.

616

618

ping_charity_help How much ping are you willing to take over from your opponent?

617

619

ping_charity_max_help Server option: maximum ping charity value. Set to 0 to avoid instant kills. Active only if all clients are 0.2.8.3 or better.

618

620

ping_charity_min_help Server option: minimum ping charity value. Use to enforce fairness. Active only if all clients are 0.2.8.3 or better.

2842

2844

access_level_hide_of_help Minimal access level to be able to hide it's own user account information.

2843

2845

access_level_hide_to_help Minimal access level to see everyone's user account information.

2844

2846

access_level_team_help Minimal access level for /lock, /unlock, /invite and /uninvite team management.

2845

access_level_op_help Minimal access level for /op, /deop, /promote and /demote co-admin management commands commands.

2846

access_level_op_max_help Maximal access level attainable by /op and /promote commands.

2847

access_level_op_help Minimal access level for /op and /deop co-admin management commands commands.

2848

access_level_op_max_help Maximal access level directly attainable by /op commands.

2847

2849

access_level_admin_help Minimal access level for /admin command.

2848

access_level_rtfm_help Minimal access level for /teach or /rtfm command.

2850

access_level_rtfm_help Minimal access level for /teach or /rtfm command.

2849

2851

access_level_chat_help Minimal access level for chatting.

2850

2852

access_level_ips_help Minimal access level you need for seeing IPs of other players in the /players command.

2851

2853

access_level_nver_help Minimal access level you need for seeing Network versions/strings from other players in /players.

2866

2868

access_level_vote_command_execute_help Minimal access level successful command votes will be executed at.

2867

2869

2868

2870

access_level_chat_timeout_help Time in seconds between public announcements that someone wants to chat, but can't. Set to 0 to disable the public warnings.

2869

access_level_chat_request \10xRESETT would like to chat, but is not authorized yet. Would someone be so kind and say "/op \2" or "/promote \2"?\n

2871

access_level_chat_request \10xRESETT would like to chat, but is not authorized yet. Would someone be so kind and say "/op \2"?\n

2870

2872

access_level_chat_denied 0xff7f7fChat denied,0xffffff insufficient access level.\n

2871

2873

access_level_op_denied 0xff7f7f\1 denied,0xffffff insufficient access level.\n

2872

2874

access_level_op_overpowered 0xff7f7f\1 denied,0xffffff your need higher access righrs than your victim.\n

2874

2876

access_level_op_denied_max 0xff7f7f\1 denied,0xffffff your victim already has maximal rights.\n

2875

2877

access_level_op_denied_ai 0xff7f7f\1 denied,0xffffff your victim is an AI.\n

2876

2878

access_level_op_same \1: This would have no effect.\n

2877

access_level_op_unclear \1: User is already logged in, please explicitely set an access level.\n

2879

access_level_op_unclear \1: User is already logged in, please explicitly set an access level.\n

2878

2880

2879

2881

access_level_demote \1 has been demoted to "\2" by order of \3.\n

2880

2882

access_level_promote \1 has been promoted to "\2" by order of \3.\n

Older »