From: Rudolf Polzer Date: Sat, 13 Aug 2011 12:10:04 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/terencehill/better_dom_hud_stats' X-Git-Tag: xonotic-v0.5.0~148^2~10 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=6090fd965ca0c109683dc1dbcc041dd37d32339a;hp=4ff407cfdee127549288cb13456a87ea6e3d18df;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/terencehill/better_dom_hud_stats' --- diff --git a/csprogs.dat.de.po b/csprogs.dat.de.po index aab41bdf6..653f80695 100644 --- a/csprogs.dat.de.po +++ b/csprogs.dat.de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1preview\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-27 18:26+0200\n" +"POT-Creation-Date: 2011-08-04 22:19+0200\n" "PO-Revision-Date: 2011-04-20 10:46+0200\n" "Last-Translator: Rudolf Polzer \n" "Language-Team: Rudolf Polzer \n" @@ -68,13 +68,13 @@ msgid "A CSQC entity changed its owner! (edict: %d, classname: %s)\n" msgstr "" "Ein CSQC-Entity hat seinen Besitzer gewechselt! (edict: %d, classname: %s)\n" -#: qcsrc/client/Main.qc:953 +#: qcsrc/client/Main.qc:964 #, c-format msgid "A CSQC entity changed its type! (edict: %d, classname: %s)\n" msgstr "" "Ein CSQC-Entity hat seinen Typ gewechselt! (edict: %d, classname: %s)\n" -#: qcsrc/client/Main.qc:994 +#: qcsrc/client/Main.qc:1005 #, c-format msgid "" "Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: " @@ -83,12 +83,12 @@ msgstr "" "Unbekannter Entity-Typ in CSQC_Ent_Update (enttype: %d, edict: %d, " "classname: %s)\n" -#: qcsrc/client/Main.qc:1463 +#: qcsrc/client/Main.qc:1450 #, c-format msgid "%s (not bound)" msgstr "%s (nicht zugewiesen)" -#: qcsrc/client/Main.qc:1468 qcsrc/client/hud.qc:407 +#: qcsrc/client/Main.qc:1455 qcsrc/client/hud.qc:407 #, c-format msgid "%s (%s)" msgstr "%s (%s)" @@ -797,152 +797,152 @@ msgstr "Ja (%s): %d" msgid "No (%s): %d" msgstr "Nein (%s): %d" -#: qcsrc/client/hud.qc:3667 qcsrc/client/hud.qc:3670 qcsrc/client/hud.qc:3672 +#: qcsrc/client/hud.qc:3663 qcsrc/client/hud.qc:3666 qcsrc/client/hud.qc:3668 msgid "Personal best" msgstr "Persönliche Bestzeit" -#: qcsrc/client/hud.qc:3685 qcsrc/client/hud.qc:3688 qcsrc/client/hud.qc:3690 +#: qcsrc/client/hud.qc:3681 qcsrc/client/hud.qc:3684 qcsrc/client/hud.qc:3686 msgid "Server best" msgstr "Server-Bestzeit" -#: qcsrc/client/hud.qc:4031 +#: qcsrc/client/hud.qc:4027 msgid "^3Player^7: This is the chat area." msgstr "^3Player^7: Das ist der Chat-Bereich." -#: qcsrc/client/hud.qc:4098 +#: qcsrc/client/hud.qc:4094 #, c-format msgid "FPS: %.*f" msgstr "FPS: %.*f" -#: qcsrc/client/hud.qc:4164 +#: qcsrc/client/hud.qc:4160 msgid "^1Observing" msgstr "^1Beobachten" -#: qcsrc/client/hud.qc:4166 +#: qcsrc/client/hud.qc:4162 #, c-format msgid "^1Spectating: ^7%s" msgstr "^1Zuschauen bei: ^7%s" -#: qcsrc/client/hud.qc:4170 +#: qcsrc/client/hud.qc:4166 #, c-format msgid "^1Press ^3%s^1 to spectate" msgstr "^1Drücke ^3%s^1, um bei jemandem zuzuschauen" -#: qcsrc/client/hud.qc:4172 +#: qcsrc/client/hud.qc:4168 #, c-format msgid "^1Press ^3%s^1 for another player" msgstr "^1Drücke ^3%s^1 für einen anderen Spieler" -#: qcsrc/client/hud.qc:4176 +#: qcsrc/client/hud.qc:4172 #, c-format msgid "^1Use ^3%s^1 or ^3%s^1 to change the speed" msgstr "^1Benutze ^3%s^1 oder ^3%s^1 zum Ändern der Geschwindigkeit" -#: qcsrc/client/hud.qc:4178 +#: qcsrc/client/hud.qc:4174 #, c-format msgid "^1Press ^3%s^1 to observe" msgstr "^1Drücke ^3%s^1 zum Beobachten" -#: qcsrc/client/hud.qc:4181 +#: qcsrc/client/hud.qc:4177 #, c-format msgid "^1Press ^3%s^1 for gamemode info" msgstr "^1Drücke ^3%s^1 für Spielmodus-Info" -#: qcsrc/client/hud.qc:4185 +#: qcsrc/client/hud.qc:4181 msgid "^1Wait for your turn to join" msgstr "^1Warte, bis du dran bist" -#: qcsrc/client/hud.qc:4191 +#: qcsrc/client/hud.qc:4187 msgid "^1Match has already begun" msgstr "^1Das Match hat bereits begonnen" -#: qcsrc/client/hud.qc:4193 +#: qcsrc/client/hud.qc:4189 msgid "^1You have no more lives left" msgstr "^1Du hast keine Leben mehr übrig" -#: qcsrc/client/hud.qc:4195 qcsrc/client/hud.qc:4198 +#: qcsrc/client/hud.qc:4191 qcsrc/client/hud.qc:4194 #, c-format msgid "^1Press ^3%s^1 to join" -msgstr "^1Drücke ^3%s^1 zum Eintreten" +msgstr "^1Drücke ^3%s^1 zum Mitspielen" -#: qcsrc/client/hud.qc:4206 +#: qcsrc/client/hud.qc:4202 #, c-format msgid "^1Game starts in ^3%d^1 seconds" msgstr "^1Das Spiel beginnt in ^3%d^1 Sekunden" -#: qcsrc/client/hud.qc:4213 +#: qcsrc/client/hud.qc:4209 msgid "^2Currently in ^1warmup^2 stage!" msgstr "^2Momentan in der ^1Aufwärmphase!" -#: qcsrc/client/hud.qc:4228 +#: qcsrc/client/hud.qc:4224 #, c-format msgid "%sPress ^3%s%s to end warmup" msgstr "%sDrücke ^3%s%s um die Aufwärmphase zu beenden" -#: qcsrc/client/hud.qc:4230 +#: qcsrc/client/hud.qc:4226 #, c-format msgid "%sPress ^3%s%s once you are ready" msgstr "%sDrücke ^3%s%s sobald du soweit bist" -#: qcsrc/client/hud.qc:4235 +#: qcsrc/client/hud.qc:4231 msgid "^2Waiting for others to ready up to end warmup..." msgstr "^2Warte, bis andere bereit sind, um die Aufwärmphase zu beenden" -#: qcsrc/client/hud.qc:4237 +#: qcsrc/client/hud.qc:4233 msgid "^2Waiting for others to ready up..." msgstr "^2Warte, bis andere bereit sind..." -#: qcsrc/client/hud.qc:4243 +#: qcsrc/client/hud.qc:4239 #, c-format msgid "^2Press ^3%s^2 to end warmup" msgstr "^2Drücke ^3%s^2 um die Aufwärmphase zu beenden" -#: qcsrc/client/hud.qc:4264 +#: qcsrc/client/hud.qc:4260 msgid "Teamnumbers are unbalanced!" msgstr "Die Teams sind unbalanciert!" -#: qcsrc/client/hud.qc:4269 +#: qcsrc/client/hud.qc:4265 #, c-format msgid " Press ^3%s%s to adjust" msgstr "Drücke ^3%s%s um dies zu korrigieren" -#: qcsrc/client/hud.qc:4277 +#: qcsrc/client/hud.qc:4273 msgid "^7Press ^3ESC ^7to show HUD options." msgstr "^7Drücke ^3ESC^7 um die HUD-Optionen zu zeigen" -#: qcsrc/client/hud.qc:4279 +#: qcsrc/client/hud.qc:4275 msgid "^3Doubleclick ^7a panel for panel-specific options." msgstr "^3Doppelklick^7 auf ein Panel für Panel-spezifische Optionen." -#: qcsrc/client/hud.qc:4281 +#: qcsrc/client/hud.qc:4277 msgid "^3CTRL ^7to disable collision testing, ^3SHIFT ^7and" msgstr "^3CTRL^7 um Kollisionstests zu deaktivieren, ^3SHIFT^7 und" -#: qcsrc/client/hud.qc:4283 +#: qcsrc/client/hud.qc:4279 msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT^7 + ^3PFEILTASTEN^7 für Feinjustierungen" -#: qcsrc/client/hud.qc:4319 +#: qcsrc/client/hud.qc:4315 msgid " qu/s" msgstr "qu/s" -#: qcsrc/client/hud.qc:4323 +#: qcsrc/client/hud.qc:4319 msgid " m/s" msgstr "m/s" -#: qcsrc/client/hud.qc:4327 +#: qcsrc/client/hud.qc:4323 msgid " km/h" msgstr "km/h" -#: qcsrc/client/hud.qc:4331 +#: qcsrc/client/hud.qc:4327 msgid " mph" msgstr "mph" -#: qcsrc/client/hud.qc:4335 +#: qcsrc/client/hud.qc:4331 msgid " knots" msgstr "Knoten" -#: qcsrc/client/hud.qc:4686 +#: qcsrc/client/hud.qc:4682 msgid "Automatically fixed wrong/missing panel numbers in _hud_panelorder\n" msgstr "Falsche Panel-Nummern in _hud_panelorder wurden automatisch behoben" @@ -975,7 +975,7 @@ msgstr "Egal" msgid "Vote for a map" msgstr "Wähle eine Map" -#: qcsrc/client/mapvoting.qc:199 +#: qcsrc/client/mapvoting.qc:200 #, c-format msgid "%d seconds left" msgstr "%d Sekunden übrig" @@ -1025,13 +1025,13 @@ msgstr "Du hast die %s!" msgid "Trying to remove a team which is not in the teamlist!" msgstr "Versuchte, ein Team zu löschen, das nicht in der Teamliste ist!" -#: qcsrc/client/movetypes.qc:159 +#: qcsrc/client/movetypes.qc:163 #, c-format msgid "Can't unstick an entity (edict: %d, classname: %s, origin: %s)\n" msgstr "" "Kann ein Objekt nicht befreien (edict: %d, classname: %s, origin: %s)\n" -#: qcsrc/client/movetypes.qc:162 +#: qcsrc/client/movetypes.qc:166 #, c-format msgid "Sucessfully unstuck an entity (edict: %d, classname: %s, origin: %s)\n" msgstr "" @@ -1377,68 +1377,68 @@ msgstr "Fehlendes Feld '%s' wurde ergänzt.\n" msgid "N/A" msgstr "-" -#: qcsrc/client/scoreboard.qc:949 +#: qcsrc/client/scoreboard.qc:950 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Genauigkeit (Durchschn.: %d%%)" -#: qcsrc/client/scoreboard.qc:1014 +#: qcsrc/client/scoreboard.qc:1015 #, c-format msgid "%d%%" msgstr "%d%%" -#: qcsrc/client/scoreboard.qc:1074 +#: qcsrc/client/scoreboard.qc:1075 msgid "Rankings" msgstr "Platzierungen" -#: qcsrc/client/scoreboard.qc:1165 qcsrc/client/scoreboard.qc:1167 +#: qcsrc/client/scoreboard.qc:1170 qcsrc/client/scoreboard.qc:1172 msgid "Scoreboard" msgstr "Tabelle" -#: qcsrc/client/scoreboard.qc:1208 +#: qcsrc/client/scoreboard.qc:1218 #, c-format msgid "Speed award: %d ^7(%s^7)" msgstr "Höchstgeschwindigkeit: %d ^7(%s^7)" -#: qcsrc/client/scoreboard.qc:1212 +#: qcsrc/client/scoreboard.qc:1222 #, c-format msgid "All-time fastest: %d ^7(%s^7)" msgstr "Rekord: %d ^7(%s^7)" -#: qcsrc/client/scoreboard.qc:1239 qcsrc/client/teamplay.qc:63 +#: qcsrc/client/scoreboard.qc:1249 qcsrc/client/teamplay.qc:63 msgid "Spectators" msgstr "Zuschauer" -#: qcsrc/client/scoreboard.qc:1246 +#: qcsrc/client/scoreboard.qc:1255 #, c-format msgid "playing on ^2%s^7" msgstr "es wird auf ^2%s^7 gespielt" -#: qcsrc/client/scoreboard.qc:1253 qcsrc/client/scoreboard.qc:1258 +#: qcsrc/client/scoreboard.qc:1262 qcsrc/client/scoreboard.qc:1267 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " für bis zu ^1%.1f Minuten^7" -#: qcsrc/client/scoreboard.qc:1262 qcsrc/client/scoreboard.qc:1281 +#: qcsrc/client/scoreboard.qc:1271 qcsrc/client/scoreboard.qc:1290 msgid " or" msgstr " oder" -#: qcsrc/client/scoreboard.qc:1265 qcsrc/client/scoreboard.qc:1272 +#: qcsrc/client/scoreboard.qc:1274 qcsrc/client/scoreboard.qc:1281 #, c-format msgid " until ^3%s %s^7" msgstr " bis ^3%s %s^7" -#: qcsrc/client/scoreboard.qc:1266 qcsrc/client/scoreboard.qc:1273 -#: qcsrc/client/scoreboard.qc:1285 qcsrc/client/scoreboard.qc:1292 +#: qcsrc/client/scoreboard.qc:1275 qcsrc/client/scoreboard.qc:1282 +#: qcsrc/client/scoreboard.qc:1294 qcsrc/client/scoreboard.qc:1301 msgid "SCO^points" msgstr "Punkte" -#: qcsrc/client/scoreboard.qc:1267 qcsrc/client/scoreboard.qc:1274 -#: qcsrc/client/scoreboard.qc:1286 qcsrc/client/scoreboard.qc:1293 +#: qcsrc/client/scoreboard.qc:1276 qcsrc/client/scoreboard.qc:1283 +#: qcsrc/client/scoreboard.qc:1295 qcsrc/client/scoreboard.qc:1302 msgid "SCO^is beaten" msgstr "geschlagen wird" -#: qcsrc/client/scoreboard.qc:1284 qcsrc/client/scoreboard.qc:1291 +#: qcsrc/client/scoreboard.qc:1293 qcsrc/client/scoreboard.qc:1300 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " bis zu einem Vorsprung von ^3%s %s^7" @@ -1464,204 +1464,208 @@ msgstr "Gelbes Team" msgid "Pink Team" msgstr "Pinkes Team" -#: qcsrc/client/waypointsprites.qc:234 +#: qcsrc/client/waypointsprites.qc:254 msgid "Push" msgstr "Drücken" -#: qcsrc/client/waypointsprites.qc:235 +#: qcsrc/client/waypointsprites.qc:255 msgid "Destroy" msgstr "Zerstören" -#: qcsrc/client/waypointsprites.qc:236 +#: qcsrc/client/waypointsprites.qc:256 msgid "Defend" msgstr "Verteidigen" -#: qcsrc/client/waypointsprites.qc:237 +#: qcsrc/client/waypointsprites.qc:257 msgid "Blue base" msgstr "Blaue Basis" -#: qcsrc/client/waypointsprites.qc:238 +#: qcsrc/client/waypointsprites.qc:258 msgid "DANGER" msgstr "GEFAHR" -#: qcsrc/client/waypointsprites.qc:239 +#: qcsrc/client/waypointsprites.qc:259 msgid "Flag carrier" msgstr "Flaggenträger" -#: qcsrc/client/waypointsprites.qc:240 +#: qcsrc/client/waypointsprites.qc:260 msgid "Dropped flag" msgstr "Flagge" -#: qcsrc/client/waypointsprites.qc:241 +#: qcsrc/client/waypointsprites.qc:261 msgid "Help me!" msgstr "Hilfe!" -#: qcsrc/client/waypointsprites.qc:242 +#: qcsrc/client/waypointsprites.qc:262 msgid "Here" msgstr "Hier" -#: qcsrc/client/waypointsprites.qc:243 +#: qcsrc/client/waypointsprites.qc:263 msgid "Dropped key" msgstr "Schlüssel" -#: qcsrc/client/waypointsprites.qc:244 qcsrc/client/waypointsprites.qc:246 -#: qcsrc/client/waypointsprites.qc:247 qcsrc/client/waypointsprites.qc:248 -#: qcsrc/client/waypointsprites.qc:249 +#: qcsrc/client/waypointsprites.qc:264 qcsrc/client/waypointsprites.qc:266 +#: qcsrc/client/waypointsprites.qc:267 qcsrc/client/waypointsprites.qc:268 +#: qcsrc/client/waypointsprites.qc:269 msgid "Key carrier" msgstr "Schlüsselträger" -#: qcsrc/client/waypointsprites.qc:245 +#: qcsrc/client/waypointsprites.qc:265 msgid "Run here" msgstr "Hier her!" -#: qcsrc/client/waypointsprites.qc:250 +#: qcsrc/client/waypointsprites.qc:270 msgid "Red base" msgstr "Rote Basis" -#: qcsrc/client/waypointsprites.qc:251 +#: qcsrc/client/waypointsprites.qc:271 msgid "Waypoint" msgstr "Wegpunkt" -#: qcsrc/client/waypointsprites.qc:252 qcsrc/client/waypointsprites.qc:253 -#: qcsrc/client/waypointsprites.qc:254 +#: qcsrc/client/waypointsprites.qc:272 qcsrc/client/waypointsprites.qc:273 +#: qcsrc/client/waypointsprites.qc:274 msgid "Generator" msgstr "Generator" -#: qcsrc/client/waypointsprites.qc:255 qcsrc/client/waypointsprites.qc:256 -#: qcsrc/client/waypointsprites.qc:257 qcsrc/client/waypointsprites.qc:258 -#: qcsrc/client/waypointsprites.qc:259 qcsrc/client/waypointsprites.qc:260 -#: qcsrc/client/waypointsprites.qc:261 qcsrc/client/waypointsprites.qc:262 -#: qcsrc/client/waypointsprites.qc:285 qcsrc/client/waypointsprites.qc:286 -#: qcsrc/client/waypointsprites.qc:287 qcsrc/client/waypointsprites.qc:288 -#: qcsrc/client/waypointsprites.qc:289 +#: qcsrc/client/waypointsprites.qc:275 qcsrc/client/waypointsprites.qc:276 +#: qcsrc/client/waypointsprites.qc:277 qcsrc/client/waypointsprites.qc:278 +#: qcsrc/client/waypointsprites.qc:279 qcsrc/client/waypointsprites.qc:280 +#: qcsrc/client/waypointsprites.qc:281 qcsrc/client/waypointsprites.qc:282 +#: qcsrc/client/waypointsprites.qc:306 qcsrc/client/waypointsprites.qc:307 +#: qcsrc/client/waypointsprites.qc:308 qcsrc/client/waypointsprites.qc:309 +#: qcsrc/client/waypointsprites.qc:310 msgid "Control point" msgstr "Kontrollpunkt" -#: qcsrc/client/waypointsprites.qc:263 +#: qcsrc/client/waypointsprites.qc:283 msgid "Checkpoint" msgstr "Checkpoint" -#: qcsrc/client/waypointsprites.qc:264 +#: qcsrc/client/waypointsprites.qc:284 qcsrc/client/waypointsprites.qc:286 msgid "Finish" msgstr "Ziel" -#: qcsrc/client/waypointsprites.qc:265 +#: qcsrc/client/waypointsprites.qc:285 qcsrc/client/waypointsprites.qc:286 msgid "Start" msgstr "Start" -#: qcsrc/client/waypointsprites.qc:266 qcsrc/client/waypointsprites.qc:267 +#: qcsrc/client/waypointsprites.qc:287 qcsrc/client/waypointsprites.qc:288 msgid "Ball" msgstr "Ball" -#: qcsrc/client/waypointsprites.qc:268 +#: qcsrc/client/waypointsprites.qc:289 msgid "Ball carrier" msgstr "Ballbesitzer" -#: qcsrc/client/waypointsprites.qc:269 qcsrc/server/w_laser.qc:2 +#: qcsrc/client/waypointsprites.qc:290 qcsrc/server/w_laser.qc:2 msgid "Laser" msgstr "Laser" -#: qcsrc/client/waypointsprites.qc:270 qcsrc/server/w_shotgun.qc:2 +#: qcsrc/client/waypointsprites.qc:291 qcsrc/server/w_shotgun.qc:2 msgid "Shotgun" msgstr "Shotgun" -#: qcsrc/client/waypointsprites.qc:271 qcsrc/server/w_uzi.qc:2 +#: qcsrc/client/waypointsprites.qc:292 qcsrc/server/w_uzi.qc:2 msgid "Machine Gun" msgstr "Machine Gun" -#: qcsrc/client/waypointsprites.qc:272 qcsrc/server/w_grenadelauncher.qc:2 +#: qcsrc/client/waypointsprites.qc:293 qcsrc/server/w_grenadelauncher.qc:2 msgid "Mortar" msgstr "Mortar" -#: qcsrc/client/waypointsprites.qc:273 qcsrc/server/w_electro.qc:2 +#: qcsrc/client/waypointsprites.qc:294 qcsrc/server/w_electro.qc:2 msgid "Electro" msgstr "Electro" -#: qcsrc/client/waypointsprites.qc:274 qcsrc/server/w_crylink.qc:2 +#: qcsrc/client/waypointsprites.qc:295 qcsrc/server/w_crylink.qc:2 msgid "Crylink" msgstr "Crylink" -#: qcsrc/client/waypointsprites.qc:275 qcsrc/server/w_nex.qc:2 +#: qcsrc/client/waypointsprites.qc:296 qcsrc/server/w_nex.qc:2 msgid "Nex" msgstr "Nex" -#: qcsrc/client/waypointsprites.qc:276 qcsrc/server/w_hagar.qc:2 +#: qcsrc/client/waypointsprites.qc:297 qcsrc/server/w_hagar.qc:2 msgid "Hagar" msgstr "Hagar" -#: qcsrc/client/waypointsprites.qc:277 qcsrc/server/w_rocketlauncher.qc:2 +#: qcsrc/client/waypointsprites.qc:298 qcsrc/server/w_rocketlauncher.qc:2 msgid "Rocket Launcher" msgstr "Rocket Launcher" -#: qcsrc/client/waypointsprites.qc:278 qcsrc/server/w_porto.qc:2 +#: qcsrc/client/waypointsprites.qc:299 qcsrc/server/w_porto.qc:2 msgid "Port-O-Launch" msgstr "Port-O-Launch" -#: qcsrc/client/waypointsprites.qc:279 +#: qcsrc/client/waypointsprites.qc:300 msgid "Minstanex" msgstr "MinstaNex" -#: qcsrc/client/waypointsprites.qc:280 +#: qcsrc/client/waypointsprites.qc:301 msgid "Hook" msgstr "Hook" -#: qcsrc/client/waypointsprites.qc:281 qcsrc/server/w_fireball.qc:2 +#: qcsrc/client/waypointsprites.qc:302 qcsrc/server/w_fireball.qc:2 msgid "Fireball" msgstr "Fireball" -#: qcsrc/client/waypointsprites.qc:282 +#: qcsrc/client/waypointsprites.qc:303 msgid "HLAC" msgstr "HLAC" -#: qcsrc/client/waypointsprites.qc:283 qcsrc/server/w_rifle.qc:2 +#: qcsrc/client/waypointsprites.qc:304 qcsrc/server/w_rifle.qc:2 msgid "Rifle" msgstr "Gewehr" -#: qcsrc/client/waypointsprites.qc:284 qcsrc/server/w_minelayer.qc:2 +#: qcsrc/client/waypointsprites.qc:305 qcsrc/server/w_minelayer.qc:2 msgid "Mine Layer" msgstr "Mine Layer" -#: qcsrc/client/waypointsprites.qc:290 +#: qcsrc/client/waypointsprites.qc:311 msgid "Invisibility" msgstr "Unsichtbarkeit" -#: qcsrc/client/waypointsprites.qc:291 +#: qcsrc/client/waypointsprites.qc:312 msgid "Extra life" msgstr "Extraleben" -#: qcsrc/client/waypointsprites.qc:292 +#: qcsrc/client/waypointsprites.qc:313 msgid "Speed" msgstr "Geschwindigkeit" -#: qcsrc/client/waypointsprites.qc:293 +#: qcsrc/client/waypointsprites.qc:314 msgid "Strength" msgstr "Stärke" -#: qcsrc/client/waypointsprites.qc:294 +#: qcsrc/client/waypointsprites.qc:315 msgid "Shield" msgstr "Schutzschild" -#: qcsrc/client/waypointsprites.qc:295 +#: qcsrc/client/waypointsprites.qc:316 msgid "Fuel regen" msgstr "Treibstoff-Regeneration" -#: qcsrc/client/waypointsprites.qc:296 +#: qcsrc/client/waypointsprites.qc:317 msgid "Jet Pack" msgstr "Jetpack" -#: qcsrc/client/waypointsprites.qc:297 +#: qcsrc/client/waypointsprites.qc:318 msgid "Frozen!" msgstr "Eingefroren!" -#: qcsrc/client/waypointsprites.qc:298 +#: qcsrc/client/waypointsprites.qc:319 msgid "Tagged" msgstr "Getaggt!" -#: qcsrc/client/waypointsprites.qc:299 +#: qcsrc/client/waypointsprites.qc:320 msgid "Vehicle" msgstr "Fahrzeug" -#: qcsrc/client/waypointsprites.qc:560 +#: qcsrc/client/waypointsprites.qc:590 +msgid "Spam" +msgstr "Frühstücksfleisch" + +#: qcsrc/client/waypointsprites.qc:594 #, c-format msgid "%s needing help!" msgstr "%s braucht Hilfe!" @@ -1686,37 +1690,37 @@ msgstr "%s trat %ss Crylink zu nahe" msgid "%s took a close look at %s's Crylink" msgstr "%s schaute sich %ss Crylink sehr genau an" -#: qcsrc/server/w_electro.qc:577 +#: qcsrc/server/w_electro.qc:574 #, c-format msgid "%s could not remember where they put plasma" msgstr "%s vergaß, wo er das Plasma hingetan hatte" -#: qcsrc/server/w_electro.qc:579 +#: qcsrc/server/w_electro.qc:576 #, c-format msgid "%s played with plasma" msgstr "%s spielte mit Plasma" -#: qcsrc/server/w_electro.qc:586 +#: qcsrc/server/w_electro.qc:583 #, c-format msgid "%s just noticed %s's blue ball" msgstr "%s hat gerade %ss blaue Kugel bemerkt" -#: qcsrc/server/w_electro.qc:588 +#: qcsrc/server/w_electro.qc:585 #, c-format msgid "%s got in touch with %s's blue ball" msgstr "%s kam mit %ss blauer Kugel in Kontakt" -#: qcsrc/server/w_electro.qc:593 +#: qcsrc/server/w_electro.qc:590 #, c-format msgid "%s felt the electrifying air of %s's combo" msgstr "%s hat gespürt, wie %ss Combo die Luft elektrisierte" -#: qcsrc/server/w_electro.qc:595 +#: qcsrc/server/w_electro.qc:592 #, c-format msgid "%s got too close to %s's blue beam" msgstr "%s kam zu nah an %ss blauen Strahl" -#: qcsrc/server/w_electro.qc:597 +#: qcsrc/server/w_electro.qc:594 #, c-format msgid "%s was blasted by %s's blue beam" msgstr "%s wurde von %ss blauen Strahl erwischt" @@ -1761,27 +1765,27 @@ msgstr "%s ist %ss Feuerball zu nahe getreten" msgid "%s tasted %s's fireball" msgstr "%s hat von %ss Feuerball probiert" -#: qcsrc/server/w_grenadelauncher.qc:379 +#: qcsrc/server/w_grenadelauncher.qc:383 #, c-format msgid "%s tried out his own grenade" msgstr "%s wollte wissen, ob seine Granate funktioniert" -#: qcsrc/server/w_grenadelauncher.qc:381 +#: qcsrc/server/w_grenadelauncher.qc:385 #, c-format msgid "%s detonated" msgstr "%s verfing sich in der eigenen Detonation" -#: qcsrc/server/w_grenadelauncher.qc:387 +#: qcsrc/server/w_grenadelauncher.qc:391 #, c-format msgid "%s didn't see %s's grenade" msgstr "%s hat %ss Granate nicht gesehen" -#: qcsrc/server/w_grenadelauncher.qc:389 +#: qcsrc/server/w_grenadelauncher.qc:393 #, c-format msgid "%s almost dodged %s's grenade" msgstr "%s ist fast %ss Granate ausgewichen" -#: qcsrc/server/w_grenadelauncher.qc:391 +#: qcsrc/server/w_grenadelauncher.qc:395 #, c-format msgid "%s ate %s's grenade" msgstr "%s nahm %ss Granate in den Mund" @@ -1953,13 +1957,13 @@ msgstr "^1%s^1 wurde von %s^1 erschossen" msgid "@!#%'n Tuba" msgstr "@!#%'n Tuba" -#: qcsrc/server/w_tuba.qc:263 +#: qcsrc/server/w_tuba.qc:252 #, c-format msgid "%s hurt his own ears with the @!#%%'n Tuba" msgstr "" "%s haben die Ohren geschmerzt von seinem eigenen Spiel auf der @!#%%'n Tuba" -#: qcsrc/server/w_tuba.qc:267 +#: qcsrc/server/w_tuba.qc:256 #, c-format msgid "%s died of %s's great playing on the @!#%%'n Tuba" msgstr "" @@ -1970,21 +1974,3 @@ msgstr "" #, c-format msgid "%s was riddled full of holes by %s" msgstr "%s ist von %s durchlöchert worden wie ein Schweizer Käse" - -#~ msgid "Sniper Rifle" -#~ msgstr "Sniper Rifle" - -#~ msgid "^1Moron! You fragged %s, a team mate!" -#~ msgstr "^1Idiot! Du hast %s getötet, also einen Teamkollegen von dir!" - -#~ msgid "^1Moron! You went against %s, a team mate!" -#~ msgstr "^1Idiot! Du hast %s getroffen, also einen Teamkollegen von dir!" - -#~ msgid "unknown entity type in CSQC_Ent_Update: %d\n" -#~ msgstr "unbekannter Entity-Typ in CSQC_Ent_Update: %d\n" - -#~ msgid "A CSQC entity changed its type!\n" -#~ msgstr "Ein CSQC-Entity hat seinen Typ gewechselt!\n" - -#~ msgid "A CSQC entity changed its owner!\n" -#~ msgstr "Ein CSQC-Entity hat seinen Besitzer gewechselt!\n" diff --git a/csprogs.dat.it.po b/csprogs.dat.it.po index a8e0d9d95..a4c1b9ebb 100644 --- a/csprogs.dat.it.po +++ b/csprogs.dat.it.po @@ -2,14 +2,14 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-27 18:24+0200\n" +"POT-Creation-Date: 2011-07-06 20:55+0200\n" "PO-Revision-Date: \n" "Last-Translator: Felice Sallustio \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Language: Italian\n" #: qcsrc/client/Main.qc:30 @@ -29,12 +29,14 @@ msgstr "" msgid "^4CSQC Build information: ^1%s\n" msgstr "^4Informazioni sulla build CSQC: ^1%s\n" -#: qcsrc/client/Main.qc:237 qcsrc/client/Main.qc:253 +#: qcsrc/client/Main.qc:237 +#: qcsrc/client/Main.qc:253 #, c-format msgid "trying to switch to unsupported team %d\n" msgstr "tentando di passare al team non supportato %d\n" -#: qcsrc/client/Main.qc:369 qcsrc/client/scoreboard.qc:241 +#: qcsrc/client/Main.qc:369 +#: qcsrc/client/scoreboard.qc:241 msgid "Usage:\n" msgstr "Uso:\n" @@ -59,28 +61,27 @@ msgid " scoreboard_columns_help\n" msgstr " scoreboard_columns_help\n" #: qcsrc/client/Main.qc:726 -#, fuzzy, c-format +#, c-format msgid "A CSQC entity changed its owner! (edict: %d, classname: %s)\n" -msgstr "Una entity CSQC ha cambiato il suo tipo!\n" +msgstr "Una entity CSQC ha cambiato il suo dominio! (edict: %d, classname: %s)\n" #: qcsrc/client/Main.qc:953 -#, fuzzy, c-format +#, c-format msgid "A CSQC entity changed its type! (edict: %d, classname: %s)\n" -msgstr "Una entity CSQC ha cambiato il suo tipo!\n" +msgstr "Una entity CSQC ha cambiato il suo tipo! (edict: %d, classname: %s)\n" #: qcsrc/client/Main.qc:994 -#, fuzzy, c-format -msgid "" -"Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: " -"%s)\n" -msgstr "entity type sconosciuto in CSQC_Ent_Update: %d\n" +#, c-format +msgid "Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n" +msgstr "Entity type sconosciuto in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n" #: qcsrc/client/Main.qc:1463 #, c-format msgid "%s (not bound)" -msgstr "" +msgstr "%s (nessun limite)" -#: qcsrc/client/Main.qc:1468 qcsrc/client/hud.qc:407 +#: qcsrc/client/Main.qc:1468 +#: qcsrc/client/hud.qc:407 #, c-format msgid "%s (%s)" msgstr "%s (%s)" @@ -102,7 +103,8 @@ msgstr "1) ^3pagina precedente" msgid "2) ^3next page" msgstr "2) ^3pagina successiva" -#: qcsrc/client/ctf.qc:55 qcsrc/client/ctf.qc:161 +#: qcsrc/client/ctf.qc:55 +#: qcsrc/client/ctf.qc:161 msgid "ESC) Exit Menu" msgstr "ESC) Esci dal menu" @@ -170,7 +172,8 @@ msgstr " (+%dG)" msgid "Start line" msgstr "Linea di partenza" -#: qcsrc/client/hud.qc:398 qcsrc/client/hud.qc:402 +#: qcsrc/client/hud.qc:398 +#: qcsrc/client/hud.qc:402 msgid "Finish line" msgstr "Linea d'arrivo" @@ -201,7 +204,8 @@ msgstr "Non disponibile" msgid "^1%s^1 couldn't take it anymore\n" msgstr "^1%s^1 non ce l'ha più fatta\n" -#: qcsrc/client/hud.qc:1653 qcsrc/client/hud.qc:1957 +#: qcsrc/client/hud.qc:1653 +#: qcsrc/client/hud.qc:1957 #, c-format msgid "^1%s^1 died\n" msgstr "^1%s^1 è morto\n" @@ -209,8 +213,7 @@ msgstr "^1%s^1 è morto\n" #: qcsrc/client/hud.qc:1657 #, c-format msgid "^7%s^7 committed suicide. What's the point of living without ammo?\n" -msgstr "" -"^7%s^7 ha commesso il suicidio. Qual'è il motivo di vivere senza munizioni?\n" +msgstr "^7%s^7 ha commesso il suicidio. Qual'è il motivo di vivere senza munizioni?\n" #: qcsrc/client/hud.qc:1661 #, c-format @@ -255,30 +258,22 @@ msgstr "^1%s^1 è stato falciato da un compagno di squadra\n" #: qcsrc/client/hud.qc:1705 #, c-format msgid "^1%s^1 ended a %d scoring spree by going against a team mate\n" -msgstr "" -"^1%s^1 ha concluso una serie di %d punti per esser andato contro un compagno " -"di squadra\n" +msgstr "^1%s^1 ha concluso una serie di %d punti per esser andato contro un compagno di squadra\n" #: qcsrc/client/hud.qc:1707 #, c-format msgid "^1%s^1 ended a %d kill spree by killing a team mate\n" -msgstr "" -"^1%s^1 ha concluso una serie di %d uccisioni per aver ammazzato un compagno " -"di squadra\n" +msgstr "^1%s^1 ha concluso una serie di %d uccisioni per aver ammazzato un compagno di squadra\n" #: qcsrc/client/hud.qc:1711 #, c-format msgid "^1%s^1's %s scoring spree was ended by a team mate!\n" -msgstr "" -"^1La serie di ^1%s^1 di ^1%s^1 punti è stata conclusa da un compagno di " -"squadra!\n" +msgstr "^1La serie di ^1%s^1 di ^1%s^1 punti è stata conclusa da un compagno di squadra!\n" #: qcsrc/client/hud.qc:1713 #, c-format msgid "^1%s^1's %s kill spree was ended by a team mate!\n" -msgstr "" -"^1La serie di ^1%s ^1di ^1%s ^1uccisioni è stata conclusa da un compagno di " -"squadra!\n" +msgstr "^1La serie di ^1%s ^1di ^1%s ^1uccisioni è stata conclusa da un compagno di squadra!\n" #: qcsrc/client/hud.qc:1717 #, c-format @@ -366,19 +361,19 @@ msgid "^1%s^1 dies when %s^1's wakizashi dies.\n" msgstr "^1%s^1 muore mentre il wakizashi di %s^1 muore.\n" #: qcsrc/client/hud.qc:1791 -#, fuzzy, c-format +#, c-format msgid "^1%s^1 nailed to hell by %s\n" -msgstr "^1%s^1 è stato disintegrato da %s\n" +msgstr "^1%s^1 è stato inchiodato all'inferno da %s\n" #: qcsrc/client/hud.qc:1795 -#, fuzzy, c-format +#, c-format msgid "^1%s^1 cluster crushed by %s\n" -msgstr "^1%s^1 è stato schiacciato da %s\n" +msgstr "^1L'ammasso di ^1%s^1 è stato schiacciato da %s\n" #: qcsrc/client/hud.qc:1799 -#, fuzzy, c-format +#, c-format msgid "^1%s^1 dies when %s^1's raptor dies.\n" -msgstr "^1%s^1 muore mentre il wakizashi di %s^1 muore.\n" +msgstr "^1%s^1 muore mentre il raptor di %s^1 muore.\n" #: qcsrc/client/hud.qc:1803 #, c-format @@ -408,12 +403,12 @@ msgstr "^1%s^1 è stato fraggato da %s\n" #: qcsrc/client/hud.qc:1832 #, c-format msgid "^1%s^1's %s scoring spree was ended by %s\n" -msgstr "^1La serie di ^1%s ^1 di ^1%s^1 punti è stata conclusa da %s\n" +msgstr "^1La serie di ^1%s ^1di ^1%s^1 punti è stata conclusa da %s\n" #: qcsrc/client/hud.qc:1834 #, c-format msgid "^1%s^1's %s kill spree was ended by %s\n" -msgstr "^1La serie di %s ^1 di ^1%s^1 uccisioni è stata conclusa da %s\n" +msgstr "^1La serie di %s^1 di ^1%s^1 uccisioni è stata conclusa da %s\n" #: qcsrc/client/hud.qc:1837 #, c-format @@ -631,8 +626,7 @@ msgid "" "You have been moved into a different team to improve team balance\n" "You are now on: %s" msgstr "" -"Sei stato spostato in una squadra differente per aumentare il bilanciamento " -"delle squadre\n" +"Sei stato spostato in una squadra differente per aumentare il bilanciamento delle squadre\n" "Sei ora in: %s" #: qcsrc/client/hud.qc:2022 @@ -676,14 +670,14 @@ msgid "^1You killed your own dumb self!" msgstr "^1Ti sei ammazzato da solo!" #: qcsrc/client/hud.qc:2051 -#, fuzzy, c-format +#, c-format msgid "^1Moron! You went against ^7%s^1, a team mate!" -msgstr "^1Idiota! Sei andato contro %s, un compagno di squadra!" +msgstr "^1Idiota! Sei andato contro ^7%s^1, un compagno di squadra!" #: qcsrc/client/hud.qc:2053 -#, fuzzy, c-format +#, c-format msgid "^1Moron! You fragged ^7%s^1, a team mate!" -msgstr "^1Idiota! Hai fraggato %s, un compagno di squadra!" +msgstr "^1Idiota! Hai fraggato ^7%s^1, un compagno di squadra!" #: qcsrc/client/hud.qc:2057 msgid "^1First score" @@ -743,9 +737,11 @@ msgstr "^1Sei stato fraggato da ^7%s" #: qcsrc/client/hud.qc:2094 msgid "^1Watch your step!" -msgstr "^1Attendo a dove metti i piedi!" +msgstr "^1Attento a dove metti i piedi!" -#: qcsrc/client/hud.qc:2162 qcsrc/client/hud.qc:2163 qcsrc/client/hud.qc:2646 +#: qcsrc/client/hud.qc:2162 +#: qcsrc/client/hud.qc:2163 +#: qcsrc/client/hud.qc:2646 #, c-format msgid "Player %d" msgstr "Giocatore %d" @@ -754,7 +750,9 @@ msgstr "Giocatore %d" msgid "^1Intermediate 1 (+15.42)" msgstr "^1Intermedio 1 (+15.42)" -#: qcsrc/client/hud.qc:2951 qcsrc/client/hud.qc:2993 qcsrc/client/hud.qc:3034 +#: qcsrc/client/hud.qc:2951 +#: qcsrc/client/hud.qc:2993 +#: qcsrc/client/hud.qc:3034 #, c-format msgid "^1PENALTY: %.1f (%s)" msgstr "^1PENALITÀ: %.1f (%s)" @@ -766,7 +764,7 @@ msgstr "^2PENALITÀ: %.1f (%s)" #: qcsrc/client/hud.qc:3064 msgid "^1You must answer before entering hud configure mode\n" -msgstr "" +msgstr "^1Devi rispondere ad alcune domande prima di entrare nella modalità di configurazione dell'HUD\n" #: qcsrc/client/hud.qc:3067 msgid "^2Name ^7instead of \"^1Unregistered player^7\" in stats" @@ -794,11 +792,15 @@ msgstr "Sì (%s): %d" msgid "No (%s): %d" msgstr "No (%s): %d" -#: qcsrc/client/hud.qc:3667 qcsrc/client/hud.qc:3670 qcsrc/client/hud.qc:3672 +#: qcsrc/client/hud.qc:3667 +#: qcsrc/client/hud.qc:3670 +#: qcsrc/client/hud.qc:3672 msgid "Personal best" msgstr "Miglior personale" -#: qcsrc/client/hud.qc:3685 qcsrc/client/hud.qc:3688 qcsrc/client/hud.qc:3690 +#: qcsrc/client/hud.qc:3685 +#: qcsrc/client/hud.qc:3688 +#: qcsrc/client/hud.qc:3690 msgid "Server best" msgstr "Migliori del server" @@ -857,7 +859,8 @@ msgstr "^1La partita è già iniziata" msgid "^1You have no more lives left" msgstr "^1Non hai più vite a disposizione" -#: qcsrc/client/hud.qc:4195 qcsrc/client/hud.qc:4198 +#: qcsrc/client/hud.qc:4195 +#: qcsrc/client/hud.qc:4198 #, c-format msgid "^1Press ^3%s^1 to join" msgstr "^1Premi ^3%s^1 per entrare" @@ -941,7 +944,7 @@ msgstr " nodi" #: qcsrc/client/hud.qc:4686 msgid "Automatically fixed wrong/missing panel numbers in _hud_panelorder\n" -msgstr "" +msgstr "Corretti automaticamente numeri sul pannello sbagliati/mancanti in _hud_panelorder\n" #: qcsrc/client/hud_config.qc:132 #, c-format @@ -976,8 +979,7 @@ msgid "%d seconds left" msgstr "%d secondi rimanenti" #: qcsrc/client/mapvoting.qc:263 -msgid "" -"mv_mapdownload: ^3You're not supposed to use this command on your own!\n" +msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!\n" msgstr "mv_mapdownload: ^3Non avrai creduto di poter usare questo comando!\n" #: qcsrc/client/mapvoting.qc:273 @@ -1155,13 +1157,11 @@ msgstr "SCO^presi" #: qcsrc/client/scoreboard.qc:50 msgid "SCO^ticks" -msgstr "" +msgstr "SCO^tick" #: qcsrc/client/scoreboard.qc:239 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command.\n" -msgstr "" -"Puoi modificare lo scoreboard usando il comando ^2scoreboard_columns_set.\n" +msgid "You can modify the scoreboard using the ^2scoreboard_columns_set command.\n" +msgstr "Puoi modificare lo scoreboard usando il comando ^2scoreboard_columns_set.\n" #: qcsrc/client/scoreboard.qc:240 msgid "^3|---------------------------------------------------------------|\n" @@ -1220,25 +1220,16 @@ msgid "^3kd^7 The kill-death ratio\n" msgstr "^3kd^7 Rapporto uccisioni-morti\n" #: qcsrc/client/scoreboard.qc:255 -msgid "" -"^3caps^7 How often a flag (CTF) or a key (KeyHunt) was " -"captured\n" -msgstr "" -"^3catture^7 Per quante volte una bandiera (CTF) o una " -"chiave (KeyHunt) è stata catturata\n" +msgid "^3caps^7 How often a flag (CTF) or a key (KeyHunt) was captured\n" +msgstr "^3catture^7 Per quante volte una bandiera (CTF) o una chiave (KeyHunt) è stata catturata\n" #: qcsrc/client/scoreboard.qc:256 -msgid "" -"^3pickups^7 How often a flag (CTF) or a key (KeyHunt) or a " -"ball (Keepaway) was picked up\n" -msgstr "" -"^3raccolte^7 Per quante volte una bandiera (CTF) o una " -"chiave (KeyHunt) o una palla (Keepaway) viene raccolta\n" +msgid "^3pickups^7 How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up\n" +msgstr "^3raccolte^7 Per quante volte una bandiera (CTF) o una chiave (KeyHunt) o una palla (Keepaway) viene raccolta\n" #: qcsrc/client/scoreboard.qc:257 msgid "^3fckills^7 Number of flag carrier kills\n" -msgstr "" -"^3fckills^7 Numero di uccisioni dei portatori di bandiere\n" +msgstr "^3fckills^7 Numero di uccisioni dei portatori di bandiere\n" #: qcsrc/client/scoreboard.qc:258 msgid "^3returns^7 Number of flag returns\n" @@ -1258,26 +1249,19 @@ msgstr "^3posizione^7 Posizione del giocatore\n" #: qcsrc/client/scoreboard.qc:262 msgid "^3pushes^7 Number of players pushed into void\n" -msgstr "" -"^3buttati^7 Numero di giocatori buttati giù nel nulla\n" +msgstr "^3buttati^7 Numero di giocatori buttati giù nel nulla\n" #: qcsrc/client/scoreboard.qc:263 -msgid "" -"^3destroyed^7 Number of keys destroyed by pushing them into " -"void\n" -msgstr "" -"^3distrutte^7 Numero di chiavi distrutte buttandole giù nel " -"nulla\n" +msgid "^3destroyed^7 Number of keys destroyed by pushing them into void\n" +msgstr "^3distrutte^7 Numero di chiavi distrutte buttandole giù nel nulla\n" #: qcsrc/client/scoreboard.qc:264 msgid "^3kckills^7 Number of keys carrier kills\n" -msgstr "" -"^3kckills^7 Numero di uccisioni dei portatori di chiavi\n" +msgstr "^3kckills^7 Numero di uccisioni dei portatori di chiavi\n" #: qcsrc/client/scoreboard.qc:265 msgid "^3losses^7 Number of times a key was lost\n" -msgstr "" -"^3perdute^7 Numero di volte che una chiave s'è persa\n" +msgstr "^3perdute^7 Numero di volte che una chiave s'è persa\n" #: qcsrc/client/scoreboard.qc:266 msgid "^3laps^7 Number of laps finished (race/cts)\n" @@ -1289,12 +1273,11 @@ msgstr "^3tempo^7 Tempo totale (corsa/cts)\n" #: qcsrc/client/scoreboard.qc:268 msgid "^3fastest^7 Time of fastest lap (race/cts)\n" -msgstr "" -"^3giro più veloce^7 Tempo del giro più veloce (corsa/cts)\n" +msgstr "^3giro più veloce^7 Tempo del giro più veloce (corsa/cts)\n" #: qcsrc/client/scoreboard.qc:269 msgid "^3ticks^7 Number of ticks (DOM)\n" -msgstr "" +msgstr "^3tick^7 Numero di tick (DOM)\n" #: qcsrc/client/scoreboard.qc:270 msgid "^3takes^7 Number of domination points taken (DOM)\n" @@ -1302,16 +1285,11 @@ msgstr "^3presi^7 Numero di punti di dominio presi (DOM)\n" #: qcsrc/client/scoreboard.qc:271 msgid "^3bckills^7 Number of ball carrier kills\n" -msgstr "" -"^3bckills^7 Numbero di uccisioni dei portatori di palle\n" +msgstr "^3bckills^7 Numbero di uccisioni dei portatori di palle\n" #: qcsrc/client/scoreboard.qc:272 -msgid "" -"^3bctime^7 Total amount of time holding the ball in " -"Keepaway\n" -msgstr "" -"^3bctime^7 Totale ammontare del tempo in possesso della " -"palla nel Keepaway\n" +msgid "^3bctime^7 Total amount of time holding the ball in Keepaway\n" +msgstr "^3bctime^7 Totale ammontare del tempo in possesso della palla nel Keepaway\n" #: qcsrc/client/scoreboard.qc:273 msgid "" @@ -1336,15 +1314,13 @@ msgid "" "include/exclude ALL teams/noteams game modes.\n" "\n" msgstr "" -"I nomi speciali per il tipo di gioco 'teams' e 'noteams' possono essere " -"usati\n" +"I nomi speciali per il tipo di gioco 'teams' e 'noteams' possono essere usati\n" "per includere/escludere TUTTE le modalità con team/senza team.\n" "\n" #: qcsrc/client/scoreboard.qc:283 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4\n" -msgstr "" -"Esempio: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4\n" +msgstr "Esempio: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4\n" #: qcsrc/client/scoreboard.qc:284 msgid "" @@ -1362,84 +1338,98 @@ msgstr "" "'field3' sarà mostrato solo in CTF, e 'field4' sarà mostrato in tutte\n" "le altre modalità di gioco eccetto DM.\n" -#: qcsrc/client/scoreboard.qc:432 qcsrc/client/scoreboard.qc:447 -#: qcsrc/client/scoreboard.qc:457 qcsrc/client/scoreboard.qc:466 +#: qcsrc/client/scoreboard.qc:432 +#: qcsrc/client/scoreboard.qc:447 +#: qcsrc/client/scoreboard.qc:457 +#: qcsrc/client/scoreboard.qc:466 #: qcsrc/client/scoreboard.qc:475 #, c-format msgid "fixed missing field '%s'\n" msgstr "riparato campo mancante '%s'\n" -#: qcsrc/client/scoreboard.qc:515 qcsrc/client/scoreboard.qc:522 +#: qcsrc/client/scoreboard.qc:515 +#: qcsrc/client/scoreboard.qc:522 msgid "N/A" msgstr "N/D" -#: qcsrc/client/scoreboard.qc:949 +#: qcsrc/client/scoreboard.qc:950 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Stato precisione (media %d%%)" -#: qcsrc/client/scoreboard.qc:1014 +#: qcsrc/client/scoreboard.qc:1015 #, c-format msgid "%d%%" msgstr "%d%%" -#: qcsrc/client/scoreboard.qc:1074 +#: qcsrc/client/scoreboard.qc:1075 msgid "Rankings" msgstr "Posizioni" -#: qcsrc/client/scoreboard.qc:1165 qcsrc/client/scoreboard.qc:1167 +#: qcsrc/client/scoreboard.qc:1170 +#: qcsrc/client/scoreboard.qc:1172 msgid "Scoreboard" msgstr "Tabella dei punteggi" -#: qcsrc/client/scoreboard.qc:1208 +#: qcsrc/client/scoreboard.qc:1218 #, c-format msgid "Speed award: %d ^7(%s^7)" msgstr "Velocità migliore: %d ^7(%s^7)" -#: qcsrc/client/scoreboard.qc:1212 +#: qcsrc/client/scoreboard.qc:1222 #, c-format msgid "All-time fastest: %d ^7(%s^7)" msgstr "Tempo più veloce in assoluto: %d ^7(%s^7)" -#: qcsrc/client/scoreboard.qc:1239 qcsrc/client/teamplay.qc:63 +#: qcsrc/client/scoreboard.qc:1249 +#: qcsrc/client/teamplay.qc:63 msgid "Spectators" msgstr "Spettatori" -#: qcsrc/client/scoreboard.qc:1246 +#: qcsrc/client/scoreboard.qc:1255 #, c-format msgid "playing on ^2%s^7" msgstr "giocando in ^2%s^7" -#: qcsrc/client/scoreboard.qc:1253 qcsrc/client/scoreboard.qc:1258 +#: qcsrc/client/scoreboard.qc:1262 +#: qcsrc/client/scoreboard.qc:1267 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " fino a ^1%1.0f minuti^7" -#: qcsrc/client/scoreboard.qc:1262 qcsrc/client/scoreboard.qc:1281 +#: qcsrc/client/scoreboard.qc:1271 +#: qcsrc/client/scoreboard.qc:1290 msgid " or" msgstr " o" -#: qcsrc/client/scoreboard.qc:1265 qcsrc/client/scoreboard.qc:1272 +#: qcsrc/client/scoreboard.qc:1274 +#: qcsrc/client/scoreboard.qc:1281 #, c-format msgid " until ^3%s %s^7" msgstr " fino a ^3%s %s^7" -#: qcsrc/client/scoreboard.qc:1266 qcsrc/client/scoreboard.qc:1273 -#: qcsrc/client/scoreboard.qc:1285 qcsrc/client/scoreboard.qc:1292 +#: qcsrc/client/scoreboard.qc:1275 +#: qcsrc/client/scoreboard.qc:1282 +#: qcsrc/client/scoreboard.qc:1294 +#: qcsrc/client/scoreboard.qc:1301 msgid "SCO^points" msgstr "SCO^punti" -#: qcsrc/client/scoreboard.qc:1267 qcsrc/client/scoreboard.qc:1274 -#: qcsrc/client/scoreboard.qc:1286 qcsrc/client/scoreboard.qc:1293 +#: qcsrc/client/scoreboard.qc:1276 +#: qcsrc/client/scoreboard.qc:1283 +#: qcsrc/client/scoreboard.qc:1295 +#: qcsrc/client/scoreboard.qc:1302 msgid "SCO^is beaten" msgstr "SCO^è battuto" -#: qcsrc/client/scoreboard.qc:1284 qcsrc/client/scoreboard.qc:1291 +#: qcsrc/client/scoreboard.qc:1293 +#: qcsrc/client/scoreboard.qc:1300 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " fino a ^3%s %s^7" -#: qcsrc/client/target_music.qc:93 qcsrc/client/target_music.qc:181 +#: qcsrc/client/target_music.qc:93 +#: qcsrc/client/target_music.qc:181 #, c-format msgid "Cannot initialize sound %s\n" msgstr "Impossibile inizializzare suono %s\n" @@ -1462,141 +1452,154 @@ msgstr "Team Rosa" #: qcsrc/client/waypointsprites.qc:234 msgid "Push" -msgstr "" +msgstr "Spingi" #: qcsrc/client/waypointsprites.qc:235 -#, fuzzy msgid "Destroy" -msgstr "SCO^distrutte" +msgstr "Distruggi" #: qcsrc/client/waypointsprites.qc:236 -#, fuzzy msgid "Defend" -msgstr " 2) Difendi" +msgstr "Difendi" #: qcsrc/client/waypointsprites.qc:237 -#, fuzzy msgid "Blue base" -msgstr "Team Blu" +msgstr "Base Blu" #: qcsrc/client/waypointsprites.qc:238 msgid "DANGER" -msgstr "" +msgstr "PERICOLO" #: qcsrc/client/waypointsprites.qc:239 msgid "Flag carrier" -msgstr "" +msgstr "Portatore bandiera" #: qcsrc/client/waypointsprites.qc:240 msgid "Dropped flag" -msgstr "" +msgstr "Bandiera rilasciata" #: qcsrc/client/waypointsprites.qc:241 msgid "Help me!" -msgstr "" +msgstr "Aiuto!" #: qcsrc/client/waypointsprites.qc:242 msgid "Here" -msgstr "" +msgstr "Qui" #: qcsrc/client/waypointsprites.qc:243 msgid "Dropped key" -msgstr "" +msgstr "Chiave rilasciata" -#: qcsrc/client/waypointsprites.qc:244 qcsrc/client/waypointsprites.qc:246 -#: qcsrc/client/waypointsprites.qc:247 qcsrc/client/waypointsprites.qc:248 +#: qcsrc/client/waypointsprites.qc:244 +#: qcsrc/client/waypointsprites.qc:246 +#: qcsrc/client/waypointsprites.qc:247 +#: qcsrc/client/waypointsprites.qc:248 #: qcsrc/client/waypointsprites.qc:249 msgid "Key carrier" -msgstr "" +msgstr "Portatore chiave" #: qcsrc/client/waypointsprites.qc:245 msgid "Run here" -msgstr "" +msgstr "Corri qui" #: qcsrc/client/waypointsprites.qc:250 -#, fuzzy msgid "Red base" -msgstr "Team Rosso" +msgstr "Base Rossa" #: qcsrc/client/waypointsprites.qc:251 msgid "Waypoint" -msgstr "" +msgstr "Waypoint" -#: qcsrc/client/waypointsprites.qc:252 qcsrc/client/waypointsprites.qc:253 +#: qcsrc/client/waypointsprites.qc:252 +#: qcsrc/client/waypointsprites.qc:253 #: qcsrc/client/waypointsprites.qc:254 msgid "Generator" -msgstr "" - -#: qcsrc/client/waypointsprites.qc:255 qcsrc/client/waypointsprites.qc:256 -#: qcsrc/client/waypointsprites.qc:257 qcsrc/client/waypointsprites.qc:258 -#: qcsrc/client/waypointsprites.qc:259 qcsrc/client/waypointsprites.qc:260 -#: qcsrc/client/waypointsprites.qc:261 qcsrc/client/waypointsprites.qc:262 -#: qcsrc/client/waypointsprites.qc:285 qcsrc/client/waypointsprites.qc:286 -#: qcsrc/client/waypointsprites.qc:287 qcsrc/client/waypointsprites.qc:288 +msgstr "Generatore" + +#: qcsrc/client/waypointsprites.qc:255 +#: qcsrc/client/waypointsprites.qc:256 +#: qcsrc/client/waypointsprites.qc:257 +#: qcsrc/client/waypointsprites.qc:258 +#: qcsrc/client/waypointsprites.qc:259 +#: qcsrc/client/waypointsprites.qc:260 +#: qcsrc/client/waypointsprites.qc:261 +#: qcsrc/client/waypointsprites.qc:262 +#: qcsrc/client/waypointsprites.qc:285 +#: qcsrc/client/waypointsprites.qc:286 +#: qcsrc/client/waypointsprites.qc:287 +#: qcsrc/client/waypointsprites.qc:288 #: qcsrc/client/waypointsprites.qc:289 msgid "Control point" -msgstr "" +msgstr "Punto di controllo" #: qcsrc/client/waypointsprites.qc:263 -#, fuzzy msgid "Checkpoint" -msgstr "SCO^punti" +msgstr "Checkpoint" #: qcsrc/client/waypointsprites.qc:264 -#, fuzzy msgid "Finish" -msgstr "Linea d'arrivo" +msgstr "Arrivo" #: qcsrc/client/waypointsprites.qc:265 -#, fuzzy msgid "Start" -msgstr "Linea di partenza" +msgstr "Partenza" -#: qcsrc/client/waypointsprites.qc:266 qcsrc/client/waypointsprites.qc:267 +#: qcsrc/client/waypointsprites.qc:266 +#: qcsrc/client/waypointsprites.qc:267 msgid "Ball" -msgstr "" +msgstr "Palla" #: qcsrc/client/waypointsprites.qc:268 msgid "Ball carrier" -msgstr "" +msgstr "Portatore palla" -#: qcsrc/client/waypointsprites.qc:269 qcsrc/server/w_laser.qc:2 +#: qcsrc/client/waypointsprites.qc:269 +#: qcsrc/server/w_laser.qc:2 msgid "Laser" msgstr "Laser" -#: qcsrc/client/waypointsprites.qc:270 qcsrc/server/w_shotgun.qc:2 +#: qcsrc/client/waypointsprites.qc:270 +#: qcsrc/server/w_shotgun.qc:2 msgid "Shotgun" msgstr "" -#: qcsrc/client/waypointsprites.qc:271 qcsrc/server/w_uzi.qc:2 +#: qcsrc/client/waypointsprites.qc:271 +#: qcsrc/server/w_uzi.qc:2 msgid "Machine Gun" msgstr "" -#: qcsrc/client/waypointsprites.qc:272 qcsrc/server/w_grenadelauncher.qc:2 +#: qcsrc/client/waypointsprites.qc:272 +#: qcsrc/server/w_grenadelauncher.qc:2 msgid "Mortar" msgstr "" -#: qcsrc/client/waypointsprites.qc:273 qcsrc/server/w_electro.qc:2 +#: qcsrc/client/waypointsprites.qc:273 +#: qcsrc/server/w_electro.qc:2 msgid "Electro" msgstr "" -#: qcsrc/client/waypointsprites.qc:274 qcsrc/server/w_crylink.qc:2 +#: qcsrc/client/waypointsprites.qc:274 +#: qcsrc/server/w_crylink.qc:2 msgid "Crylink" msgstr "Crylink" -#: qcsrc/client/waypointsprites.qc:275 qcsrc/server/w_nex.qc:2 +#: qcsrc/client/waypointsprites.qc:275 +#: qcsrc/server/w_nex.qc:2 msgid "Nex" msgstr "Nex" -#: qcsrc/client/waypointsprites.qc:276 qcsrc/server/w_hagar.qc:2 +#: qcsrc/client/waypointsprites.qc:276 +#: qcsrc/server/w_hagar.qc:2 msgid "Hagar" msgstr "" -#: qcsrc/client/waypointsprites.qc:277 qcsrc/server/w_rocketlauncher.qc:2 +#: qcsrc/client/waypointsprites.qc:277 +#: qcsrc/server/w_rocketlauncher.qc:2 msgid "Rocket Launcher" msgstr "Rocket Launcher" -#: qcsrc/client/waypointsprites.qc:278 qcsrc/server/w_porto.qc:2 +#: qcsrc/client/waypointsprites.qc:278 +#: qcsrc/server/w_porto.qc:2 msgid "Port-O-Launch" msgstr "" @@ -1608,7 +1611,8 @@ msgstr "" msgid "Hook" msgstr "" -#: qcsrc/client/waypointsprites.qc:281 qcsrc/server/w_fireball.qc:2 +#: qcsrc/client/waypointsprites.qc:281 +#: qcsrc/server/w_fireball.qc:2 msgid "Fireball" msgstr "" @@ -1616,58 +1620,60 @@ msgstr "" msgid "HLAC" msgstr "" -#: qcsrc/client/waypointsprites.qc:283 qcsrc/server/w_rifle.qc:2 +#: qcsrc/client/waypointsprites.qc:283 +#: qcsrc/server/w_rifle.qc:2 msgid "Rifle" -msgstr "" +msgstr "Fucile" -#: qcsrc/client/waypointsprites.qc:284 qcsrc/server/w_minelayer.qc:2 +#: qcsrc/client/waypointsprites.qc:284 +#: qcsrc/server/w_minelayer.qc:2 msgid "Mine Layer" msgstr "" #: qcsrc/client/waypointsprites.qc:290 msgid "Invisibility" -msgstr "" +msgstr "Invisibilità" #: qcsrc/client/waypointsprites.qc:291 msgid "Extra life" -msgstr "" +msgstr "Vita extra" #: qcsrc/client/waypointsprites.qc:292 msgid "Speed" -msgstr "" +msgstr "Velocità" #: qcsrc/client/waypointsprites.qc:293 msgid "Strength" -msgstr "" +msgstr "Forza" #: qcsrc/client/waypointsprites.qc:294 msgid "Shield" -msgstr "" +msgstr "Scudo" #: qcsrc/client/waypointsprites.qc:295 msgid "Fuel regen" -msgstr "" +msgstr "Rigeneratore di carburante" #: qcsrc/client/waypointsprites.qc:296 msgid "Jet Pack" -msgstr "" +msgstr "Jet Pack" #: qcsrc/client/waypointsprites.qc:297 msgid "Frozen!" -msgstr "" +msgstr "Congelato!" #: qcsrc/client/waypointsprites.qc:298 msgid "Tagged" -msgstr "" +msgstr "Contrassegnato" #: qcsrc/client/waypointsprites.qc:299 msgid "Vehicle" -msgstr "" +msgstr "Veicolo" #: qcsrc/client/waypointsprites.qc:560 #, c-format msgid "%s needing help!" -msgstr "" +msgstr "%s sta chiedendo aiuto!" #: qcsrc/server/w_crylink.qc:664 #, c-format @@ -1689,37 +1695,37 @@ msgstr "%s era troppo vicino al Crylink di %s" msgid "%s took a close look at %s's Crylink" msgstr "%s ha visto da vicino il Crylink di %s" -#: qcsrc/server/w_electro.qc:577 +#: qcsrc/server/w_electro.qc:574 #, c-format msgid "%s could not remember where they put plasma" msgstr "%s non s'è ricordato dove loro avevano posto del plasma" -#: qcsrc/server/w_electro.qc:579 +#: qcsrc/server/w_electro.qc:576 #, c-format msgid "%s played with plasma" msgstr "%s ha giocato col plasma" -#: qcsrc/server/w_electro.qc:586 +#: qcsrc/server/w_electro.qc:583 #, c-format msgid "%s just noticed %s's blue ball" msgstr "%s aveva appena notato la palla blu di %s" -#: qcsrc/server/w_electro.qc:588 +#: qcsrc/server/w_electro.qc:585 #, c-format msgid "%s got in touch with %s's blue ball" msgstr "%s è entrato in contatto con la palla blu di %s" -#: qcsrc/server/w_electro.qc:593 +#: qcsrc/server/w_electro.qc:590 #, c-format msgid "%s felt the electrifying air of %s's combo" msgstr "%s ha sentito l'aria elettrificata della combo di %s" -#: qcsrc/server/w_electro.qc:595 +#: qcsrc/server/w_electro.qc:592 #, c-format msgid "%s got too close to %s's blue beam" msgstr "%s s'è avvicinato troppo al raggio blu di %s" -#: qcsrc/server/w_electro.qc:597 +#: qcsrc/server/w_electro.qc:594 #, c-format msgid "%s was blasted by %s's blue beam" msgstr "%s è stato fatto saltare in aria dal raggio blu di %s" @@ -1729,7 +1735,8 @@ msgstr "%s è stato fatto saltare in aria dal raggio blu di %s" msgid "%s forgot about some firemine" msgstr "%s s'è dimenticato di alcune mine infuocate" -#: qcsrc/server/w_fireball.qc:419 qcsrc/server/w_hlac.qc:240 +#: qcsrc/server/w_fireball.qc:419 +#: qcsrc/server/w_hlac.qc:240 #, c-format msgid "%s should have used a smaller gun" msgstr "%s avrebbe dovuto usare un'arma più piccola" @@ -1789,7 +1796,8 @@ msgstr "%s ha quasi schivato la granata di %s" msgid "%s ate %s's grenade" msgstr "%s ha mangiato la granata di %s" -#: qcsrc/server/w_hagar.qc:382 qcsrc/server/w_seeker.qc:655 +#: qcsrc/server/w_hagar.qc:382 +#: qcsrc/server/w_seeker.qc:655 #, c-format msgid "%s played with tiny rockets" msgstr "%s ha giocato con piccoli razzi" @@ -1799,7 +1807,8 @@ msgstr "%s ha giocato con piccoli razzi" msgid "%s hoped %s's missiles wouldn't bounce" msgstr "%s ha sperato che il missile di %s non rimbalzasse" -#: qcsrc/server/w_hagar.qc:388 qcsrc/server/w_seeker.qc:661 +#: qcsrc/server/w_hagar.qc:388 +#: qcsrc/server/w_seeker.qc:661 #, c-format msgid "%s was pummeled by %s" msgstr "%s è stato riempito di sberle da %s" @@ -1817,7 +1826,8 @@ msgstr "%s è stato abbattuto da %s" msgid "Grappling Hook" msgstr "" -#: qcsrc/server/w_hook.qc:266 qcsrc/server/w_porto.qc:296 +#: qcsrc/server/w_hook.qc:266 +#: qcsrc/server/w_porto.qc:296 #, c-format msgid "%s did the impossible" msgstr "%s ha fatto l'impossibile" @@ -1842,7 +1852,8 @@ msgstr "%s è stato tagliato a metà dal guanto di %s" msgid "%s was lasered to death by %s" msgstr "%s è stato \"laserato\" alla morte da %s" -#: qcsrc/server/w_minelayer.qc:523 qcsrc/server/w_rocketlauncher.qc:501 +#: qcsrc/server/w_minelayer.qc:523 +#: qcsrc/server/w_rocketlauncher.qc:501 #, c-format msgid "%s exploded" msgstr "%s è esploso" @@ -1866,13 +1877,16 @@ msgstr "%s è passato sopra la mina di %s" msgid "MinstaNex" msgstr "" -#: qcsrc/server/w_minstanex.qc:290 qcsrc/server/w_nex.qc:253 -#: qcsrc/server/w_shotgun.qc:209 qcsrc/server/w_uzi.qc:317 +#: qcsrc/server/w_minstanex.qc:290 +#: qcsrc/server/w_nex.qc:253 +#: qcsrc/server/w_shotgun.qc:209 +#: qcsrc/server/w_uzi.qc:317 #, c-format msgid "%s is now thinking with portals" -msgstr "" +msgstr "%s sta ora pensando con i portali" -#: qcsrc/server/w_minstanex.qc:292 qcsrc/server/w_nex.qc:255 +#: qcsrc/server/w_minstanex.qc:292 +#: qcsrc/server/w_nex.qc:255 #, c-format msgid "%s has been vaporized by %s" msgstr "%s è stato vaporizzato da %s" @@ -1912,7 +1926,8 @@ msgstr "%s non è riuscito a nascondersi dal fucile di %s" msgid "%s got hit in the head by %s" msgstr "%s ha preso un colpo in testa da %s" -#: qcsrc/server/w_rifle.qc:258 qcsrc/server/w_uzi.qc:321 +#: qcsrc/server/w_rifle.qc:258 +#: qcsrc/server/w_uzi.qc:321 #, c-format msgid "%s was sniped by %s" msgstr "%s è stato fucilato da %s" @@ -1956,12 +1971,12 @@ msgstr "%s è stato sparato da %s" msgid "@!#%'n Tuba" msgstr "@!#%'n Tuba" -#: qcsrc/server/w_tuba.qc:263 +#: qcsrc/server/w_tuba.qc:253 #, c-format msgid "%s hurt his own ears with the @!#%%'n Tuba" msgstr "%s s'è fatto male alle orecchie con la @!#%%'n Tuba" -#: qcsrc/server/w_tuba.qc:267 +#: qcsrc/server/w_tuba.qc:257 #, c-format msgid "%s died of %s's great playing on the @!#%%'n Tuba" msgstr "%s è morto nella gran esibizione di %s con la @!#%%'n Tuba" @@ -1970,3 +1985,4 @@ msgstr "%s è morto nella gran esibizione di %s con la @!#%%'n Tuba" #, c-format msgid "%s was riddled full of holes by %s" msgstr "%s è stato riempito di buchi da %s" + diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 58d54e41d..abd694165 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1202,7 +1202,7 @@ set sv_curl_serverpackages_auto 1 "automatically add packs with *.serverpackage set sv_motd "" -set g_waypoints_for_items 1 "make waypoints out of items, values: 0 = never, 1 = unless the mapper prevents it by worldspawn.spawnflags & 1, 2 = always" +set g_waypoints_for_items 0 "make waypoints out of items, values: 0 = never, 1 = unless the mapper prevents it by worldspawn.spawnflags & 1, 2 = always" seta g_maplist_votable 6 "number of maps that are shown in the map voting at the end of a match" seta g_maplist_votable_keeptwotime 15 @@ -1256,6 +1256,7 @@ seta g_waypointsprite_crosshairfadedistance 150 "distance in virtual pixels from seta g_waypointsprite_distancefadealpha 1 "alpha multiplier near distance" seta g_waypointsprite_distancefadescale 0.7 "scale multiplier near the distance" seta g_waypointsprite_distancefadedistancemultiplier 0.5 "distance in map sizes from distance where to stop fading" +set g_waypointsprite_spam 0 "Debugging feature. Set to 10 and load courtfun in race mode to test." alias "g_waypointsprite_personal" "impulse 30" alias "g_waypointsprite_personal_p" "impulse 31" alias "g_waypointsprite_personal_d" "impulse 32" diff --git a/effects-high.cfg b/effects-high.cfg index 664fca7ad..48d0d43b8 100644 --- a/effects-high.cfg +++ b/effects-high.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 0 cl_decals_time 4 cl_particles_quality 1 gl_flashblend 0 diff --git a/effects-low.cfg b/effects-low.cfg index 769ca5121..9609a5780 100644 --- a/effects-low.cfg +++ b/effects-low.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 0 cl_decals_time 2 cl_particles_quality 0.4 gl_flashblend 1 diff --git a/effects-med.cfg b/effects-med.cfg index a6e5e7d0b..94a85e509 100644 --- a/effects-med.cfg +++ b/effects-med.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 0 cl_decals_time 2 cl_particles_quality 1 gl_flashblend 0 diff --git a/effects-normal.cfg b/effects-normal.cfg index dbad23826..7822102ba 100644 --- a/effects-normal.cfg +++ b/effects-normal.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 0 cl_decals_time 2 cl_particles_quality 1 gl_flashblend 0 diff --git a/effects-omg.cfg b/effects-omg.cfg index 6e6a1dcbb..a68a15787 100644 --- a/effects-omg.cfg +++ b/effects-omg.cfg @@ -1,4 +1,5 @@ cl_decals 0 +cl_decals_models 0 cl_decals_time 2 cl_particles_quality 0.4 gl_flashblend 1 diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg index d6e501892..20cd2e563 100644 --- a/effects-ultimate.cfg +++ b/effects-ultimate.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 1 cl_decals_time 10 cl_particles_quality 1 gl_flashblend 0 diff --git a/effects-ultra.cfg b/effects-ultra.cfg index 47949e551..94d47fab2 100644 --- a/effects-ultra.cfg +++ b/effects-ultra.cfg @@ -1,4 +1,5 @@ cl_decals 1 +cl_decals_models 1 cl_decals_time 10 cl_particles_quality 1 gl_flashblend 0 diff --git a/keybinds.txt.it b/keybinds.txt.it new file mode 100644 index 000000000..b09bb5ab2 --- /dev/null +++ b/keybinds.txt.it @@ -0,0 +1,91 @@ +"" "Movimento" +"+forward" "avanti" +"+back" "indietro" +"+moveleft" "a sinistra" +"+moveright" "a destra" +"+jump" "salta / nuota" +"+crouch" "accovacciarsi / abbassarsi" +"+hook" "uncino / jet pack" +"" "" +"" "Attacco" +"+fire" "fuoco primario" +"+fire2" "fuoco secondario" +"" "" +"" "Cambio d'arma" +"weapprev" "arma precedente" +"weapnext" "arma successiva" +"weaplast" "ultima arma usata" +"weapbest" "miglior arma" +"reload" "ricarica" +"impulse 1" "Laser" +"impulse 2" "Shotgun" +"impulse 3" "Machine Gun" +"impulse 4" "Mortar / Mine Layer" +"impulse 5" "Electro" +"impulse 6" "Crylink / HLAC" +"impulse 7" "Nex / MinstaNex / Fucile" +"impulse 8" "Hagar / Seeker" +"impulse 9" "Rocket Launcher / Fireball" +"impulse 14" "Port-O-Launch / Hook" +"" "" +"" "Vista" +"+zoom" "zoom click unico" +"togglezoom" "zoom con doppio click" +"+showscores" "mostra punteggio" +"screenshot" "cattura schermata" +"" "" +"" "Comunicazione" +"messagemode" "chat pubblica" +"messagemode2" "chat di squadra" +"+con_chat_maximize" "mostra storia chat" +"vyes" "vota SÌ" +"vno" "vota NO" +"ready" "pronto" +"" "" +"" "Client" +"+show_info" "info del server" +"toggleconsole" "apri console" +"disconnect" "disconnetti" +"quit" "chiudi" +"" "" +"" "Teamplay" +"messagemode2" "chat di squadra" +"team_auto" "auto-unisciti ad una squadra" +"menu_showteamselect" "selezione della squadra" +"spec" "entra in modalità spettatore" +"dropweapon" "rilascia arma" +"+use" "rilascia chiave / rilascia bandiera" +"" "" +"" "Definiti dall'utente" +"+userbind 1" "$userbind1" +"+userbind 2" "$userbind2" +"+userbind 3" "$userbind3" +"+userbind 4" "$userbind4" +"+userbind 5" "$userbind5" +"+userbind 6" "$userbind6" +"+userbind 7" "$userbind7" +"+userbind 8" "$userbind8" +"+userbind 9" "$userbind9" +"+userbind 10" "$userbind10" +"+userbind 11" "$userbind11" +"+userbind 12" "$userbind12" +"+userbind 13" "$userbind13" +"+userbind 14" "$userbind14" +"+userbind 15" "$userbind15" +"+userbind 16" "$userbind16" +"+userbind 17" "$userbind17" +"+userbind 18" "$userbind18" +"+userbind 19" "$userbind19" +"+userbind 20" "$userbind20" +"+userbind 21" "$userbind21" +"+userbind 22" "$userbind22" +"+userbind 23" "$userbind23" +"+userbind 24" "$userbind24" +"+userbind 25" "$userbind25" +"+userbind 26" "$userbind26" +"+userbind 27" "$userbind27" +"+userbind 28" "$userbind28" +"+userbind 29" "$userbind29" +"+userbind 30" "$userbind30" +"+userbind 31" "$userbind31" +"+userbind 32" "$userbind32" diff --git a/menu.dat.de.po b/menu.dat.de.po index 79ddeb113..e14bb3919 100644 --- a/menu.dat.de.po +++ b/menu.dat.de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1preview\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-27 18:26+0200\n" +"POT-Creation-Date: 2011-08-04 22:19+0200\n" "PO-Revision-Date: 2011-04-20 10:46+0200\n" "Last-Translator: Rudolf Polzer \n" "Language-Team: Rudolf Polzer \n" @@ -291,93 +291,93 @@ msgstr "Eintrags-Ausblendung:" msgid "Physics Panel" msgstr "Physik-Panel" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:23 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:22 #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c:21 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.c:21 msgid "Panel disabled" msgstr "Panel nicht anzeigen" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:24 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:23 msgid "Panel enabled if not observing" msgstr "Panel beim Spielen anzeigen" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:25 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:24 #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c:23 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.c:23 msgid "Panel always enabled" msgstr "Panel immer anzeigen" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:31 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:30 msgid "Status bar" msgstr "Statusleiste" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:33 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:32 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c:48 msgid "Left align" msgstr "Links" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:34 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:33 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c:52 msgid "Right align" msgstr "Rechts" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:35 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:34 msgid "Inward align" msgstr "Innen" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:36 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:35 msgid "Outward align" msgstr "Außen" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:40 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:39 msgid "Flip speed/acceleration positions" msgstr "Geschwindigkeit/Beschleunigung tauschen" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:44 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:43 msgid "Speed:" msgstr "Geschwindigkeit:" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:45 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:44 msgid "Include vertical speed" msgstr "Mit vertikaler Geschwindigkeit" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:56 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:55 msgid "Speed unit:" msgstr "Geschwindigkeitseinheit:" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:58 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:57 msgid "qu/s" msgstr "qu/s" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:59 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:58 msgid "m/s" msgstr "m/s" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:60 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:59 msgid "km/h" msgstr "km/h" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:61 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:60 msgid "mph" msgstr "mph" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:62 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:61 msgid "knots" msgstr "Knoten" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:64 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:63 msgid "Show" msgstr "Anzeigen" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:67 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:66 msgid "Top speed" msgstr "Geschwindigkeitsrekord:" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:73 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:72 msgid "Acceleration:" msgstr "Beschleunigung:" -#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:74 +#: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:73 msgid "Include vertical acceleration" msgstr "Mit vertikaler Beschleunigung" @@ -699,131 +699,131 @@ msgstr "Demos" msgid "Player Setup" msgstr "Spieler-Einstellungen" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:35 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:34 msgid "Game type:" msgstr "Spieltyp" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:47 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:46 msgid "Match settings:" msgstr "Spieleinstellungen:" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:49 msgid "Time limit:" msgstr "Zeitlimit:" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:54 -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:62 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:53 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:61 msgid "Use map specified default" msgstr "Standardwert der Map verwenden" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:57 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:56 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:155 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:156 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:157 -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:158 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:161 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:162 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:163 -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:164 msgid "Point limit:" msgstr "Punktelimit" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:64 msgid "Player slots:" msgstr "Spielerplätze:" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:68 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:67 msgid "Number of bots:" msgstr "Anzahl Bots:" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:72 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:71 msgid "Bot skill:" msgstr "Spielstärke:" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:75 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:74 msgid "Botlike" msgstr "Bots halt" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:76 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:75 msgid "Beginner" msgstr "Anfänger" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:77 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:76 msgid "You will win" msgstr "Gewinnst schon" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:78 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:77 msgid "You can win" msgstr "Kannst gewinnen" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:79 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:78 msgid "You might win" msgstr "Könntest gewinnen" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:80 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:79 msgid "Advanced" msgstr "Fortgeschritten" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:81 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:80 msgid "Expert" msgstr "Experte" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:82 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:81 msgid "Pro" msgstr "Profi" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:83 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:82 msgid "Assassin" msgstr "Mörder" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:84 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:83 msgid "Unhuman" msgstr "Übermenschlich" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:85 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:84 msgid "Godlike" msgstr "Gottgleich" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:89 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:88 msgid "Mutators..." msgstr "Mutators..." -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:98 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:97 #: qcsrc/menu/xonotic/dialog_settings_misc.c:57 msgid "Advanced settings..." msgstr "Erweiterte Einstellungen..." -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:105 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:104 msgid "Map list:" msgstr "Mapliste:" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:111 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:110 msgid "Select all" msgstr "Alle auswählen" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:114 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:113 msgid "Select none" msgstr "Keine auswählen" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:120 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:119 msgid "Start Multiplayer!" msgstr "Starten!" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:154 msgid "Capture limit:" msgstr "Capture-Limit:" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:159 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:158 msgid "Lives:" msgstr "Leben:" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:160 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:159 msgid "Laps:" msgstr "Runden:" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:160 msgid "Goals:" msgstr "Tore:" -#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:165 +#: qcsrc/menu/xonotic/dialog_multiplayer_create.c:164 msgid "Frag limit:" msgstr "Punktelimit:" @@ -1367,8 +1367,8 @@ msgid "Damage splash:" msgstr "Schadenseffekt:" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:195 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:178 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:191 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:173 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:193 #: qcsrc/menu/xonotic/dialog_settings_misc.c:30 #: qcsrc/menu/xonotic/dialog_settings_misc.c:41 #: qcsrc/menu/xonotic/dialog_settings_video.c:109 @@ -1505,7 +1505,7 @@ msgstr "Master:" msgid "Music:" msgstr "Musik:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:40 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:41 msgid "VOL^Ambient:" msgstr "Umgebung:" @@ -1513,180 +1513,180 @@ msgstr "Umgebung:" msgid "Info:" msgstr "Info:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:57 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:55 msgid "Items:" msgstr "Gegenstände:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:65 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:62 msgid "Pain:" msgstr "Schmerz:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:73 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:69 msgid "Player:" msgstr "Spieler:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:81 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:76 msgid "Shots:" msgstr "Schüsse:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:88 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:83 msgid "Voice:" msgstr "Stimme:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:96 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:91 msgid "Weapons:" msgstr "Waffen:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:103 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:161 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:98 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:156 msgid "Frequency:" msgstr "Frequenz:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:105 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:100 msgid "8 kHz" msgstr "8 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:106 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:101 msgid "11.025 kHz" msgstr "11,025 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:107 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:102 msgid "16 kHz" msgstr "16 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:108 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:103 msgid "22.05 kHz" msgstr "22,05 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:109 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:104 msgid "24 kHz" msgstr "24 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:110 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:105 msgid "32 kHz" msgstr "32 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:111 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:106 msgid "44.1 kHz" msgstr "44,1 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:112 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:107 msgid "48 kHz" msgstr "48 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:115 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:110 msgid "Channels:" msgstr "Kanäle" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:117 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:112 msgid "Mono" msgstr "Mono" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:118 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:113 msgid "Stereo" msgstr "Stereo" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:119 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:114 msgid "2.1" msgstr "2.1" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:120 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:115 msgid "4" msgstr "4" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:121 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:116 msgid "5" msgstr "5" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:122 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:117 msgid "5.1" msgstr "5.1" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:123 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:118 msgid "6.1" msgstr "6.1" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:124 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:119 msgid "7.1" msgstr "7.1" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:128 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:123 msgid "Swap Stereo" msgstr "Stereokanäle tauschen" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:132 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:127 msgid "Headphone friendly mode" msgstr "Kopfhörer-Modus" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:136 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:131 msgid "Spatial voices:" msgstr "Räumliche Sprachnachrichten:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:137 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:132 msgid "VOCS^None" msgstr "keine" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:138 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:133 msgid "VOCS^Taunts" msgstr "nur Spott" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:139 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:134 msgid "VOCS^All" msgstr "alle" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:142 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:137 msgid "Taunt range:" msgstr "Spott-Radius:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:145 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:140 msgid "RNG^Very short" msgstr "Sehr klein" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:146 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:141 msgid "RNG^Short" msgstr "Klein" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:147 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:142 msgid "RNG^Normal" msgstr "Normal" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:148 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:143 msgid "RNG^Long" msgstr "Groß" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:149 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:144 msgid "RNG^Full" msgstr "Sehr groß" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:156 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:151 msgid "Automatic taunts" msgstr "Automatischer Spott" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:165 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:160 msgid "Time warning:" msgstr "Zeitwarnung:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:167 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:162 msgid "WRN^None" msgstr "keine" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:168 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:163 msgid "1 minute" msgstr "1 Minute" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:169 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:164 msgid "5 minutes" msgstr "5 Minuten" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:170 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:165 msgid "WRN^Both" msgstr "beide" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:173 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:168 msgid "Hit indicator" msgstr "Treffer-Indikator" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:175 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:170 msgid "Menu sounds" msgstr "Menü-Sounds" @@ -1829,108 +1829,112 @@ msgstr "Partikeldistanz:" msgid "Decals" msgstr "Einschusslöcher" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:120 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:118 +msgid "Decals on models" +msgstr "auch auf Objekten" + +#: qcsrc/menu/xonotic/dialog_settings_effects.c:122 msgid "Distance:" msgstr "Distanz:" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:126 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:128 msgid "Time:" msgstr "Zeit:" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:132 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:134 msgid "Use lightmaps" msgstr "Lightmaps verwenden" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:133 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:135 msgid "Deluxe mapping" msgstr "Deluxemapping" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:135 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:137 msgid "Gloss" msgstr "Glanz" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:138 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:140 msgid "Offset mapping" msgstr "Offsetmapping" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:140 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:142 msgid "Relief mapping" msgstr "Reliefmapping" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:143 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:145 msgid "Reflections:" msgstr "Reflexionen:" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:146 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:148 msgid "Blurred" msgstr "Schwammig" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:147 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:149 msgid "REFL^Good" msgstr "Gut" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:148 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:150 msgid "Sharp" msgstr "Scharf" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:153 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:155 msgid "Show surfaces" msgstr "Oberflächen anzeigen" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:155 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:157 msgid "No dynamic lighting" msgstr "Kein dynamisches Licht" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:157 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:159 msgid "Flash blend approximation" msgstr "Flash-Blend-Näherung" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:159 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:161 msgid "Realtime dynamic lighting" msgstr "Dynamisches Licht in Echtzeit" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:160 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:164 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:162 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:166 msgid "Shadows" msgstr "Schatten" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:163 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:165 msgid "Realtime world lighting" msgstr "Map-Licht in Echtzeit" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:168 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:170 msgid "Use normal maps" msgstr "Normalmaps verwenden" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:170 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:172 msgid "Soft shadows" msgstr "Weiche Schatten" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:173 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:175 msgid "Coronas" msgstr "Koronas" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:174 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:176 msgid "Use Occlusion Queries" msgstr "Occlusion Queries verwenden" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:176 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:178 msgid "Bloom" msgstr "Überstrahlung" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:178 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:180 msgid "High Dynamic Range (HDR)" msgstr "Lichtdynamik (HDR)" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:182 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:184 msgid "Motion blur:" msgstr "Bewegungsunschärfe:" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:187 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:189 msgid "Damage & water blur" msgstr "Schadens-Unschärfe" -#: qcsrc/menu/xonotic/dialog_settings_effects.c:188 +#: qcsrc/menu/xonotic/dialog_settings_effects.c:190 msgid "Powerup sharpen" msgstr "Bonus-Schärfe" @@ -2519,37 +2523,37 @@ msgstr "%s schaute sich %ss Crylink sehr genau an" msgid "Electro" msgstr "Electro" -#: qcsrc/server/w_electro.qc:577 +#: qcsrc/server/w_electro.qc:574 #, c-format msgid "%s could not remember where they put plasma" msgstr "%s vergaß, wo er das Plasma hingetan hatte" -#: qcsrc/server/w_electro.qc:579 +#: qcsrc/server/w_electro.qc:576 #, c-format msgid "%s played with plasma" msgstr "%s spielte mit Plasma" -#: qcsrc/server/w_electro.qc:586 +#: qcsrc/server/w_electro.qc:583 #, c-format msgid "%s just noticed %s's blue ball" msgstr "%s hat gerade %ss blaue Kugel bemerkt" -#: qcsrc/server/w_electro.qc:588 +#: qcsrc/server/w_electro.qc:585 #, c-format msgid "%s got in touch with %s's blue ball" msgstr "%s kam mit %ss blauer Kugel in Kontakt" -#: qcsrc/server/w_electro.qc:593 +#: qcsrc/server/w_electro.qc:590 #, c-format msgid "%s felt the electrifying air of %s's combo" msgstr "%s hat gespürt, wie %ss Combo die Luft elektrisierte" -#: qcsrc/server/w_electro.qc:595 +#: qcsrc/server/w_electro.qc:592 #, c-format msgid "%s got too close to %s's blue beam" msgstr "%s kam zu nah an %ss blauen Strahl" -#: qcsrc/server/w_electro.qc:597 +#: qcsrc/server/w_electro.qc:594 #, c-format msgid "%s was blasted by %s's blue beam" msgstr "%s wurde von %ss blauen Strahl erwischt" @@ -2602,27 +2606,27 @@ msgstr "%s hat von %ss Feuerball probiert" msgid "Mortar" msgstr "Mortar" -#: qcsrc/server/w_grenadelauncher.qc:379 +#: qcsrc/server/w_grenadelauncher.qc:383 #, c-format msgid "%s tried out his own grenade" msgstr "%s wollte wissen, ob seine Granate funktioniert" -#: qcsrc/server/w_grenadelauncher.qc:381 +#: qcsrc/server/w_grenadelauncher.qc:385 #, c-format msgid "%s detonated" msgstr "%s verfing sich in der eigenen Detonation" -#: qcsrc/server/w_grenadelauncher.qc:387 +#: qcsrc/server/w_grenadelauncher.qc:391 #, c-format msgid "%s didn't see %s's grenade" msgstr "%s hat %ss Granate nicht gesehen" -#: qcsrc/server/w_grenadelauncher.qc:389 +#: qcsrc/server/w_grenadelauncher.qc:393 #, c-format msgid "%s almost dodged %s's grenade" msgstr "%s ist fast %ss Granate ausgewichen" -#: qcsrc/server/w_grenadelauncher.qc:391 +#: qcsrc/server/w_grenadelauncher.qc:395 #, c-format msgid "%s ate %s's grenade" msgstr "%s nahm %ss Granate in den Mund" @@ -2826,13 +2830,13 @@ msgstr "^1%s^1 wurde von %s^1 erschossen" msgid "@!#%'n Tuba" msgstr "@!#%'n Tuba" -#: qcsrc/server/w_tuba.qc:263 +#: qcsrc/server/w_tuba.qc:252 #, c-format msgid "%s hurt his own ears with the @!#%%'n Tuba" msgstr "" "%s haben die Ohren geschmerzt von seinem eigenen Spiel auf der @!#%%'n Tuba" -#: qcsrc/server/w_tuba.qc:267 +#: qcsrc/server/w_tuba.qc:256 #, c-format msgid "%s died of %s's great playing on the @!#%%'n Tuba" msgstr "" @@ -2847,18 +2851,3 @@ msgstr "Machine Gun" #, c-format msgid "%s was riddled full of holes by %s" msgstr "%s ist von %s durchlöchert worden wie ein Schweizer Käse" - -#~ msgid "Speedometer" -#~ msgstr "Tachometer" - -#~ msgid "qu/s (hidden)" -#~ msgstr "qu/s (ohne Einheit)" - -#~ msgid "Show accelerometer" -#~ msgstr "Akzelerometer anzeigen" - -#~ msgid "Accelerometer scale:" -#~ msgstr "Akzelerometer-Skalierung:" - -#~ msgid "Sniper Rifle" -#~ msgstr "Sniper Rifle" diff --git a/menu.dat.it.po b/menu.dat.it.po index 86860d457..ae808d274 100644 --- a/menu.dat.it.po +++ b/menu.dat.it.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: 0.1preview\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-27 18:26+0200\n" -"PO-Revision-Date: 2011-06-04 12:39+0100\n" +"POT-Creation-Date: 2011-07-06 20:54+0200\n" +"PO-Revision-Date: 2011-08-02 09:20+0100\n" "Last-Translator: Felice Sallustio \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Language: Italian\n" #: qcsrc/menu/gamecommand.qc:47 @@ -41,9 +41,7 @@ msgstr "error creating curl handle\n" #: qcsrc/menu/gamecommand.qc:239 msgid "Invalid command. For a list of supported commands, try menu_cmd help.\n" -msgstr "" -"Comando non valido. Per una lista dei comandi supportati, prova menu_cmd " -"help.\n" +msgstr "Comando non valido. Per una lista dei comandi supportati, prova menu_cmd help.\n" #: qcsrc/menu/item/gecko.c:49 msgid "Browser not initialized!" @@ -52,9 +50,7 @@ msgstr "Browser non inizializzato!" #: qcsrc/menu/item/label.c:63 #, c-format msgid "NOTE: label text %s too wide for label, condensed by factor %f\n" -msgstr "" -"NOTA: testo dell'etichetta %s troppo grande per l'etichetta, compresso di un " -"fattore %f\n" +msgstr "NOTA: testo dell'etichetta %s troppo grande per l'etichetta, compresso di un fattore %f\n" #: qcsrc/menu/item/listbox.c:300 #, c-format @@ -66,7 +62,8 @@ msgstr "Oggetto %d" msgid "%d (%s)" msgstr "%d (%s)" -#: qcsrc/menu/item/textslider.c:29 qcsrc/menu/item/textslider.c:31 +#: qcsrc/menu/item/textslider.c:29 +#: qcsrc/menu/item/textslider.c:31 msgid "custom" msgstr "personalizzato" @@ -124,14 +121,8 @@ msgid "Welcome" msgstr "Benvenuto" #: qcsrc/menu/xonotic/dialog_firstrun.c:33 -msgid "" -"Welcome to Xonotic, please select your language preference and enter your " -"player name to get started. You can change these options later through the " -"menu system." -msgstr "" -"Benvenuto in Xonotic, per favore selezione la tua lingua e inserisci il tuo " -"nome come giocatore per iniziare. Puoi cambiare queste opzioni più tardi " -"tramite il menu." +msgid "Welcome to Xonotic, please select your language preference and enter your player name to get started. You can change these options later through the menu system." +msgstr "Benvenuto in Xonotic, per favore selezione la tua lingua e inserisci il tuo nome come giocatore per iniziare. Puoi cambiare queste opzioni più tardi tramite il menu." #: qcsrc/menu/xonotic/dialog_firstrun.c:38 #: qcsrc/menu/xonotic/dialog_settings_misc.c:35 @@ -162,7 +153,7 @@ msgstr "Mostra solo il tipo corrente di munizioni" #: qcsrc/menu/xonotic/dialog_hudpanel_ammo.c:28 msgid "Align icon:" -msgstr "" +msgstr "Allineamento icone:" #: qcsrc/menu/xonotic/dialog_hudpanel_ammo.c:29 #: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c:28 @@ -279,7 +270,7 @@ msgstr "Mostra anche le notifiche sulla console" #: qcsrc/menu/xonotic/dialog_hudpanel_notification.c:28 msgid "Flip notify order" -msgstr "Inverti ordine delle notifiche" +msgstr "Inverti ordine notifiche" #: qcsrc/menu/xonotic/dialog_hudpanel_notification.c:31 msgid "Entry lifetime:" @@ -290,9 +281,8 @@ msgid "Entry fadetime:" msgstr "Durata dissolvenza:" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:4 -#, fuzzy msgid "Physics Panel" -msgstr "Pannello Chat" +msgstr "Pannello Fisica" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:23 #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c:21 @@ -301,9 +291,8 @@ msgid "Panel disabled" msgstr "Pannello disabilitato" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:24 -#, fuzzy msgid "Panel enabled if not observing" -msgstr "Pannello abilitato in modalità spettatore" +msgstr "Pannello abilitato se non si sta osservando" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:25 #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c:23 @@ -312,9 +301,8 @@ msgid "Panel always enabled" msgstr "Pannello sempre abilitato" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:31 -#, fuzzy msgid "Status bar" -msgstr "Abilita barra di stato" +msgstr "Barra di stato" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:33 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c:48 @@ -327,32 +315,28 @@ msgid "Right align" msgstr "Allinea a destra" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:35 -#, fuzzy msgid "Inward align" -msgstr "Interno" +msgstr "Allineamento interno" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:36 -#, fuzzy msgid "Outward align" -msgstr "Esterno" +msgstr "Allineamento esterno" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:40 -#, fuzzy msgid "Flip speed/acceleration positions" -msgstr "Inverti posizioni di vita e armatura" +msgstr "Inverti posizioni velocità/accelerazione" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:44 -#, fuzzy msgid "Speed:" -msgstr "Velocità (kB/s):" +msgstr "Velocità:" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:45 msgid "Include vertical speed" -msgstr "" +msgstr "Includi velocità verticale" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:56 msgid "Speed unit:" -msgstr "" +msgstr "Unità di misura velocità:" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:58 msgid "qu/s" @@ -375,23 +359,20 @@ msgid "knots" msgstr "nodi" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:64 -#, fuzzy msgid "Show" -msgstr "Mostra munizioni" +msgstr "Mostra" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:67 -#, fuzzy msgid "Top speed" -msgstr "Velocità zoom:" +msgstr "Velocità massima" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:73 -#, fuzzy msgid "Acceleration:" -msgstr "Riflessioni:" +msgstr "Accelerazione:" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.c:74 msgid "Include vertical acceleration" -msgstr "" +msgstr "Includi accelerazione verticale" #: qcsrc/menu/xonotic/dialog_hudpanel_powerups.c:4 msgid "Powerups Panel" @@ -491,24 +472,23 @@ msgstr "Pannello punteggio" #: qcsrc/menu/xonotic/dialog_hudpanel_score.c:22 msgid "Score:" -msgstr "" +msgstr "Punteggi:" #: qcsrc/menu/xonotic/dialog_hudpanel_score.c:25 msgid "Rankings:" -msgstr "" +msgstr "Posizioni:" #: qcsrc/menu/xonotic/dialog_hudpanel_score.c:26 -#, fuzzy msgid "Off" -msgstr "VBO^Off" +msgstr "Off" #: qcsrc/menu/xonotic/dialog_hudpanel_score.c:27 msgid "And me" -msgstr "" +msgstr "E me" #: qcsrc/menu/xonotic/dialog_hudpanel_score.c:28 msgid "Pure" -msgstr "" +msgstr "Puro" #: qcsrc/menu/xonotic/dialog_hudpanel_timer.c:4 msgid "Timer Panel" @@ -565,9 +545,8 @@ msgid "Alpha" msgstr "Opacità" #: qcsrc/menu/xonotic/dialog_hudpanel_weapons.c:38 -#, fuzzy msgid "EF^Both" -msgstr "WNR^Entrambi" +msgstr "EF^Entrambi" #: qcsrc/menu/xonotic/dialog_hudpanel_weapons.c:42 msgid "Weapon icons:" @@ -613,24 +592,29 @@ msgstr "Setup del Panel HUD" msgid "Panel background defaults:" msgstr "Sfondo del pannello predefinito:" -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:23 qcsrc/menu/xonotic/util.qc:575 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:23 +#: qcsrc/menu/xonotic/util.qc:575 msgid "Background:" msgstr "Sfondo:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:37 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:52 -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:91 qcsrc/menu/xonotic/util.qc:578 -#: qcsrc/menu/xonotic/util.qc:594 qcsrc/menu/xonotic/util.qc:611 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:91 +#: qcsrc/menu/xonotic/util.qc:578 +#: qcsrc/menu/xonotic/util.qc:594 +#: qcsrc/menu/xonotic/util.qc:611 msgid "Disable" msgstr "Disabilita" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:30 -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:77 qcsrc/menu/xonotic/util.qc:583 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:77 +#: qcsrc/menu/xonotic/util.qc:583 msgid "Color:" msgstr "Colore:" -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:35 qcsrc/menu/xonotic/util.qc:591 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:35 +#: qcsrc/menu/xonotic/util.qc:591 msgid "Border size:" msgstr "Dimensioni del bordo:" @@ -639,11 +623,13 @@ msgstr "Dimensioni del bordo:" msgid "Team color:" msgstr "Colore team:" -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:58 qcsrc/menu/xonotic/util.qc:617 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:58 +#: qcsrc/menu/xonotic/util.qc:617 msgid "Test team color in configure mode" msgstr "Prova colore team in modalità configurazione" -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:61 qcsrc/menu/xonotic/util.qc:620 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:61 +#: qcsrc/menu/xonotic/util.qc:620 msgid "Padding:" msgstr "Riempimento:" @@ -965,7 +951,7 @@ msgstr "Chiudi" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:122 #: qcsrc/menu/xonotic/dialog_multiplayer_demo.c:46 msgid "Play" -msgstr "Gioca" +msgstr "Riproduci" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:7 msgid "Mutators" @@ -1261,11 +1247,11 @@ msgstr "Campo di vista:" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:92 msgid "View bobbing:" -msgstr "Ondeggiamento vista:" +msgstr "Ondeggiamento:" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:96 msgid "Zoom factor:" -msgstr "Moltiplicatore zoom:" +msgstr "Fattore zoom:" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:100 msgid "Zoom speed:" @@ -1381,7 +1367,7 @@ msgid "Damage splash:" msgstr "Schizzo del danno:" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:195 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:178 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:173 #: qcsrc/menu/xonotic/dialog_settings_effects.c:191 #: qcsrc/menu/xonotic/dialog_settings_misc.c:30 #: qcsrc/menu/xonotic/dialog_settings_misc.c:41 @@ -1447,7 +1433,7 @@ msgstr "Mostra modello arma in 1ª persona" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c:50 msgid "Center" -msgstr "" +msgstr "Centro" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c:55 msgid "Flip view horizontally" @@ -1471,7 +1457,7 @@ msgstr "Sei sicuro di voler uscire?" #: qcsrc/menu/xonotic/dialog_quit.c:20 msgid "Yes" -msgstr "Si" +msgstr "Sì" #: qcsrc/menu/xonotic/dialog_quit.c:21 msgid "No" @@ -1519,7 +1505,7 @@ msgstr "Master:" msgid "Music:" msgstr "Musica:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:40 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:41 msgid "VOL^Ambient:" msgstr "VOL^Ambiente:" @@ -1527,180 +1513,180 @@ msgstr "VOL^Ambiente:" msgid "Info:" msgstr "Info:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:57 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:55 msgid "Items:" msgstr "Oggetti:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:65 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:62 msgid "Pain:" msgstr "Dolore:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:73 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:69 msgid "Player:" msgstr "Giocatore:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:81 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:76 msgid "Shots:" msgstr "Spari:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:88 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:83 msgid "Voice:" msgstr "Voce:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:96 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:91 msgid "Weapons:" msgstr "Armi:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:103 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:161 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:98 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:156 msgid "Frequency:" msgstr "Frequenza:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:105 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:100 msgid "8 kHz" msgstr "8 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:106 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:101 msgid "11.025 kHz" msgstr "11.025 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:107 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:102 msgid "16 kHz" msgstr "16 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:108 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:103 msgid "22.05 kHz" msgstr "22.05 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:109 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:104 msgid "24 kHz" msgstr "24 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:110 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:105 msgid "32 kHz" msgstr "32 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:111 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:106 msgid "44.1 kHz" msgstr "44.1 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:112 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:107 msgid "48 kHz" msgstr "48 kHz" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:115 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:110 msgid "Channels:" msgstr "Canali:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:117 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:112 msgid "Mono" msgstr "Mono" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:118 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:113 msgid "Stereo" msgstr "Stereo" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:119 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:114 msgid "2.1" msgstr "2.1" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:120 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:115 msgid "4" msgstr "4" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:121 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:116 msgid "5" msgstr "5" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:122 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:117 msgid "5.1" msgstr "5.1" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:123 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:118 msgid "6.1" msgstr "6.1" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:124 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:119 msgid "7.1" msgstr "7.1" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:128 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:123 msgid "Swap Stereo" msgstr "Scambia canali stereo" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:132 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:127 msgid "Headphone friendly mode" msgstr "Modalità cuffie" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:136 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:131 msgid "Spatial voices:" msgstr "Voci spaziali:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:137 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:132 msgid "VOCS^None" msgstr "VOCS^Nessuna" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:138 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:133 msgid "VOCS^Taunts" msgstr "VOCS^Insulti" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:139 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:134 msgid "VOCS^All" msgstr "VOCS^Tutte" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:142 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:137 msgid "Taunt range:" msgstr "Range di insulti:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:145 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:140 msgid "RNG^Very short" msgstr "RNG^Molto ristretto" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:146 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:141 msgid "RNG^Short" msgstr "RNG^Ristretto" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:147 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:142 msgid "RNG^Normal" msgstr "RNG^Normale" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:148 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:143 msgid "RNG^Long" msgstr "RNG^Lungo" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:149 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:144 msgid "RNG^Full" msgstr "RNG^Pieno" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:156 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:151 msgid "Automatic taunts" msgstr "Insulti automatici" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:165 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:160 msgid "Time warning:" msgstr "Avvertimento di tempo:" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:167 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:162 msgid "WRN^None" msgstr "WRN^Nessuno" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:168 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:163 msgid "1 minute" msgstr "1 minuto" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:169 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:164 msgid "5 minutes" msgstr "5 minuti" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:170 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:165 msgid "WRN^Both" msgstr "WNR^Entrambi" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:173 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:168 msgid "Hit indicator" msgstr "Indicatore di colpo" -#: qcsrc/menu/xonotic/dialog_settings_audio.c:175 +#: qcsrc/menu/xonotic/dialog_settings_audio.c:170 msgid "Menu sounds" msgstr "Suoni del menu" @@ -1938,17 +1924,15 @@ msgstr "High Dynamic Range (HDR)" #: qcsrc/menu/xonotic/dialog_settings_effects.c:182 msgid "Motion blur:" -msgstr "Sfocatura da movimento:" +msgstr "Sfocatura movimento:" #: qcsrc/menu/xonotic/dialog_settings_effects.c:187 -#, fuzzy msgid "Damage & water blur" -msgstr "Sfocatura da danno:" +msgstr "Sfocatura da danno & acqua:" #: qcsrc/menu/xonotic/dialog_settings_effects.c:188 -#, fuzzy msgid "Powerup sharpen" -msgstr "Pannello dei Powerup" +msgstr "Powerup nitido" #: qcsrc/menu/xonotic/dialog_settings_input.c:26 msgid "Key bindings:" @@ -2284,15 +2268,14 @@ msgstr "rosa" msgid "spectate" msgstr "spettatore" -#: qcsrc/menu/xonotic/mainwindow.c:35 qcsrc/menu/xonotic/mainwindow.c:38 +#: qcsrc/menu/xonotic/mainwindow.c:35 +#: qcsrc/menu/xonotic/mainwindow.c:38 msgid "Do not press this button again!" msgstr "Non premere questo tasto di nuovo!" #: qcsrc/menu/xonotic/maplist.c:278 -msgid "" -"Huh? Can't play this (m is NULL). Refiltering so this won't happen again.\n" -msgstr "" -"Huh? Can't play this (m is NULL). Refiltering so this won't happen again.\n" +msgid "Huh? Can't play this (m is NULL). Refiltering so this won't happen again.\n" +msgstr "Huh? Can't play this (m is NULL). Refiltering so this won't happen again.\n" #: qcsrc/menu/xonotic/maplist.c:286 #, c-format @@ -2300,12 +2283,8 @@ msgid "%s's Xonotic Server" msgstr "Server Xonotic di %s" #: qcsrc/menu/xonotic/maplist.c:291 -msgid "" -"Huh? Can't play this (invalid game type). Refiltering so this won't happen " -"again.\n" -msgstr "" -"Huh? Can't play this (invalid game type). Refiltering so this won't happen " -"again.\n" +msgid "Huh? Can't play this (invalid game type). Refiltering so this won't happen again.\n" +msgstr "Huh? Can't play this (invalid game type). Refiltering so this won't happen again.\n" #: qcsrc/menu/xonotic/playermodel.c:174 msgid "" @@ -2378,8 +2357,7 @@ msgstr "Ricevuta richiesta HTTP per un invalido id %d.\n" #: qcsrc/menu/xonotic/util.qc:285 #, c-format msgid "error receiving update notification: status is %d\n" -msgstr "" -"errore durante la notifica d'aggiornamento: lo stato è impostato su %d\n" +msgstr "errore durante la notifica d'aggiornamento: lo stato è impostato su %d\n" #: qcsrc/menu/xonotic/util.qc:290 msgid "error: received HTML instead of an update notification\n" @@ -2489,8 +2467,10 @@ msgstr "Team Deathmatch" msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Tuba Throwing" -#: qcsrc/menu/xonotic/util.qc:577 qcsrc/menu/xonotic/util.qc:593 -#: qcsrc/menu/xonotic/util.qc:602 qcsrc/menu/xonotic/util.qc:610 +#: qcsrc/menu/xonotic/util.qc:577 +#: qcsrc/menu/xonotic/util.qc:593 +#: qcsrc/menu/xonotic/util.qc:602 +#: qcsrc/menu/xonotic/util.qc:610 #: qcsrc/menu/xonotic/util.qc:622 msgid "Default" msgstr "Predefinito" @@ -2535,37 +2515,37 @@ msgstr "%s ha visto da vicino il Crylink di %s" msgid "Electro" msgstr "Electro" -#: qcsrc/server/w_electro.qc:577 +#: qcsrc/server/w_electro.qc:574 #, c-format msgid "%s could not remember where they put plasma" msgstr "%s non s'è ricordato dove aveva messo il plasma" -#: qcsrc/server/w_electro.qc:579 +#: qcsrc/server/w_electro.qc:576 #, c-format msgid "%s played with plasma" msgstr "%s ha giocato col plasma" -#: qcsrc/server/w_electro.qc:586 +#: qcsrc/server/w_electro.qc:583 #, c-format msgid "%s just noticed %s's blue ball" msgstr "%s ha appena notato la palla blu di %s" -#: qcsrc/server/w_electro.qc:588 +#: qcsrc/server/w_electro.qc:585 #, c-format msgid "%s got in touch with %s's blue ball" msgstr "%s è entrato in contatto con la palla blu di %s" -#: qcsrc/server/w_electro.qc:593 +#: qcsrc/server/w_electro.qc:590 #, c-format msgid "%s felt the electrifying air of %s's combo" msgstr "%s ha sentito l'aria elettrificata della combo di %s" -#: qcsrc/server/w_electro.qc:595 +#: qcsrc/server/w_electro.qc:592 #, c-format msgid "%s got too close to %s's blue beam" msgstr "%s s'è avvicinato troppo al raggio blu di %s" -#: qcsrc/server/w_electro.qc:597 +#: qcsrc/server/w_electro.qc:594 #, c-format msgid "%s was blasted by %s's blue beam" msgstr "%s è stato fatto saltare in aria dal raggio blu di %s" @@ -2579,7 +2559,8 @@ msgstr "Fireball" msgid "%s forgot about some firemine" msgstr "%s s'è dimenticato di alcune mine infuocate" -#: qcsrc/server/w_fireball.qc:419 qcsrc/server/w_hlac.qc:240 +#: qcsrc/server/w_fireball.qc:419 +#: qcsrc/server/w_hlac.qc:240 #, c-format msgid "%s should have used a smaller gun" msgstr "%s avrebbe dovuto usare un'arma più piccola" @@ -2647,7 +2628,8 @@ msgstr "%s ha mangiato la granata di %s" msgid "Hagar" msgstr "Hagar" -#: qcsrc/server/w_hagar.qc:382 qcsrc/server/w_seeker.qc:655 +#: qcsrc/server/w_hagar.qc:382 +#: qcsrc/server/w_seeker.qc:655 #, c-format msgid "%s played with tiny rockets" msgstr "%s ha giocato con piccoli razzi" @@ -2657,7 +2639,8 @@ msgstr "%s ha giocato con piccoli razzi" msgid "%s hoped %s's missiles wouldn't bounce" msgstr "%s ha sperato che il missile di %s non rimbalzasse" -#: qcsrc/server/w_hagar.qc:388 qcsrc/server/w_seeker.qc:661 +#: qcsrc/server/w_hagar.qc:388 +#: qcsrc/server/w_seeker.qc:661 #, c-format msgid "%s was pummeled by %s" msgstr "%s è stato preso a pugni da %s" @@ -2675,7 +2658,8 @@ msgstr "%s è stato abbattuto da %s" msgid "Grappling Hook" msgstr "Grappling Hook" -#: qcsrc/server/w_hook.qc:266 qcsrc/server/w_porto.qc:296 +#: qcsrc/server/w_hook.qc:266 +#: qcsrc/server/w_porto.qc:296 #, c-format msgid "%s did the impossible" msgstr "%s ha fatto l'impossibile" @@ -2708,7 +2692,8 @@ msgstr "%s è stato \"laserato\" alla morte da %s" msgid "Mine Layer" msgstr "Mine Layer" -#: qcsrc/server/w_minelayer.qc:523 qcsrc/server/w_rocketlauncher.qc:501 +#: qcsrc/server/w_minelayer.qc:523 +#: qcsrc/server/w_rocketlauncher.qc:501 #, c-format msgid "%s exploded" msgstr "%s è esploso" @@ -2732,13 +2717,16 @@ msgstr "%s è passato sopra la mina di %s" msgid "MinstaNex" msgstr "MinstaNex" -#: qcsrc/server/w_minstanex.qc:290 qcsrc/server/w_nex.qc:253 -#: qcsrc/server/w_shotgun.qc:209 qcsrc/server/w_uzi.qc:317 +#: qcsrc/server/w_minstanex.qc:290 +#: qcsrc/server/w_nex.qc:253 +#: qcsrc/server/w_shotgun.qc:209 +#: qcsrc/server/w_uzi.qc:317 #, c-format msgid "%s is now thinking with portals" -msgstr "" +msgstr "%s sta ora pensando con i portali" -#: qcsrc/server/w_minstanex.qc:292 qcsrc/server/w_nex.qc:255 +#: qcsrc/server/w_minstanex.qc:292 +#: qcsrc/server/w_nex.qc:255 #, c-format msgid "%s has been vaporized by %s" msgstr "%s è stato vaporizzato da %s" @@ -2758,7 +2746,7 @@ msgstr "%s ha sentito %s fargli l'impossibile" #: qcsrc/server/w_rifle.qc:2 msgid "Rifle" -msgstr "" +msgstr "Fucile" #: qcsrc/server/w_rifle.qc:233 #, c-format @@ -2790,7 +2778,8 @@ msgstr "%s non è riuscito a nascondersi dal fucile di %s" msgid "%s got hit in the head by %s" msgstr "%s ha preso un colpo in testa da %s" -#: qcsrc/server/w_rifle.qc:258 qcsrc/server/w_uzi.qc:321 +#: qcsrc/server/w_rifle.qc:258 +#: qcsrc/server/w_uzi.qc:321 #, c-format msgid "%s was sniped by %s" msgstr "%s è stato fucilato da %s" @@ -2842,12 +2831,12 @@ msgstr "%s è stato sparato da %s" msgid "@!#%'n Tuba" msgstr "@!#%'n Tuba" -#: qcsrc/server/w_tuba.qc:263 +#: qcsrc/server/w_tuba.qc:253 #, c-format msgid "%s hurt his own ears with the @!#%%'n Tuba" msgstr "%s s'è fatto male alle orecchie con la @!#%%'n Tuba" -#: qcsrc/server/w_tuba.qc:267 +#: qcsrc/server/w_tuba.qc:257 #, c-format msgid "%s died of %s's great playing on the @!#%%'n Tuba" msgstr "%s è morto nella gran esibizione di %s con la @!#%%'n Tuba" @@ -2861,29 +2850,29 @@ msgstr "Machine Gun" msgid "%s was riddled full of holes by %s" msgstr "%s è stato riempito di buchi da %s" -#~ msgid "Speedometer" -#~ msgstr "Tachimetro" - -#~ msgid "qu/s (hidden)" -#~ msgstr "qu/s (nascosto)" +#~ msgid "Waypoint settings:" +#~ msgstr "Impostazioni dei waypoint" -#~ msgid "Show accelerometer" -#~ msgstr "Mostra accelerometro" +#~ msgid "" +#~ "Please answer a few initial questions to enhance the game experience." +#~ msgstr "" +#~ "Per favore rispondi a poche domande iniziali per migliorare l'esperienza " +#~ "di gioco." -#~ msgid "Accelerometer scale:" -#~ msgstr "Scala accelerometro:" +#~ msgid "%d/%d" +#~ msgstr "%d/%d" #~ msgid "Sniper Rifle" #~ msgstr "Sniper Rifle" -#~ msgid "%d/%d" -#~ msgstr "%d/%d" +#~ msgid "Accelerometer scale:" +#~ msgstr "Scala accelerometro:" -#~ msgid "" -#~ "Please answer a few initial questions to enhance the game experience." -#~ msgstr "" -#~ "Per favore rispondi a poche domande iniziali per migliorare l'esperienza " -#~ "di gioco." +#~ msgid "Show accelerometer" +#~ msgstr "Mostra accelerometro" -#~ msgid "Waypoint settings:" -#~ msgstr "Impostazioni dei waypoint" +#~ msgid "qu/s (hidden)" +#~ msgstr "qu/s (nascosto)" + +#~ msgid "Speedometer" +#~ msgstr "Tachimetro" diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 8e60d8212..0dc5b1849 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -138,11 +138,12 @@ var float autocvar_g_waypointsprite_edgeoffset_bottom = 0; var float autocvar_g_waypointsprite_edgeoffset_left = 0; var float autocvar_g_waypointsprite_edgeoffset_right = 0; var float autocvar_g_waypointsprite_edgeoffset_top = 0; +var float autocvar_g_waypointsprite_fontsize = 12; float autocvar_g_waypointsprite_minalpha; float autocvar_g_waypointsprite_minscale; float autocvar_g_waypointsprite_normdistance; var float autocvar_g_waypointsprite_scale = 1; -var float autocvar_g_waypointsprite_fontsize = 12; +float autocvar_g_waypointsprite_spam; float autocvar_g_waypointsprite_timealphaexponent; var float autocvar_hud_colorflash_alpha = 0.5; float autocvar_hud_configure_bg_minalpha; diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc index 9e5b19988..77eceab5e 100644 --- a/qcsrc/client/waypointsprites.qc +++ b/qcsrc/client/waypointsprites.qc @@ -228,6 +228,22 @@ vector spritelookupcolor(string s, vector def) switch(s) { case "keycarrier-friend": return '0 1 0'; + case "wpn-laser": return '1 0.5 0.5'; + case "wpn-shotgun": return '0.5 0.25 0'; + case "wpn-uzi": return '1 1 0'; + case "wpn-gl": return '1 0 0'; + case "wpn-electro": return '0 0.5 1'; + case "wpn-crylink": return '1 0.5 1'; + case "wpn-nex": return '0.5 1 1'; + case "wpn-hagar": return '1 1 0.5'; + case "wpn-rl": return '1 1 0'; + case "wpn-porto": return '0.5 0.5 0.5'; + case "wpn-minstanex": return '0.5 1 1'; + case "wpn-hookgun": return '0 0.5 0'; + case "wpn-fireball": return '1 0.5 0'; + case "wpn-hlac": return '0 1 0'; + case "wpn-campingrifle": return '0.5 1 0'; + case "wpn-minelayer": return '0.75 1 0'; default: return def; } } @@ -267,6 +283,7 @@ string spritelookuptext(string s) case "race-checkpoint": return _("Checkpoint"); case "race-finish": return _("Finish"); case "race-start": return _("Start"); + case "race-start-finish": return (race_checkpointtime || race_mycheckpointtime) ? _("Finish") : _("Start"); case "nb-ball": return _("Ball"); case "ka-ball": return _("Ball"); case "ka-ballcarrier": return _("Ball carrier"); @@ -363,6 +380,7 @@ vector fixrgbexcess(vector rgb) return rgb; } +float waypointsprite_count, waypointsprite_newcount; void Draw_WaypointSprite() { string spriteimage; @@ -418,6 +436,8 @@ void Draw_WaypointSprite() if(spriteimage == "") return; + + ++waypointsprite_newcount; float dist; dist = vlen(self.origin - view_origin); @@ -566,7 +586,10 @@ void Draw_WaypointSprite() o = drawspritearrow(o, ang, rgb, a, SPRITE_ARROW_SCALE * t); string txt; - txt = spritelookuptext(spriteimage); + if(autocvar_g_waypointsprite_spam && waypointsprite_count >= autocvar_g_waypointsprite_spam) + txt = _("Spam"); + else + txt = spritelookuptext(spriteimage); if(self.helpme && time < self.helpme) txt = sprintf(_("%s needing help!"), txt); if(autocvar_g_waypointsprite_uppercase) @@ -775,4 +798,7 @@ void WaypointSprite_Load() WaypointSprite_Load_Frames(".jpg"); waypointsprite_initialized = true; } + + waypointsprite_count = waypointsprite_newcount; + waypointsprite_newcount = 0; } diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc index 08cec8092..067cd8054 100644 --- a/qcsrc/common/campaign_file.qc +++ b/qcsrc/common/campaign_file.qc @@ -18,7 +18,7 @@ float CampaignFile_Load(float offset, float n) campaign_entries = 0; campaign_title = string_null; - fn = strcat("maps/campaign", campaign_name, ".txt"); + fn = language_filename(strcat("maps/campaign", campaign_name, ".txt")); fh = fopen(fn, FILE_READ); if(fh >= 0) { diff --git a/qcsrc/menu/xonotic/credits.c b/qcsrc/menu/xonotic/credits.c index daf4d22f9..0d998d7de 100644 --- a/qcsrc/menu/xonotic/credits.c +++ b/qcsrc/menu/xonotic/credits.c @@ -31,8 +31,6 @@ void XonoticCreditsList_configureXonoticCreditsList(entity me) me.configureXonoticListBox(me); // load the file me.bufferIndex = buf_load(language_filename("xonotic-credits.txt")); - if(me.bufferIndex < 0) - me.bufferIndex = buf_load("xonotic-credits.txt"); me.nItems = buf_getsize(me.bufferIndex); } void XonoticCreditsList_destroy(entity me) diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c index 2aa2d5239..23cb6a3b9 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.c +++ b/qcsrc/menu/xonotic/dialog_settings_effects.c @@ -114,7 +114,9 @@ void XonoticEffectsSettingsTab_fill(entity me) me.TD(me, 1, 1.9, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance")); me.TR(me); me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_decals", _("Decals"))); + me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_decals", _("Decals"))); + me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_decals_models", _("Decals on models"))); + setDependent(e, "cl_decals", 1, 1); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Distance:"))); diff --git a/qcsrc/qc-client.cbp b/qcsrc/qc-client.cbp deleted file mode 100644 index 63e00e9e1..000000000 --- a/qcsrc/qc-client.cbp +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - diff --git a/qcsrc/qc-common.cbp b/qcsrc/qc-common.cbp deleted file mode 100644 index 95f1ba836..000000000 --- a/qcsrc/qc-common.cbp +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - diff --git a/qcsrc/qc-server.cbp b/qcsrc/qc-server.cbp deleted file mode 100644 index eaa30d2d4..000000000 --- a/qcsrc/qc-server.cbp +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc index 2a0d8bc53..85009dd83 100644 --- a/qcsrc/server/assault.qc +++ b/qcsrc/server/assault.qc @@ -313,9 +313,31 @@ void spawnfunc_target_assault_roundstart() { // trigger new round // reset objectives, toggle spawnpoints, reset triggers, ... -void assault_new_round() { +void vehicles_clearrturn(); +void vehicles_spawn(); +void assault_new_round() +{ + entity oldself; //bprint("ASSAULT: new round\n"); + oldself = self; + // Eject players from vehicles + FOR_EACH_PLAYER(self) + { + if(self.vehicle) + vehicles_exit(VHEF_RELESE); + } + + self = findchainflags(vehicle_flags, VHF_ISVEHICLE); + while(self) + { + vehicles_clearrturn(); + vehicles_spawn(); + self = self.chain; + } + + self = oldself; + // up round counter self.winning = self.winning + 1; @@ -338,7 +360,7 @@ void assault_new_round() { ent.team_saved = COLOR_TEAM1; } } - + // reset the level with a countdown cvar_set("timelimit", ftos(ceil(time - game_starttime) / 60)); ReadyRestartForce(); // sets game_starttime diff --git a/qcsrc/server/bot/aim.qc b/qcsrc/server/bot/aim.qc index 63e971b17..699748fda 100644 --- a/qcsrc/server/bot/aim.qc +++ b/qcsrc/server/bot/aim.qc @@ -7,7 +7,7 @@ entity ka_ball; float findtrajectorywithleading(vector org, vector m1, vector m2, entity targ, float shotspeed, float shotspeedupward, float maxtime, float shotdelay, entity ignore) { local float c, savesolid, shottime; - local vector dir, end, v; + local vector dir, end, v, o; if (shotspeed < 1) return FALSE; // could cause division by zero if calculated if (targ.solid < SOLID_BBOX) // SOLID_NOT and SOLID_TRIGGER @@ -18,9 +18,10 @@ float findtrajectorywithleading(vector org, vector m1, vector m2, entity targ, f setsize(tracetossent, m1, m2); savesolid = targ.solid; targ.solid = SOLID_NOT; - shottime = ((vlen(targ.origin - org) / shotspeed) + shotdelay); - v = targ.velocity * shottime + targ.origin; - tracebox(targ.origin, targ.mins, targ.maxs, v, FALSE, targ); + o = (targ.absmin + targ.absmax) * 0.5; + shottime = ((vlen(o - org) / shotspeed) + shotdelay); + v = targ.velocity * shottime + o; + tracebox(o, targ.mins, targ.maxs, v, FALSE, targ); v = trace_endpos; end = v + (targ.mins + targ.maxs) * 0.5; if ((vlen(end - org) / shotspeed + 0.2) > maxtime) diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc index 7c2f98634..377dc2ef9 100644 --- a/qcsrc/server/bot/havocbot/havocbot.qc +++ b/qcsrc/server/bot/havocbot/havocbot.qc @@ -120,7 +120,7 @@ void havocbot_ai() local vector now,v,next;//,heading; local float aimdistance,skillblend,distanceblend,blend; - next = now = self.goalcurrent.origin - (self.origin + self.view_ofs); + next = now = ( (self.goalcurrent.absmin + self.goalcurrent.absmax) * 0.5) - (self.origin + self.view_ofs); aimdistance = vlen(now); //heading = self.velocity; //dprint(self.goalstack01.classname,etos(self.goalstack01),"\n"); @@ -128,7 +128,7 @@ void havocbot_ai() self.goalstack01 != self && self.goalstack01 != world && self.aistatus & AI_STATUS_RUNNING == 0 && !(self.goalcurrent.wpflags & WAYPOINTFLAG_TELEPORT) ) - next = self.goalstack01.origin - (self.origin + self.view_ofs); + next = ((self.goalstack01.absmin + self.goalstack01.absmax) * 0.5) - (self.origin + self.view_ofs); skillblend=bound(0,(skill+self.bot_moveskill-2.5)*0.5,1); //lower skill player can't preturn distanceblend=bound(0,aimdistance/autocvar_bot_ai_keyboard_distance,1); @@ -254,6 +254,7 @@ void havocbot_bunnyhop(vector dir) local float bunnyhopdistance; local vector deviation; local float maxspeed; + vector gco, gno; if(autocvar_g_midair) return; @@ -291,7 +292,8 @@ void havocbot_bunnyhop(vector dir) self.bot_timelastseengoal = 0; } - bunnyhopdistance = vlen(self.origin - self.goalcurrent.origin); + gco = (self.goalcurrent.absmin + self.goalcurrent.absmax) * 0.5; + bunnyhopdistance = vlen(self.origin - gco); // Run only to visible goals if(self.flags & FL_ONGROUND) @@ -324,18 +326,19 @@ void havocbot_bunnyhop(vector dir) if(self.aistatus & AI_STATUS_ROAMING) if(self.goalcurrent.classname=="waypoint") if not(self.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL) - if(fabs(self.goalcurrent.origin_z - self.origin_z) < self.maxs_z - self.mins_z) + if(fabs(gco_z - self.origin_z) < self.maxs_z - self.mins_z) if(self.goalstack01!=world) { - deviation = vectoangles(self.goalstack01.origin - self.origin) - vectoangles(self.goalcurrent.origin - self.origin); + gno = (self.goalstack01.absmin + self.goalstack01.absmax) * 0.5; + deviation = vectoangles(gno - self.origin) - vectoangles(gco - self.origin); while (deviation_y < -180) deviation_y = deviation_y + 360; while (deviation_y > 180) deviation_y = deviation_y - 360; if(fabs(deviation_y) < 20) - if(bunnyhopdistance < vlen(self.origin - self.goalstack01.origin)) - if(fabs(self.goalstack01.origin_z - self.goalcurrent.origin_z) < self.maxs_z - self.mins_z) + if(bunnyhopdistance < vlen(self.origin - gno)) + if(fabs(gno_z - gco_z) < self.maxs_z - self.mins_z) { - if(vlen(self.goalcurrent.origin - self.goalstack01.origin) > autocvar_bot_ai_bunnyhop_startdistance) + if(vlen(gco - gno) > autocvar_bot_ai_bunnyhop_startdistance) if(checkpvs(self.origin + self.view_ofs, self.goalstack01)) { checkdistance = FALSE; @@ -405,6 +408,7 @@ void havocbot_movetogoal() local vector evadelava; local float s; local float maxspeed; + local vector gco; //local float dist; local vector dodge; //if (self.goalentity) @@ -443,7 +447,7 @@ void havocbot_movetogoal() float db, v, d; vector dxy; - dxy = self.origin - self.goalcurrent.origin; dxy_z = 0; + dxy = self.origin - ( ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5 ); dxy_z = 0; d = vlen(dxy); v = vlen(self.velocity - self.velocity_z * '0 0 1'); db = (pow(v,2) / (autocvar_g_jetpack_acceleration_side * 2)) + 100; @@ -501,7 +505,7 @@ void havocbot_movetogoal() if(distance>1000) continue; - traceline(self.origin + self.view_ofs , head.origin, TRUE, world); + traceline(self.origin + self.view_ofs , ( ( head.absmin + head.absmax ) * 0.5 ), TRUE, world); if(trace_fraction<1) continue; @@ -571,7 +575,7 @@ void havocbot_movetogoal() if(self.goalcurrent==world) dir = v_forward; else - dir = normalize(self.goalcurrent.origin - self.origin); + dir = normalize(( ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5 ) - self.origin); local vector xyvelocity = self.velocity; xyvelocity_z = 0; local float xyspeed = xyvelocity * dir; @@ -656,6 +660,7 @@ void havocbot_movetogoal() return; } + if(autocvar_bot_debug_goalstack) debuggoalstack(); @@ -670,6 +675,7 @@ void havocbot_movetogoal() dir = normalize(diff); flatdir = diff;flatdir_z = 0; flatdir = normalize(flatdir); + gco = (self.goalcurrent.absmin + self.goalcurrent.absmax) * 0.5; //if (self.bot_dodgevector_time < time) { @@ -687,7 +693,7 @@ void havocbot_movetogoal() } else { - if(self.velocity_z >= 0 && !(self.watertype == CONTENT_WATER && self.goalcurrent.origin_z < self.origin_z) && + if(self.velocity_z >= 0 && !(self.watertype == CONTENT_WATER && gco_z < self.origin_z) && ( !(self.waterlevel == WATERLEVEL_WETFEET && self.watertype == CONTENT_WATER) || self.aistatus & AI_STATUS_OUT_WATER)) self.BUTTON_JUMP = TRUE; else @@ -783,7 +789,11 @@ void havocbot_movetogoal() { // Remove dangerous dynamic goals from stack if (self.goalcurrent.classname == "player" || self.goalcurrent.classname == "droppedweapon") + { navigation_poproute(); + if(self.goalcurrent) + gco = (self.goalcurrent.absmin + self.goalcurrent.absmax) * 0.5; + } // try to stop flatdir = '0 0 0'; evadeobstacle = normalize(self.velocity) * -1; @@ -804,7 +814,7 @@ void havocbot_movetogoal() dodge = havocbot_dodge(); dodge = dodge * bound(0,0.5+(skill+self.bot_dodgeskill)*0.1,1); evadelava = evadelava * bound(1,3-(skill+self.bot_dodgeskill),3); //Noobs fear lava a lot and take more distance from it - traceline(self.origin, self.enemy.origin, TRUE, world); + traceline(self.origin, ( ( self.enemy.absmin + self.enemy.absmax ) * 0.5 ), TRUE, world); if(trace_ent.classname == "player") dir = dir * bound(0,(skill+self.bot_dodgeskill)/7,1); @@ -874,9 +884,9 @@ void havocbot_chooseenemy() // and not really really far away // and we're not severely injured // then keep tracking for a half second into the future - traceline(self.origin+self.view_ofs, self.enemy.origin+self.enemy.view_ofs*0.5,FALSE,world); + traceline(self.origin+self.view_ofs, ( self.enemy.absmin + self.enemy.absmax ) * 0.5,FALSE,world); if (trace_ent == self.enemy || trace_fraction == 1) - if (vlen(self.enemy.origin - self.origin) < 1000) + if (vlen((( self.enemy.absmin + self.enemy.absmax ) * 0.5) - self.origin) < 1000) if (self.health > 30) { // remain tracking him for a shot while (case he went after a small corner or pilar @@ -1084,10 +1094,10 @@ void havocbot_aim() enemyvel = self.enemy.velocity; if (!self.enemy.waterlevel) enemyvel_z = 0; - lag_additem(time + self.ping, 0, 0, self.enemy, self.origin, selfvel, self.enemy.origin, enemyvel); + lag_additem(time + self.ping, 0, 0, self.enemy, self.origin, selfvel, (self.enemy.absmin + self.enemy.absmax) * 0.5, enemyvel); } else - lag_additem(time + self.ping, 0, 0, world, self.origin, selfvel, self.goalcurrent.origin, '0 0 0'); + lag_additem(time + self.ping, 0, 0, world, self.origin, selfvel, ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5, '0 0 0'); }; float havocbot_moveto_refresh_route() @@ -1145,7 +1155,7 @@ float havocbot_moveto(vector pos) debuggoalstack(); // Heading - local vector dir = self.goalcurrent.origin - (self.origin + self.view_ofs); + local vector dir = ( ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5 ) - (self.origin + self.view_ofs); dir_z = 0; bot_aimdir(dir, -1); diff --git a/qcsrc/server/bot/havocbot/roles.qc b/qcsrc/server/bot/havocbot/roles.qc index ac52c698f..18699a7bd 100644 --- a/qcsrc/server/bot/havocbot/roles.qc +++ b/qcsrc/server/bot/havocbot/roles.qc @@ -10,12 +10,14 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius) local entity head; local entity player; local float rating, d, discard, distance, friend_distance, enemy_distance; + vector o; ratingscale = ratingscale * 0.0001; // items are rated around 10000 already head = findchainfloat(bot_pickup, TRUE); while (head) { - distance = vlen(head.origin - org); + o = (head.absmin + head.absmax) * 0.5; + distance = vlen(o - org); friend_distance = 10000; enemy_distance = 10000; rating = 0; @@ -28,7 +30,7 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius) // Check if the item can be picked up safely if(head.classname == "droppedweapon") { - traceline(head.origin, head.origin + '0 0 -1500', TRUE, world); + traceline(o, o + '0 0 -1500', TRUE, world); d = pointcontents(trace_endpos + '0 0 1'); if(d & CONTENT_WATER || d & CONTENT_SLIME || d & CONTENT_LAVA) @@ -63,7 +65,7 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius) if ( self == player || player.deadflag ) continue; - d = vlen(player.origin - head.origin); // distance between player and item + d = vlen(player.origin - o); // distance between player and item if ( player.team == self.team ) { @@ -131,7 +133,7 @@ void havocbot_goalrating_controlpoints(float ratingscale, vector org, float srad head = findchain(classname, "dom_controlpoint"); while (head) { - if (vlen(head.origin - org) < sradius) + if (vlen(( ( head.absmin + head.absmax ) * 0.5 ) - org) < sradius) { if(head.cnt > -1) // this is just being fought for navigation_routerating(head, ratingscale, 5000); diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc index 03a549439..ebaf210b3 100644 --- a/qcsrc/server/bot/navigation.qc +++ b/qcsrc/server/bot/navigation.qc @@ -641,16 +641,18 @@ void navigation_markroutes_inverted(entity fixed_source_waypoint) void navigation_routerating(entity e, float f, float rangebias) { entity nwp; + vector o; if (!e) return; + o = (e.absmin + e.absmax) * 0.5; //print("routerating ", etos(e), " = ", ftos(f), " - ", ftos(rangebias), "\n"); // Evaluate path using jetpack if(g_jetpack) if(self.items & IT_JETPACK) if(autocvar_bot_ai_navigation_jetpack) - if(vlen(self.origin - e.origin) > autocvar_bot_ai_navigation_jetpack_mindistance) + if(vlen(self.origin - o) > autocvar_bot_ai_navigation_jetpack_mindistance) { vector pointa, pointb; @@ -661,7 +663,7 @@ void navigation_routerating(entity e, float f, float rangebias) pointa = trace_endpos - '0 0 1'; // Point B - traceline(e.origin, e.origin + '0 0 65535', MOVE_NORMAL, e); + traceline(o, o + '0 0 65535', MOVE_NORMAL, e); pointb = trace_endpos - '0 0 1'; // Can I see these two points from the sky? @@ -768,7 +770,7 @@ void navigation_routerating(entity e, float f, float rangebias) { //te_wizspike(nwp.wpnearestpoint); // dprint(e.classname, " ", ftos(f), "/(1+", ftos((nwp.wpcost + vlen(e.origin - nwp.wpnearestpoint))), "/", ftos(rangebias), ") = "); - f = f * rangebias / (rangebias + (nwp.wpcost + vlen(e.origin - nwp.wpnearestpoint))); + f = f * rangebias / (rangebias + (nwp.wpcost + vlen(o - nwp.wpnearestpoint))); //dprint("considering ", e.classname, " (with rating ", ftos(f), ")\n"); //dprint(ftos(f)); if (navigation_bestrating < f) @@ -801,7 +803,7 @@ float navigation_routetogoal(entity e, vector startposition) return TRUE; // if it can reach the goal there is nothing more to do - if (tracewalk(self, startposition, PL_MIN, PL_MAX, e.origin, bot_navigation_movemode)) + if (tracewalk(self, startposition, PL_MIN, PL_MAX, (e.absmin + e.absmax) * 0.5, bot_navigation_movemode)) return TRUE; // see if there are waypoints describing a path to the item @@ -927,7 +929,7 @@ void navigation_goalrating_end() void botframe_updatedangerousobjects(float maxupdate) { local entity head, bot_dodgelist; - local vector m1, m2, v; + local vector m1, m2, v, o; local float c, d, danger; c = 0; bot_dodgelist = findchainfloat(bot_dodge, TRUE); @@ -944,10 +946,11 @@ void botframe_updatedangerousobjects(float maxupdate) v_x = bound(m1_x, v_x, m2_x); v_y = bound(m1_y, v_y, m2_y); v_z = bound(m1_z, v_z, m2_z); - d = head.bot_dodgerating - vlen(head.origin - v); + o = (head.absmin + head.absmax) * 0.5; + d = head.bot_dodgerating - vlen(o - v); if (d > 0) { - traceline(head.origin, v, TRUE, world); + traceline(o, v, TRUE, world); if (trace_fraction == 1) danger = danger + d; } @@ -1027,7 +1030,7 @@ void navigation_unstuck() while(head) { if(head.classname=="waypoint") - if(!(head.wpflags & WAYPOINTFLAG_GENERATED)) + // if(!(head.wpflags & WAYPOINTFLAG_GENERATED)) { if(bot_waypoint_queue_goal) bot_waypoint_queue_goal.bot_waypoint_queue_nextgoal = head; @@ -1104,7 +1107,7 @@ void debugnodestatus(vector position, float status) void debuggoalstack() { local entity goal; - local vector org; + local vector org, go; if(self.goalcounter==0)goal=self.goalcurrent; else if(self.goalcounter==1)goal=self.goalstack01; @@ -1152,8 +1155,9 @@ void debuggoalstack() org = self.lastposition; - te_lightning2(world, org, goal.origin); - self.lastposition = goal.origin; + go = ( goal.absmin + goal.absmax ) * 0.5; + te_lightning2(world, org, go); + self.lastposition = go; self.goalcounter++; } diff --git a/qcsrc/server/bot/waypoints.qc b/qcsrc/server/bot/waypoints.qc index b39e59f76..2fe2a09d7 100644 --- a/qcsrc/server/bot/waypoints.qc +++ b/qcsrc/server/bot/waypoints.qc @@ -23,7 +23,7 @@ entity waypoint_spawn(vector m1, vector m2, float f) setsize(w, m1 - w.origin, m2 - w.origin); if (vlen(w.size) > 0) w.wpisbox = TRUE; - + if(!w.wpisbox) { setsize(w, PL_MIN - '1 1 0', PL_MAX + '1 1 0'); @@ -496,11 +496,11 @@ void waypoint_load_links_hardwired() // Search "from" waypoint if(wp_from.origin!=wp_from_pos) { - wp_from = findradius(wp_from_pos, 1); + wp_from = findradius(wp_from_pos, 5); found = FALSE; while(wp_from) { - if(vlen(wp_from.origin-wp_from_pos)<1) + if(vlen(wp_from.origin-wp_from_pos)<5) if(wp_from.classname == "waypoint") { found = TRUE; @@ -517,11 +517,11 @@ void waypoint_load_links_hardwired() } // Search "to" waypoint - wp_to = findradius(wp_to_pos, 1); + wp_to = findradius(wp_to_pos, 5); found = FALSE; while(wp_to) { - if(vlen(wp_to.origin-wp_to_pos)<1) + if(vlen(wp_to.origin-wp_to_pos)<5) if(wp_to.classname == "waypoint") { found = TRUE; @@ -772,12 +772,12 @@ void waypoint_spawnforitem(entity e) waypoint_spawnforitem_force(e, e.origin); }; -void waypoint_spawnforteleporter(entity e, vector destination, float timetaken) +void waypoint_spawnforteleporter_boxes(entity e, vector org1, vector org2, vector destination1, vector destination2, float timetaken) { local entity w; local entity dw; - w = waypoint_spawn(e.absmin, e.absmax, WAYPOINTFLAG_GENERATED | WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_NORELINK); - dw = waypoint_spawn(destination, destination, WAYPOINTFLAG_GENERATED); + w = waypoint_spawn(org1, org2, WAYPOINTFLAG_GENERATED | WAYPOINTFLAG_TELEPORT | WAYPOINTFLAG_NORELINK); + dw = waypoint_spawn(destination1, destination2, WAYPOINTFLAG_GENERATED); // one way link to the destination w.wp00 = dw; w.wp00mincost = timetaken; // this is just for jump pads @@ -787,6 +787,19 @@ void waypoint_spawnforteleporter(entity e, vector destination, float timetaken) e.nearestwaypointtimeout = time + 1000000000; }; +void waypoint_spawnforteleporter_v(entity e, vector org, vector destination, float timetaken) +{ + org = waypoint_fixorigin(org); + destination = waypoint_fixorigin(destination); + waypoint_spawnforteleporter_boxes(e, org, org, destination, destination, timetaken); +}; + +void waypoint_spawnforteleporter(entity e, vector destination, float timetaken) +{ + destination = waypoint_fixorigin(destination); + waypoint_spawnforteleporter_boxes(e, e.absmin, e.absmax, destination, destination, timetaken); +}; + entity waypoint_spawnpersonal(vector position) { entity w; diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index a4f937a33..a497f8c34 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -1277,10 +1277,10 @@ void ClientKill_Now() Damage(self, self, self, 1 , DEATH_KILL, self.origin, '0 0 0'); } } - + if(self.killindicator && !wasfreed(self.killindicator)) - remove(self.killindicator); - + remove(self.killindicator); + self.killindicator = world; if(self.killindicator_teamchange) @@ -1293,6 +1293,13 @@ void ClientKill_Now() } void KillIndicator_Think() { + if (gameover) + { + self.owner.killindicator = world; + remove(self); + return; + } + if (!self.owner.modelindex) { self.owner.killindicator = world; @@ -1340,6 +1347,10 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 { float killtime; entity e; + + if (gameover) + return; + killtime = autocvar_g_balance_kill_delay; if(g_race_qualifying || g_cts) @@ -1412,6 +1423,9 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 void ClientKill (void) { + if (gameover) + return; + if((g_arena || g_ca) && ((champion && champion.classname == "player" && player_count > 1) || player_count == 1)) // don't allow a kill in this case either { // do nothing @@ -1435,55 +1449,6 @@ void CTS_ClientKill (entity e) // silent version of ClientKill, used when player e.lip = 0; } -void DoTeamChange(float destteam) -{ - float t, c0; - if(!teamplay) - { - if(destteam >= 0) - SetPlayerColors(self, destteam); - return; - } - if(self.classname == "player") - if(destteam == -1) - { - CheckAllowedTeams(self); - t = FindSmallestTeam(self, TRUE); - switch(self.team) - { - case COLOR_TEAM1: c0 = c1; break; - case COLOR_TEAM2: c0 = c2; break; - case COLOR_TEAM3: c0 = c3; break; - case COLOR_TEAM4: c0 = c4; break; - default: c0 = 999; - } - switch(t) - { - case 1: - if(c0 > c1) - destteam = COLOR_TEAM1; - break; - case 2: - if(c0 > c2) - destteam = COLOR_TEAM2; - break; - case 3: - if(c0 > c3) - destteam = COLOR_TEAM3; - break; - case 4: - if(c0 > c4) - destteam = COLOR_TEAM4; - break; - } - if(destteam == -1) - return; - } - if(destteam == self.team && destteam >= 0 && !self.killindicator) - return; - ClientKill_TeamChange(destteam); -} - void FixClientCvars(entity e) { // send prediction settings to the client diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc index 3dfd2a6aa..939b6d258 100644 --- a/qcsrc/server/cl_impulse.qc +++ b/qcsrc/server/cl_impulse.qc @@ -259,7 +259,7 @@ void ImpulseCommands (void) case 107: for(e = findchain(classname, "waypoint"); e; e = e.chain) { - e.colormod_x = 1; + e.colormod = '0.5 0.5 0.5'; e.effects &~= EF_NODEPTHTEST | EF_RED | EF_BLUE; } e2 = navigation_findnearestwaypoint(self, FALSE); @@ -271,7 +271,7 @@ void ImpulseCommands (void) if(e.wpcost >= 10000000) { print("unreachable: ", etos(e), " ", vtos(e.origin), "\n"); - e.colormod_x = 0.1; + e.colormod_z = 8; e.effects |= EF_NODEPTHTEST | EF_BLUE; ++i; ++m; @@ -286,7 +286,7 @@ void ImpulseCommands (void) if(e.wpcost >= 10000000) { print("cannot reach me: ", etos(e), " ", vtos(e.origin), "\n"); - e.colormod_x = 0.1; + e.colormod_x = 8; if not(e.effects & EF_NODEPTHTEST) // not already reported before ++m; e.effects |= EF_NODEPTHTEST | EF_RED; @@ -317,12 +317,53 @@ void ImpulseCommands (void) setmodel(e, self.model); e.frame = self.frame; e.skin = self.skin; + e.colormod = '8 0.5 8'; setsize(e, '0 0 0', '0 0 0'); ++i; } } if(i) print(ftos(i), " spawnpoints have no nearest waypoint (marked by player model)\n"); + i = 0; + entity start; + start = findchainflags(flags, FL_ITEM); + for(e = start; e; e = e.chain) + { + e.effects &~= EF_NODEPTHTEST | EF_RED | EF_BLUE; + e.colormod = '0.5 0.5 0.5'; + } + for(e = start; e; e = e.chain) + { + if(navigation_findnearestwaypoint(e, FALSE)) + { + } + else + { + print("item without waypoint: ", etos(e), " ", vtos(e.origin), "\n"); + e.effects |= EF_NODEPTHTEST | EF_RED; + e.colormod_x = 8; + ++i; + } + } + if(i) + print(ftos(i), " items have no nearest waypoint and cannot be walked away from (marked with red light)\n"); + i = 0; + for(e = start; e; e = e.chain) + { + org = e.origin; + if(navigation_findnearestwaypoint(e, TRUE)) + { + } + else + { + print("item without waypoint: ", etos(e), " ", vtos(e.origin), "\n"); + e.effects |= EF_NODEPTHTEST | EF_BLUE; + e.colormod_z = 8; + ++i; + } + } + if(i) + print(ftos(i), " items have no nearest waypoint and cannot be walked to (marked with blue light)\n"); break; } } diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc index c1d3162a5..bace1dd7e 100644 --- a/qcsrc/server/clientcommands.qc +++ b/qcsrc/server/clientcommands.qc @@ -239,6 +239,11 @@ void SV_ParseClientCommand(string s) { if(self.classname == "player" && autocvar_sv_spectate == 1) { ClientKill_TeamChange(-2); // observe } + if(g_ca && self.caplayer && (self.classname == "spectator" || self.classname == "observer")) { + // in CA, allow a dead player to move to spectatators (without that, caplayer!=0 will be moved back to the player list) + sprint(self, "WARNING: you will spectate in the next round.\n"); + self.caplayer = 0; + } } else if(cmd == "join") { if not(self.flags & FL_CLIENT) return; diff --git a/qcsrc/server/mode_onslaught.qc b/qcsrc/server/mode_onslaught.qc index 457141f74..4f8aee2e7 100644 --- a/qcsrc/server/mode_onslaught.qc +++ b/qcsrc/server/mode_onslaught.qc @@ -372,6 +372,7 @@ float onslaught_controlpoint_attackable(entity cp, float t) return 0; } +float overtime_msg_time; void onslaught_generator_think() { local float d; @@ -379,9 +380,14 @@ void onslaught_generator_think() self.nextthink = ceil(time + 1); if (!gameover) { - if (autocvar_timelimit) - if (time > game_starttime + autocvar_timelimit * 60) + if (autocvar_timelimit && time > game_starttime + autocvar_timelimit * 60) { + if (!overtime_msg_time) + { + FOR_EACH_PLAYER(e) + centerprint(e, "^3Now playing ^1OVERTIME^3!\n^3Generators start now to self-damaging.\n^3The more control points your team holds,\n^3the more damage the enemy generator gets."); + overtime_msg_time = time; + } // self.max_health / 300 gives 5 minutes of overtime. // control points reduce the overtime duration. sound(self, CH_TRIGGER, "onslaught/generator_decay.wav", VOL_BASE, ATTN_NORM); @@ -397,6 +403,8 @@ void onslaught_generator_think() d = d * self.max_health / 300; Damage(self, self, self, d, DEATH_HURTTRIGGER, self.origin, '0 0 0'); } + else if (overtime_msg_time) + overtime_msg_time = 0; } }; @@ -819,6 +827,7 @@ void onslaught_generator_reset() self.think = onslaught_generator_delayed; self.nextthink = time + 0.2; setmodel(self, "models/onslaught/generator.md3"); + setsize(self, '-52 -52 -14', '52 52 75'); WaypointSprite_UpdateMaxHealth(self.sprite, self.max_health); WaypointSprite_UpdateHealth(self.sprite, self.health); @@ -1067,33 +1076,55 @@ void onslaught_controlpoint_icon_think() self.owner.waslinked = self.owner.islinked; } - if (self.punchangle_x > 2) - self.punchangle_x = self.punchangle_x - 2; - else if (self.punchangle_x < -2) - self.punchangle_x = self.punchangle_x + 2; - else - self.punchangle_x = 0; - if (self.punchangle_y > 2) - self.punchangle_y = self.punchangle_y - 2; - else if (self.punchangle_y < -2) - self.punchangle_y = self.punchangle_y + 2; - else - self.punchangle_y = 0; - if (self.punchangle_z > 2) - self.punchangle_z = self.punchangle_z - 2; - else if (self.punchangle_z < -2) - self.punchangle_z = self.punchangle_z + 2; - else - self.punchangle_z = 0; + + if (self.punchangle_x > 0) + { + self.punchangle_x = self.punchangle_x - 60 * sys_frametime; + if (self.punchangle_x < 0) + self.punchangle_x = 0; + } + else if (self.punchangle_x < 0) + { + self.punchangle_x = self.punchangle_x + 60 * sys_frametime; + if (self.punchangle_x > 0) + self.punchangle_x = 0; + } + + if (self.punchangle_y > 0) + { + self.punchangle_y = self.punchangle_y - 60 * sys_frametime; + if (self.punchangle_y < 0) + self.punchangle_y = 0; + } + else if (self.punchangle_y < 0) + { + self.punchangle_y = self.punchangle_y + 60 * sys_frametime; + if (self.punchangle_y > 0) + self.punchangle_y = 0; + } + + if (self.punchangle_z > 0) + { + self.punchangle_z = self.punchangle_z - 60 * sys_frametime; + if (self.punchangle_z < 0) + self.punchangle_z = 0; + } + else if (self.punchangle_z < 0) + { + self.punchangle_z = self.punchangle_z + 60 * sys_frametime; + if (self.punchangle_z > 0) + self.punchangle_z = 0; + } + self.angles_x = self.punchangle_x; self.angles_y = self.punchangle_y + self.mangle_y; self.angles_z = self.punchangle_z; - self.mangle_y = self.mangle_y + 1.5; + self.mangle_y = self.mangle_y + 45 * sys_frametime; - self.cp_bob_origin_z = 4 * PI * (1 - cos(self.cp_bob_spd / 8)); - self.cp_bob_spd = self.cp_bob_spd + 0.5; + self.cp_bob_origin_z = 4 * PI * (1 - cos(self.cp_bob_spd)); + self.cp_bob_spd = self.cp_bob_spd + 1.875 * sys_frametime; if(self.cp_bob_dmg_z > 0) - self.cp_bob_dmg_z = self.cp_bob_dmg_z - 0.1; + self.cp_bob_dmg_z = self.cp_bob_dmg_z - 3 * sys_frametime; else self.cp_bob_dmg_z = 0; setorigin(self,self.cp_origin + self.cp_bob_origin + self.cp_bob_dmg); diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 80cb96b10..f6ca98682 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -807,7 +807,7 @@ void spawnfunc_trigger_race_checkpoint() if(self.race_checkpoint) WaypointSprite_SpawnFixed("race-checkpoint", o, self, sprite, RADARICON_NONE, '1 0.5 0'); else - WaypointSprite_SpawnFixed("race-finish", o, self, sprite, RADARICON_NONE, '1 0.5 0'); + WaypointSprite_SpawnFixed("race-start-finish", o, self, sprite, RADARICON_NONE, '1 0.5 0'); } self.sprite.waypointsprite_visible_for_player = race_waypointsprite_visible_for_player; diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index d11a7e3fd..15f43ad9e 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -389,3 +389,20 @@ void SV_OnEntityPreSpawnFunction() return; } } + +void WarpZone_PostInitialize_Callback(void) +{ + // create waypoint links for warpzones + entity e; + for(e = world; (e = find(e, classname, "trigger_warpzone")); ) + { + vector src, dst; + src = (e.absmin + e.absmax) * 0.5; + makevectors(e.warpzone_angles); + src = src + ((e.warpzone_origin - src) * v_forward) * v_forward + 16 * v_right; + dst = (e.enemy.absmin + e.enemy.absmax) * 0.5; + makevectors(e.enemy.warpzone_angles); + dst = dst + ((e.enemy.warpzone_origin - dst) * v_forward) * v_forward - 16 * v_right; + waypoint_spawnforteleporter_v(e, src, dst, 0); + } +} diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc index 18dbef171..888b94456 100644 --- a/qcsrc/server/t_jumppads.qc +++ b/qcsrc/server/t_jumppads.qc @@ -127,6 +127,8 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht) void trigger_push_touch() { + vector move; + if (self.active == ACTIVE_NOT) return; @@ -139,13 +141,30 @@ void trigger_push_touch() EXACTTRIGGER_TOUCH; - if(self.target) - self.movedir = trigger_push_calculatevelocity(other.origin, self.enemy, self.height); + if(self.enemy) + { + other.velocity = trigger_push_calculatevelocity(other.origin, self.enemy, self.height); + } + else if(self.target) + { + entity e; + RandomSelection_Init(); + for(e = world; (e = find(e, targetname, self.target)); ) + { + if(e.cnt) + RandomSelection_Add(e, 0, string_null, e.cnt, 1); + else + RandomSelection_Add(e, 0, string_null, 1, 1); + } + other.velocity = trigger_push_calculatevelocity(other.origin, RandomSelection_chosen_ent, self.height); + } + else + { + other.velocity = self.movedir; + } other.flags &~= FL_ONGROUND; - other.velocity = self.movedir; - if (other.classname == "player") { // reset tracking of oldvelocity for impact damage (sudden velocity changes) @@ -227,7 +246,7 @@ void trigger_push_touch() .vector dest; void trigger_push_findtarget() { - local entity e; + local entity e, t; local vector org; local float flighttime; @@ -237,31 +256,48 @@ void trigger_push_findtarget() if (self.target) { - // find the target - self.enemy = find(world, targetname, self.target); - if (!self.enemy) + float n; + n = 0; + for(t = world; (t = find(t, targetname, self.target)); ) { - objerror("trigger_push: target not found\n"); - remove(self); - return; + ++n; + e = spawn(); + setorigin(e, org); + setsize(e, PL_MIN, PL_MAX); + e.velocity = trigger_push_calculatevelocity(org, t, self.height); + tracetoss(e, e); + if(e.movetype == MOVETYPE_NONE) + waypoint_spawnforteleporter(self, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity)); + remove(e); } - self.movedir = trigger_push_calculatevelocity(org, self.enemy, self.height); - flighttime = trigger_push_calculatevelocity_flighttime; + if(n == 0) + { + // no dest! + objerror ("Jumppad with nonexistant target"); + return; + } + else if(n == 1) + { + // exactly one dest - bots love that + self.enemy = find(e, targetname, self.target); + } + else + { + // have to use random selection every single time + self.enemy = world; + } } else - flighttime = 0; - - // calculate the destination and spawn a teleporter spawnfunc_waypoint - e = spawn(); - setorigin(e, org); - setsize(e, PL_MIN, PL_MAX); - e.velocity = self.movedir; - tracetoss(e, e); - self.dest = trace_endpos; - remove(e); - - waypoint_spawnforteleporter(self, self.dest, flighttime); + { + e = spawn(); + setorigin(e, org); + setsize(e, PL_MIN, PL_MAX); + e.velocity = self.movedir; + tracetoss(e, e); + waypoint_spawnforteleporter(self, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity)); + remove(e); + } }; /* diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc index 4d7bd92cf..0adbd5196 100644 --- a/qcsrc/server/t_teleporters.qc +++ b/qcsrc/server/t_teleporters.qc @@ -251,18 +251,15 @@ void teleport_findtarget (void) entity e; float n; - RandomSelection_Init(); n = 0; for(e = world; (e = find(e, targetname, self.target)); ) { ++n; if(e.movetype == MOVETYPE_NONE) - RandomSelection_Add(e, 0, string_null, 1, 1); + waypoint_spawnforteleporter(self, e.origin, 0); if(e.classname != "info_teleport_destination") print("^3MAPPER ERROR: teleporter does target an invalid teleport destination entity. Angles will not work.\n"); } - if(RandomSelection_chosen_ent) - waypoint_spawnforteleporter(self, RandomSelection_chosen_ent.origin, 0); if(n == 0) { @@ -274,7 +271,6 @@ void teleport_findtarget (void) { // exactly one dest - bots love that self.enemy = find(e, targetname, self.target); - self.dest = self.enemy.origin; } else { diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index 9fbd6541f..e3c74c5e1 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -669,6 +669,10 @@ void spawnfunc_vehicle_racer() self.vehicle_flags |= VHF_HEALTHREGEN; self.think = racer_dinit; - self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_racer_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); + + if(g_assault) + self.nextthink = time + 0.5; + else + self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_racer_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } #endif // SVQC diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc index 26054ae09..201c186c3 100644 --- a/qcsrc/server/vehicles/raptor.qc +++ b/qcsrc/server/vehicles/raptor.qc @@ -734,6 +734,10 @@ void spawnfunc_vehicle_raptor() precache_sound ("vehicles/raptor_speed.wav"); self.think = raptor_dinit; - self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_raptor_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); + + if(g_assault) + self.nextthink = time + 0.5; + else + self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_raptor_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } #endif // SVQC diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc index 8d64ca420..f43ec08e5 100644 --- a/qcsrc/server/vehicles/spiderbot.qc +++ b/qcsrc/server/vehicles/spiderbot.qc @@ -673,7 +673,11 @@ void spawnfunc_vehicle_spiderbot() if(autocvar_g_vehicle_spiderbot_health_regen) self.vehicle_flags |= VHF_HEALTHREGEN; - self.think = vewhicle_spiderbot_dinit; - self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_spiderbot_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); + self.think = vewhicle_spiderbot_dinit; + + if(g_assault) + self.nextthink = time + 0.5; + else + self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_spiderbot_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } #endif // SVQC diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc index 901e68ff1..d9d77b5f5 100644 --- a/qcsrc/server/vehicles/vehicles.qc +++ b/qcsrc/server/vehicles/vehicles.qc @@ -618,7 +618,9 @@ void vehicles_exit(float eject) if(!teamplay) self.team = 0; - + else + self.team = self.tur_head.team; + if(self.owner.flagcarried) { self.owner.flagcarried.scale = 0.6; @@ -629,6 +631,7 @@ void vehicles_exit(float eject) sound (self, CH_TRIGGER_SINGLE, "misc/null.wav", 1, ATTN_NORM); self.vehicle_exit(eject); self.owner = world; + vehicles_reset_colors(); if(oldself) self = oldself; @@ -845,7 +848,7 @@ void vehicles_setreturn() ret.classname = "vehicle_return"; ret.enemy = self; ret.team = self.team; - ret.think = vehicles_showwp; + ret.think = vehicles_showwp; if(self.deadflag != DEAD_NO) { @@ -856,8 +859,6 @@ void vehicles_setreturn() { ret.nextthink = min(time + self.vehicle_respawntime, time + self.vehicle_respawntime - 1); } - - setmodel(ret, "null"); setorigin(ret, self.pos1 + '0 0 96'); @@ -959,7 +960,7 @@ float vehicle_initialize(string net_name, if(self.team && !teamplay) self.team = 0; - + self.vehicle_flags |= VHF_ISVEHICLE; setmodel(self, bodymodel); @@ -1018,7 +1019,8 @@ float vehicle_initialize(string net_name, self.pos1 = self.origin; self.pos2 = self.angles; - + self.tur_head.team = self.team; + return TRUE; } diff --git a/qcsrc/server/waypointsprites.qc b/qcsrc/server/waypointsprites.qc index 836a85357..b5b6a0beb 100644 --- a/qcsrc/server/waypointsprites.qc +++ b/qcsrc/server/waypointsprites.qc @@ -214,6 +214,23 @@ float WaypointSprite_Customize() if(e.classname == "spectator") e = e.enemy; + // as a GENERAL rule: + // if you have the invisibility powerup, sprites ALWAYS are restricted to your team + // but only apply this to real players, not to spectators + if(g_minstagib && (self.owner.items & IT_STRENGTH) && (e == other)) + { + if(teamplay) + { + if(self.owner.team != e.team) + return FALSE; + } + else + { + if(self.owner != e) + return FALSE; + } + } + return self.waypointsprite_visible_for_player(e); } diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc index 94209205b..4d44fe84e 100644 --- a/qcsrc/warpzonelib/server.qc +++ b/qcsrc/warpzonelib/server.qc @@ -770,6 +770,7 @@ void WarpZone_StartFrame() WarpZone_InitStep_UpdateTransform(); self = e; WarpZones_Reconnect(); + WarpZone_PostInitialize_Callback(); } if(warpzone_warpzones_exist) diff --git a/qcsrc/warpzonelib/server.qh b/qcsrc/warpzonelib/server.qh index 621e0f951..7a301a8b8 100644 --- a/qcsrc/warpzonelib/server.qh +++ b/qcsrc/warpzonelib/server.qh @@ -10,3 +10,5 @@ const float ENT_CLIENT_WARPZONE; const float ENT_CLIENT_WARPZONE_CAMERA; void WarpZone_PlayerPhysics_FixVAngle(void); + +void WarpZone_PostInitialize_Callback(void); diff --git a/qcsrc/xonotic-gamecode.workspace b/qcsrc/xonotic-gamecode.workspace deleted file mode 100644 index 3f4a59a30..000000000 --- a/qcsrc/xonotic-gamecode.workspace +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tooltips.db.it b/tooltips.db.it new file mode 100644 index 000000000..753832bcb --- /dev/null +++ b/tooltips.db.it @@ -0,0 +1,202 @@ +0 +\XonoticSingleplayerDialog\Gioca la campagna in giocatore singolo o una partita istantanea contro dei bot + + +\XonoticMultiplayerDialog\Gioca online, contro i tuoi amici in LAN, guarda demo o cambia le impostazioni del giocatore +\XonoticMultiplayerDialog/Server\Cerca dei server dove giocare +\menu_slist_showempty\Mostra server vuoti +\menu_slist_showfull\Mostra server pieni che non hanno slot disponibili +\net_slist_pause\Ferma l'aggiornamento della serverlist per prevenire il "jumping around" dei server +\XonoticMultiplayerDialog/Info\Mostra maggiori informazioni riguardo l'ultimo server selezionato +\XonoticMultiplayerDialog/Aggiungi tra i preferiti\Aggiungi nel segnalibri il server attualmente selezionato in modo che sia più veloce da trovare in futuro +\XonoticMultiplayerDialog/Havoc\Cambia in modalità "Havoc" in cui sono presenti alcune modifiche al gameplay +\XonoticMultiplayerDialog/Crea\Ospita la tua partita +\XonoticMultiplayerDialog/Demo\Naviga e vedi le demo +\XonoticMultiplayerDialog/Setup giocatore\Modifica le impostazioni del tuo giocatore + +\XonoticTeamSelectDialog/join 'best' team (auto-select)\Autoseleziona team (raccomandato) +\XonoticTeamSelectDialog/rosso\Entra nel team rosso +\XonoticTeamSelectDialog/blu\Entra nel team blu +\XonoticTeamSelectDialog/giallo\Entra nel team giallo +\XonoticTeamSelectDialog/rosa\Entra nel team rosa + +\timelimit_override\Tempo limite in minuti in cui, appena si colpisce, terminerà la partita +\fraglimit_override\Il numero di frag necessari affinchè la partita finisca +\menu_maxplayers\Il massimo numero di giocatori o bot che possono essere connessi al tuo server alla volta +\bot_number\Numero di bot nel tuo server +\skill\Specifica quanto i bot dovranno essere esperti +\g_maplist_votable\Numero di mappe che sono mostrate nel voto delle mappe alla fine di una partita +\sv_vote_simple_majority_factor\La semplice maggioranza vince il voto +\XonoticMultiplayerDialog/Impostazioni avanzate...\Impostazioni del server avanzate +\XonoticMultiplayerDialog/Mutatori...\Arene dedicate per mutatori e armi +\g_dodging\Abilita dodging +\g_cloaked\Tutti i giocatori sono quasi invisibili +\g_footsteps\Abilita suoni dei passi +\g_midair\È possibili infliggere danni al tuo nemico solo quando è per aria +\g_vampire\Il danno effettuato al tuo nemico aumenta la tua vita +\g_bloodloss\L'ammontare di vita sotto la quale il tuo giocatore viene stordito per la perdita di sangue +\sv_gravity\Rendi la caduta degli oggetti più lenta, valori inferiori significano minor gravità +\g_grappling_hook\I giocatori effettuano il respawn con il grappling hook +\g_jetpack\I giocatori effettuano il respawn col jetpack +\g_pinata\I giocatori rilasceranno tutte le armi che possedevano appena vengono uccisi +\g_weapon_stay\Le armi rimangono appena dopo vengono raccolte +\g_weaponarena\Selezionando un'arena dedicata per un'arma si darà a tutti i giocatori munizioni infinite, e disabiliterà tutti gli altri raccoglimenti delle armi. +\menu_weaponarena_with_laser\Abilita anche il laser nelle arene dedicate ad un'arma +\g_minstagib\Ai giocatori sarà dato il Minstanex, che è un railgun con danni illimitati. Se il giocatore rimane senza munizioni, avrà 10 secondi per trovarne alcune, altrimenti morirà. Il fuoco secondario è un laser che non infligge nessun danno ed è buono per effettuare vari trickjump. +\g_nix\"No items Xonotic" - invece di raccogliere oggetti, ognuno giocherà con la stessa arma. Dopo un pò di tempo, un conto alla rovescia inizierà, dopo la quale ognuno passerà ad un'altra arma. +\g_nix_with_laser\Porta sempre il laser come arma aggiuntiva nella modalità "No items Xonotic" +\XonoticMultiplayerDialog/All\Seleziona tutte le mappe +\XonoticMultiplayerDialog/None\Deseleziona tutte le mappe + + +\XonoticMultiplayerDialog/Timedemo\Testa quanto velocemente il tuo computer fa girare il demo selezionato + +\fov\Il campo di vista da 60 a 130 gradi, di default è a 90 gradi +\cl_bobcycle\Mostra frequenza dell'ondeggiamento, disabilita per nessun ondeggiamento +\cl_zoomfactor\Quanto grande è il fattore zoom quando il tasto per lo zoom viene premuto +\cl_zoomsensitivity\Come lo zoom fa variare la sensibilità del mouse, da 0 (sensibilità più bassa) a 1 (nessun cambio di sensibilità) +\cl_zoomspeed\Quando velocemente la vista viene zoomata, disabilitalo per lo zoom istantaneo +\XonoticMultiplayerDialog/Impostazioni arma...\Imposta le tue armi preferite, i cambi automatici e le impostazioni dei modelli delle armi + +\cl_weaponpriority_useforcycling\Usa la lista qui sotto per definire le armi usando la rotellina del mouse +\cl_autoswitch\Automaticamente passa all'arma appena raccolta se è migliore di quella che stavi già usando +\r_drawviewmodel\Mostra il modello dell'arma +\cl_gunalign\Posizione del modello dell'arma (richiede riconnessione) + +\crosshair_per_weapon\Imposta un differente mirino per ogni arma, buono se giochi senza i modelli delle armi +\crosshair_color_per_weapon\Imposta il colore del mirino dipendente dall'arma che stai correntemente usando +\crosshair_size\Imposta la dimensione del mirino +\crosshair_alpha\Imposta l'opacità del mirino +\crosshair_color\Imposta il colore del mirino +\sbar_hudselector\Usa il tema del vecchio HUD +\XonoticMultiplayerDialog/Radar, HUD & Waypoints...\Imposta il radar, l'HUD e i waypoint +\_cl_name\Nome con la quale vorresti apparire in gioco + +\XonoticSettingsDialog\Cambia le impostazioni del gioco +\XonoticCreditsDialog\I crediti del team di Xonotic +\XonoticTeamSelectDialog\- +\XonoticMutatorsDialog\- +\XonoticMapInfoDialog\- +\XonoticUserbindEditDialog\- +\XonoticWinnerDialog\- +\XonoticWeaponsDialog\- +\XonoticRadarDialog\- +\XonoticServerInfoDialog\- +\XonoticCvarsDialog\- + +\XonoticQuitDialog\Chiudi il gioco +\XonoticQuitDialog/Sì\Devo tornare a lavorare... +\XonoticQuitDialog/No\Ho ancora un pò di frag da compiere! + +\XonoticSettingsDialog/Comandi\Impostazioni input +\sensitivity\Velocità mouse +\menu_mouse_speed\Velocità mouse nel menu, non fa effetto nel gioco +\m_filter\Rendi più morbido il movimento del mouse, però rende la sua risposta più lenta +\m_pitch\Inverti il movimento del mouse nell'asse Y +\vid_dgamouse\Rendi possibile l'uso di un mouse DGA +\con_closeontoggleconsole\Rendi il tasto di chiusura console uguale a quella di apertura + +\XonoticSettingsDialog/Video\Impostazioni video +\vid_width\Risoluzione schermo +\vid_bitsperpixel\Bit per pixel (BPP) per il rendering, 32 è raccomandato +\vid_fullscreen\Abilita modalità a tutto schermo (predefinito: abilitato) +\vid_vsync\Abilita la sincronizzazione verticale per prevenire il "tearing", limita il numero max di fotogrammi al secondo (predefinito: disabilitato) +\r_glsl\Abilita i pixel shader OpenGL 2.0 per la luminosità (predefinito: abilitato) +\gl_vbo\Rendi possibile l'uso dei Vertex Buffer Objects per salvare nella memoria grafica i modelli 3D per un rendering più veloce (predefinito: Vertici e Triangoli) +\r_depthfirst\Elimita i problemi di "overdraw" eseguendo per primo il rendering della profondità della scena, poi più tardi il rendering "standard" (predefinito: disabilitato) +\gl_texturecompression\Comprimi le texture per le schede video con poca memoria grafica disponibile (predefinito: Nessuna) +\gl_finish\Fa in modo che la CPU attenda che la GPU finisca di elaborare ogni frame, può aiutare con alcuni strani input o in presenza di video lag in alcune macchine (predefinito: disabilitato) +\v_brightness\Luminosità del nero (predefinito: 0) +\v_contrast\Luminosità del bianco (predefinito: 1) +\v_gamma\Valore della correzione gamma inversa, un effetto di luminosità che non affligge il bianco o il nero (predefinito: 1.125) +\v_contrastboost\Di quanto viene moltiplicato il contrasto nelle aree oscure (predefinito: 1) +\r_glsl_saturation\Adattamento saturazione (0 = scala di grigi, 1 = normale, 2 = sovra-saturo), richiede il GLSL color control (predefinito: 1) +\v_glslgamma\Abilita l'uso delle GLSL per applicare la correzione gamma, nota che le performance potrebbero decrementare di tanto (predefinito: disabilitato) +\r_ambient\Luminosità dell'ambiente, se è impostato ad un valore troppo alto tende a rendere la luce delle mappe opaca e piatta (predefinito: 4) +\r_hdr_scenebrightness\Rendering luminosità globale (predefinito: 1) +\vid_samples\Abilita l'antialiasing, che smussa i bordi dei modelli in 3D. Nota che le performance potrebbero decrementare di un bel pò (predefinito: disabilitato) +\v_flipped\Modalità mancino (Predefinito: off) + +\XonoticSettingsDialog/Effetti\Impostazioni effetti +\r_subdivisions_tolerance\Cambia lo smussamento delle curve della mappa (predefinito: normali) +\gl_picmip\Cambia la nitidezza delle textures. Valori più bassi riducono l'uso della memoria per le texture, però faranno apparire quest'ultime molto sfuocate. (predefinito: buona) +\r_picmipworld\Se impostato, riduce solo la qualità delle texture dei modelli (predefinito: abilitato) +\mod_q3bsp_nolightmaps\Usa le lightmaps ad alta risoluzione, che appaiono più gradite alla vista, però sfruttano più memoria video (predefinito: abilitato) +\cl_particles_quality\Moltiplicatore del numero di particolari. Valori inferiori significano meno particolari, che di conseguenza incrementano le performance (predefinito: 0.5) +\r_drawparticles_drawdistance\Distanza per cui i particolari non vengono mostrati (predefinito: 1000) +\cl_decals\Abilita i segni (buchi dei proiettili e sangue) (predefinito: abilitati) +\r_drawdecals_drawdistance\Distanza per cui i segni non vengono mostrati (predefinito: 300) +\cl_decals_time\Tempo in secondi dopo la quale i segni svaniscono (predefinito: 2) +\cl_gentle\Sostituisci il sangue e i gib con contenuti che non hanno alcun effetto offensivo (predefinito: disabilitato) +\cl_nogibs\Riduci il numero di gib o rimuovili completamente (predefinito: parecchi) +\v_kicktime\Quanto dura una vista spostata per i danni (predefinito: 0) +\gl_texture_anisotropy\Qualità del filtro anisotropico (predefinito: 1x) +\r_glsl_deluxemapping\Usa gli effetti di luminosità pixel per pixel (predefinito: abilitati) +\r_shadow_gloss\Abilita l'uso della lucentezza delle mappe sulle texture che la supportano (predefinito: abilitati) +\gl_flashblend\Abilita luci dinamiche più veloci ma meno gradevoli tramite il rendering di corone luminose invece di luci dinamiche reali (predefinito: disabilitato) +\r_shadow_realtime_dlight\Abilita il rendering delle luci dinamiche come esplosioni e lancio di razzi (predefinito: abilitato) +\r_shadow_realtime_dlight_shadows\Abilita il rendering di ombre dalle luci dinamiche (predefinito: abilitato) +\r_shadow_realtime_world\Abilita il rendering delle luci dell'ambiente in tempo reale in mappe che le supportano. Nota che questo potrebbe avere un grande impatto sulle performance. (predefinito: disabilitato) +\r_shadow_realtime_world_shadows\Abilita il rendering di ombre dalle luci dell'ambiente in tempo reale (predefinito: disabilitato) +\r_shadow_usenormalmap\Abilita l'uso di ombre direzionali sulle texture (predefinito: abilitato) +\r_showsurfaces\Disabilita completamnete le texture per hardware molto lento. Questo dà un enorme boost alle performance, però appare molto poco gradevole. (predefinito: disabilitato) +\r_glsl_offsetmapping\Effetto del mappaggio in offset che fa sembrare che le texture con bumpmaps "saltino fuori" dalle piane superfici in 2D (predefinito: disabilitato) +\r_glsl_offsetmapping_reliefmapping\Mappaggio dell'offset di maggior qualità, che ha anche un enorme impatto sulle performance (predefinito: disabilitato) +\r_water\Qualità dei riflessi e delle rifrazioni, ha un enorme impatto sulle performance nelle mappe superfici riflettenti (predefinito: disabilitato) +\r_water_resolutionmultiplier\Risoluzione dei riflessi/rifrazioni (predefinito: buona) +\r_coronas\Abilita i bagliori corona attorno a determinate luci (predefinito: abilitati) +\r_coronas_occlusionquery\Dissolvi corone rispetto a visibilità (predefinito: abilitato) +\r_bloom\Abilita effetti bloom, che illuminano i pixel più vicini a pixel molto luminosi. Hanno un grosso impatto sulle performance. (predefinito: disabilitato) +\r_hdr\Versione a più alta qualità dei bloom, che hanno un enorme impatto sulle performance. (predefinito: disabilitato) +\r_motionblur\Forza della sfocatura da movimento - raccomandato a 0.5 +\r_damageblur\Ammontare della sfocatura da movimento quando si è colpiti - raccomandato a 0.4 + +\XonoticSettingsDialog/Audio\Impostazioni audio +\bgmvolume\- +\volume\- +\snd_staticvolume\- +\snd_worldchannel0volume\- +\snd_entchannel3volume\- +\snd_playerchannel6volume\- +\snd_playerchannel7volume\- +\snd_entchannel4volume\- +\snd_playerchannel2volume\- +\snd_playerchannel1volume\- +\snd_speed\Frequenza di campionamento in uscita +\snd_channels\Numero di canali in uscita +\snd_swapstereo\Inverti canali sinistro/destro +\snd_spatialization_control\Abilita spazialità (mischia leggermente i canali destro e sinistro per decrementare di un pò la separazione stereo per le cuffie) +\cl_voice_directional\Abilita voci direzionali +\cl_voice_directional_taunt_attenuation\Distanza dalla quale gli insulti possono essere uditi +\cl_autotaunt\Automaticamente insulta i nemici quando gli fragghi +\cl_sound_maptime_warning\Un annuncio ti avverte dei minuti rimanenti alla fine della partita +\cl_hitsound\Riproduci un suono quando il tuo sparo colpisce un nemico +\menu_sounds\Riproduci suoni quando clicchi o navighi su oggetti del menu + +\XonoticSettingsDialog/Rete\Impostazioni di rete +\cl_movement\Abilita predizione del movimento lato client +\cl_nolerp\Abilita aggiornamento da rete spianato +\shownetgraph\Mostra un grafico delle dimensioni dei pacchetti e di altre informazioni +\_cl_rate\Specifica la velocità della tua rete con questa barra +\cl_netfps\Quanti pacchetti in ingresso da inviare al server ogni secondo +\cl_curl_maxdownloads\Massimo numero di download HTTP/FTP da effettuarsi contemporaneamente +\cl_curl_maxspeed\Velocità massima di download +\cl_port\Forza il client a usare la porta selezionata se non è impostata a 0 + +\XonoticSettingsDialog/Altro\Impostazioni varie +\showtime\Mostra l'orario corrente, utile negli screenshot +\showdate\Mostra la data corrente, utile negli screenshot +\showfps\Mostra i fotogrammi al secondo + +\XonoticSettingsDialog/Impostazioni avanzate...\Impostazioni avanzate dove puoi mettere mano ad ogni singola variabile del gioco +\g_friendlyfire\Percentuale di danno inflitto ai compagni di squadra +\g_mirrordamage\Percentuale di danno inflitto ai compagni di squadra che viene riversato su di te +\g_tdm_teams_override\Sovrapponi il numero predefinito di squadre nei giochi di squadra + +\viewsize\Abilita/disabilita lo sfondo dell'HUD +\cl_hidewaypoints\Mostra i waypoint dei vari specifici tipi di gioco +\g_waypointsprite_scale\Scala moltiplicatore dei waypoint +\g_waypointsprite_alpha\Controlla la trasparenza dei waypoint +\cl_shownames\Mostra il nome del giocatore che stai usando + +\crosshair_hittest\Nessuno: nessun effetto al mirino; TrueAim: sfoca il mirino quando non dovresti colpire il muro; Nemici: allarga anche il mirino quando dovresti colpire un nemico