Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 0bfdaeaa857e311f69426836dbfe59bec733b474..4d893d60942bdcfd1f8f9ec5877d6b4a40e5173d 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -445,16 +445,16 @@ set g_balance_crylink_primary_damage 10
 set g_balance_crylink_primary_edgedamage 5
 set g_balance_crylink_primary_force -55
 set g_balance_crylink_primary_radius 80
-set g_balance_crylink_primary_speed 1800
-set g_balance_crylink_primary_spread 0.075
-set g_balance_crylink_primary_shots 7
+set g_balance_crylink_primary_speed 2000
+set g_balance_crylink_primary_spread 0.08
+set g_balance_crylink_primary_shots 6
 set g_balance_crylink_primary_bounces 1
 set g_balance_crylink_primary_refire 0.7
 set g_balance_crylink_primary_animtime 0.3
 set g_balance_crylink_primary_ammo 3
 set g_balance_crylink_primary_bouncedamagefactor 0.5
-set g_balance_crylink_primary_joindelay 0
-set g_balance_crylink_primary_joinspread 0.4
+set g_balance_crylink_primary_joindelay 0.1
+set g_balance_crylink_primary_joinspread 0.2
 set g_balance_crylink_primary_jointime 0
 set g_balance_crylink_primary_joinexplode 1
 set g_balance_crylink_primary_joinexplode_damage 0

diff --git a/menu.dat.es.po b/menu.dat.es.po
index 47ba9ac194d249a281b9ffddab4668f9c5d98155..65636cfccf65d6e119114112b0160f6aec01e31b 100644 (file)
--- a/menu.dat.es.po
+++ b/menu.dat.es.po
@@ -8,7 +8,8 @@ msgstr ""
 "Project-Id-Version: Xonotic 0.1preview\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-09-02 07:51+0200\n"
-"Last-Translator: Rodrigo Mouton Laudin <ratogenesis@gmail.com>\n"
+"Author: Rodrigo Mouton Laudin <ratogenesis@gmail.com>\n"
+"Last-Translator: mand1nga <mand1nga@xonotic.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"