merge changes for storm-1452

master
Oz Linden 2011-06-30 06:40:46 -04:00
commit f07173a968
6 changed files with 12 additions and 10 deletions

View File

@ -452,6 +452,7 @@ Jonathan Yap
STORM-899
STORM-1273
STORM-457
STORM-1452
STORM-1406
STORM-1327
STORM-1396
@ -791,6 +792,7 @@ Strife Onizuka
SNOW-691
TankMaster Finesmith
STORM-1100
STORM-1452
Tayra Dagostino
SNOW-517
SNOW-543

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="DEBUG INDSTILLINGER">
<radio_group name="boolean_combo">
<radio_item label="SANDT" name="TRUE" value="sand"/>
<radio_item label="FALSK" name="FALSE" value=""/>
<radio_item label="SANDT" name="TRUE" />
<radio_item label="FALSK" name="FALSE" />
</radio_group>
<color_swatch label="Farve" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="CONFIGURACIONES DEL DEPURADOR">
<radio_group name="boolean_combo">
<radio_item label="VERDADERO" name="TRUE" value="verdadero"/>
<radio_item label="FALSO" name="FALSE" value=""/>
<radio_item label="VERDADERO" name="TRUE" />
<radio_item label="FALSO" name="FALSE" />
</radio_group>
<color_swatch label="Color" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="PARAMETRI DI DEBUG">
<radio_group name="boolean_combo">
<radio_item label="VERO" name="TRUE" value="vero"/>
<radio_item label="FALSO" name="FALSE" value=""/>
<radio_item label="VERO" name="TRUE" />
<radio_item label="FALSO" name="FALSE" />
</radio_group>
<color_swatch label="Colore" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="USTAWIENIA DEBUGOWANIA">
<radio_group name="boolean_combo">
<radio_item label="PRAWDA" name="TRUE" value="prawda"/>
<radio_item label="NIEPRAWDA" name="FALSE" value=""/>
<radio_item label="PRAWDA" name="TRUE" />
<radio_item label="NIEPRAWDA" name="FALSE" />
</radio_group>
<color_swatch label="Kolor" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="DEBUG SETTINGS">
<radio_group name="boolean_combo">
<radio_item label="TRUE" name="TRUE" value="verdadeiro"/>
<radio_item label="FALSE" name="FALSE" value=""/>
<radio_item label="TRUE" name="TRUE" />
<radio_item label="FALSE" name="FALSE" />
</radio_group>
<color_swatch label="Cor" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/>