← Back to branch summary

~armagetronad-dev/armagetronad/trunk-armagetronad-fortress_ai

~armagetronad-dev/armagetronad/trunk-armagetronad-fortress_ai

« back to all changes in this revision

Viewing changes to language/british.txt

Committer: Manuel Moos
Date: 2010-08-07 21:08:56 UTC
mfrom: (890.1.89 armagetronad)
Revision ID: z-man@users.sf.net-20100807210856-93ljrijn34c77p5v

Merging from mainline.

files added:
config/keys_cursor.cfg

config/keys_cursor_single.cfg

config/keys_twohand.cfg

config/keys_wasd.cfg

config/keys_x.cfg

config/keys_zqsd.cfg

language/portugese.txt

files modified:
COPYING.txt

batch/rcd_startstop.in

batch/serverstarter.in

bootstrap.sh

config/Makefile.am

config/default.cfg

config/settings.cfg

configure.ac

language/american.txt

language/british.txt

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/new.txt

src/doc/bugs.html.m4

src/doc/changelog.html.m4

src/engine/eCamera.cpp

src/engine/eCamera.h

src/engine/eGameObject.cpp

src/engine/eGameObject.h

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eVoter.cpp

src/network/nNetObject.cpp

src/network/nNetwork.cpp

src/network/nProtoBuf.cpp

src/render/rConsole.h

src/render/rConsoleGraph.cpp

src/render/rFont.h

src/render/rViewport.cpp

src/resource/tResource.cpp

src/resource/tResourceManager.cpp

src/tools/tColor.h

src/tools/tMemManager.cpp

src/tools/tMemManager.h

src/tools/tRecorder.cpp

src/tools/tSysTime.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gCycleMovement.cpp

src/tron/gCycleMovement.h

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gLanguageMenu.cpp

src/tron/gLanguageMenu.h

src/tron/gLogo.cpp

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gParser.h

src/tron/gServerBrowser.cpp

src/tron/gServerFavorites.cpp

src/tron/gServerFavorites.h

src/tron/gSparks.cpp

src/tron/gTeam.cpp

src/ui/uInput.cpp

src/ui/uInput.h

src/ui/uMenu.cpp

src/ui/uMenu.h

Show diffs side-by-side

added added

removed removed

language/british.txt

17

17

colordepth_help colour depth to use (0: 16 1: desktop 2: 24)

18

18

last_colordepth_help colour depth, last successful init

19

19

zdepth_help z buffer depth to use (0: 16 1: from colour depth 2: 32)

20

failed_attempts_help Number of failed attemts to initialise graphics mode

20

failed_attempts_help Number of failed attempts to initialise graphics mode

21

21

player_blue_help Lets you choose the blue component of your colour.

22

22

player_green_help Lets you choose the green component of your colour.

23

23

player_red_help Lets you choose the red component of your colour.

24

player_name_team_help You can set your prefered method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple colour label.

24

player_name_team_help You can set your preferred method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple colour label.

25

25

player_num_per_team_help Set your favourite number of players per team here. When you join a game and the smallest team has less players than specified here, you'll join that team. Otherwise, you will create a new team. Only the default behaviour is governed by this setting; you can switch teams later.

26

26

player_camera_initial_help Choose your favourite camera perspective here.

27

27

player_camera_fov_help Choose your favourite FOV (Field of vision).

Older »