From 437292b7330b2467d4b955a2674ca4200884c81f Mon Sep 17 00:00:00 2001 From: LegendaryGuard Date: Thu, 10 Mar 2022 23:16:52 +0100 Subject: [PATCH] Merge branch 'master' into 'LegendaryGuard/cyber' and cleanup resources --- .gitlab-ci.yml | 2 +- _hud_common.cfg | 14 + _hud_descriptions.cfg | 10 - balance-mario.cfg | 16 + balance-nexuiz25.cfg | 16 + balance-overkill.cfg | 16 + balance-samual.cfg | 16 + balance-xdf.cfg | 16 + balance-xonotic.cfg | 16 + balance-xpm.cfg | 16 + commands.cfg | 4 +- common.ast.po | 381 ++++++---- common.be.po | 379 ++++++---- common.bg.po | 381 ++++++---- common.ca.po | 383 ++++++---- common.cs.po | 379 ++++++---- common.da.po | 435 ++++++----- common.de.po | 390 ++++++---- common.de_CH.po | 390 ++++++---- common.el.po | 379 ++++++---- common.en_AU.po | 379 ++++++---- common.eo.po | 379 ++++++---- common.es.po | 383 ++++++---- common.es_MX.po | 379 ++++++---- common.fi.po | 473 +++++++----- common.fr.po | 389 ++++++---- common.ga.po | 379 ++++++---- common.gd.po | 381 ++++++---- common.gl.po | 381 ++++++---- common.he.po | 379 ++++++---- common.hu.po | 379 ++++++---- common.it.po | 384 ++++++---- common.ja_JP.po | 383 ++++++---- common.jbo.po | 379 ++++++---- common.kk@Cyrl.po | 379 ++++++---- common.ko.po | 379 ++++++---- common.kw.po | 379 ++++++---- common.mk.po | 379 ++++++---- common.ms.po | 379 ++++++---- common.nl.po | 379 ++++++---- common.no.po | 379 ++++++---- common.pl.po | 401 +++++----- common.pot | 377 ++++++---- common.pt.po | 379 ++++++---- common.pt_BR.po | 396 ++++++---- common.ro.po | 379 ++++++---- common.ru.po | 443 ++++++----- common.sq.po | 379 ++++++---- common.sr.po | 381 ++++++---- common.sv.po | 451 +++++++----- common.tr.po | 393 ++++++---- common.uk.po | 381 ++++++---- common.uz@Latn.po | 379 ++++++---- common.zh_CN.po | 381 ++++++---- common.zh_TW.po | 379 ++++++---- effectinfo.txt | 537 -------------- gamemodes-server.cfg | 6 +- gfx/hud/default/nade_ammo.tga | Bin 65580 -> 0 bytes gfx/hud/default/nade_dark.tga | Bin 65580 -> 0 bytes gfx/hud/default/nade_emerald.tga | Bin 65580 -> 0 bytes gfx/hud/luma/nade_ammo.tga | Bin 65580 -> 0 bytes gfx/hud/luma/nade_dark.tga | Bin 65580 -> 0 bytes gfx/hud/luma/nade_emerald.tga | Bin 65580 -> 0 bytes gfx/menu/luma/gametype_mmm.tga | Bin 42866 -> 0 bytes gfx/menu/luminos/gametype_mmm.tga | Bin 32567 -> 0 bytes gfx/menu/wickedx/gametype_mmm.tga | Bin 32567 -> 0 bytes gfx/menu/xaw/gametype_mmm.tga | Bin 65580 -> 0 bytes hud_luma.cfg | 14 +- hud_luminos.cfg | 14 +- hud_luminos_minimal.cfg | 20 +- hud_luminos_minimal_xhair.cfg | 20 +- hud_luminos_old.cfg | 12 +- hud_nexuiz.cfg | 12 +- languages.txt | 24 +- models/sprites/make-sprites.sh | 2 +- models/weapons/make-sprites.sh | 2 + mutators.cfg | 4 +- notifications.cfg | 13 - qcsrc/client/_mod.inc | 1 - qcsrc/client/_mod.qh | 1 - qcsrc/client/announcer.qc | 53 +- qcsrc/client/hud/hud.qh | 2 +- qcsrc/client/hud/panel/ammo.qc | 10 +- qcsrc/client/hud/panel/centerprint.qc | 13 +- qcsrc/client/hud/panel/centerprint.qh | 3 +- qcsrc/client/hud/panel/chat.qc | 73 +- qcsrc/client/hud/panel/chat.qh | 2 + qcsrc/client/hud/panel/healtharmor.qc | 7 +- qcsrc/client/hud/panel/radar.qc | 2 +- qcsrc/client/hud/panel/score.qc | 1 + qcsrc/client/hud/panel/scoreboard.qc | 58 +- qcsrc/client/hud/panel/spect.qc | 62 +- qcsrc/client/hud/panel/strafehud.qc | 2 +- qcsrc/client/hud/panel/timer.qc | 186 +++-- qcsrc/client/hud/panel/timer.qh | 6 + qcsrc/client/hud/panel/weapons.qc | 1 + qcsrc/client/main.qc | 10 +- qcsrc/client/main.qh | 3 + qcsrc/client/resources.qc | 85 --- qcsrc/client/shownames.qc | 2 +- qcsrc/client/view.qc | 7 +- qcsrc/client/view.qh | 1 + qcsrc/common/_all.inc | 5 + qcsrc/common/_mod.inc | 1 + qcsrc/common/announcer.qc | 45 ++ qcsrc/common/colors.qc | 181 +++++ qcsrc/common/constants.qh | 15 +- qcsrc/common/deathtypes/all.inc | 2 - qcsrc/common/debug.qh | 2 +- qcsrc/common/effects/all.inc | 3 - qcsrc/common/effects/effectinfo_nades.inc | 9 - qcsrc/common/effects/qc/casings.qc | 7 - qcsrc/common/effects/qc/casings.qh | 5 + qcsrc/common/effects/qc/globalsound.qc | 6 + qcsrc/common/effects/qc/globalsound.qh | 4 + qcsrc/common/ent_cs.qc | 10 +- qcsrc/common/ent_cs.qh | 6 + .../gamemode/clanarena/cl_clanarena.qc | 9 + .../gamemode/clanarena/sv_clanarena.qc | 73 +- .../gamemode/freezetag/cl_freezetag.qh | 1 - .../gamemode/freezetag/sv_freezetag.qc | 8 +- .../gamemode/freezetag/sv_freezetag.qh | 3 +- .../gamemode/keepaway/sv_keepaway.qc | 22 +- qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc | 9 +- qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc | 11 +- qcsrc/common/gamemodes/sv_rules.qc | 19 + qcsrc/common/gamemodes/sv_rules.qh | 3 + qcsrc/common/items/inventory.qh | 12 - qcsrc/common/items/item/ammo.qh | 19 +- qcsrc/common/minigames/sv_minigames.qc | 2 +- qcsrc/common/mutators/mutator/_mod.inc | 1 + qcsrc/common/mutators/mutator/_mod.qh | 1 + .../mutators/mutator/attackertext/_mod.inc | 8 + .../mutators/mutator/attackertext/_mod.qh | 11 + .../mutator/attackertext/attackertext.qc | 3 + .../mutator/attackertext/attackertext.qh | 4 + .../mutator/attackertext/cl_attackertext.qc | 61 ++ .../mutator/attackertext/cl_attackertext.qh | 4 + .../mutator/attackertext/sv_attackertext.qc | 34 + .../mutator/attackertext/sv_attackertext.qh | 1 + qcsrc/common/mutators/mutator/buffs/buffs.qc | 4 + qcsrc/common/mutators/mutator/buffs/buffs.qh | 4 + .../common/mutators/mutator/buffs/cl_buffs.qh | 3 - .../common/mutators/mutator/buffs/sv_buffs.qc | 4 +- .../common/mutators/mutator/buffs/sv_buffs.qh | 3 - .../mutators/mutator/dodging/cl_dodging.qc | 3 + .../mutators/mutator/dodging/cl_dodging.qh | 7 +- .../mutators/mutator/dodging/sv_dodging.qc | 10 +- .../mutators/mutator/dodging/sv_dodging.qh | 3 + .../mutators/mutator/itemstime/itemstime.qc | 48 ++ .../mutators/mutator/itemstime/itemstime.qh | 4 + .../mutators/mutator/multijump/multijump.qc | 8 +- .../mutators/mutator/multijump/multijump.qh | 4 + .../common/mutators/mutator/nades/effects.inc | 14 +- qcsrc/common/mutators/mutator/nades/nades.inc | 33 - qcsrc/common/mutators/mutator/nades/nades.qc | 694 +----------------- qcsrc/common/mutators/mutator/nades/nades.qh | 131 +--- qcsrc/common/mutators/mutator/nix/sv_nix.qc | 1 + .../common/mutators/mutator/overkill/okhmg.qh | 2 +- .../mutators/mutator/overkill/okmachinegun.qh | 2 +- .../common/mutators/mutator/overkill/oknex.qh | 2 +- .../common/mutators/mutator/overkill/okrpc.qh | 2 +- .../mutators/mutator/overkill/okshotgun.qh | 2 +- .../cl_spawn_near_teammate.qh | 3 - .../spawn_near_teammate.qc | 4 + .../spawn_near_teammate.qh | 3 + .../sv_spawn_near_teammate.qc | 4 - .../status_effects/sv_status_effects.qc | 10 + qcsrc/common/net_linked.qh | 1 + qcsrc/common/notifications/all.inc | 28 +- qcsrc/common/notifications/all.qh | 13 +- qcsrc/common/physics/player.qc | 6 + qcsrc/common/physics/player.qh | 6 + qcsrc/common/playerstats.qc | 15 + qcsrc/common/playerstats.qh | 9 + qcsrc/common/replicate.qh | 108 +-- qcsrc/common/resources.qh | 24 - qcsrc/common/resources/_mod.inc | 8 + qcsrc/common/resources/_mod.qh | 8 + qcsrc/common/resources/all.inc | 61 ++ qcsrc/common/resources/cl_resources.qc | 52 ++ .../resources/cl_resources.qh} | 28 +- qcsrc/common/resources/resources.qc | 15 + qcsrc/common/resources/resources.qh | 65 ++ .../resources/sv_resources.qc} | 65 +- .../resources/sv_resources.qh} | 30 +- qcsrc/common/scores.qh | 2 +- qcsrc/common/sounds/all.inc | 2 + qcsrc/common/state.qc | 1 - qcsrc/common/stats.qh | 21 +- qcsrc/common/util.qc | 2 +- qcsrc/common/util.qh | 2 +- qcsrc/common/vehicles/sv_vehicles.qc | 2 +- qcsrc/common/vehicles/vehicle/_mod.inc | 4 - qcsrc/common/vehicles/vehicle/_mod.qh | 4 - qcsrc/common/weapons/all.qc | 45 +- qcsrc/common/weapons/all.qh | 20 +- qcsrc/common/weapons/weapon.qh | 15 +- qcsrc/common/weapons/weapon/arc.qc | 9 +- qcsrc/common/weapons/weapon/arc.qh | 2 +- qcsrc/common/weapons/weapon/blaster.qh | 2 +- qcsrc/common/weapons/weapon/crylink.qh | 2 +- qcsrc/common/weapons/weapon/devastator.qh | 2 +- qcsrc/common/weapons/weapon/electro.qh | 2 +- qcsrc/common/weapons/weapon/fireball.qh | 2 +- qcsrc/common/weapons/weapon/hagar.qh | 2 +- qcsrc/common/weapons/weapon/hlac.qh | 2 +- qcsrc/common/weapons/weapon/hook.qh | 2 +- qcsrc/common/weapons/weapon/machinegun.qh | 2 +- qcsrc/common/weapons/weapon/minelayer.qh | 2 +- qcsrc/common/weapons/weapon/mortar.qh | 2 +- qcsrc/common/weapons/weapon/porto.qh | 2 +- qcsrc/common/weapons/weapon/rifle.qh | 2 +- qcsrc/common/weapons/weapon/seeker.qc | 12 +- qcsrc/common/weapons/weapon/seeker.qh | 2 +- qcsrc/common/weapons/weapon/shockwave.qh | 2 +- qcsrc/common/weapons/weapon/shotgun.qh | 2 +- qcsrc/common/weapons/weapon/tuba.qc | 7 +- qcsrc/common/weapons/weapon/vaporizer.qc | 154 ++-- qcsrc/common/weapons/weapon/vaporizer.qh | 6 +- qcsrc/common/weapons/weapon/vortex.qc | 3 + qcsrc/common/weapons/weapon/vortex.qh | 4 +- qcsrc/lib/counting.qh | 55 +- qcsrc/lib/replicate.qh | 74 +- qcsrc/lib/string.qh | 60 +- qcsrc/lib/urllib.qh | 1 + qcsrc/menu/xonotic/_mod.inc | 4 + qcsrc/menu/xonotic/_mod.qh | 4 + qcsrc/menu/xonotic/credits.qc | 59 +- qcsrc/menu/xonotic/dialog_firstrun.qc | 5 + qcsrc/menu/xonotic/dialog_firstrun.qh | 1 + qcsrc/menu/xonotic/dialog_hudpanel_timer.qc | 9 + .../dialog_multiplayer_join_serverinfo.qc | 146 ++-- .../dialog_multiplayer_join_serverinfo.qh | 59 +- .../dialog_multiplayer_join_serverinfotab.qc | 107 +++ .../dialog_multiplayer_join_serverinfotab.qh | 30 + .../dialog_multiplayer_join_termsofservice.qc | 62 ++ .../dialog_multiplayer_join_termsofservice.qh | 18 + qcsrc/menu/xonotic/dialog_termsofservice.qc | 101 +++ qcsrc/menu/xonotic/dialog_termsofservice.qh | 24 + qcsrc/menu/xonotic/mainwindow.qc | 27 +- qcsrc/menu/xonotic/mainwindow.qh | 3 +- qcsrc/menu/xonotic/playerlist.qc | 12 +- qcsrc/menu/xonotic/serverlist.qc | 9 +- qcsrc/menu/xonotic/textbox.qc | 90 +++ qcsrc/menu/xonotic/textbox.qh | 23 + qcsrc/menu/xonotic/util.qc | 13 +- qcsrc/menu/xonotic/util.qh | 1 + qcsrc/server/_mod.inc | 1 - qcsrc/server/_mod.qh | 1 - qcsrc/server/bot/api.qh | 2 +- qcsrc/server/bot/default/bot.qc | 33 +- qcsrc/server/bot/default/bot.qh | 2 +- qcsrc/server/bot/default/havocbot/roles.qc | 2 +- qcsrc/server/bot/null/bot_null.qc | 2 +- qcsrc/server/cheats.qc | 2 +- qcsrc/server/client.qc | 91 ++- qcsrc/server/client.qh | 16 +- qcsrc/server/clientkill.qc | 2 +- qcsrc/server/command/cmd.qc | 12 +- qcsrc/server/command/common.qc | 2 + qcsrc/server/command/common.qh | 1 - qcsrc/server/command/getreplies.qc | 39 +- qcsrc/server/command/sv_cmd.qc | 94 ++- qcsrc/server/command/vote.qc | 40 +- qcsrc/server/command/vote.qh | 2 +- qcsrc/server/compat/quake3.qc | 2 +- qcsrc/server/damage.qc | 2 +- qcsrc/server/impulse.qc | 79 +- qcsrc/server/intermission.qc | 2 +- qcsrc/server/ipban.qc | 1 + qcsrc/server/ipban.qh | 1 + qcsrc/server/items/items.qc | 21 +- qcsrc/server/items/items.qh | 3 +- qcsrc/server/main.qh | 3 - qcsrc/server/mutators/_mod.inc | 2 +- qcsrc/server/mutators/events.qh | 39 +- qcsrc/server/race.qc | 1 + qcsrc/server/round_handler.qc | 13 +- qcsrc/server/scores.qc | 1 + qcsrc/server/weapons/accuracy.qc | 4 + qcsrc/server/weapons/accuracy.qh | 6 +- qcsrc/server/weapons/selection.qc | 10 + qcsrc/server/weapons/spawning.qc | 3 +- qcsrc/server/weapons/throwing.qc | 4 +- qcsrc/server/weapons/tracing.qc | 1 + qcsrc/server/weapons/weaponsystem.qc | 3 +- qcsrc/server/weapons/weaponsystem.qh | 2 + qcsrc/server/world.qc | 63 +- qcsrc/server/world.qh | 19 +- sound/misc/blind.ogg | Bin 399646 -> 0 bytes sound/misc/goomba.ogg | Bin 13399 -> 0 bytes xonotic-client.cfg | 6 + xonotic-server.cfg | 1 + 294 files changed, 12847 insertions(+), 9798 deletions(-) delete mode 100644 gfx/hud/default/nade_ammo.tga delete mode 100644 gfx/hud/default/nade_dark.tga delete mode 100644 gfx/hud/default/nade_emerald.tga delete mode 100644 gfx/hud/luma/nade_ammo.tga delete mode 100644 gfx/hud/luma/nade_dark.tga delete mode 100644 gfx/hud/luma/nade_emerald.tga delete mode 100644 gfx/menu/luma/gametype_mmm.tga delete mode 100644 gfx/menu/luminos/gametype_mmm.tga delete mode 100644 gfx/menu/wickedx/gametype_mmm.tga delete mode 100644 gfx/menu/xaw/gametype_mmm.tga delete mode 100644 qcsrc/client/resources.qc create mode 100644 qcsrc/common/announcer.qc create mode 100644 qcsrc/common/colors.qc create mode 100644 qcsrc/common/mutators/mutator/attackertext/_mod.inc create mode 100644 qcsrc/common/mutators/mutator/attackertext/_mod.qh create mode 100644 qcsrc/common/mutators/mutator/attackertext/attackertext.qc create mode 100644 qcsrc/common/mutators/mutator/attackertext/attackertext.qh create mode 100644 qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qc create mode 100644 qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qh create mode 100644 qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qc create mode 100644 qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qh delete mode 100644 qcsrc/common/resources.qh create mode 100644 qcsrc/common/resources/_mod.inc create mode 100644 qcsrc/common/resources/_mod.qh create mode 100644 qcsrc/common/resources/all.inc create mode 100644 qcsrc/common/resources/cl_resources.qc rename qcsrc/{client/resources.qh => common/resources/cl_resources.qh} (62%) create mode 100644 qcsrc/common/resources/resources.qc create mode 100644 qcsrc/common/resources/resources.qh rename qcsrc/{server/resources.qc => common/resources/sv_resources.qc} (71%) rename qcsrc/{server/resources.qh => common/resources/sv_resources.qh} (77%) create mode 100644 qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc create mode 100644 qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh create mode 100644 qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qc create mode 100644 qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh create mode 100644 qcsrc/menu/xonotic/dialog_termsofservice.qc create mode 100644 qcsrc/menu/xonotic/dialog_termsofservice.qh create mode 100644 qcsrc/menu/xonotic/textbox.qc create mode 100644 qcsrc/menu/xonotic/textbox.qh delete mode 100644 sound/misc/blind.ogg delete mode 100644 sound/misc/goomba.ogg diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5031c66b..70dcdcd64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ test_sv_game: - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache - make - - EXPECT=7b55642e475a26f6fb397093e6f8fe81 + - EXPECT=66e05c80be9b58fe3e0b80802672f8af - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg | tee /dev/stderr | sed -e 's,^\[[^]]*\] ,,' diff --git a/_hud_common.cfg b/_hud_common.cfg index c5d37c1dc..83eb2490d 100644 --- a/_hud_common.cfg +++ b/_hud_common.cfg @@ -93,6 +93,8 @@ seta hud_panel_healtharmor_progressbar_gfx_lowhealth 40 "health progressbar blin seta hud_panel_healtharmor_hide_ondeath 0 "hide this panel when dead" seta hud_panel_timer_increment "0" "show elapsed time instead of remaining time" +seta hud_panel_timer_secondary "1" "secondary timer (0 = hide, 1 = show, 2 = show swapped)" +seta hud_panel_timer_unbound "0" "show seconds leading up to the start of the match" seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does" seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point" @@ -116,6 +118,18 @@ seta hud_panel_infomessages_group0 1 "show group 0 messages (showing keys for no seta hud_panel_infomessages_group_time 6 "number of seconds a message of a group lasts before it gets changed" seta hud_panel_infomessages_group_fadetime 0.4 "group message fade in/out time" +seta hud_panel_centerprint_time 3 "message duration (NOTE: certain messages have a fixed duration)" +seta hud_panel_centerprint_fade_in 0.15 "how long a message takes to fade in" +seta hud_panel_centerprint_fade_in_short 0 " "how long a message that lasts 2 or less seconds takes to fade in" +seta hud_panel_centerprint_fade_out 0.15 "how long a message takes to fade out (this time is included in the message duration and can't be > 5)" +seta hud_panel_centerprint_fade_subsequent 1 "enable extra fading effects for each additional message, so that the more messages you have the more they become faded out" +seta hud_panel_centerprint_fade_subsequent_passone 3 "division factor for the first pass for alpha fading, with 2 all messages after the first have half alpha" +seta hud_panel_centerprint_fade_subsequent_passone_minalpha 0.5 "minimum factor that the first pass can fade to" +seta hud_panel_centerprint_fade_subsequent_passtwo 10 "division factor for the second pass for alpha fading, it applies another fade on top of the first pass to make it more transitioned" +seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha 0.5 "minimum factor that the second pass can fade to" +seta hud_panel_centerprint_fade_subsequent_minfontsize 0.75 "minimum factor for the font size from the subsequent fading effects" +seta hud_panel_centerprint_fade_minfontsize 0 "minimum factor for the font size from the fading in/out effects" + seta hud_panel_scoreboard_namesize 15 "size limit of player names and relative column (multiplied by fontsize)" seta hud_panel_scoreboard_maxheight 0.6 "max height of the scoreboard; a few players that wouldn't fit into the scoreboard are listed in the last row" seta hud_panel_scoreboard_others_showscore 1 "show scores of players listed in the last row when the scoreboard reaches the max height" diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index 02d2d5a0f..185eb5c21 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -274,16 +274,6 @@ seta hud_panel_centerprint_align "" "text alignment: 0 left, 0.5 center, 1 right seta hud_panel_centerprint_flip "" "invert messages order" seta hud_panel_centerprint_fontscale "" "scale the text font by this amount" seta hud_panel_centerprint_fontscale_bold "" "scale the bold text font by this amount" -seta hud_panel_centerprint_time "" "message duration (NOTE: certain messages have a fixed duration)" -seta hud_panel_centerprint_fade_in "" "how long a message takes to fade in" -seta hud_panel_centerprint_fade_out "" "how long a message takes to fade out (this time is included in the message duration and can't be > 5)" -seta hud_panel_centerprint_fade_subsequent "" "enable extra fading effects for each additional message, so that the more messages you have the more they become faded out" -seta hud_panel_centerprint_fade_subsequent_passone "" "division factor for the first pass for alpha fading, with 2 all messages after the first have half alpha" -seta hud_panel_centerprint_fade_subsequent_passone_minalpha "" "minimum factor that the first pass can fade to" -seta hud_panel_centerprint_fade_subsequent_passtwo "" "division factor for the second pass for alpha fading, it applies another fade on top of the first pass to make it more transitioned" -seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "" "minimum factor that the second pass can fade to" -seta hud_panel_centerprint_fade_subsequent_minfontsize "" "minimum factor for the font size from the subsequent fading effects" -seta hud_panel_centerprint_fade_minfontsize "" "minimum factor for the font size from the fading in/out effects" seta hud_panel_minigameboard_pos "" "position of this panel" seta hud_panel_minigameboard_size "" "size of this panel" diff --git a/balance-mario.cfg b/balance-mario.cfg index 42e3a6696..8b9f37ac1 100644 --- a/balance-mario.cfg +++ b/balance-mario.cfg @@ -49,6 +49,22 @@ set g_lms_start_ammo_rockets 160 set g_lms_start_ammo_cells 180 set g_lms_start_ammo_plasma 180 set g_lms_start_ammo_fuel 0 +set g_mayhem_start_health 200 +set g_mayhem_start_armor 200 +set g_mayhem_start_ammo_shells 60 +set g_mayhem_start_ammo_nails 320 +set g_mayhem_start_ammo_rockets 160 +set g_mayhem_start_ammo_cells 180 +set g_mayhem_start_ammo_plasma 180 +set g_mayhem_start_ammo_fuel 0 +set g_tmayhem_start_health 200 +set g_tmayhem_start_armor 200 +set g_tmayhem_start_ammo_shells 60 +set g_tmayhem_start_ammo_nails 320 +set g_tmayhem_start_ammo_rockets 160 +set g_tmayhem_start_ammo_cells 180 +set g_tmayhem_start_ammo_plasma 180 +set g_tmayhem_start_ammo_fuel 0 set g_balance_nix_roundtime 25 set g_balance_nix_incrtime 1.6 set g_balance_nix_ammo_shells 60 diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg index 6cdc29dcc..0b39de222 100644 --- a/balance-nexuiz25.cfg +++ b/balance-nexuiz25.cfg @@ -49,6 +49,22 @@ set g_lms_start_ammo_rockets 50 set g_lms_start_ammo_cells 50 set g_lms_start_ammo_plasma 50 set g_lms_start_ammo_fuel 0 +set g_mayhem_start_health 250 +set g_mayhem_start_armor 100 +set g_mayhem_start_ammo_shells 50 +set g_mayhem_start_ammo_nails 150 +set g_mayhem_start_ammo_rockets 50 +set g_mayhem_start_ammo_cells 50 +set g_mayhem_start_ammo_plasma 50 +set g_mayhem_start_ammo_fuel 0 +set g_tmayhem_start_health 250 +set g_tmayhem_start_armor 100 +set g_tmayhem_start_ammo_shells 50 +set g_tmayhem_start_ammo_nails 150 +set g_tmayhem_start_ammo_rockets 50 +set g_tmayhem_start_ammo_cells 50 +set g_tmayhem_start_ammo_plasma 50 +set g_tmayhem_start_ammo_fuel 0 set g_balance_nix_roundtime 25 set g_balance_nix_incrtime 1.6 set g_balance_nix_ammo_shells 15 diff --git a/balance-overkill.cfg b/balance-overkill.cfg index e33ee827f..3944d7d3b 100644 --- a/balance-overkill.cfg +++ b/balance-overkill.cfg @@ -49,6 +49,22 @@ set g_lms_start_ammo_rockets 160 set g_lms_start_ammo_cells 180 set g_lms_start_ammo_plasma 180 set g_lms_start_ammo_fuel 0 +set g_mayhem_start_health 200 +set g_mayhem_start_armor 100 +set g_mayhem_start_ammo_shells 60 +set g_mayhem_start_ammo_nails 320 +set g_mayhem_start_ammo_rockets 160 +set g_mayhem_start_ammo_cells 180 +set g_mayhem_start_ammo_plasma 180 +set g_mayhem_start_ammo_fuel 0 +set g_tmayhem_start_health 200 +set g_tmayhem_start_armor 100 +set g_tmayhem_start_ammo_shells 60 +set g_tmayhem_start_ammo_nails 320 +set g_tmayhem_start_ammo_rockets 160 +set g_tmayhem_start_ammo_cells 180 +set g_tmayhem_start_ammo_plasma 180 +set g_tmayhem_start_ammo_fuel 0 set g_balance_nix_roundtime 25 set g_balance_nix_incrtime 1.6 set g_balance_nix_ammo_shells 60 diff --git a/balance-samual.cfg b/balance-samual.cfg index 7850aaba8..5686c58d6 100644 --- a/balance-samual.cfg +++ b/balance-samual.cfg @@ -49,6 +49,22 @@ set g_lms_start_ammo_rockets 160 set g_lms_start_ammo_cells 180 set g_lms_start_ammo_plasma 180 set g_lms_start_ammo_fuel 0 +set g_mayhem_start_health 200 +set g_mayhem_start_armor 200 +set g_mayhem_start_ammo_shells 60 +set g_mayhem_start_ammo_nails 320 +set g_mayhem_start_ammo_rockets 160 +set g_mayhem_start_ammo_cells 180 +set g_mayhem_start_ammo_plasma 180 +set g_mayhem_start_ammo_fuel 0 +set g_tmayhem_start_health 200 +set g_tmayhem_start_armor 200 +set g_tmayhem_start_ammo_shells 60 +set g_tmayhem_start_ammo_nails 320 +set g_tmayhem_start_ammo_rockets 160 +set g_tmayhem_start_ammo_cells 180 +set g_tmayhem_start_ammo_plasma 180 +set g_tmayhem_start_ammo_fuel 0 set g_balance_nix_roundtime 25 set g_balance_nix_incrtime 1.6 set g_balance_nix_ammo_shells 60 diff --git a/balance-xdf.cfg b/balance-xdf.cfg index 94e98a646..f248b7ac8 100644 --- a/balance-xdf.cfg +++ b/balance-xdf.cfg @@ -49,6 +49,22 @@ set g_lms_start_ammo_rockets 160 set g_lms_start_ammo_cells 180 set g_lms_start_ammo_plasma 180 set g_lms_start_ammo_fuel 0 +set g_mayhem_start_health 200 +set g_mayhem_start_armor 200 +set g_mayhem_start_ammo_shells 60 +set g_mayhem_start_ammo_nails 320 +set g_mayhem_start_ammo_rockets 160 +set g_mayhem_start_ammo_cells 180 +set g_mayhem_start_ammo_plasma 180 +set g_mayhem_start_ammo_fuel 0 +set g_tmayhem_start_health 200 +set g_tmayhem_start_armor 200 +set g_tmayhem_start_ammo_shells 60 +set g_tmayhem_start_ammo_nails 320 +set g_tmayhem_start_ammo_rockets 160 +set g_tmayhem_start_ammo_cells 180 +set g_tmayhem_start_ammo_plasma 180 +set g_tmayhem_start_ammo_fuel 0 set g_balance_nix_roundtime 25 set g_balance_nix_incrtime 1.6 set g_balance_nix_ammo_shells 60 diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg index 784e447f4..2cf8c9eb4 100644 --- a/balance-xonotic.cfg +++ b/balance-xonotic.cfg @@ -49,6 +49,22 @@ set g_lms_start_ammo_rockets 160 set g_lms_start_ammo_cells 180 set g_lms_start_ammo_plasma 180 set g_lms_start_ammo_fuel 0 +set g_mayhem_start_health 200 +set g_mayhem_start_armor 200 +set g_mayhem_start_ammo_shells 60 +set g_mayhem_start_ammo_nails 320 +set g_mayhem_start_ammo_rockets 160 +set g_mayhem_start_ammo_cells 180 +set g_mayhem_start_ammo_plasma 180 +set g_mayhem_start_ammo_fuel 0 +set g_tmayhem_start_health 200 +set g_tmayhem_start_armor 200 +set g_tmayhem_start_ammo_shells 60 +set g_tmayhem_start_ammo_nails 320 +set g_tmayhem_start_ammo_rockets 160 +set g_tmayhem_start_ammo_cells 180 +set g_tmayhem_start_ammo_plasma 180 +set g_tmayhem_start_ammo_fuel 0 set g_balance_nix_roundtime 25 set g_balance_nix_incrtime 1.6 set g_balance_nix_ammo_shells 60 diff --git a/balance-xpm.cfg b/balance-xpm.cfg index 189be9c71..87b781a55 100644 --- a/balance-xpm.cfg +++ b/balance-xpm.cfg @@ -49,6 +49,22 @@ set g_lms_start_ammo_rockets 160 set g_lms_start_ammo_cells 180 set g_lms_start_ammo_plasma 180 set g_lms_start_ammo_fuel 0 +set g_mayhem_start_health 200 +set g_mayhem_start_armor 200 +set g_mayhem_start_ammo_shells 60 +set g_mayhem_start_ammo_nails 320 +set g_mayhem_start_ammo_rockets 160 +set g_mayhem_start_ammo_cells 180 +set g_mayhem_start_ammo_plasma 180 +set g_mayhem_start_ammo_fuel 0 +set g_tmayhem_start_health 200 +set g_tmayhem_start_armor 200 +set g_tmayhem_start_ammo_shells 60 +set g_tmayhem_start_ammo_nails 320 +set g_tmayhem_start_ammo_rockets 160 +set g_tmayhem_start_ammo_cells 180 +set g_tmayhem_start_ammo_plasma 180 +set g_tmayhem_start_ammo_fuel 0 set g_balance_nix_roundtime 25 set g_balance_nix_incrtime 1.6 set g_balance_nix_ammo_shells 60 diff --git a/commands.cfg b/commands.cfg index a6162badf..52ce407f9 100644 --- a/commands.cfg +++ b/commands.cfg @@ -238,7 +238,8 @@ alias unlockteams "qc_cmd_sv unlockteams ${* ?}" // Enable alias warp "qc_cmd_sv warp ${* ?}" // Choose different level in campaign // other aliases for server commands -alias endmatch "timelimit -1" +set _endmatch 0 "if set to 1 ends the match immediately; use it instead of timelimit -1 (deprecated)" +alias endmatch "_endmatch 1" alias bots "minplayers 4; minplayers_per_team 2" alias nobots "minplayers 0; minplayers_per_team 0" @@ -267,6 +268,7 @@ alias settemp_restore "qc_cmd_svcl settemp_restore" // =================================== alias ban "qc_cmd_sv ban ${* ?}" // Ban an IP address or a range of addresses (like 1.2.3) alias banlist "qc_cmd_sv banlist ${* ?}" // List all existing bans +alias kickkick "qc_cmd_sv kickkick ${* ?}" // Disconnect a client alias kickban "qc_cmd_sv kickban ${* ?}" // Disconnect a client and ban it at the same time alias mute "qc_cmd_sv mute ${* ?}" // Disallow a client from talking by muting them alias unban "qc_cmd_sv unban ${* ?}" // Remove an existing ban diff --git a/common.ast.po b/common.ast.po index 44dabc94c..9652f3910 100644 --- a/common.ast.po +++ b/common.ast.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Asturian (http://www.transifex.com/team-xonotic/xonotic/" "language/ast/)\n" @@ -58,7 +58,7 @@ msgstr "" msgid "Generic message" msgstr "Mensaxe xenéricu" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Xugador^7: Esto ye l'área pa charrar." @@ -523,7 +523,7 @@ msgstr "Sector %d" msgid "PENALTY: %.1f (%s)" msgstr "PENALIZACIÓN: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "puntu de control saltáu" @@ -935,12 +935,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/D" @@ -1044,9 +1044,26 @@ msgstr "mi" msgid "nmi" msgstr "nmi" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "CALENTAMIENTU" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1070,7 +1087,7 @@ msgstr "^1Configurar la interfaz" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1083,7 +1100,7 @@ msgstr "Sí" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1094,43 +1111,43 @@ msgstr "Sí" msgid "No" msgstr "Non" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Ensin munición" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Nun tienes" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "kt" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1334,10 +1351,6 @@ msgid "Key Hunt" msgstr "Cazallaves" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1La partida yá comenzó" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Nun te queden más vides" @@ -1411,23 +1424,23 @@ msgstr "Ayuda al to equipu a facer la mayoría d'asesinatos" msgid "Team Deathmatch" msgstr "Partida a muerte per equipos" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "bales" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "plasma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "cohetes" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "cartuchos" @@ -1864,7 +1877,7 @@ msgstr "Tamañu máximu:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Color:" @@ -4586,7 +4599,7 @@ msgstr ", perdiendo la so racha de %d asesinatos" msgid ", losing their %d score spree" msgstr ", perdiendo la so racha de %d puntos" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr " con %d %s" @@ -5472,12 +5485,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d díes, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5502,175 +5515,175 @@ msgstr "Equipu principal" msgid "Extended Team" msgstr "Equipu estendíu" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Sitiu web" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Estadístiques" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Grafismu" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animación" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Diseñu de niveles" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Música y efeutos de soníu" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Motor del xuegu" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Compilador" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Otros collaboradores activos" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Traductores" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturianu" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Bielorrusu" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Búlgaru" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chinu (China)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Chinu (Taiwán)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Córnicu" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Checu" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Neerlandés" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Inglés (Australia)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finlandés" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Francés" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Alemán" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Griegu" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Húngaru" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Gaélicu (Irlanda)" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italia" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "Xaponés" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kazaxu" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Coreanu" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polacu" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portugués" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Rumanu" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Rusu" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Gaélicu (Escocia)" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbiu" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Castellán" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Suecu" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ucraín" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Collaboradores pasaos" @@ -5737,7 +5750,7 @@ msgstr "Desconectase" msgid "Disconnect from the server you are connected to" msgstr "Desconéutate del sirvidor nel que tas" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5746,29 +5759,29 @@ msgstr "" "Afáyate en Xonotic. Esbilla la to llingua ya introduz un nome de xugador pa " "entamar. Pues camudar estos axustes dempués, na configuración del xuegu." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Nome:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "El nome col que vas apaecer nel xuegu" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Llingua de los testos:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "¿Permitir que les estadístiques usen el nomatu en stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" @@ -5776,11 +5789,11 @@ msgstr "" "Les estadístiques de xugador actívense por defeutu, pues camudar esto " "dempués nel menú Perfil" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Guardar los axustes" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Acoyida" @@ -5961,12 +5974,13 @@ msgstr "Panel de mensaxes d'información" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Desactivar" @@ -6033,7 +6047,8 @@ msgstr "Panel d'avisos" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Activar" @@ -6147,7 +6162,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Tresparencia:" @@ -6315,14 +6330,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "Panel de StrafeHUD" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Temporizador:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Amosar el tiempu que trescurrió" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Panel del temporizador" @@ -6453,12 +6476,12 @@ msgid "Panel background defaults:" msgstr "Axustes predeterminaos del fondu de los paneles:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Fondu:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Tamañu del berbesu:" @@ -6468,12 +6491,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Probar el color del equipu nel mou de configuración" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Rellenu:" @@ -6605,9 +6628,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Por defeutu" @@ -6801,7 +6824,7 @@ msgid "Game types:" msgstr "Tipos de xuegu:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Zarrar" @@ -7118,7 +7141,7 @@ msgid "" msgstr "Posa l'anovamientu de la llista de sirvidores pa evitar que se muevan" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Direición:" @@ -7131,118 +7154,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Amuesa más información tocante al sirvidor rescampláu" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Xunise" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "Por defeutu" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d modificaos" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Oficiales" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/D (falta la biblioteca d'autenticación, nun pue conectase)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/D (falta la biblioteca d'autenticación)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Nun se sofita (nun pue conectase)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Nun se sofita (nun va cifrase)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Sofítase (va cifrase)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Sofítase (nun va cifrase)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Solicitóse (va cifrase)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Solicitóse (nun va cifrase)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Solicitóse (nun pue conectase)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Ríquese (va cifrase)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "Usa la cvar «crypto_aeslevel» pa camudar la to preferencia" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "estadístiques desactivaes" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "estadístiques activaes" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Nome del agospiador:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Tipu de partida:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Mapa:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Versión:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Axustes:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Xugadores:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Robós:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Güecos llibres" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Cifráu:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Clave:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Información d'un sirvidor" @@ -9541,6 +9602,22 @@ msgstr "Ser espectador" msgid "Team Selection" msgstr "Esbilla d'un equipu" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "¿Permitir que les estadístiques usen el nomatu?" @@ -9725,7 +9802,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "¡Nun vuelvas primir esti botón!" @@ -9788,42 +9865,34 @@ msgstr "Mapa" msgid "Type" msgstr "Tipu" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "nivel d'AES %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "nengún" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "cifráu:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "mod: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "axustes modificaos" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "axustes oficiales" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "estadístiques desactivaes" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "estadístiques activaes" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Sirvidores favoritos" @@ -10047,20 +10116,20 @@ msgstr "Percentil:" msgid "%d (unranked)" msgstr "%d (ensin clasificar)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "L'anovamientu pue baxase en:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "¡Anueva a %s yá!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10068,10 +10137,10 @@ msgstr "" "^1FALLU: Ríquese la compresión de testures mas nun ta sofitada.\n" "^1Espérense problemes visuales." -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Lo predeterminao" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Color del equipu:" diff --git a/common.be.po b/common.be.po index e0d098c13..dd0bec97e 100644 --- a/common.be.po +++ b/common.be.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Belarusian (http://www.transifex.com/team-xonotic/xonotic/" "language/be/)\n" @@ -53,7 +53,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Гулец^7: Гэта чат." @@ -519,7 +519,7 @@ msgstr "Сярэдняе %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -931,12 +931,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "Н/Д" @@ -1040,8 +1040,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1066,7 +1083,7 @@ msgstr "^1Наставіць HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1079,7 +1096,7 @@ msgstr "Так" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1090,43 +1107,43 @@ msgstr "Так" msgid "No" msgstr "Не" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Няма патронаў" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Няма" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Недаступны" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Спроба выдаліць каманду, якой няма ў спісе каманд!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/с" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "м/с" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "км/г" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "м/г" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "вузлы" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (не звязаны)" @@ -1328,10 +1345,6 @@ msgid "Key Hunt" msgstr "Key Hunt" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Матч ужо пачаўся" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1У вас скончыліся жыцці" @@ -1405,23 +1418,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "Team Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1856,7 +1869,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Колер:" @@ -4527,7 +4540,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5413,12 +5426,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d дзён, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5443,175 +5456,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5678,7 +5691,7 @@ msgstr "Адлучэнне" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5687,39 +5700,39 @@ msgstr "" "Сардэчна запрашаем у Xonotic. Калі ласка, пазначце сваю мову і задайце сваё " "імя ў гульні. Пазней можна будзе змяніць гэтыя настáўленні праз меню." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Імя:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Мова:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "Звязаць ваша імя са статыстыкай гульні на stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Захаваць настáўленні" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Сардэчна запрашаем" @@ -5900,12 +5913,13 @@ msgstr "Панэль інфармацыйных паведамленняў" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Адключыць" @@ -5972,7 +5986,8 @@ msgstr "Панэль абвяшчэнняў" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6086,7 +6101,7 @@ msgstr "Радар:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Празрыстасць:" @@ -6254,14 +6269,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Таймер:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Паказваць мінулы час" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Панэль таймера" @@ -6392,12 +6415,12 @@ msgid "Panel background defaults:" msgstr "Стандартны фон панэляў:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Фон:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Шырыня краёў:" @@ -6407,12 +6430,12 @@ msgid "Team color:" msgstr "Колер каманды:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Праверыць колер каманды ў рэжыме настáўлення" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Прамежак:" @@ -6542,9 +6565,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Стандартна" @@ -6736,7 +6759,7 @@ msgid "Game types:" msgstr "Тыпы гульні:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Закрыць" @@ -7046,7 +7069,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Адрас:" @@ -7059,118 +7082,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Далучыцца!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d змяненняў" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Афіцыйныя настáўленні" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "Н/Д (не выйшла далучыцца, няма бібліятэкі аўтэнтыфікацыі)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "Н/Д (няма бібліятэкі аўтэнтыфікацыі)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Не падтрымліваецца (не выйшла далучыцца)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Не падтрымліваецца (шыфравання не будзе)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Падтрымліваецца (будзе шыфраванне)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Падтрымліваецца (шыфравання не будзе)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Запытана (будзе шыфраванне)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Запытана (шыфравання не будзе)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Патрабуецца (не выйшла далучыцца)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Патрабуецца (будзе шыфраванне)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Назва сервера:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Тып гульні:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Мапа:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Мод:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Версія:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Настáўленні:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Гульцы:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Боты:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Вольныя месцы:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Шыфраванне:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Ключ:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Інфармацыя пра сервер" @@ -9447,6 +9508,22 @@ msgstr "назіраць" msgid "Team Selection" msgstr "Выбар каманды" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9631,7 +9708,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Больш не націскайце гэтую кнопку!" @@ -9693,42 +9770,34 @@ msgstr "Мапа" msgid "Type" msgstr "Тып" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "SLCAT^Упадабанае" @@ -9952,29 +10021,29 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (без рэйтынгу)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Аўтаматычнае стварэнне mapinfo для новых мапаў..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Абнавіцеся да %s зараз!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Стандартныя настáўленні" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Колер каманды:" diff --git a/common.bg.po b/common.bg.po index 7b87c05d5..33524a799 100644 --- a/common.bg.po +++ b/common.bg.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Bulgarian (http://www.transifex.com/team-xonotic/xonotic/" "language/bg/)\n" @@ -55,7 +55,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Играч^7: Това е мястото чатене" @@ -520,7 +520,7 @@ msgstr "Междинен %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "пропуснат чекпойнт" @@ -932,12 +932,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "няма" @@ -1041,9 +1041,26 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "ЗАГРЯВКА" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1067,7 +1084,7 @@ msgstr "^1Конфигуриране на HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1080,7 +1097,7 @@ msgstr "Да" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1091,44 +1108,44 @@ msgstr "Да" msgid "No" msgstr "Не" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Мунициите свършиха" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Нямам" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Не е на разположение" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" "Опитвате се да премахнете отбор, който не съществува в списъка на отборите!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "м/с" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "км/ч" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "мили/ч" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "възли" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (не е свързано)" @@ -1330,10 +1347,6 @@ msgid "Key Hunt" msgstr "Key Hunt" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Мачът вече започна" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Нямате повече животи" @@ -1407,23 +1420,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "Team Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1858,7 +1871,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Цвят:" @@ -4583,7 +4596,7 @@ msgstr ", губещ своята последователност от %d уб msgid ", losing their %d score spree" msgstr ", губещ своята последователност от %d точки" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5469,12 +5482,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5499,175 +5512,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Български" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Чешки" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Френски" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Немски" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Гръцки" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Унгарски" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Италиански" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Корейски" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Полски" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Румънски" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Руски" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Сръбски" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Испански" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Украински" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5734,7 +5747,7 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5743,40 +5756,40 @@ msgstr "" "Добре дошли в Xonotic, моля изберете вашият език и въведете името на играча " "си. Можете да промените тези настройки и по-късно от менюто." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Име:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Език на текста:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Използвай името на играча при събиране на статистика в stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Запазване на настройките" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Добре дошли" @@ -5957,12 +5970,13 @@ msgstr "Панел с информационни съобщения" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Забраняване" @@ -6029,7 +6043,8 @@ msgstr "Панел за уведомления" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6143,7 +6158,7 @@ msgstr "Радар:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Прозрачност:" @@ -6311,14 +6326,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Таймер" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Показване на изминалото време" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Панел с таймер" @@ -6449,12 +6472,12 @@ msgid "Panel background defaults:" msgstr "Настройки на фона на панела:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Фон:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Размер на рамката:" @@ -6464,12 +6487,12 @@ msgid "Team color:" msgstr "Отборен цвят:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Тестване на отборния цвят по време на конфигурирането" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Отстояние:" @@ -6599,9 +6622,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "По подразбиране" @@ -6793,7 +6816,7 @@ msgid "Game types:" msgstr "Режими на игра:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Затваряне" @@ -7103,7 +7126,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Адрес:" @@ -7116,118 +7139,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Присъединяване!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "По подразбиране" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d променени" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Официални" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "НЯМА (библиотеката липсва, не може да се осъществи връзка)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (библиотеката за проверка липсва)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "не се поддържа (не може да се осъществи връзка)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "не се поддържа (не може да се криптира)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "поддържа се (с криптиране)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "поддържа се (не може да се криптира)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "изисква се (с криптиране) " -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "поддържа се (не може да се криптира)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "изисква се (не може да се осъществи връзка)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "изисква се (с криптиране)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Име на хост:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Режим на игра:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Карта:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Мод:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Версия:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Настройки:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Играчи:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Ботове:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Свободни слотове:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Криптиране:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "Номер:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Ключ:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Информация за сървъра" @@ -9508,6 +9569,22 @@ msgstr "наблюдаване" msgid "Team Selection" msgstr "Избор на отбор" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9692,7 +9769,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Не натискайте пак този бутон!" @@ -9754,42 +9831,34 @@ msgstr "Карта" msgid "Type" msgstr "Тип" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "SLCAT^Любими" @@ -10013,29 +10082,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Автоматично генериране на информацията за новодобавените карти..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Обновете до %s сега!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Използване на стандартен" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Цвят на отбора:" diff --git a/common.ca.po b/common.ca.po index 498e84008..918b8c51f 100644 --- a/common.ca.po +++ b/common.ca.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-12-12 19:37+0000\n" -"Last-Translator: LegendGuard\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" +"Last-Translator: divVerent \n" "Language-Team: Catalan (http://www.transifex.com/team-xonotic/xonotic/" "language/ca/)\n" "Language: ca\n" @@ -54,7 +54,7 @@ msgstr "Missatge a l’hora %s" msgid "Generic message" msgstr "Missatge genèric" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Jugador^7: Això és l'àrea del xat." @@ -520,7 +520,7 @@ msgstr "Intermedi %d" msgid "PENALTY: %.1f (%s)" msgstr "SANCIÓ: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "falta un punt de control" @@ -954,12 +954,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1063,9 +1063,26 @@ msgstr "mi" msgid "nmi" msgstr "nmi" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "ESCALFAMENT" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1089,7 +1106,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1102,7 +1119,7 @@ msgstr "Si" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1113,43 +1130,43 @@ msgstr "Si" msgid "No" msgstr "No" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1349,10 +1366,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1La partida ja ha començat" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1No tens cap vida restant" @@ -1424,23 +1437,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1875,7 +1888,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4532,7 +4545,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5418,12 +5431,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5448,175 +5461,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Estadístiques" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5683,48 +5696,48 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Permetre que les estadístiques de jugador utilitzin el teu sobrenom en stats." "xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5905,12 +5918,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5977,7 +5991,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6091,7 +6106,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6259,14 +6274,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6397,12 +6420,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6412,12 +6435,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6547,9 +6570,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6741,7 +6764,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7051,7 +7074,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7064,118 +7087,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "estadístiques habilitades" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "estadístiques deshabilitades" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9452,6 +9513,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9636,7 +9713,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9698,42 +9775,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "estadístiques habilitades" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "estadístiques deshabilitades" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9957,29 +10026,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Color de l'Equip:" diff --git a/common.cs.po b/common.cs.po index 853591e6b..c23b2a856 100644 --- a/common.cs.po +++ b/common.cs.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Czech (http://www.transifex.com/team-xonotic/xonotic/language/" "cs/)\n" @@ -65,7 +65,7 @@ msgstr "Zpráva v čase %s" msgid "Generic message" msgstr "Obecná zpráva" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Hráč^7: Toto je komunikační oblast." @@ -530,7 +530,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -942,12 +942,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1051,8 +1051,25 @@ msgstr "mi" msgid "nmi" msgstr "nmi" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1077,7 +1094,7 @@ msgstr "^1Nastavit HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1090,7 +1107,7 @@ msgstr "Ano" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1101,43 +1118,43 @@ msgstr "Ano" msgid "No" msgstr "Ne" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Chybí munice" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Chybí" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Nedostupné" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "uzly" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1337,10 +1354,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Zápas už začal" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Už nemáš žádné životy" @@ -1412,23 +1425,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "náboje" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "plazma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "rakety" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1863,7 +1876,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4520,7 +4533,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5406,12 +5419,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5436,175 +5449,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Stránka" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Statistiky" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animace" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Design levelů" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Hudba / Zvuky FX" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Kód hry" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Překladači" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulharský" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5671,7 +5684,7 @@ msgstr "Odpojit" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5680,40 +5693,40 @@ msgstr "" "Vítej v Xonotic, abys mohl začít, vyber si prosím svůj jazyk a zvol si " "jméno. Tyto možnosti si potom můžeš změnit v nastavení." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Jméno:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Jméno pod kterým budeš vystupovat ve hře" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Jazyk textu:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Povolit hráčské statistice používání Vaší přezdívky na stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Nerozhodnutý" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Uložit nastavení" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Vítej" @@ -5894,12 +5907,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Zákázat" @@ -5966,7 +5980,8 @@ msgstr "Panel notifikací" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Povolit" @@ -6080,7 +6095,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6248,14 +6263,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6386,12 +6409,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6401,12 +6424,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6538,9 +6561,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Výchozí" @@ -6736,7 +6759,7 @@ msgid "Game types:" msgstr "Herní módy:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Zavřít" @@ -7052,7 +7075,7 @@ msgid "" msgstr "Pozastaví update serverů aby v seznamu neposkakovaly" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Adresa:" @@ -7065,118 +7088,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Ukáže více informací o vybraném serveru" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Připojit!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d upraveno" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Oficiální" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Není podporováno (nemůže se spojit)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Není podporováno (nebude šifrovat)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Podporováno (bude šifrovat)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Podporováno (nebude šifrovat)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Dotazováno (bude šifrovat)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Dotazováno (nebude šifrovat)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Vyžadováno (nemůže se spojit)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Vyžadováno (bude šifrovat)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "statistiky zakázány" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "statistiky povoleny" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Název:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Herní mód:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Mapa:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Verze:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Nastavení:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Hráči" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "boti:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Volná místa:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Šifrování:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Klíč:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Informace o serveru" @@ -9461,6 +9522,22 @@ msgstr "" msgid "Team Selection" msgstr "Vybírání týmů" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Povolit používání Vaší přezdívky v hráčské statistice?" @@ -9645,7 +9722,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Neklikej znova na tohle tlačítko!" @@ -9708,42 +9785,34 @@ msgstr "Mapa" msgid "Type" msgstr "Typ" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "šifrování:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "modifikované nastavení" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "oficiální nastavení" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "statistiky zakázány" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "statistiky povoleny" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9967,29 +10036,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "Update je ke stažení na:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Updatuj na 1%s teď!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Použít výchozí" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Barva týmu:" diff --git a/common.da.po b/common.da.po index c736235e5..d2b6c283d 100644 --- a/common.da.po +++ b/common.da.po @@ -3,12 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Archy Coder, 2022 +# Archy Coder, 2022 msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Danish (http://www.transifex.com/team-xonotic/xonotic/" "language/da/)\n" @@ -49,7 +51,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "" @@ -85,7 +87,7 @@ msgstr "" #: qcsrc/client/hud/panel/infomessages.qc:107 #: qcsrc/client/hud/panel/infomessages.qc:111 msgid "next weapon" -msgstr "" +msgstr "næste våben" #: qcsrc/client/hud/panel/infomessages.qc:107 #: qcsrc/client/hud/panel/infomessages.qc:111 @@ -130,12 +132,12 @@ msgstr "" #: qcsrc/client/hud/panel/infomessages.qc:128 #: qcsrc/common/notifications/all.qh:430 msgid "jump" -msgstr "" +msgstr "hoppe" #: qcsrc/client/hud/panel/infomessages.qc:137 #, c-format msgid "^1Game starts in ^3%d^1 seconds" -msgstr "" +msgstr "^1Spil begynder om ^3%d^1 sekunder" #: qcsrc/client/hud/panel/infomessages.qc:143 msgid "^2Currently in ^1warmup^2 stage!" @@ -183,7 +185,7 @@ msgstr "" #: qcsrc/client/hud/panel/infomessages.qc:197 #: qcsrc/menu/xonotic/keybinder.qc:115 msgid "team menu" -msgstr "" +msgstr "hold menu" #: qcsrc/client/hud/panel/infomessages.qc:207 msgid "^1Spectating this player:" @@ -213,7 +215,7 @@ msgstr "" #: qcsrc/client/hud/panel/score.qc:66 #, c-format msgid "Player %d" -msgstr "" +msgstr "Spiller %d" #: qcsrc/client/hud/panel/quickmenu.qc:617 #: qcsrc/client/hud/panel/quickmenu.qc:619 @@ -224,7 +226,7 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:624 #, c-format msgid "Command%d" -msgstr "" +msgstr "Kommando%d" #: qcsrc/client/hud/panel/quickmenu.qc:650 msgid "Continue..." @@ -233,7 +235,7 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:807 #: qcsrc/client/hud/panel/quickmenu.qc:814 msgid "Chat" -msgstr "" +msgstr "Chat" #: qcsrc/client/hud/panel/quickmenu.qc:808 msgid "QMCMD^Send public message to" @@ -261,12 +263,12 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:813 msgid "QMCMD^Send in English" -msgstr "" +msgstr "QMCMD^Send i Engelsk" #: qcsrc/client/hud/panel/quickmenu.qc:818 #: qcsrc/client/hud/panel/quickmenu.qc:834 msgid "QMCMD^Team chat" -msgstr "" +msgstr "QMCMD^Hold chat" #: qcsrc/client/hud/panel/quickmenu.qc:819 msgid "QMCMD^strength soon" @@ -274,7 +276,7 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:820 msgid "QMCMD^free item %x^7 (l:%y^7)" -msgstr "" +msgstr "QMCMD^Gratis objekt %x^7 (l:%y^7)" #: qcsrc/client/hud/panel/quickmenu.qc:820 msgid "QMCMD^free item, icon" @@ -290,11 +292,11 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:822 msgid "QMCMD^negative" -msgstr "" +msgstr "QMCMD^negative" #: qcsrc/client/hud/panel/quickmenu.qc:823 msgid "QMCMD^positive" -msgstr "" +msgstr "QMCMD^positive" #: qcsrc/client/hud/panel/quickmenu.qc:824 msgid "QMCMD^need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)" @@ -302,7 +304,7 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:824 msgid "QMCMD^need help, icon" -msgstr "" +msgstr "QMCMD^brug for hjælp, icon" #: qcsrc/client/hud/panel/quickmenu.qc:825 msgid "QMCMD^enemy seen (l:%y^7)" @@ -338,7 +340,7 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:829 msgid "QMCMD^attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)" -msgstr "" +msgstr "QMCMD^angriber (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)" #: qcsrc/client/hud/panel/quickmenu.qc:829 msgid "QMCMD^attacking, icon" @@ -384,7 +386,7 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:839 #: qcsrc/client/hud/panel/quickmenu.qc:869 msgid "QMCMD^Settings" -msgstr "" +msgstr "QMCMD^Indstillinger" #: qcsrc/client/hud/panel/quickmenu.qc:840 #: qcsrc/client/hud/panel/quickmenu.qc:847 @@ -409,7 +411,7 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:845 msgid "QMCMD^FPS" -msgstr "" +msgstr "QMCMD^FPS" #: qcsrc/client/hud/panel/quickmenu.qc:846 msgid "QMCMD^Net graph" @@ -439,11 +441,11 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:862 msgid "QMCMD^Increase speed" -msgstr "" +msgstr "QMCMD^Fart op" #: qcsrc/client/hud/panel/quickmenu.qc:863 msgid "QMCMD^Decrease speed" -msgstr "" +msgstr "QMCMD^Fart ned" #: qcsrc/client/hud/panel/quickmenu.qc:864 msgid "QMCMD^Wall collision" @@ -451,7 +453,7 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:868 msgid "QMCMD^Fullscreen" -msgstr "" +msgstr "QMCMD^Fuldskærm" #: qcsrc/client/hud/panel/quickmenu.qc:871 #: qcsrc/client/hud/panel/quickmenu.qc:881 @@ -485,12 +487,12 @@ msgstr "" #: qcsrc/client/hud/panel/racetimer.qc:56 #, c-format msgid " (-%dL)" -msgstr "" +msgstr " (-%dL)" #: qcsrc/client/hud/panel/racetimer.qc:61 #, c-format msgid " (+%dL)" -msgstr "" +msgstr " (+%dL)" #: qcsrc/client/hud/panel/racetimer.qc:80 msgid "Start line" @@ -514,7 +516,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -560,11 +562,11 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:124 msgid "Number of deaths" -msgstr "" +msgstr "Antal døde" #: qcsrc/client/hud/panel/scoreboard.qc:124 msgid "SCO^deaths" -msgstr "" +msgstr "SCO^døde" #: qcsrc/client/hud/panel/scoreboard.qc:125 msgid "Number of keys destroyed by pushing them into void" @@ -632,7 +634,7 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:133 msgid "FPS" -msgstr "" +msgstr "FPS" #: qcsrc/client/hud/panel/scoreboard.qc:133 msgid "SCO^fps" @@ -698,7 +700,7 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:142 msgid "Number of lives (LMS)" -msgstr "" +msgstr "Antal live (LMS)" #: qcsrc/client/hud/panel/scoreboard.qc:142 msgid "SCO^lives" @@ -756,7 +758,7 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:149 msgid "SCO^pl" -msgstr "" +msgstr "SCO^pl" #: qcsrc/client/hud/panel/scoreboard.qc:150 msgid "Number of players pushed into void" @@ -808,7 +810,7 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:156 msgid "Number of suicides" -msgstr "" +msgstr "Antal selvmord" #: qcsrc/client/hud/panel/scoreboard.qc:156 msgid "SCO^suicides" @@ -926,12 +928,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1035,8 +1037,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1061,7 +1080,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1074,7 +1093,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1085,43 +1104,43 @@ msgstr "" msgid "No" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1321,10 +1340,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1396,23 +1411,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1847,7 +1862,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4504,7 +4519,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5390,12 +5405,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5420,175 +5435,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5655,46 +5670,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5875,12 +5890,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5947,7 +5963,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6061,7 +6078,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6229,14 +6246,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6367,12 +6392,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6382,12 +6407,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6517,9 +6542,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6711,7 +6736,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7021,7 +7046,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7034,118 +7059,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9422,6 +9485,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9606,7 +9685,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9668,42 +9747,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9927,29 +9998,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.de.po b/common.de.po index 57f6e8b33..64667e86b 100644 --- a/common.de.po +++ b/common.de.po @@ -4,7 +4,7 @@ # # Translators: # afba88cf42cbdff57149d4a6d53a94f9, 2018 -# Wuzzy , 2016-2018 +# Wuzzy , 2016-2018 # TheTrueBrot , 2015 # cvcxc , 2013 # divVerent , 2011,2013 @@ -15,20 +15,21 @@ # Larson März , 2016 # Larson März , 2016 # afba88cf42cbdff57149d4a6d53a94f9, 2018 -# Mirio , 2014-2017,2019-2021 +# Mirio , 2014-2017,2019-2022 # Robert Katzinsky , 2020 # divVerent , 2011 # Sless , 2014 # Sless , 2014 # TheTrueBrot , 2015 -# Wuzzy , 2016 +# Wuzzy , 2016 +# Wuzzy , 2016 # Yepoleb , 2013 msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-12-02 20:44+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-08 11:22+0000\n" "Last-Translator: Mirio \n" "Language-Team: German (http://www.transifex.com/team-xonotic/xonotic/" "language/de/)\n" @@ -73,7 +74,7 @@ msgstr "Nachricht beim Zeitpunkt %s" msgid "Generic message" msgstr "Allgemeine Nachricht" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Spieler^7: Dies ist der Chat-Bereich." @@ -539,7 +540,7 @@ msgstr "Zwischenzeit %d" msgid "PENALTY: %.1f (%s)" msgstr "STRAFE: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "einen Kontrollpunkt verpasst" @@ -976,12 +977,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/V" @@ -1085,9 +1086,26 @@ msgstr "mi" msgid "nmi" msgstr "sm" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "AUFWÄRMPHASE" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "Aufwärmphase" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "Timeout" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "Sudden Death" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "Verlängerung" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "Verlängerung #%d" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1111,7 +1129,7 @@ msgstr "^1Das HUD konfigurieren" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1124,7 +1142,7 @@ msgstr "Ja" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1135,43 +1153,43 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Muni alle" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Nicht dabei" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Fehlend" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 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/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mil/h" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "kn" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (nicht zugewiesen)" @@ -1381,10 +1399,6 @@ msgid "Key Hunt" msgstr "Key Hunt" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Das Spiel hat bereits begonnen" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Du hast keine Leben mehr übrig" @@ -1459,23 +1473,23 @@ msgstr "Hilf deinem Team, mehr Frags zu erzielen als das gegnerische Team" msgid "Team Deathmatch" msgstr "Team-Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "Kugeln" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "Zellen" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "Plasma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "Raketen" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "Patronen" @@ -1916,7 +1930,7 @@ msgstr "Maximale Schriftgröße:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Farbe:" @@ -4708,7 +4722,7 @@ msgstr ", und verliert den Lauf von %d Kills" msgid ", losing their %d score spree" msgstr ", und verliert den Lauf von %d Punkten" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr " mit %d %s" @@ -5596,12 +5610,12 @@ msgstr "" "Entity-Feld %s.%s (%s) ist nicht auf der weißen Liste. Falls du glaubst, " "dass das ein Programmfehler ist, melde ihn bitte." -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d Tage, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5626,175 +5640,175 @@ msgstr "Hauptteam" msgid "Extended Team" msgstr "Erweitertes Team" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Webpräsenz" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Statistiken" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Kunst" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animation" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Level-Design" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Musik/Toneffekte" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Spiel-Code" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Marketing / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Rechtliches" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Spiel-Engine" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Engine-Ergänzungen" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Compiler" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Andere aktive Mitwirkende" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Übersetzer" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturisch" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Belarussisch" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulgarisch" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chinesisch (China)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Chinesisch (Taiwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Kornisch" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Tscheschich" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Niederländisch" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Englisch (Australien)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finnisch" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Französisch" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Deutsch" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Griechisch" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Ungarisch" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Irisch" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italienisch" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "Japanisch" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kasachisch" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Koreanisch" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polnisch" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portugiesisch" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Rumänisch" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Russisch" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Schottisch-Gälisch" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbisch" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Spanisch" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Schwedisch" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ukrainisch" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Frühere Mitwirkende" @@ -5861,7 +5875,7 @@ msgstr "Trennen" msgid "Disconnect from the server you are connected to" msgstr "Vom derzeit verbundenen Server trennen" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5871,30 +5885,30 @@ msgstr "" "Spielernamens kann es losgehen. Diese Optionen können natürlich später im " "Menüsystem geändert werden." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Name:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Leg deinen Namen im Spiel fest" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Textsprache:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Darf stats.xonotic.org deinen Spielernamen für Spielerstatistiken nutzen?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Später nachfragen" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" @@ -5902,11 +5916,11 @@ msgstr "" "Spielerstatistiken sind standardmäßig eingeschaltet. Du kannst dies im " "Profil-Menü ändern" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Einstellungen speichern" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Willkommen" @@ -6087,12 +6101,13 @@ msgstr "Informations-Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Aus" @@ -6159,7 +6174,8 @@ msgstr "Nachrichten-Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Aktivieren" @@ -6273,7 +6289,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Alpha:" @@ -6441,14 +6457,22 @@ msgstr "Inaktiv:" msgid "StrafeHUD Panel" msgstr "StrafeHUD-Panel" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Zeit:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Vergangene Zeit anzeigen" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "Sekundärzeit:" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "Umgedreht" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Zeit-Panel" @@ -6579,12 +6603,12 @@ msgid "Panel background defaults:" msgstr "Panel-Standardhintergrund:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Hintergrund:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Rahmengröße:" @@ -6594,12 +6618,12 @@ msgid "Team color:" msgstr "Teamfarbe:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Teamfarbe bei Konfiguration testen" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Abstand:" @@ -6731,9 +6755,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Standard" @@ -6931,7 +6955,7 @@ msgid "Game types:" msgstr "Spieltyp:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Schließen" @@ -7278,7 +7302,7 @@ msgstr "" "„Herumspringen“ zu verhindern" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Adresse:" @@ -7291,118 +7315,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Lass dir mehr Informationen über den markierten Server anzeigen" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Verbinden!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "Keine Nutzungsbedingungen angegeben" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^Standard" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d veränderte Einstellungen" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Offizielle Einstellungen" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A (auth-Bibliothek fehlt, kann nicht verbinden)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (auth-Bibliothek fehlt)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Nicht unterstützt (Verbindung nicht möglich)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Nicht unterstützt (verschlüsselt nicht)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Unterstützt (aktiv)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Unterstützt (nicht aktiv)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Erwünscht (aktiv)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Erwünscht (nicht aktiv)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Notwendig (nicht kompatibel)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Notwendig (aktiv)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "Benutze die cvar `crypto_aeslevel`, um deine Einstellungen zu ändern" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "benutzerdefinierter Statistiken server" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "Statistiken deaktiviert" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "Statistiken aktiviert" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "Status" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "Nutzungsbedingungen" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "Server Information" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Servername:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Spieltyp:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Karte:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Version:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Einstellungen:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Spieler:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Bots:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Freie Plätze:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Verschlüsselung:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Schlüssel:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "Statistiken:" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Server-Information" @@ -9768,6 +9830,24 @@ msgstr "zuschauen" msgid "Team Selection" msgstr "Teamauswahl" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" +"Die Nutzungsbedingungen wurde aktualisiert. Bitte lese sie, bevor du " +"fortfährst:" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "Willkommen bei Xonotic! Bitte lese die folgenden Nutzungsbedingungen" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "Akzeptieren" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "Nicht akzeptieren (das Spiel beenden)" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Dürfen Spielerstatistiken deinen Spitznamen aufnehmen?" @@ -9952,7 +10032,7 @@ msgstr "Objekt ziehen (Sandkasten)" msgid "waypoint editor menu" msgstr "Wegpunkteditormenü" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Bitte nicht nochmal diesen Knopf drücken!" @@ -10020,42 +10100,34 @@ msgstr "Karte" msgid "Type" msgstr "Typ" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "AES-Stufe %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "keine" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "Verschüsselung:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "Mod: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "Modifizierte Einstellungen" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "Offizielle Einstellungen" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "Statistiken deaktiviert" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "Statistiken aktiviert" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Favoriten" @@ -10282,20 +10354,20 @@ msgstr "Perzentil:" msgid "%d (unranked)" msgstr "%d (kein Rang)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "Update kann heruntergeladen werden auf:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Automatisch mapinfo-Dateien für neu hinzugefügte Karten erzeugen …" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Jetzt auf %s updaten!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10303,10 +10375,10 @@ msgstr "" "^1FEHLER: Texturenkompression wird benötigt, aber ist nicht unterstützt.\n" "^1Rechne mit visuellen Problemen." -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Standard" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Teamfarbe:" diff --git a/common.de_CH.po b/common.de_CH.po index 9d3eb4cc1..d0bc9517a 100644 --- a/common.de_CH.po +++ b/common.de_CH.po @@ -4,7 +4,7 @@ # # Translators: # afba88cf42cbdff57149d4a6d53a94f9, 2018 -# Wuzzy , 2016-2018 +# Wuzzy , 2016-2018 # TheTrueBrot , 2015 # cvcxc , 2013 # divVerent , 2011,2013 @@ -15,20 +15,21 @@ # Larson März , 2016 # Larson März , 2016 # afba88cf42cbdff57149d4a6d53a94f9, 2018 -# Mirio , 2014-2017,2019-2021 +# Mirio , 2014-2017,2019-2022 # Robert Katzinsky , 2020 # divVerent , 2011 # Sless , 2014 # Sless , 2014 # TheTrueBrot , 2015 -# Wuzzy , 2016 +# Wuzzy , 2016 +# Wuzzy , 2016 # Yepoleb , 2013 msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-12-02 20:44+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-08 11:22+0000\n" "Last-Translator: Mirio \n" "Language-Team: German (http://www.transifex.com/team-xonotic/xonotic/" "language/de/)\n" @@ -73,7 +74,7 @@ msgstr "Nachricht beim Zeitpunkt %s" msgid "Generic message" msgstr "Allgemeine Nachricht" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Spieler^7: Dies ist der Chat-Bereich." @@ -539,7 +540,7 @@ msgstr "Zwischenzeit %d" msgid "PENALTY: %.1f (%s)" msgstr "STRAFE: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "einen Kontrollpunkt verpasst" @@ -976,12 +977,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/V" @@ -1085,9 +1086,26 @@ msgstr "mi" msgid "nmi" msgstr "sm" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "AUFWÄRMPHASE" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "Aufwärmphase" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "Timeout" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "Sudden Death" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "Verlängerung" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "Verlängerung #%d" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1111,7 +1129,7 @@ msgstr "^1Das HUD konfigurieren" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1124,7 +1142,7 @@ msgstr "Ja" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1135,43 +1153,43 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Muni alle" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Nicht dabei" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Fehlend" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 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/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mil/h" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "kn" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (nicht zugewiesen)" @@ -1381,10 +1399,6 @@ msgid "Key Hunt" msgstr "Key Hunt" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Das Spiel hat bereits begonnen" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Du hast keine Leben mehr übrig" @@ -1459,23 +1473,23 @@ msgstr "Hilf deinem Team, mehr Frags zu erzielen als das gegnerische Team" msgid "Team Deathmatch" msgstr "Team-Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "Kugeln" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "Zellen" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "Plasma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "Raketen" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "Patronen" @@ -1916,7 +1930,7 @@ msgstr "Maximale Schriftgrösse:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Farbe:" @@ -4708,7 +4722,7 @@ msgstr ", und verliert den Lauf von %d Kills" msgid ", losing their %d score spree" msgstr ", und verliert den Lauf von %d Punkten" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr " mit %d %s" @@ -5596,12 +5610,12 @@ msgstr "" "Entity-Feld %s.%s (%s) ist nicht auf der weissen Liste. Falls du glaubst, " "dass das ein Programmfehler ist, melde ihn bitte." -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d Tage, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5626,175 +5640,175 @@ msgstr "Hauptteam" msgid "Extended Team" msgstr "Erweitertes Team" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Webpräsenz" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Statistiken" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Kunst" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animation" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Level-Design" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Musik/Toneffekte" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Spiel-Code" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Marketing / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Rechtliches" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Spiel-Engine" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Engine-Ergänzungen" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Compiler" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Andere aktive Mitwirkende" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Übersetzer" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturisch" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Belarussisch" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulgarisch" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chinesisch (China)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Chinesisch (Taiwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Kornisch" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Tscheschich" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Niederländisch" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Englisch (Australien)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finnisch" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Französisch" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Deutsch" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Griechisch" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Ungarisch" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Irisch" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italienisch" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "Japanisch" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kasachisch" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Koreanisch" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polnisch" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portugiesisch" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Rumänisch" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Russisch" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Schottisch-Gälisch" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbisch" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Spanisch" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Schwedisch" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ukrainisch" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Frühere Mitwirkende" @@ -5861,7 +5875,7 @@ msgstr "Trennen" msgid "Disconnect from the server you are connected to" msgstr "Vom derzeit verbundenen Server trennen" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5871,30 +5885,30 @@ msgstr "" "Spielernamens kann es losgehen. Diese Optionen können natürlich später im " "Menüsystem geändert werden." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Name:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Leg deinen Namen im Spiel fest" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Textsprache:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Darf stats.xonotic.org deinen Spielernamen für Spielerstatistiken nutzen?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Später nachfragen" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" @@ -5902,11 +5916,11 @@ msgstr "" "Spielerstatistiken sind standardmässig eingeschaltet. Du kannst dies im " "Profil-Menü ändern" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Einstellungen speichern" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Willkommen" @@ -6087,12 +6101,13 @@ msgstr "Informations-Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Aus" @@ -6159,7 +6174,8 @@ msgstr "Nachrichten-Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Aktivieren" @@ -6273,7 +6289,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Alpha:" @@ -6441,14 +6457,22 @@ msgstr "Inaktiv:" msgid "StrafeHUD Panel" msgstr "StrafeHUD-Panel" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Zeit:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Vergangene Zeit anzeigen" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "Sekundärzeit:" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "Umgedreht" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Zeit-Panel" @@ -6579,12 +6603,12 @@ msgid "Panel background defaults:" msgstr "Panel-Standardhintergrund:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Hintergrund:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Rahmengrösse:" @@ -6594,12 +6618,12 @@ msgid "Team color:" msgstr "Teamfarbe:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Teamfarbe bei Konfiguration testen" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Abstand:" @@ -6731,9 +6755,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Standard" @@ -6931,7 +6955,7 @@ msgid "Game types:" msgstr "Spieltyp:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Schliessen" @@ -7278,7 +7302,7 @@ msgstr "" "„Herumspringen“ zu verhindern" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Adresse:" @@ -7291,118 +7315,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Lass dir mehr Informationen über den markierten Server anzeigen" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Verbinden!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "Keine Nutzungsbedingungen angegeben" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^Standard" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d veränderte Einstellungen" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Offizielle Einstellungen" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A (auth-Bibliothek fehlt, kann nicht verbinden)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (auth-Bibliothek fehlt)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Nicht unterstützt (Verbindung nicht möglich)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Nicht unterstützt (verschlüsselt nicht)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Unterstützt (aktiv)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Unterstützt (nicht aktiv)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Erwünscht (aktiv)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Erwünscht (nicht aktiv)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Notwendig (nicht kompatibel)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Notwendig (aktiv)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "Benutze die cvar `crypto_aeslevel`, um deine Einstellungen zu ändern" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "benutzerdefinierter Statistiken server" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "Statistiken deaktiviert" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "Statistiken aktiviert" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "Status" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "Nutzungsbedingungen" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "Server Information" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Servername:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Spieltyp:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Karte:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Version:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Einstellungen:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Spieler:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Bots:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Freie Plätze:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Verschlüsselung:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Schlüssel:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "Statistiken:" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Server-Information" @@ -9768,6 +9830,24 @@ msgstr "zuschauen" msgid "Team Selection" msgstr "Teamauswahl" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" +"Die Nutzungsbedingungen wurde aktualisiert. Bitte lese sie, bevor du " +"fortfährst:" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "Willkommen bei Xonotic! Bitte lese die folgenden Nutzungsbedingungen" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "Akzeptieren" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "Nicht akzeptieren (das Spiel beenden)" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Dürfen Spielerstatistiken deinen Spitznamen aufnehmen?" @@ -9952,7 +10032,7 @@ msgstr "Objekt ziehen (Sandkasten)" msgid "waypoint editor menu" msgstr "Wegpunkteditormenü" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Bitte nicht nochmal diesen Knopf drücken!" @@ -10020,42 +10100,34 @@ msgstr "Karte" msgid "Type" msgstr "Typ" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "AES-Stufe %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "keine" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "Verschüsselung:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "Mod: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "Modifizierte Einstellungen" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "Offizielle Einstellungen" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "Statistiken deaktiviert" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "Statistiken aktiviert" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Favoriten" @@ -10282,20 +10354,20 @@ msgstr "Perzentil:" msgid "%d (unranked)" msgstr "%d (kein Rang)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "Update kann heruntergeladen werden auf:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Automatisch mapinfo-Dateien für neu hinzugefügte Karten erzeugen …" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Jetzt auf %s updaten!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10303,10 +10375,10 @@ msgstr "" "^1FEHLER: Texturenkompression wird benötigt, aber ist nicht unterstützt.\n" "^1Rechne mit visuellen Problemen." -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Standard" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Teamfarbe:" diff --git a/common.el.po b/common.el.po index 550a25554..8e7f42436 100644 --- a/common.el.po +++ b/common.el.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Greek (http://www.transifex.com/team-xonotic/xonotic/language/" "el/)\n" @@ -66,7 +66,7 @@ msgstr "Μήνυμα στη στιγμή %s" msgid "Generic message" msgstr "Κοινότυπο μήνυμα" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Παίκτης^7: Αυτή είναι η περιοχή συνομιλίας." @@ -535,7 +535,7 @@ msgstr "Ενδιάμεση %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -947,12 +947,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1056,8 +1056,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1083,7 +1100,7 @@ msgstr "^1Διαμόρφωση του HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1096,7 +1113,7 @@ msgstr "Ναι" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1107,43 +1124,43 @@ msgstr "Ναι" msgid "No" msgstr "Όχι" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Χωρίς πυρομαχικά" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Δεν διαθέτετε" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Μη διαθέσιμο" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "μέτρα/δευτερόλεπτο" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "χλμ/ώρα" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "μίλια/ώρα" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "κόμβοι" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (μη δεσμευμένο)" @@ -1343,10 +1360,6 @@ msgid "Key Hunt" msgstr "Κυνήγι για κλειδιά" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Ο αγώνας έχει ήδη ξεκινήσει" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Δε σας απομένουν περεταίρω ζωές" @@ -1418,23 +1431,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "Team Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "Πύραυλοι" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1870,7 +1883,7 @@ msgstr "Μέγιστο μέγεθος γραμματοσειράς:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Χρώμα:" @@ -4529,7 +4542,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5415,12 +5428,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d μέρες, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5445,175 +5458,175 @@ msgstr "Βασική ομάδα" msgid "Extended Team" msgstr "Εκτεταμένη ομάδα" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Ιστοσελίδα" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Στατιστικά" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Τέχνη" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Κινούμενα σχέδια" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Σχεδιασμός επιπέδων" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Μουσική / Ηχητικά εφέ" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Κώδικας παιχνιδιού" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Μάρκετινγκ / Δημόσιες σχέσεις" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Μεταφραστές" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Αστουριανά" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Λευκορωσικά" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Βουλγαρικά" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Κινεζικά (Κίνα)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Chinese (Taiwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Cornish" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Τσεχικά " -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Ολλανδικά" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Αγγλικά (Αυστραλία)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Φιλανδικά" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Γαλλικά" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Γερμανικά" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Ελληνικά" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Ουγγρικά" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Ιταλικά" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kazakh" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Korean" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Πολωνικά" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Πορτογαλικά" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Ρουμανικά" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Ρωσικά" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Σερβικά" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Ισπανικά" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Σουηδικά " -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ουκρανικά" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5680,7 +5693,7 @@ msgstr "Αποσύνδεση" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5690,41 +5703,41 @@ msgstr "" "εισάγετε το όνομά σας. Μπορείτε να αλλάξετε αυτές τις επιλογές αργότερα μέσω " "του μενού." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Όνομα:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Γλώσσα κειμένου:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Θέλετε τα στατιστικά παιχτών να χρησιμοποιούν το όνομά σας στο stats.xonotic." "org;" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Αποθήκευση ρυθμίσεων" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Καλωσορίσατε" @@ -5905,12 +5918,13 @@ msgstr "Πίνακας Πληροφοριών" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Απενεργοποίηση" @@ -5977,7 +5991,8 @@ msgstr "Πίνακας Ανακοινώσεων" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Ενεργοποίηση" @@ -6091,7 +6106,7 @@ msgstr "Ραντάρ:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6259,14 +6274,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Χρονόμετρο:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Πίνακας Χρονοδιακόπτη" @@ -6397,12 +6420,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Φόντο:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Μέγεθος περιθωρίου:" @@ -6412,12 +6435,12 @@ msgid "Team color:" msgstr "Χρώμα ομάδας:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6547,9 +6570,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Προεπιλογή" @@ -6742,7 +6765,7 @@ msgid "Game types:" msgstr "Τύποι παιχνιδιού:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Κλείσιμο" @@ -7052,7 +7075,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Διεύθυνση" @@ -7065,118 +7088,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Σύνδεση!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^Πρόεπιλεγμενο" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d τροποποιημένες ρυθμίσεις" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Επίσημες ρυθμίσεις" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "δεν υποστηρίζεται (δεν συνδέεται)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "δεν υποστηρίζεται (δεν κρυπτογραφείζεται)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "υποστηρίζεται (θα κρυπτογραφειθεί)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "υποστηρίζεται (δεν κρυπτογραφίζεται)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "απαιτήται (θα κρυπτογραφειθεί)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "υποστηρίζεται (δεν κρυπτογραφίζεται)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "απαιτήται (δεν συνδέεται)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "απαιτήται (θα κρυπτογραφειθεί)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "Στατιστικά απενεργοποιήθηκαν" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "Στατιστικά ενεργοποιήθηκαν" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Όνομα διακομιστή:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Τύπος παιχνιδιού:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Χάρτης:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Τροποποίηση:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Έκδοση:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Ρυθμίσεις:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Παίκτες:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Ρομπότ:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Ελεύθερες θέσεις:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Κρυπτογράφηση:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Κωδικός:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Πληροφορίες Διακομιστή" @@ -9461,6 +9522,22 @@ msgstr "θέαση" msgid "Team Selection" msgstr "Επιλογή Ομαδάς" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9645,7 +9722,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Μην ξαναπατήσεις αυτό το κουμπί!" @@ -9709,42 +9786,34 @@ msgstr "Χάρτης" msgid "Type" msgstr "Τύπος" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "Επίπεδο AES %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "ENC^τίποτα" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "κρυπτογράφηση:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "mod: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "επίσημες ρυθμίσεις" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "Στατιστικά απενεργοποιήθηκαν" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "Στατιστικά ενεργοποιήθηκαν" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "SLCAT^Αγαπημένα" @@ -9968,30 +10037,30 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (καταταγμένος)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" "Αυτόματη δημιουργία πληροφοριών χάρτη για χάρτες που προστέθηκαν πρόσφατα..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Αναβαθμίστε στην έκδοση %s τώρα!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Χρήση προεπιλογής" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Χρώμα Ομαδάς:" diff --git a/common.en_AU.po b/common.en_AU.po index 3e14298e0..4c7e84700 100644 --- a/common.en_AU.po +++ b/common.en_AU.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: English (Australia) (http://www.transifex.com/team-xonotic/" "xonotic/language/en_AU/)\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Player^7: This is the chat area." @@ -519,7 +519,7 @@ msgstr "Intermediate %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -931,12 +931,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1040,8 +1040,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1066,7 +1083,7 @@ msgstr "^1Configure the HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1079,7 +1096,7 @@ msgstr "Yes" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1090,43 +1107,43 @@ msgstr "Yes" msgid "No" msgstr "No" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Out of ammo" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Don't have" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Unavailable" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Trying to remove a team which is not in the teamlist!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "knots" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (not bound)" @@ -1330,10 +1347,6 @@ msgid "Key Hunt" msgstr "Key Hunt" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Match has already begun" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1You have no more lives left" @@ -1405,23 +1418,23 @@ msgstr "Help your team score the most frags against the enemy team" msgid "Team Deathmatch" msgstr "Team Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1857,7 +1870,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Colour:" @@ -4586,7 +4599,7 @@ msgstr ", losing their %d frag spree" msgid ", losing their %d score spree" msgstr ", losing their %d score spree" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5472,12 +5485,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d days, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5502,175 +5515,175 @@ msgstr "Core Team" msgid "Extended Team" msgstr "Extended Team" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Website" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Stats" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Art" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animation" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Level Design" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Music / Sound FX" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Game Code" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Marketing / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Legal" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Game Engine" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Engine Additions" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Compiler" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Other Active Contributors" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Translators" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturian" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Belarusian" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulgarian" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chinese (China)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Czech" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Dutch" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "English (Australia)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finnish" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "French" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "German" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Greek" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Hungarian" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italian" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polish" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portuguese" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Romanian" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Russian" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbian" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Spanish" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Swedish" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ukrainian" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Past Contributors" @@ -5737,7 +5750,7 @@ msgstr "Disconnect" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5747,39 +5760,39 @@ msgstr "" "player name to get started. You can change these options later through the " "menu system." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Name:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Name under which you will appear in the game" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Text language:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "Allow player statistics to use your nickname at stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Undecided" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Save settings" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Welcome" @@ -5960,12 +5973,13 @@ msgstr "Info Messages Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Disable" @@ -6032,7 +6046,8 @@ msgstr "Notification Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6146,7 +6161,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Alpha:" @@ -6314,14 +6329,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Timer:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Show elapsed time" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Timer Panel" @@ -6452,12 +6475,12 @@ msgid "Panel background defaults:" msgstr "Panel background defaults:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Background:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Border size:" @@ -6467,12 +6490,12 @@ msgid "Team color:" msgstr "Team colour:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Test team colour in configure mode" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Padding:" @@ -6602,9 +6625,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Default" @@ -6796,7 +6819,7 @@ msgid "Game types:" msgstr "Game types:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Close" @@ -7106,7 +7129,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Address:" @@ -7119,118 +7142,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Join!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d modified" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Official" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A (auth library missing, can't connect)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (auth library missing)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Not supported (can't connect)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Not supported (won't encrypt)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Supported (will encrypt)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Supported (won't encrypt)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Requested (will encrypt)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Requested (won't encrypt)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Required (can't connect)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Required (will encrypt)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Hostname:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Gametype:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Map:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Version:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Settings:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Players:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Bots:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Free slots:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Encryption:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Key:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Server Information" @@ -9507,6 +9568,22 @@ msgstr "spectate" msgid "Team Selection" msgstr "Team Selection" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9691,7 +9768,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Do not press this button again!" @@ -9753,42 +9830,34 @@ msgstr "Map" msgid "Type" msgstr "Type" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "SLCAT^Favourites" @@ -10012,29 +10081,29 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (unranked)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Autogenerating mapinfo for newly added maps..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Update to %s now!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Use default" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Team Colour:" diff --git a/common.eo.po b/common.eo.po index 8da242cbe..d55bd0ec3 100644 --- a/common.eo.po +++ b/common.eo.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Esperanto (http://www.transifex.com/team-xonotic/xonotic/" "language/eo/)\n" @@ -50,7 +50,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "" @@ -515,7 +515,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -927,12 +927,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1036,8 +1036,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1062,7 +1079,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1075,7 +1092,7 @@ msgstr "Jes" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1086,43 +1103,43 @@ msgstr "Jes" msgid "No" msgstr "Ne" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Ne havas" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1322,10 +1339,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1397,23 +1410,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1848,7 +1861,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4505,7 +4518,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5391,12 +5404,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5421,175 +5434,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5656,46 +5669,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5876,12 +5889,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5948,7 +5962,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6062,7 +6077,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6230,14 +6245,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6368,12 +6391,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6383,12 +6406,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6518,9 +6541,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6712,7 +6735,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7022,7 +7045,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7035,118 +7058,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9423,6 +9484,22 @@ msgstr "spekti" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9607,7 +9684,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9669,42 +9746,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9928,29 +9997,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.es.po b/common.es.po index bb59e8c86..fcf6dbaf3 100644 --- a/common.es.po +++ b/common.es.po @@ -31,9 +31,9 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-12-12 19:11+0000\n" -"Last-Translator: LegendGuard\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" +"Last-Translator: divVerent \n" "Language-Team: Spanish (http://www.transifex.com/team-xonotic/xonotic/" "language/es/)\n" "Language: es\n" @@ -75,7 +75,7 @@ msgstr "Mensaje a la hora %s" msgid "Generic message" msgstr "Mensaje genérico" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Jugador^7: Este es el área del chat." @@ -541,7 +541,7 @@ msgstr "Intermedio %d" msgid "PENALTY: %.1f (%s)" msgstr "SANCIÓN: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "falta un punto de control" @@ -977,12 +977,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1086,9 +1086,26 @@ msgstr "ml" msgid "nmi" msgstr "nmi" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "CALENTAMIENTO" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1113,7 +1130,7 @@ msgstr "^1Configurar el HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1126,7 +1143,7 @@ msgstr "Sí" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1137,43 +1154,43 @@ msgstr "Sí" msgid "No" msgstr "No" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Sin munición" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "No lo/la tienes" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "No disponible" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "¡Intentando eliminar un equipo que no está en la lista de equipos!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "nudos" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (sin asignar)" @@ -1379,10 +1396,6 @@ msgid "Key Hunt" msgstr "Caza de llaves" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1La partida ya ha empezado" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1No tienes ninguna vida restante" @@ -1459,23 +1472,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "Combate a muerte por equipos" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "balas" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "células" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "plasma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "cohetes" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "proyectiles" @@ -1917,7 +1930,7 @@ msgstr "Tamaño de fuente máximo:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Color:" @@ -4700,7 +4713,7 @@ msgstr ", perdiendo sus %d eliminaciones seguidas" msgid ", losing their %d score spree" msgstr ", perdiendo sus %d aciertos seguidos" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr " con %d %s" @@ -5588,12 +5601,12 @@ msgstr "" "Campo de entidad %s.%s (%s) no está en la lista. Si crees que esto es un " "error, por favor reporte el problema." -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d días, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5618,175 +5631,175 @@ msgstr "Equipo Principal" msgid "Extended Team" msgstr "Equipo Extendido" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Página web" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Estadísticas" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Arte" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animación" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Diseño de Niveles" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Música / Sonido FX" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Código del Juego" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Marketing / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Legal" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Motor del Juego" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Adiciones del Motor" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Compilador" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Otros contribuidores activos" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Traductores" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturiano" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Bieloruso" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Búlgaro" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chino (China)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Chino (Taiwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Córnico" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Checo" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Holandés" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Inglés (Australia)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finlandés" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Francés" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Alemán" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Griego" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Húngaro" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Irlandés" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italiano" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "Japonés" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kazajo" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Coreano" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polaco" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portugués" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Rumano" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Ruso" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Gaélico escocés" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbio" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Español" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Sueco" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ucraniano" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Contribuidores anteriores" @@ -5853,7 +5866,7 @@ msgstr "Desconectar" msgid "Disconnect from the server you are connected to" msgstr "Desconectar del servidor al que está conectado" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5862,31 +5875,31 @@ msgstr "" "Bienvenido/a a Xonotic, selecciona tu idioma e introduzca su apodo. Puedes " "modificar estas opciones más tarde a través del menú de configuración." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Nombre:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Nombre bajo el cual aparecerás en el juego" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Texto del idioma:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "¿Permitir que las estadísticas de jugador utilicen tu apodo en stats.xonotic." "org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Indeciso" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" @@ -5894,11 +5907,11 @@ msgstr "" "Estadísticas de jugador están habilitadas por defecto, puedes cambiar esto " "en el menú de perfil" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Guardar la configuración" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Bienvenido/a" @@ -6079,12 +6092,13 @@ msgstr "Panel de Información de los mensajes" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Deshabilitar" @@ -6151,7 +6165,8 @@ msgstr "Panel de notificaciones" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Habilitar" @@ -6265,7 +6280,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Transparencia:" @@ -6433,14 +6448,22 @@ msgstr "Inactivo:" msgid "StrafeHUD Panel" msgstr "Panel StrafeHUD:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Reloj:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Mostrar el tiempo transcurrido" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Panel del Reloj" @@ -6571,12 +6594,12 @@ msgid "Panel background defaults:" msgstr "Fondo por defecto del panel:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Fondo:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Grosor del borde:" @@ -6586,12 +6609,12 @@ msgid "Team color:" msgstr "Color del equipo:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Probar el color del equipo en modo configuración" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Tamaño de letra:" @@ -6723,9 +6746,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Por defecto" @@ -6922,7 +6945,7 @@ msgid "Game types:" msgstr "Modos de juego:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Cerrar" @@ -7262,7 +7285,7 @@ msgstr "" "Pausar la actualización de la lista de servidores para evitar que se salten" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Dirección:" @@ -7275,118 +7298,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Mostrar más información sobre el servidor actual resaltado" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "¡Unirse!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "Por defecto" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d modificado" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Oficial" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A (falta la biblioteca de autenticación, no es posible conectarse)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (falta la biblioteca de autenticación)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "No soportado (no se puede conectar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "No soportado (no se cifrará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Soportado (se cifrará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Soportado (no se cifrará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Solicitado (se cifrará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Solicitado (no se cifrará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Requerido (no se puede conectar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Requerido (se cifrará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "Usa la cvar `crypto_aeslevel` para cambiar tus preferencias" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "estadísticas deshabilitadas" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "estadísticas habilitadas" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Nombre del servidor:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Modo de juego:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Mapa:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Versión:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Configuración:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Jugadores:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Bots:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Espacios libres:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Cifrado:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Llave:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Información del servidor" @@ -9737,6 +9798,22 @@ msgstr "espectar" msgid "Team Selection" msgstr "Selección de equipo" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "¿Permitir que la estadística de jugadores use su apodo?" @@ -9921,7 +9998,7 @@ msgstr "arrastrar objeto (sandbox)" msgid "waypoint editor menu" msgstr "menú del editor de puntos de encuentro" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "¡No vuelva a pulsar este botón!" @@ -9989,42 +10066,34 @@ msgstr "Mapa" msgid "Type" msgstr "Tipo" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "Nivel AES %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "Ninguno" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "cifrado:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "mod: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "configuración modificada" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "configuración oficial" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "estadísticas deshabilitadas" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "estadísticas habilitadas" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Favoritos" @@ -10251,20 +10320,20 @@ msgstr "Porcentaje:" msgid "%d (unranked)" msgstr "%d (sin clasificar)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "La actualización puede ser descargada en:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Generación automática de información para mapas recién agregados..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "¡Actualiza a %s ahora!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10272,10 +10341,10 @@ msgstr "" "^1ERROR: Se requiere la compresión de texturas, pero no soporta.\n" "^1Pueden ocurrir posibles problemas visuales." -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Usar por defecto" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Color del equipo:" diff --git a/common.es_MX.po b/common.es_MX.po index cefe20054..fa0905223 100644 --- a/common.es_MX.po +++ b/common.es_MX.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/team-xonotic/" "xonotic/language/es_MX/)\n" @@ -49,7 +49,7 @@ msgstr "" msgid "Generic message" msgstr "Mensaje genérico" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "" @@ -514,7 +514,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -926,12 +926,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1035,8 +1035,25 @@ msgstr "mi" msgid "nmi" msgstr "nmi" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1061,7 +1078,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1074,7 +1091,7 @@ msgstr "Sí" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1085,43 +1102,43 @@ msgstr "Sí" msgid "No" msgstr "No" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Sin munición" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "No tengo" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "No disponible" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "¡Tratando de remover un equipo que no está en la lista de equipos!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "nudos" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1323,10 +1340,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1398,23 +1411,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "balas" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "celdas" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "plasma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "cohetes" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "proyectiles" @@ -1849,7 +1862,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4506,7 +4519,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5392,12 +5405,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5422,175 +5435,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Bieloruso" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Búlgaro" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chino (China)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Chino (Taiwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Checo" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Holandés" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Inglés (Australia)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finlandés" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Francés" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Alemán" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Griego" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Húngaro" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Irlandés" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italiano" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kazajo" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Coreano" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Poláco" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portugués" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Rumano" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Ruso" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Gaélico Escocés" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbio" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Español" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Sueco" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ucraniano" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Contribuidores pasados" @@ -5657,7 +5670,7 @@ msgstr "Desconectar" msgid "Disconnect from the server you are connected to" msgstr "Desconectar del servidor al que estás conectado" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5667,31 +5680,31 @@ msgstr "" "tu nombre de jugador para iniciar. Puedes cambiar estas opciones " "posteriormente en el menú del sistema." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Nombre:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Nombre con el que aparecerás en el juego" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Idioma del texto:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "¿Permitir a las estadísticas del jugador utilizar tu sobrenombre en stats." "xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Indeciso" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" @@ -5699,11 +5712,11 @@ msgstr "" "Las estadísticas del jugador están habilitadas de forma predeterminada, " "puedes cambiar esto en el menú de Perfil" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Bienvenido" @@ -5884,12 +5897,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5956,7 +5970,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6070,7 +6085,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6238,14 +6253,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6376,12 +6399,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6391,12 +6414,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6526,9 +6549,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6720,7 +6743,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7030,7 +7053,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7043,118 +7066,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9431,6 +9492,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9615,7 +9692,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9677,42 +9754,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9936,29 +10005,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.fi.po b/common.fi.po index 956a24007..1dc41e2b9 100644 --- a/common.fi.po +++ b/common.fi.po @@ -7,13 +7,13 @@ # Dr. Jaska , 2020 # Henry 'Exitium' Sanmark , 2011 # Jonas Sahlberg , 2015 -# Oi Suomi On! , 2020 +# Oi Suomi On! , 2020,2022 msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Finnish (http://www.transifex.com/team-xonotic/xonotic/" "language/fi/)\n" @@ -58,7 +58,7 @@ msgstr "Viesti ajassa %s" msgid "Generic message" msgstr "Yleisluontoinen viesti" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Pelaaja^7: Tämä on keskustelualue." @@ -524,7 +524,7 @@ msgstr "Välimuoto %d" msgid "PENALTY: %.1f (%s)" msgstr "RANGAISTUS: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "tarkastuspiste sivuutettu" @@ -956,12 +956,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -972,7 +972,7 @@ msgstr "Tarkkuustilastot (keskimäärin %d%%)" #: qcsrc/client/hud/panel/scoreboard.qc:1407 msgid "Item stats" -msgstr "" +msgstr "Esineen tilastot" #: qcsrc/client/hud/panel/scoreboard.qc:1518 msgid "Map stats:" @@ -1065,9 +1065,26 @@ msgstr "mi" msgid "nmi" msgstr "mpk" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "LÄMMITTELY" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1091,7 +1108,7 @@ msgstr "^1Määrittele HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1104,7 +1121,7 @@ msgstr "Kyllä" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1115,43 +1132,43 @@ msgstr "Kyllä" msgid "No" msgstr "Ei" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Ammukset loppu" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Ei ole" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Ei saatavissa" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Koetetaan poistaa joukkuetta joka ei ole joukkuelistassa!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "knots" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (ei sidottu)" @@ -1360,10 +1377,6 @@ msgid "Key Hunt" msgstr "Avaimenetsintä (Key Hunt)" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Ottelu on jo alkanut" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Sinulla ei ole elämiä enää jäljellä" @@ -1435,23 +1448,23 @@ msgstr "Auta joukkuettasi tekemään eniten tappoja vihollisjoukkuetta vastaan" msgid "Team Deathmatch" msgstr "Joukkuemättö (Team Deatchmatch)" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "luodit" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "kennot" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "plasma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "raketit" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "ammukset" @@ -1570,7 +1583,7 @@ msgstr "Hienosti meni! Napsauta 'Seuraava Taso' jatkaaksesi" #: qcsrc/common/minigames/minigame/ps.qc:498 #: qcsrc/common/minigames/minigame/ttt.qc:329 msgid "You are spectating" -msgstr "" +msgstr "Olet tällä hetkellä katsojana" #: qcsrc/common/minigames/minigame/bd.qc:1184 msgid "Better luck next time!" @@ -1791,7 +1804,7 @@ msgstr "Hämähäkin hyökkäys" #: qcsrc/common/monsters/monster/spider.qh:39 msgid "Webbed" -msgstr "" +msgstr "Verkotettu" #: qcsrc/common/monsters/monster/wyvern.qh:17 #: qcsrc/menu/xonotic/dialog_monstertools.qc:19 @@ -1835,7 +1848,7 @@ msgstr "Vammaisuus" #: qcsrc/common/mutators/mutator/buffs/all.inc:89 msgid "Disabled" -msgstr "" +msgstr "Kytketty pois" #: qcsrc/common/mutators/mutator/buffs/all.inc:100 msgid "Vengeance" @@ -1890,7 +1903,7 @@ msgstr "Suurin kirjasinkoko:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Väri:" @@ -1989,15 +2002,15 @@ msgstr "Voima" #: qcsrc/common/mutators/mutator/status_effects/status_effect/burning.qh:16 msgid "Burning" -msgstr "" +msgstr "Palaa" #: qcsrc/common/mutators/mutator/status_effects/status_effect/spawnshield.qh:10 msgid "Spawn Shield" -msgstr "" +msgstr "Uudelleensyntymäsuoja" #: qcsrc/common/mutators/mutator/status_effects/status_effect/superweapons.qh:7 msgid "Superweapons" -msgstr "" +msgstr "Superaseet" #: qcsrc/common/mutators/mutator/waypoints/all.inc:3 msgid "Waypoint" @@ -3043,12 +3056,12 @@ msgstr "^BG%s^F3 yhteys katkesi" #: qcsrc/common/notifications/all.inc:411 #, c-format msgid "^BG%s^F3 was kicked after idling for %s seconds" -msgstr "" +msgstr "^BG%s^F3 potkaistiin idlattuaan %s sekuntia" #: qcsrc/common/notifications/all.inc:412 #, c-format msgid "^BG%s^F3 was moved to^BG spectators^F3 after idling for %s seconds" -msgstr "" +msgstr "^BG%s^F3 siirrettiin osastolle^BG katsojat^F3 idlattuaan %s sekuntia" #: qcsrc/common/notifications/all.inc:413 msgid "" @@ -3066,7 +3079,7 @@ msgstr "^BG%s^F3 potkaistiin jatkuvien oman joukkueen jäsenten tappamisesta" #: qcsrc/common/notifications/all.inc:415 #, c-format msgid "^BG%s^F3 is now^BG spectating" -msgstr "" +msgstr "^BG%s^F3 on nyt^BG katsojatilassa" #: qcsrc/common/notifications/all.inc:417 #, c-format @@ -3811,7 +3824,7 @@ msgstr "" #: qcsrc/common/notifications/all.inc:616 msgid "^K1You were punished for attacking your team mates!" -msgstr "" +msgstr "^K1Sinua rangaistiin hyökkäämisestäsi joukkuekavereitasi vastaan!" #: qcsrc/common/notifications/all.inc:617 msgid "^K1Die camper!" @@ -3848,7 +3861,7 @@ msgstr "^K1Nyt oli hiukan liian rapeaa!" #: qcsrc/common/notifications/all.inc:623 msgid "^K1You fragged yourself!" -msgstr "" +msgstr "^K1frägäsit itsesi!" #: qcsrc/common/notifications/all.inc:623 msgid "^K1You need to be more careful!" @@ -3998,22 +4011,22 @@ msgstr "^K1Katso mihin astut!" #: qcsrc/common/notifications/all.inc:651 #, c-format msgid "^K1Traitor! You betrayed team mate ^BG%s" -msgstr "" +msgstr "^K1Petturi! Kavalsit joukkuekaverisi ^BG%s" #: qcsrc/common/notifications/all.inc:651 #, c-format msgid "^K1Traitor! You team killed ^BG%s" -msgstr "" +msgstr "^K1Petturi! Joukkuetapoit ^BG%s" #: qcsrc/common/notifications/all.inc:652 #, c-format msgid "^K1You were betrayed by team mate ^BG%s" -msgstr "" +msgstr "^K1Joukkuekaverisi petti sinut ^BG%s" #: qcsrc/common/notifications/all.inc:652 #, c-format msgid "^K1You were team killed by ^BG%s" -msgstr "" +msgstr "^K1Sinut joukkuetapettiin ^BG%s" #: qcsrc/common/notifications/all.inc:654 msgid "" @@ -4028,6 +4041,8 @@ msgid "" "^K1Stop idling!\n" "^BGMoving to spectators in ^COUNT..." msgstr "" +"^K1Lopeta sluibuilu!\n" +"^BGSiirryt katsojahommiin ajassa ^COUNT..." #: qcsrc/common/notifications/all.inc:657 #, c-format @@ -4666,7 +4681,7 @@ msgstr ", menettää %d frägiputkensa" msgid ", losing their %d score spree" msgstr ", menettää %d pisteputkensa" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "täten %d %s" @@ -5554,12 +5569,12 @@ msgstr "" "Oliokenttä %s.%s (%s) ei ole valkoluetteloitu. Mikäli uskot tämän olevan " "virhe, ole hyvä ja ilmoita siitä." -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d päivää, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5584,175 +5599,175 @@ msgstr "Ydinjoukkue" msgid "Extended Team" msgstr "Laajennettu joukkue" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Verkkosivu" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Tilastot" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Taide" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animaatio" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Kenttäsuunnittelu" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Musiikki / ääniefektit" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Pelin ohjelmakoodi" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Markkinointi / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Lakisääteiset asiat" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Pelimoottori" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Moottorin lisät" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Koonti" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Muita aktiivisia panoksensa antajia" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Kääntäjät" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturian-kieli" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Valko-venäjä" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulgaria" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Kiina (Kiinassa)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Kiina (Taiwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Korni" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Tsekki" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Hollanti" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Englanti (Australiassa)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Suomi" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Ranska" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Saksa" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Kreikka" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Unkari" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Iiri" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italia" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" -msgstr "" +msgstr "Japani" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kasakki" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Korea" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Puola" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portugali" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Romania" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Venäjä" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Skottilainen keltti" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbia" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Espanja" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Ruotsi" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ukraina" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Aikaisemmat panoksensa antajat" @@ -5819,7 +5834,7 @@ msgstr "Katkaise yhteys" msgid "Disconnect from the server you are connected to" msgstr "Katkaise yhteys palvelimeen johon olet yhdistettynä" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5829,39 +5844,41 @@ msgstr "" "aloittaaksesi. Voit vaihtaa näitä asetuksia jälkikäteen pelin " "asetusvalikosta." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Nimi:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Näkyvä nimi jota tulet käyttämään pelissä" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Tekstin kieli:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "Salli pelinimesi käyttö pelaajatilastosivulla stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Ei päätetty" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" +"Pelaajatilastot ovat kytketyt päälle vakiollisesti, voit muuttaa tämän " +"asianhaaran Profiili -valikossa" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Tallenna asetukset" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Tervetuloa" @@ -5945,7 +5962,7 @@ msgstr "Fontin skaalaus:" #: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:41 msgid "Bold font scale:" -msgstr "" +msgstr "Lihavoidun kirjasimen skaala:" #: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh:6 msgid "Centerprint Panel" @@ -6042,12 +6059,13 @@ msgstr "Tiedotuspaneeli" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Pois päältä" @@ -6114,7 +6132,8 @@ msgstr "Ilmoituspaneeli" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Ota käyttöön" @@ -6228,7 +6247,7 @@ msgstr "Tutka:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Alpha:" @@ -6335,7 +6354,7 @@ msgstr "edistymispalkki" #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:59 msgid "gradient" -msgstr "" +msgstr "pinnoite" #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:62 msgid "Demo mode" @@ -6343,7 +6362,7 @@ msgstr "Demo-tila" #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:66 msgid "Range:" -msgstr "" +msgstr "Säde:" #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:69 msgid "Center panel" @@ -6396,14 +6415,22 @@ msgstr "Epäaktiivinen:" msgid "StrafeHUD Panel" msgstr "StrafeHUD-paneeli" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Ajastin:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Näytä kulutettu aika" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Ajastinpaneeli" @@ -6534,12 +6561,12 @@ msgid "Panel background defaults:" msgstr "Paneelin taustan perusasetukset:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Tausta:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Reunan koko:" @@ -6549,12 +6576,12 @@ msgid "Team color:" msgstr "Joukkueen väri:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Kokeile joukkueen väriä muokkaustilassa" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Pehmustus:" @@ -6686,9 +6713,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Perusasetus" @@ -6884,7 +6911,7 @@ msgid "Game types:" msgstr "Pelityypit:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Sulje" @@ -7228,7 +7255,7 @@ msgstr "" "hyppelyn\"" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Osoite:" @@ -7241,118 +7268,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Näytä lisätietoja tämänhetkisestä korostetusta palvelimesta" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Liity!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^Vakio" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d muokattua asetusta" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Viralliset asetukset" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "Ei saatavilla (valtuutuskirjastot puuttuvat, ei voida yhdistää)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "Ei saatavilla (valtuutuskirjastot puuttuvat)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Ei tuettu (ei voida yhdistää)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Ei tuettu (salaus ei onnistu)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Tuettu (salaus onnistuu)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Tuettu (salaus ei onnistu)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Pyydetty (salaus onnistuu)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Pyydetty (salaus ei onnistu)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Vaadittu (ei voida yhdistää)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Vaadittu (salaus onnistuu)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "Käytä `crypto_aeslevel` cvar muuttaaksesi asetuksia" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "tilastot pois päältä" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "tilastot päällä" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Palvelimen nimi" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Pelityyppi" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Kartta:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Modi:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Versio:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Asetukset" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Pelaajat:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Botit:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Vapaat paikat:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Salaus:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "Tunnus:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Avain:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Palvelimen tiedot" @@ -7854,23 +7919,23 @@ msgstr "Toista osumaa merkitsevä ääni laukauksesi osuessa viholliseen" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:149 msgid "SND^Fixed" -msgstr "" +msgstr "SND^Korjattu" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:152 msgid "Decrease pitch with more damage" -msgstr "" +msgstr "Vähennä kallistusta enenevän vahingon mukaisesti" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:152 msgid "Decreasing" -msgstr "" +msgstr "Vähennetään" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:155 msgid "Increase pitch with more damage" -msgstr "" +msgstr "Nosta kallistusta enenevän vahingon mukaisesti" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:155 msgid "Increasing" -msgstr "" +msgstr "Nostetaan" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:159 msgid "Chat message sound" @@ -8396,19 +8461,19 @@ msgstr "Pehmennä tähtäimen efektejä" #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:125 msgid "Perform hit tests for the crosshair" -msgstr "" +msgstr "Suorita osumatestejä tähtäimen suhteen" #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:129 msgid "Blur if obstructed by an obstacle" -msgstr "" +msgstr "Sumenna mikäli eteen tulee este" #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:133 msgid "Blur if obstructed by a teammate" -msgstr "" +msgstr "Sumenna mikäli joukkuekaveri tulee tielle" #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:137 msgid "Shrink if obstructed by a teammate" -msgstr "" +msgstr "Kutista mikäli joukkuekaveri tulee tielle" #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:140 msgid "Animate crosshair when hitting an enemy" @@ -8730,10 +8795,12 @@ msgid "" "Warning: if enabled in team games your team's color may be the same as the " "enemy team" msgstr "" +"Varoitus: mikäli tämä on kytketty päälle joukkuepeleissä voi joukkueesi väri " +"ilmetä samana kuten vastapuolen väri" #: qcsrc/menu/xonotic/dialog_settings_game_model.qc:57 msgid "Except in team games" -msgstr "" +msgstr "Poislukien joukkuepelit" #: qcsrc/menu/xonotic/dialog_settings_game_model.qc:58 msgid "Only in Duel" @@ -8741,11 +8808,11 @@ msgstr "Vain Kaksintaistelussa" #: qcsrc/menu/xonotic/dialog_settings_game_model.qc:59 msgid "Only in team games" -msgstr "" +msgstr "Vain joukkuepeleissä" #: qcsrc/menu/xonotic/dialog_settings_game_model.qc:60 msgid "In team games and Duel" -msgstr "" +msgstr "Joukkuepeleissä sekä kaksintaisteluissa" #: qcsrc/menu/xonotic/dialog_settings_game_model.qc:64 msgid "Body fading:" @@ -9704,6 +9771,22 @@ msgstr "seuraa sivusta" msgid "Team Selection" msgstr "Joukkueen valinta" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Salli pelaajatilastojen käyttää lempinimeäsi?" @@ -9888,7 +9971,7 @@ msgstr "raahaa kohde (hiekkalaatikko)" msgid "waypoint editor menu" msgstr "välietapin muokkausvalikko" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Älä paina enää näppäintä!" @@ -9956,42 +10039,34 @@ msgstr "Kartta" msgid "Type" msgstr "Tyyppi" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "AES taso %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "ENC^ei mikään" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "salaus:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "modi: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "mukautetut asetukset" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "viralliset asetukset" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "tilastot pois päältä" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "tilastot päällä" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "SLCAT^Lempparit" @@ -10055,27 +10130,27 @@ msgstr "PART^OMG" #: qcsrc/menu/xonotic/slider_particles.qc:15 msgid "PARTQUAL^Low" -msgstr "" +msgstr "PARTQUAL^Matala" #: qcsrc/menu/xonotic/slider_particles.qc:16 msgid "PARTQUAL^Medium" -msgstr "" +msgstr "PARTQUAL^Keskitasoa" #: qcsrc/menu/xonotic/slider_particles.qc:17 msgid "PARTQUAL^Normal" -msgstr "" +msgstr "PARTQUAL^Tavanomainen" #: qcsrc/menu/xonotic/slider_particles.qc:18 msgid "PARTQUAL^High" -msgstr "" +msgstr "PARTQUAL^Korkea" #: qcsrc/menu/xonotic/slider_particles.qc:19 msgid "PARTQUAL^Ultra" -msgstr "" +msgstr "PARTQUAL^Huikea" #: qcsrc/menu/xonotic/slider_particles.qc:20 msgid "PARTQUAL^Ultimate" -msgstr "" +msgstr "PARTQUAL^Huippu" #: qcsrc/menu/xonotic/slider_picmip.qc:13 msgid "" @@ -10091,19 +10166,19 @@ msgstr "Näytön tarkkuus" #: qcsrc/menu/xonotic/slider_sbfadetime.qc:13 msgid "FADESPEED^Slow" -msgstr "" +msgstr "FADESPEED^Hidas" #: qcsrc/menu/xonotic/slider_sbfadetime.qc:14 msgid "FADESPEED^Normal" -msgstr "" +msgstr "FADESPEED^Tavanomainen" #: qcsrc/menu/xonotic/slider_sbfadetime.qc:15 msgid "FADESPEED^Fast" -msgstr "" +msgstr "FADESPEED^Nopea" #: qcsrc/menu/xonotic/slider_sbfadetime.qc:16 msgid "FADESPEED^Instant" -msgstr "" +msgstr "FADESPEED^Välitön" #: qcsrc/menu/xonotic/statslist.qc:29 msgid "January" @@ -10217,21 +10292,21 @@ msgstr "Prosenttipiste:" msgid "%d (unranked)" msgstr "%d (ei rankattu)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "Päivitys ladattavissa osoitteessa:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" "Luodaan automaattisesti karttatietoja vastikään lisätyille kartoille..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Päivitä versioon %s nyt!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10239,10 +10314,10 @@ msgstr "" "^1VIRHE: Tekstuuripakkaus vaaditaan mutta se ei ole tuettuna.\n" "^1Odotettavissa graafisia virheitä." -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Käytä perusasetusta" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Joukkueen väri" diff --git a/common.fr.po b/common.fr.po index 385998bde..739c3ba49 100644 --- a/common.fr.po +++ b/common.fr.po @@ -11,16 +11,18 @@ # Hugo Locurcio, 2013-2014 # Maxime Paradis , 2011 # Mirio , 2017 +# Nicolas FORMICHELLA, 2022 +# Nicolas FORMICHELLA, 2022 # RedGuff , 2014 # Yannick Le Guen , 2013 # Hugo Locurcio, 2013 -# Yannick Le Guen , 2013-2021 +# Yannick Le Guen , 2013-2022 msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 11:32+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-08 12:08+0000\n" "Last-Translator: Yannick Le Guen \n" "Language-Team: French (http://www.transifex.com/team-xonotic/xonotic/" "language/fr/)\n" @@ -63,7 +65,7 @@ msgstr "Message au temps %s" msgid "Generic message" msgstr "Message générique" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Joueur^7 : Ceci est la zone de tchat." @@ -532,7 +534,7 @@ msgstr "Intermédiaire %d" msgid "PENALTY: %.1f (%s)" msgstr "PÉNALITÉ : %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "raté un point de contrôle" @@ -970,12 +972,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1079,9 +1081,26 @@ msgstr "mi" msgid "nmi" msgstr "M" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "ÉCHAUFFEMENT" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "Échauffement" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "Temps mort" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "Mort subite" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "Prolongations" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "Prolongations #%d" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1105,7 +1124,7 @@ msgstr "^1Configurer l'ATH" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1118,7 +1137,7 @@ msgstr "Oui" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1129,43 +1148,43 @@ msgstr "Oui" msgid "No" msgstr "Non" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "À court de munitions" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Manquant" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Indisponible" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Vous essayez de supprimer une équipe qui n'est pas dans la liste !" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "nœuds" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (non assigné)" @@ -1372,10 +1391,6 @@ msgid "Key Hunt" msgstr "Chasse aux Clés" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1La partie a déjà commencé" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Il ne vous reste plus aucune vie" @@ -1449,23 +1464,23 @@ msgstr "Aidez votre équipe à marquer le plus de frags contre l'équipe ennemie msgid "Team Deathmatch" msgstr "Match à Mort en Équipe" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "balles" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "cellules" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "plasma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "roquettes" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "carapaces" @@ -1908,7 +1923,7 @@ msgstr "Taille de police maximale :" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Couleur :" @@ -4698,7 +4713,7 @@ msgstr ", perdant sa série de %d frags" msgid ", losing their %d score spree" msgstr ", perdant sa série de %d points" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr " avec %d %s" @@ -5586,12 +5601,12 @@ msgstr "" "Le champ d'entité %s.%s (%s) n'est pas en liste blanche. Si vous pensez " "qu'il s'agit d'une erreur, veuillez signaler le problème." -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d jours, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5616,175 +5631,175 @@ msgstr "Équipe principale" msgid "Extended Team" msgstr "Équipe étendue" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Site web" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Stats" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Art" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animation" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Conception des niveaux" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Musique / son FX" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Code du jeu" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Marketing / Relations publiques" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Juridique" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Moteur du jeu" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Ajouts au moteur" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Compilateur" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Autres contributeurs actifs" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Traducteurs" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturien" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Biélorusse" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulgare" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chinois (Chine)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Chinois (Taïwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Cornouaillais" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Tchèque" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Néerlandais" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Anglais (Australie)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finlandais" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Français" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Allemand" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Grec" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Hongrois" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Irlandais" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italien" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "Japonais" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kazakh" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Coréen" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polonais" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portugais" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Roumain" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Russe" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Gaélique écossais" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbe" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Espagnol" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Suédois" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ukrainien" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Contributeurs passés" @@ -5851,7 +5866,7 @@ msgstr "Se déconnecter" msgid "Disconnect from the server you are connected to" msgstr "Se déconnecter du serveur auquel vous êtes connecté" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5861,31 +5876,31 @@ msgstr "" "pseudonyme avant de commencer. Vous pourrez changer ces options plus tard " "dans le menu du jeu." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Nom :" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Nom sous lequel vous apparaîtrez dans le jeu" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Langue du texte :" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Autoriser les statistiques des joueurs à utiliser votre pseudonyme sur stats." "xonotic.org ?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Indécis" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" @@ -5893,11 +5908,11 @@ msgstr "" "Les statistiques des joueurs sont activées par défaut, vous pouvez modifier " "cela dans le menu Profil" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Enregistrer les paramètres" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Bienvenue" @@ -6078,12 +6093,13 @@ msgstr "Messages d'Information" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Désactiver" @@ -6150,7 +6166,8 @@ msgstr "Notifications" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Afficher" @@ -6264,7 +6281,7 @@ msgstr "Radar :" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Transparence :" @@ -6432,14 +6449,22 @@ msgstr "Inactif :" msgid "StrafeHUD Panel" msgstr "Strafe" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Chronomètre :" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Afficher le temps écoulé" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "Chronomètre secondaire :" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "Échangé" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Chronomètre" @@ -6570,12 +6595,12 @@ msgid "Panel background defaults:" msgstr "Arrière-plan des tableaux de bord par défaut :" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Arrière-plan :" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Taille de la bordure :" @@ -6585,12 +6610,12 @@ msgid "Team color:" msgstr "Couleur de l'équipe :" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Tester la couleur d'équipe en mode configuration" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Remplissage :" @@ -6722,9 +6747,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Par défaut" @@ -6920,7 +6945,7 @@ msgid "Game types:" msgstr "Types de jeu :" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Fermer" @@ -7261,7 +7286,7 @@ msgstr "" "autre serveur" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Adresse :" @@ -7274,119 +7299,157 @@ msgid "Show more information about the currently highlighted server" msgstr "Afficher plus d'informations sur le serveur sélectionné" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Rejoindre !" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "Aucune condition d'utilisation spécifiée" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "Par défaut" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d modifiés" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Officiels" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" "N/A (bibliothèque d'authentification manquante, impossible de se connecter)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (bibliothèque d'authentification manquante)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Non pris en charge (impossible de se connecter)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Non pris en charge (pas de chiffrement)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Pris en charge (chiffrement activé)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Pris en charge (pas de chiffrement)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Requis (chiffrement activé)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Requis (pas de chiffrement)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Requis (impossible de se connecter)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Requis (chiffrement activé)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "Utiliser la cvar « crypto_aeslevel » pour changer vos préférences" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "Serveur personnalisé de statistiques" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "stats désactivées" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "stats activées" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "Statut" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "Conditions d'utilisation" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "Informations sur le serveur" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Nom de l'hôte :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Type de jeu :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Carte :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mode :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Version :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Paramètres :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Joueurs :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Bots :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Places libres :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Chiffrement :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Clé :" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "Statistiques :" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Informations sur le serveur" @@ -9742,6 +9805,26 @@ msgstr "mode spectateur" msgid "Team Selection" msgstr "Sélection d'Équipe" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" +"Les conditions d'utilisation ont été mises à jour. Veuillez les lire avant " +"de continuer :" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" +"Bienvenue sur Xonotic ! Veuillez lire les conditions d'utilisation " +"suivantes :" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "Accepter" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "Ne pas accepter (quitter le jeu)" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Autoriser les statistiques des joueurs à utiliser votre pseudonyme ?" @@ -9926,7 +10009,7 @@ msgstr "traîner l'objet (bac à sable)" msgid "waypoint editor menu" msgstr "menu de l'éditeur de waypoints" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "N'appuyez plus sur ce bouton !" @@ -9994,42 +10077,34 @@ msgstr "Carte" msgid "Type" msgstr "Type" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "AES niveau %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "aucun" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "chiffrement :" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "mode : %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "paramètres modifiés" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "paramètres officiels" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "stats désactivées" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "stats activées" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Favoris" @@ -10255,21 +10330,21 @@ msgstr "Percentile :" msgid "%d (unranked)" msgstr "%d (non classé)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "Une mise à jour peut être téléchargée sur :" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" "Auto-génération des informations de carte pour les nouveaux ajouts de cartes…" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Mettez à jour vers %s maintenant !" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10278,10 +10353,10 @@ msgstr "" "charge.\n" "^1Attendez-vous à des problèmes d'affichage." -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Par défaut" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Couleur de l'équipe :" diff --git a/common.ga.po b/common.ga.po index a099e57ce..f8ffebf5a 100644 --- a/common.ga.po +++ b/common.ga.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Irish (http://www.transifex.com/team-xonotic/xonotic/language/" "ga/)\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Imreoir^7: Seo é an painéal comhrá." @@ -517,7 +517,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -929,12 +929,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A/F" @@ -1038,8 +1038,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1064,7 +1081,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1077,7 +1094,7 @@ msgstr "Tá" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1088,43 +1105,43 @@ msgstr "Tá" msgid "No" msgstr "Níl" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Gan armlón ar bith" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Níl ar fáil" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/u" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "msu" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "cnota" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (gan cheangal)" @@ -1324,10 +1341,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Thosaigh an cluiche cheana" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Níl aon bheathaí eile fágtha agat" @@ -1399,23 +1412,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1850,7 +1863,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Dath:" @@ -4507,7 +4520,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5393,12 +5406,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d lá, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5423,175 +5436,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Suíomh Gréasáin" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Staitisticí" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Ealaín" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Beochan" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Dlí" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Tiomsaitheoir" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Aistritheoirí" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Astúiris" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Bealarúisis" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulgáiris" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Sínis (An tSín)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Sínis (An Téaváin)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Coirnis" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Seicis" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Ollainnis" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Béarla (An Astráil)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Fionlainnis" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Fraincis" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Gearmáinis" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Gréigis" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Ungáiris" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Iodáilis" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Casaicis" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Cóiréis" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polainnis" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portaingéilis" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Rómáinis" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Rúisis" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Seirbis" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Spáinnis" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Sualainnis" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Úcráinis" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5658,46 +5671,46 @@ msgstr "Dícheangail" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Ainm:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Idir dhá chomhairle" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Sábháil na socruithe" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Fáilte" @@ -5878,12 +5891,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Díchumasaigh" @@ -5950,7 +5964,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6064,7 +6079,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Alfa:" @@ -6232,14 +6247,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Amadóir:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6370,12 +6393,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Cúlra:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Méid na himlíne:" @@ -6385,12 +6408,12 @@ msgid "Team color:" msgstr "Dath na foirne:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Stuáil:" @@ -6520,9 +6543,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Réamhshocrú" @@ -6714,7 +6737,7 @@ msgid "Game types:" msgstr "Cineálacha cluiche:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Dún" @@ -7024,7 +7047,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Seoladh:" @@ -7037,118 +7060,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Glac Páirt!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Oifigiúil" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Óstainm:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Cineál an chluiche:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Léarscáil:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Leagan:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Socruithe:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Imreoirí:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Róbait:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Sliotáin shaora:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Criptiú:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "Aitheantas:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Eochair:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Eolas faoin bhfreastalaí" @@ -9425,6 +9486,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9609,7 +9686,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Ná brúigh an cnaipe seo arís!" @@ -9671,42 +9748,34 @@ msgstr "Léarscáil" msgid "Type" msgstr "Cineál" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "faic" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "criptiú:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Ceanáin" @@ -9930,29 +9999,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Úsáid an réamhshocrú" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Dath na Foirne:" diff --git a/common.gd.po b/common.gd.po index bf8a0ac04..1d796b984 100644 --- a/common.gd.po +++ b/common.gd.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/team-xonotic/" "xonotic/language/gd/)\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Cluicheadair^7: Seo raon na cabadaich." @@ -524,7 +524,7 @@ msgstr "Eadar-mheadhanach %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -936,12 +936,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1045,9 +1045,26 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "BLÀTHACHADH" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1071,7 +1088,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1084,7 +1101,7 @@ msgstr "Tha" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1095,43 +1112,43 @@ msgstr "Tha" msgid "No" msgstr "Chan eil" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Dh'fhalbh an connadh ort" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Chan eil seo agad: " -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Chan eil seo ri fhaighinn: " -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1331,10 +1348,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Tha am maids air tòiseachadh mar-thà" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Dh’fhalbh na beathannan ort" @@ -1406,23 +1419,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1861,7 +1874,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4518,7 +4531,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5404,12 +5417,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5434,175 +5447,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5669,46 +5682,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5889,12 +5902,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5961,7 +5975,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6075,7 +6090,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6243,14 +6258,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6381,12 +6404,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6396,12 +6419,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6531,9 +6554,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Bun-roghainn" @@ -6725,7 +6748,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7035,7 +7058,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7048,118 +7071,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9436,6 +9497,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9620,7 +9697,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9682,42 +9759,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9941,29 +10010,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Cleachd a’ bhun-roghainn" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.gl.po b/common.gl.po index d9ea97336..86be5058f 100644 --- a/common.gl.po +++ b/common.gl.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Galician (http://www.transifex.com/team-xonotic/xonotic/" "language/gl/)\n" @@ -53,7 +53,7 @@ msgstr "Mensaxe á hora %s" msgid "Generic message" msgstr "Mensaxe xenérica" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Xogador^7: Esta é a área de chat." @@ -518,7 +518,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -930,12 +930,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1039,9 +1039,26 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "QUECEMENTO" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1065,7 +1082,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1078,7 +1095,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1089,43 +1106,43 @@ msgstr "" msgid "No" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1325,10 +1342,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1400,23 +1413,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1851,7 +1864,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4508,7 +4521,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5394,12 +5407,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5424,175 +5437,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5659,46 +5672,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5879,12 +5892,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5951,7 +5965,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6065,7 +6080,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6233,14 +6248,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6371,12 +6394,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6386,12 +6409,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6521,9 +6544,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6715,7 +6738,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7025,7 +7048,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7038,118 +7061,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9426,6 +9487,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9610,7 +9687,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9672,42 +9749,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9931,29 +10000,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.he.po b/common.he.po index 500fd74aa..4ae9162c5 100644 --- a/common.he.po +++ b/common.he.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Hebrew (http://www.transifex.com/team-xonotic/xonotic/" "language/he/)\n" @@ -56,7 +56,7 @@ msgstr "הודעה בשעה %s" msgid "Generic message" msgstr "הודעה גנרית" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3שחקן^7: זהו אזור הצ'אט." @@ -521,7 +521,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -933,12 +933,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1042,8 +1042,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1068,7 +1085,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1081,7 +1098,7 @@ msgstr "כן" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1092,43 +1109,43 @@ msgstr "כן" msgid "No" msgstr "לא" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "לא זמין/ה" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "מ״ש" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "קמ״ש" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "מַייל לשעה" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1328,10 +1345,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1403,23 +1416,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1854,7 +1867,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "צבע:" @@ -4511,7 +4524,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5397,12 +5410,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5427,175 +5440,175 @@ msgstr "הצוות העיקרי" msgid "Extended Team" msgstr "הצוות המורחב" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "האתר" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "עיצוב השלבים" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "מנוע המשחק" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "תרגום" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "בולגרית" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "סינית (סין)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "סינית (טאיוואן)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "צ׳כית" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "אנגלית (אוסטרליה)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "צרפתית" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "גרמנית" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "יוונית" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "הונגרית" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "אירית" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "איטלקית" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "קוריאנית" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "פולנית" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "פורטוגזית" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "רומנית" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "רוסית" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "גֵאלית סקוטית" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "סברית" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "ספרדית" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "שוודית" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5662,46 +5675,46 @@ msgstr "התנתקות" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "שם:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "שמירת הגדרות" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "ברוכים הבאים" @@ -5882,12 +5895,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5954,7 +5968,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6068,7 +6083,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6236,14 +6251,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6374,12 +6397,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "רקע:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6389,12 +6412,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6524,9 +6547,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "ברירת מחדל" @@ -6718,7 +6741,7 @@ msgid "Game types:" msgstr "סוגי משחק:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "סגירה" @@ -7028,7 +7051,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "כתובת:" @@ -7041,118 +7064,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "הצטרפו!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "רשמי" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "לא נתמך (לא ניתן להתחבר)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "סטטיסטיקות מכובות" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "סטטיסטיקות מופעלות" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "סוג משחק:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "מפה:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "גרסה:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "הגדרות:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "שחקנים:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "מידע על השרת" @@ -9431,6 +9492,22 @@ msgstr "צפה" msgid "Team Selection" msgstr "בחירת צוות" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "האם להרשות לסטטיסטיקות השחקן להשתמש בכינוי שלך?" @@ -9615,7 +9692,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "אל תלחץ על כפתור זה שוב!" @@ -9677,42 +9754,34 @@ msgstr "מפה" msgid "Type" msgstr "סוג" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "רמת AES %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "הצפנה:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "מוד: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "הגדרות שנערכו" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "הגדרות רשמיות" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "סטטיסטיקות מכובות" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "סטטיסטיקות מופעלות" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9938,29 +10007,29 @@ msgstr "אחוזון:" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "העדכון ניתן להורדה באתר:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "עדכנו לגרסה %s עכשיו!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "שימוש בברירת המחדל" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "צבע קבוצה" diff --git a/common.hu.po b/common.hu.po index e481315c6..726240969 100644 --- a/common.hu.po +++ b/common.hu.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Hungarian (http://www.transifex.com/team-xonotic/xonotic/" "language/hu/)\n" @@ -56,7 +56,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Player^7: Ez a csevej terület" @@ -523,7 +523,7 @@ msgstr "Közepes %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -935,12 +935,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1044,8 +1044,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1070,7 +1087,7 @@ msgstr "^1A HUD beállításai" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1083,7 +1100,7 @@ msgstr "Igen" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1094,43 +1111,43 @@ msgstr "Igen" msgid "No" msgstr "Nem" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Nincs több lőszered." -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "nincs nálad" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "nem elérhető" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Olyan csapatot próbálsz eltávolítani, ami nincs a csapatlistában!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "csomó" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (nincs kiosztva)" @@ -1332,10 +1349,6 @@ msgid "Key Hunt" msgstr "Kulcsvadászat" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1A játék már elkezdődött" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Nincs több életed" @@ -1407,23 +1420,23 @@ msgstr "Segíts a csapatodnak több skalpot begyűjteni mint az ellenfélnek" msgid "Team Deathmatch" msgstr "Csapat[os] öldöklés " -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1858,7 +1871,7 @@ msgstr "Maximum betűméret:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Szín:" @@ -4515,7 +4528,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5401,12 +5414,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5431,175 +5444,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5666,7 +5679,7 @@ msgstr "Lekapcsolódás" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5676,12 +5689,12 @@ msgstr "" "nyelvet és írd be a játékos nevedet! Ezeket később meg tudod változtatni a " "menürendszerben." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Név:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" @@ -5689,31 +5702,31 @@ msgstr "" "gyűjtését és elküldését, akkor a http://stats.xonotic.org -on ezen a néven " "fogsz szerepelni az adatbázisban" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Fordítás:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Engedélyezed, hogy a statisztikáid mellett a játékosneved is megjelenjen a " "stats.xonotic.org-on?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Beállítások mentése" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Üdvözlünk a Xonoticban!" @@ -5894,12 +5907,13 @@ msgstr "Infó üzenetek panel" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Letiltás" @@ -5966,7 +5980,8 @@ msgstr "Értesítő Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6080,7 +6095,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Átlátszóság:" @@ -6248,14 +6263,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Időmérő:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Eltelt idő mutatása" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Időmérő panel" @@ -6386,12 +6409,12 @@ msgid "Panel background defaults:" msgstr "Alapértelmezett panel háttér:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Háttér:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Keret méret:" @@ -6401,12 +6424,12 @@ msgid "Team color:" msgstr "Csapat szín:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Csapat szín tesztelés beállítás közben" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Kitöltés:" @@ -6538,9 +6561,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Alapértelmezett" @@ -6734,7 +6757,7 @@ msgid "Game types:" msgstr "Játék típusok:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Bezár" @@ -7050,7 +7073,7 @@ msgstr "" "össze-vissza\" a listában" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Cím:" @@ -7063,118 +7086,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Még több információ megjelenítése az éppen kiválasztott szerverről" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Csatlakozok!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d módosított beállítások" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Hivatalos beállítások" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A (nem tudok csatlakozni)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (titkosítási függvénytár hiányzik) " -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "nem támogatott (nem tudok csatlakozni)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "nem támogatott (nem titkosított)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "támogatott (titkosított)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "támogatott (nem titkosított)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "kért (titkosított)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "kért (nem titkosított)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "szükséges (nem tudok csatlakozni)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "szükséges (titkosított)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Szerver neve:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Játék típusa:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Pálya:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Verzió:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Beállítások:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Játékosok:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Botok:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Szabad férőhelyek:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Titkosítás:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Kulcs:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Szerver információ" @@ -9500,6 +9561,22 @@ msgstr "Nézőként csatlakozok" msgid "Team Selection" msgstr "Válassz csapatot!" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9684,7 +9761,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Ne nyomd meg újra ezt a gombot!" @@ -9748,42 +9825,34 @@ msgstr "Pálya" msgid "Type" msgstr "Típus" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -10012,29 +10081,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "MapInfo készítése az újonnan hozzáadott pályákhoz..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Frissítés %s-re/ra!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Alapértékek használata" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Csapat színe:" diff --git a/common.it.po b/common.it.po index 19b0ee3ad..ca005c1c1 100644 --- a/common.it.po +++ b/common.it.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Antonio , 2013-2021 +# Antonio , 2013-2022 # Antonio 'terencehill' Piu , 2011-2012 # Costa , 2014,2021 # Felice Sallustio , 2011 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 14:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 11:16+0000\n" "Last-Translator: Antonio \n" "Language-Team: Italian (http://www.transifex.com/team-xonotic/xonotic/" "language/it/)\n" @@ -58,7 +58,7 @@ msgstr "Messaggio al tempo %s" msgid "Generic message" msgstr "Messaggio generico" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Giocatore^7: Questa è l'area chat." @@ -523,7 +523,7 @@ msgstr "Intermedio %d" msgid "PENALTY: %.1f (%s)" msgstr "PENALITÀ: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "mancato un checkpoint" @@ -962,12 +962,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N.D." @@ -1071,9 +1071,26 @@ msgstr "mi" msgid "nmi" msgstr "nmi" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "Warmup" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "Timeout" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "Morte improvvisa" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "Tempo supplementare" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "Tempo supplementare #%d" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1097,7 +1114,7 @@ msgstr "^1Configura l'HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1110,7 +1127,7 @@ msgstr "Sì" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1121,43 +1138,43 @@ msgstr "Sì" msgid "No" msgstr "No" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Scarica" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Mancante" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Non disponibile" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Tentando di rimuovere una squadra che non è nella lista delle squadre!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "nodi" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (non associato)" @@ -1364,10 +1381,6 @@ msgid "Key Hunt" msgstr "Caccia alla Chiave (Key Hunt)" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1La partita è già iniziata" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Non hai più vite a disposizione" @@ -1441,23 +1454,23 @@ msgstr "Aiuta la tua squadra a fare punti con i frag contro la squadra nemica" msgid "Team Deathmatch" msgstr "Team Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "proiettili" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "celle" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "plasma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "razzi" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "cartucce" @@ -1895,7 +1908,7 @@ msgstr "Grand. carattere massimo:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Colore:" @@ -4708,7 +4721,7 @@ msgstr ", perdendo la sua serie di %d frag" msgid ", losing their %d score spree" msgstr ", perdendo la sua serie di %d punti" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr " con %d %s" @@ -5596,12 +5609,12 @@ msgstr "" "Il campo di entità %s.%s (%s) non è nella lista bianca. Se credi questo sia " "un errore, riporta il problema." -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d giorni, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5626,175 +5639,175 @@ msgstr "Squadra principale" msgid "Extended Team" msgstr "Squadra estesa" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Sito web" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Statistiche" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Arte" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animazione" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Costruzione livelli" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Musica / Effetti sonori" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Codice gioco" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Commercializzazione / Relazioni pubbliche" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Questioni legali" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Motore del gioco" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Aggiunte al motore" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Compilatore" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Altri attivi contributori" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Traduttori" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturiano" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Bielorusso" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulgaro" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Cinese (Cina)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Cinese (Taiwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Cornico" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Ceco" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Olandese" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Inglese (Australia)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finlandese" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Francese" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Tedesco" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Greco" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Ungherese" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Irlandese" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italiano" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "Giapponese" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kazako" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Coreano" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polacco" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portoghese" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Rumeno" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Russo" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Gaelico scozzese" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbo" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Spagnolo" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Svedese" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ucraino" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Passati contributori" @@ -5861,7 +5874,7 @@ msgstr "Disconnetti" msgid "Disconnect from the server you are connected to" msgstr "Disconnettiti dal server a cui sei connesso" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5871,42 +5884,42 @@ msgstr "" "nome come giocatore per iniziare. Puoi cambiare queste opzioni più tardi " "tramite il menu." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Nome:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Nome col quale apparirai nel gioco" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Lingua di testo:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Consenti alle statistiche dei giocatori di usare il tuo nome in stats." "xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Indeciso" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" "Le statistiche sono abilitate di default, puoi cambiarlo nel menu Profilo" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Salva impostazioni" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Benvenuto" @@ -6087,12 +6100,13 @@ msgstr "Pannello delle informazioni" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Disabilita" @@ -6159,7 +6173,8 @@ msgstr "Pannello di notifica" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Abilita" @@ -6273,7 +6288,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Opacità:" @@ -6441,14 +6456,22 @@ msgstr "Inattivo:" msgid "StrafeHUD Panel" msgstr "Pannello StrafeHUD" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Tempo:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Mostra tempo trascorso" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "Timer secondario:" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "Scambiato" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Pannello tempo" @@ -6579,12 +6602,12 @@ msgid "Panel background defaults:" msgstr "Predefiniti dello sfondo del pannello:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Sfondo:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Dimensioni bordo:" @@ -6594,12 +6617,12 @@ msgid "Team color:" msgstr "Colore squadra:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Prova colore squadra in modalità configurazione" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Riempimento:" @@ -6731,9 +6754,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Predefinito" @@ -6929,7 +6952,7 @@ msgid "Game types:" msgstr "Tipi di gioco:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Chiudi" @@ -7269,7 +7292,7 @@ msgstr "" "spostamento di posizione dei server" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Indirizzo:" @@ -7283,118 +7306,156 @@ msgstr "" "Mostra maggiori informazioni riguardo il server attualmente selezionato" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Entra!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "Termini di servizio non specificati" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "Predefinito" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d modificate" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Ufficiali" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N.D. (libreria di autenticazione mancante, impossibile connettersi)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N.D. (libreria di autenticazione mancante)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Non supportato (impossibile connettersi)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Non supportato (non criptato)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Supportato (criptato)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Supportato (non criptato)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Richiesto (criptato)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Richiesto (non criptato)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Richiesto (impossibile connettersi)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Richiesto (criptato)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "Usa la cvar `crypto_aeslevel` per cambiare le tue preferenze" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "server delle statistiche personalizzato" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "statistiche disabilitate" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "statistiche abilitate" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "Stato" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "Termini di servizio" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "Informazioni server:" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Nome dell'host:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Tipo di gioco:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Mappa:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Versione:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Impostazioni:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Giocatori:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Bot:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Posti liberi:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Crittografia:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Chiave:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "Statistiche:" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Informazioni del server" @@ -9744,6 +9805,23 @@ msgstr "spettatore" msgid "Team Selection" msgstr "Selezione squadra" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" +"I termini di servizio sono stati aggiornati. Leggili prima di continuare:" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "Benvenuto in Xonotic! Leggi is seguenti termini di servizio:" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "Accetto" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "Non accetto (lascio il gioco)" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Consenti alle statistiche dei giocatori di usare il tuo nome?" @@ -9928,7 +10006,7 @@ msgstr "trascina oggetto (sandbox)" msgid "waypoint editor menu" msgstr "menu waypoint editor" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Non premere questo tasto di nuovo!" @@ -9996,42 +10074,34 @@ msgstr "Mappa" msgid "Type" msgstr "Tipo" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "Livello AES %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "nessuna" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "cifratura:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "mod: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "impostazioni modificate" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "impostazioni ufficiali" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "statistiche disabilitate" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "statistiche abilitate" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Favoriti" @@ -10257,20 +10327,20 @@ msgstr "Percentile:" msgid "%d (unranked)" msgstr "%d (non piazzato)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "L'aggiornamento può essere scaricato da:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Autogenerando le mapinfo per le nuove mappe..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Aggiorna a %s ora!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10278,10 +10348,10 @@ msgstr "" "^1ERRORE: La compressione delle texture è richiesta ma non supportata.\n" "^1Previsti problemi visuali." -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Usa predefinito" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Colore squadra:" diff --git a/common.ja_JP.po b/common.ja_JP.po index d7aae1bbc..69a3678a9 100644 --- a/common.ja_JP.po +++ b/common.ja_JP.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-12-12 19:35+0000\n" -"Last-Translator: LegendGuard\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" +"Last-Translator: divVerent \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/team-xonotic/" "xonotic/language/ja_JP/)\n" "Language: ja_JP\n" @@ -58,7 +58,7 @@ msgstr "時刻 %s でメッセージ" msgid "Generic message" msgstr "一般的なメッセージ" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3プレイヤー^7: ここがチャットエリアです。" @@ -523,7 +523,7 @@ msgstr "中間 %d" msgid "PENALTY: %.1f (%s)" msgstr "ペナルティ: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "必要: 1通過点" @@ -951,12 +951,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1060,9 +1060,26 @@ msgstr "mi" msgid "nmi" msgstr "nmi" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "準備" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1086,7 +1103,7 @@ msgstr "^1HUDを構成する" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1099,7 +1116,7 @@ msgstr "はい" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1110,43 +1127,43 @@ msgstr "はい" msgid "No" msgstr "いいえ" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "弾薬切れ" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "ない" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "無利用" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "チームリストにないチームを削除しようとしています!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "ミリ秒" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "時速キロ" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "時速マイル" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "ノット" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s （割り当てられていない）" @@ -1350,10 +1367,6 @@ msgid "Key Hunt" msgstr "鍵の狩猟 (KeyHunt)" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1試合はすでに開始しています" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1命を使い果たです" @@ -1425,23 +1438,23 @@ msgstr "あなたのチームが敵チームに対して最も多くの削除を msgid "Team Deathmatch" msgstr "チームデスマッチ (TDM)" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "弾丸" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "セル" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "プラズマ" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "ロケット" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "シェル" @@ -1877,7 +1890,7 @@ msgstr "最大フォントサイズ:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "カラー:" @@ -4614,7 +4627,7 @@ msgstr "、連続 %d 削除を失い中" msgid ", losing their %d score spree" msgstr "、連続 %d 得点を失い中" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr " の %d %s" @@ -5502,12 +5515,12 @@ msgstr "" "エンティティフィールド %s.%s (%s) がリストにありません。これがエラーだと思わ" "れる場合は、問題を報告してください。" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d 日、 %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5532,175 +5545,175 @@ msgstr "メインチーム" msgid "Extended Team" msgstr "拡張チーム" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "ウェブサイト" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "状態" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "アート" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "アニメーション" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "レベルの設計" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "音楽 / サウンドFX" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "ゲームコード" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "マーケティング / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "法的" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "ゲームエンジン" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "エンジンの追加" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "コンパイラ" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "他の活発な貢献者" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "翻訳者" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "アストゥリアス語" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "ベラルーシ語" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "ブルガリア語" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "中国語 (中国)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "中国語 (台湾)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "コーニッシュ語" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "チェコ語" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "オランダ語" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "英語 (オーストラリア)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "フィンランド語" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "フランス語" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "ドイツ語" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "ギリシャ語" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "ハンガリー語" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "アイリッシュ語" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "イタリア語" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "日本語" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "カザフスタン語" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "韓国語" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "ポーランド語" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "ポルトガル語" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "ルーマニア語" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "ロシア語" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "スコットランドゲール語" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "セルビア語" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "スペイン語" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "スウェーデン語" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "ウクライナ語" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "以前の貢献者" @@ -5767,7 +5780,7 @@ msgstr "切断" msgid "Disconnect from the server you are connected to" msgstr "接続してるサーバーから切断する" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5776,31 +5789,31 @@ msgstr "" "XONOTICへようこそ。使用する言語を選択し、選手名前を入力して開始してください。" "これらの設定は後でメニューシステムから変更できます。" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "名前:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "ゲームに登場するあなたの名前:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "テキスト言語:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "選手の統計が stats.xonotic.org であなたのニックネームを使用できるように許可し" "ますか?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "未定" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" @@ -5808,11 +5821,11 @@ msgstr "" "プレーヤーの統計はデフォルトで有効になって、プロファイル メニューでこれを変更" "できます" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "設定を保存する" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "ようこそ" @@ -5993,12 +6006,13 @@ msgstr "情報メッセージパネル" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "無効にする" @@ -6065,7 +6079,8 @@ msgstr "通知パネル" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "有効にする" @@ -6179,7 +6194,7 @@ msgstr "レーダー:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "アルファ:" @@ -6347,14 +6362,22 @@ msgstr "非活動:" msgid "StrafeHUD Panel" msgstr "ストラフHUDパネル:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "タイマー:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "経過時間を表示する:" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "タイマーパネル" @@ -6485,12 +6508,12 @@ msgid "Panel background defaults:" msgstr "パネルの背景のデフォルト:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "背景:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "ボーダーサイズ:" @@ -6500,12 +6523,12 @@ msgid "Team color:" msgstr "チームカラー:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "構成モードでのチームカラーのテストする" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "パディング:" @@ -6636,9 +6659,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "デフォルト" @@ -6832,7 +6855,7 @@ msgid "Game types:" msgstr "ゲームタイプ:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "閉じる" @@ -7164,7 +7187,7 @@ msgid "" msgstr "スキップしないようにサーバーリストの更新を一時停止する" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "アドレス:" @@ -7177,118 +7200,156 @@ msgid "Show more information about the currently highlighted server" msgstr "現在強調表示されているサーバーに関する詳細情報を表示する" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "参加!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^デフォルト" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d 変更した" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "公式" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A (認証ライブラリがないため接続できません)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (認証ライブラリがない)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "サポートされていません (接続できません)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "サポートされていません " -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "サポートされている (暗号化します)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "サポートされている (暗号化しません)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "要求した (暗号化します)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "要求した (暗号化しません)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "必須 (接続できません)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "必須 (暗号化します)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "設定を変更するには `crypto_aeslevel` cvarを使用します" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "無効な状態" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "有効な状態" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "ホスト名:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "ゲームモード:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "マップ:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "MOD:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "バージョン:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "設定:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "選手:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "ボット:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "自由スロット:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "暗号化:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "キー:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "サーバー情報" @@ -9611,6 +9672,22 @@ msgstr "観戦する" msgid "Team Selection" msgstr "チームの選択" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "選手の統計であなたのニックネームを使用できるように許可しますか?" @@ -9795,7 +9872,7 @@ msgstr "オブジェクトをドラッグ (サンドボックス)" msgid "waypoint editor menu" msgstr "ウェイポイント編集メニュー" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "もう一度このボタンを押さないでください!" @@ -9862,42 +9939,34 @@ msgstr "マップ" msgid "Type" msgstr "種類" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "AESレベル %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "なし" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "暗号化:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "mod: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "変更された設定" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "公式設定" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "無効な状態" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "有効な状態" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "お気に入り" @@ -10123,20 +10192,20 @@ msgstr "パーセンタイル:" msgid "%d (unranked)" msgstr "%d (ランクなし)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "更新はここからダウンロードできます:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "新しく追加されたマップの mapinfo を自動生成している..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "今すぐ %s に更新している!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10144,10 +10213,10 @@ msgstr "" "^1ERROR: テクスチャ圧縮が必要ですが、サポートされていません。\n" "^1視覚的な問題が予想されます。" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "デフォルトで使用する" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "チームカラー:" diff --git a/common.jbo.po b/common.jbo.po index 620ff2a5b..b8e3f2c41 100644 --- a/common.jbo.po +++ b/common.jbo.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Lojban (http://www.transifex.com/team-xonotic/xonotic/" "language/jbo/)\n" @@ -49,7 +49,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "" @@ -514,7 +514,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -926,12 +926,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1035,8 +1035,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1061,7 +1078,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1074,7 +1091,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1085,43 +1102,43 @@ msgstr "" msgid "No" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1321,10 +1338,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1396,23 +1409,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1847,7 +1860,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4504,7 +4517,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5390,12 +5403,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5420,175 +5433,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5655,46 +5668,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5875,12 +5888,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5947,7 +5961,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6061,7 +6076,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6229,14 +6244,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6367,12 +6390,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6382,12 +6405,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6517,9 +6540,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6711,7 +6734,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7021,7 +7044,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7034,118 +7057,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9422,6 +9483,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9606,7 +9683,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9668,42 +9745,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9927,29 +9996,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.kk@Cyrl.po b/common.kk@Cyrl.po index 1dde7b7f3..6587f852f 100644 --- a/common.kk@Cyrl.po +++ b/common.kk@Cyrl.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Kazakh (Cyrillic) (http://www.transifex.com/team-xonotic/" "xonotic/language/kk@Cyrl/)\n" @@ -53,7 +53,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Player^7: Бұл чат аренасы." @@ -518,7 +518,7 @@ msgstr "Аралықтағы %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -930,12 +930,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1039,8 +1039,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1065,7 +1082,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1078,7 +1095,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1089,43 +1106,43 @@ msgstr "" msgid "No" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "оқ-дәрілер бітіп қалды" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Қолжетімсіз" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (байланыс емес)" @@ -1325,10 +1342,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Матч баяғыда басталды" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Сенде енді өмірдер жоқ" @@ -1400,23 +1413,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1851,7 +1864,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4508,7 +4521,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5394,12 +5407,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5424,175 +5437,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5659,46 +5672,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5879,12 +5892,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5951,7 +5965,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6065,7 +6080,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6233,14 +6248,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6371,12 +6394,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6386,12 +6409,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6521,9 +6544,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6715,7 +6738,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7025,7 +7048,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7038,118 +7061,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9426,6 +9487,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9610,7 +9687,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9672,42 +9749,34 @@ msgstr "Карта" msgid "Type" msgstr "түрі" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Сүікті" @@ -9931,29 +10000,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Жана карталар үшің mapinfo автоматикалық генерациясы..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Тобының түсі" diff --git a/common.ko.po b/common.ko.po index e8abcc49f..3e31e283c 100644 --- a/common.ko.po +++ b/common.ko.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Korean (http://www.transifex.com/team-xonotic/xonotic/" "language/ko/)\n" @@ -55,7 +55,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3플레이어^7: 여기는 채팅 장소에요." @@ -520,7 +520,7 @@ msgstr "중급 %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -932,12 +932,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "준비중" @@ -1041,8 +1041,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1067,7 +1084,7 @@ msgstr "^1 HUD를 설정하세요" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1080,7 +1097,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1091,43 +1108,43 @@ msgstr "" msgid "No" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "탄환이 부족해요" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "부족해요 -->" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "이용 불가" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "팀 목록에 없는 팀을 지우려고 하는 중이에요!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (미정)" @@ -1329,10 +1346,6 @@ msgid "Key Hunt" msgstr "열쇠 사냥" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1대전은 이미 시작됐어요." - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1당신은 더 이상 남아있는 목숨이 없군요" @@ -1406,23 +1419,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "팀 데스매치" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1857,7 +1870,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "색:" @@ -4529,7 +4542,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5415,12 +5428,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5445,175 +5458,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "오스트리아어" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "벨로루시어" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "불가리아어" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "중국어(중국)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "중국어(대만)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "콘월어" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "체코어" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "네덜란드어" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "영어(호주)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "핀란드어" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "프랑스어" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "독일어" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "그리스어" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "헝가리어" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "아일렌드어" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "이탈리아어" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "카자흐어" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "한국어" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "폴란드어" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "포르투갈어" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "로마니아어" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "러시아어" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "스코트식 게일어" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "세르비아어" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "스페인어" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "스웨덴어" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "우크라이나어" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "기존 기여자" @@ -5680,7 +5693,7 @@ msgstr "연결 종료하기" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5689,41 +5702,41 @@ msgstr "" "조노틱에 오신 것을 환영해요! 시작하시려면 선호하는 언어를 선택하시고 플레이" "어 이름을 입력해 주세요. 이 선택은 나중에 메뉴를 통해 변경할 수 있어요." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "이름:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "게임 내 이름" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "텍스트 언어:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "당신의 닉네임을 stats.xonotic.org에서 플레이어 통계에서 이용하는 걸 허용하시" "겠어요?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "미정" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "저장 설정" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "환영합니다" @@ -5904,12 +5917,13 @@ msgstr "정보 메시지 제어반" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5976,7 +5990,8 @@ msgstr "공지 제어반" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6090,7 +6105,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6258,14 +6273,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "시간 기록기:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "시간 기록기 제어반" @@ -6396,12 +6419,12 @@ msgid "Panel background defaults:" msgstr "제어반 배경 기본값:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6411,12 +6434,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6546,9 +6569,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6740,7 +6763,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7052,7 +7075,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7065,118 +7088,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "호스트이름:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "맵:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "모드:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "버전:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "설정:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "플레이어:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "봇:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "아이디:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "키:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9453,6 +9514,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9637,7 +9714,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9699,42 +9776,34 @@ msgstr "맵" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9958,29 +10027,29 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (순위 안 매김)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.kw.po b/common.kw.po index ceb4e33ab..588da8b06 100644 --- a/common.kw.po +++ b/common.kw.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Cornish (http://www.transifex.com/team-xonotic/xonotic/" "language/kw/)\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Gwarier^7: Hemm yw an glappva." @@ -517,7 +517,7 @@ msgstr "Kresek %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -929,12 +929,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1038,8 +1038,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1064,7 +1081,7 @@ msgstr "^1Restra an HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1077,7 +1094,7 @@ msgstr "Ya" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1088,43 +1105,43 @@ msgstr "Ya" msgid "No" msgstr "Na" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Gallas an ammo" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Nyns eus dhywgh" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Ankavadow" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Yth esowgh owth assaya dilea para nag usi y'n rol!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (nyns yw kelmys)" @@ -1330,10 +1347,6 @@ msgid "Key Hunt" msgstr "Helgh alhwedhow" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Dallethys yw an fytt seulabrys" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Nyns eus bewnansow moy genowgh" @@ -1405,23 +1418,23 @@ msgstr "Gweresewgh agas para dhe skorya an moyha fragyow erbynn an para eskar" msgid "Team Deathmatch" msgstr "Fytt mernans yn parys" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1858,7 +1871,7 @@ msgstr "Myns font an ughella:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Liw:" @@ -4518,7 +4531,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5404,12 +5417,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5434,175 +5447,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5669,46 +5682,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5889,12 +5902,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5961,7 +5975,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6075,7 +6090,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6243,14 +6258,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6381,12 +6404,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6396,12 +6419,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6531,9 +6554,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6725,7 +6748,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7035,7 +7058,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7048,118 +7071,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9436,6 +9497,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9620,7 +9697,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9682,42 +9759,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9941,29 +10010,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.mk.po b/common.mk.po index 9c42fffe0..87c5e2b41 100644 --- a/common.mk.po +++ b/common.mk.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Macedonian (http://www.transifex.com/team-xonotic/xonotic/" "language/mk/)\n" @@ -49,7 +49,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "" @@ -514,7 +514,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -926,12 +926,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1035,8 +1035,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1061,7 +1078,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1074,7 +1091,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1085,43 +1102,43 @@ msgstr "" msgid "No" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1321,10 +1338,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1396,23 +1409,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1847,7 +1860,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4504,7 +4517,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5390,12 +5403,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5420,175 +5433,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5655,46 +5668,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5875,12 +5888,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5947,7 +5961,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6061,7 +6076,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6229,14 +6244,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6367,12 +6390,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6382,12 +6405,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6517,9 +6540,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6711,7 +6734,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7021,7 +7044,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7034,118 +7057,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9422,6 +9483,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9606,7 +9683,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9668,42 +9745,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9927,29 +9996,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.ms.po b/common.ms.po index 3b73167d1..c12149e4a 100644 --- a/common.ms.po +++ b/common.ms.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Malay (http://www.transifex.com/team-xonotic/xonotic/language/" "ms/)\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Pemain^7: Ini kawasan sembang." @@ -517,7 +517,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -929,12 +929,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "Tiada" @@ -1038,8 +1038,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1064,7 +1081,7 @@ msgstr "^1Susun HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1077,7 +1094,7 @@ msgstr "Ya" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1088,43 +1105,43 @@ msgstr "Ya" msgid "No" msgstr "Tidak" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Kehabisan peluru" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Tiada" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Tak wujud" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1330,10 +1347,6 @@ msgid "Key Hunt" msgstr "Pencarian Kunci" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Perlawanan telah bermula" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Anda dah kehabisan nyawa" @@ -1408,23 +1421,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "Kalah Mati Berpasukan" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1859,7 +1872,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4516,7 +4529,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5402,12 +5415,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5432,175 +5445,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5667,46 +5680,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5887,12 +5900,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5959,7 +5973,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6073,7 +6088,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6241,14 +6256,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6379,12 +6402,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6394,12 +6417,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6529,9 +6552,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6723,7 +6746,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7033,7 +7056,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7046,118 +7069,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9434,6 +9495,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9618,7 +9695,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9680,42 +9757,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9939,29 +10008,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.nl.po b/common.nl.po index f5ef64e28..7d744d3e2 100644 --- a/common.nl.po +++ b/common.nl.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Dutch (http://www.transifex.com/team-xonotic/xonotic/language/" "nl/)\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Player^7: Dit is de ruimte om te chatten." @@ -520,7 +520,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -932,12 +932,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1041,8 +1041,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1067,7 +1084,7 @@ msgstr "^1Configureer het HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1080,7 +1097,7 @@ msgstr "Ja" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1091,43 +1108,43 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Ammunitie is op" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Heb ik niet" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Niet beschikbaar" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Probeer een team te verwijderen welke niet in de teamlijst is!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/u" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mpu" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "knopen" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (niet gebonden)" @@ -1331,10 +1348,6 @@ msgid "Key Hunt" msgstr "Sleuteljacht" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1De wedstrijd is al begonnen" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Je hebt geen levens meer over" @@ -1409,23 +1422,23 @@ msgstr "Help je team de meeste frags te scoren tegen het vijandige team" msgid "Team Deathmatch" msgstr "Team Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1865,7 +1878,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Kleur:" @@ -4555,7 +4568,7 @@ msgstr ", zijn %d frag reeks verliezend" msgid ", losing their %d score spree" msgstr ", zijn %d score reeks verliezend" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5441,12 +5454,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5471,175 +5484,175 @@ msgstr "Kernteam" msgid "Extended Team" msgstr "Uitgebreid team" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Webpagina" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Statistieken" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Kunst" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animatie" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Kaartontwerp" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Muziek / Geluidseffecten" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Spelcode" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Marketing / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Juridisch" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Andere actieve bijdragers" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Vertalers" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Witrussisch" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulgaars" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chinees (China)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Tsjechisch" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Nederlands" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Engels (Australië)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Fins" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Frans" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Duits" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Grieks" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Hongaars" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italiaans" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Pools" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portugees" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Roemeens" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Russisch" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Servisch" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Spaans" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Zweeds" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Oekraïens" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Bijdragers uit het verleden" @@ -5706,7 +5719,7 @@ msgstr "Verbreek verbinding" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5715,40 +5728,40 @@ msgstr "" "Welkom bij Xonotic, selecteer de gewenste taal en stel je naam in bij het " "speler menu. Deze instellingen kun je later wijzigen in het menu systeem" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Naam:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Naam zoals je in spel zult verschijnen" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Taal van de tekst:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Sta toe dat speler statistieken uw nickname gebruiken op stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Onbeslist" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Instellingen opslaan" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Welkom" @@ -5929,12 +5942,13 @@ msgstr "Informatieberichtenpaneel" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Uitschakelen" @@ -6001,7 +6015,8 @@ msgstr "Notificatiepaneel" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6115,7 +6130,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Alpha:" @@ -6283,14 +6298,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Timer:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Laat verstreken tijd zien" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Tijdpaneel" @@ -6421,12 +6444,12 @@ msgid "Panel background defaults:" msgstr "Paneelachtergrond standaardwaarden:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Achtergrond:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Randgrootte:" @@ -6436,12 +6459,12 @@ msgid "Team color:" msgstr "Teamkleur:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Test teamkleur in aanpassingsmodus" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Vulling:" @@ -6573,9 +6596,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Standaard" @@ -6771,7 +6794,7 @@ msgid "Game types:" msgstr "Spelmodus:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Sluit" @@ -7085,7 +7108,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Adres:" @@ -7098,118 +7121,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Toon meer informatie over de huidige geselecteerde server" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Meedoen!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^Standaard" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d aangepast" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Officieel" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A (auth bibliotheek niet gevonden, kan geen verbinding maken)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (auth bibliotheek ontbreekt)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Niet ondersteund (kan geen verbinding maken)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Niet ondersteund (zal niet versleutelen)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Ondersteund (zal versleutelen)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Ondersteund (zal niet versleutelen)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Verzocht (zal versleutelen)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Verzocht (zal niet versleutelen)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Verplicht (kan geen verbinding maken)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Verplicht (zal versleutelen)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "statistieken gedeactiveerd" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "statistieken geactiveerd" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Hostnaam:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Speltype:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Kaart:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Versie:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Instellingen:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Spelers:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Bots:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Beschikbare plaatsen:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Versleuteling:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Sleutel:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Serverinformatie" @@ -9491,6 +9552,22 @@ msgstr "observeren" msgid "Team Selection" msgstr "Team Selectie" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9675,7 +9752,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Druk deze knop niet meer in!" @@ -9739,42 +9816,34 @@ msgstr "Map" msgid "Type" msgstr "Type" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "beveiliging:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "aangepaste instellingen" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "statistieken gedeactiveerd" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "statistieken geactiveerd" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "SLCAT^Favorieten" @@ -9998,29 +10067,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Automatisch map info aanmaken voor nieuwe maps..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Update nu naar %s!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Gebruik standaard" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Team Kleur:" diff --git a/common.no.po b/common.no.po index 2005f832c..d60e70026 100644 --- a/common.no.po +++ b/common.no.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Norwegian (http://www.transifex.com/team-xonotic/xonotic/" "language/no/)\n" @@ -49,7 +49,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "" @@ -514,7 +514,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -926,12 +926,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1035,8 +1035,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1061,7 +1078,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1074,7 +1091,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1085,43 +1102,43 @@ msgstr "" msgid "No" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1321,10 +1338,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1396,23 +1409,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1847,7 +1860,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4504,7 +4517,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5390,12 +5403,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5420,175 +5433,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5655,46 +5668,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5875,12 +5888,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5947,7 +5961,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6061,7 +6076,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6229,14 +6244,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6367,12 +6390,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6382,12 +6405,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6517,9 +6540,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6711,7 +6734,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7021,7 +7044,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7034,118 +7057,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9422,6 +9483,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9606,7 +9683,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9668,42 +9745,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9927,29 +9996,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.pl.po b/common.pl.po index e323b2a0a..a421c0236 100644 --- a/common.pl.po +++ b/common.pl.po @@ -25,13 +25,15 @@ # Saikuru Zero, 2021 # Saikuru Zero, 2021 # Sertomas, 2014 +# SFS Atlas, 2022 +# SFS Atlas, 2022 msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" -"Last-Translator: divVerent \n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 09:54+0000\n" +"Last-Translator: SFS Atlas\n" "Language-Team: Polish (http://www.transifex.com/team-xonotic/xonotic/" "language/pl/)\n" "Language: pl\n" @@ -67,13 +69,13 @@ msgstr "" #: qcsrc/client/hud/panel/centerprint.qc:177 #, c-format msgid "Message at time %s" -msgstr "" +msgstr "Wiadomość o czasu %s" #: qcsrc/client/hud/panel/centerprint.qc:182 msgid "Generic message" msgstr "Ogólna wiadomość" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Player^7: Oto pole na rozmowę." @@ -295,7 +297,7 @@ msgstr "Czat drużynowy" #: qcsrc/client/hud/panel/quickmenu.qc:819 msgid "QMCMD^strength soon" -msgstr "" +msgstr "niedługo siła" #: qcsrc/client/hud/panel/quickmenu.qc:820 msgid "QMCMD^free item %x^7 (l:%y^7)" @@ -537,9 +539,9 @@ msgstr "Pośredni %d" #: qcsrc/client/hud/panel/racetimer.qc:264 #, c-format msgid "PENALTY: %.1f (%s)" -msgstr "" +msgstr "KARA: %.1f %s" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "brak punktu kontrolnego" @@ -633,7 +635,7 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:130 msgid "SCO^fastest" -msgstr "" +msgstr "Najszybszy" #: qcsrc/client/hud/panel/scoreboard.qc:130 msgid "Time of fastest lap (Race/CTS)" @@ -953,12 +955,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1020,12 +1022,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:2079 #, c-format msgid "Speed award: %d%s ^7(%s^7)" -msgstr "" +msgstr "Nagroda za szybkość: %d %s ^7(%s^7)" #: qcsrc/client/hud/panel/scoreboard.qc:2083 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" -msgstr "" +msgstr "Najszybszy w historii: %d %s ^7(%s^7)" #: qcsrc/client/hud/panel/scoreboard.qc:2119 #, c-format @@ -1062,9 +1064,26 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "ROZGRZEWKA" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "Rozgrewka" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "Koniec czasu" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "Nagła śmierć" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1088,7 +1107,7 @@ msgstr "^1Konfiguracja interfejsu" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1101,7 +1120,7 @@ msgstr "Tak" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1112,43 +1131,43 @@ msgstr "Tak" msgid "No" msgstr "Nie" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Brak amunicji" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Nie masz" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Niedostępne" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Próbujesz usunąć drużynę, której nie ma na liście!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mil/h" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "węzły" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (nie związany)" @@ -1311,7 +1330,7 @@ msgstr "Ilość punktów potrzebna przed końcem meczu" #: qcsrc/common/gamemodes/gamemode/duel/duel.qh:9 msgid "Duel" -msgstr "" +msgstr "Pojedynek" #: qcsrc/common/gamemodes/gamemode/duel/duel.qh:9 msgid "Fight in a one versus one arena battle to decide the winner" @@ -1343,7 +1362,7 @@ msgstr "Trzymaj kulę, aby otrzymywać punkty za zabicia" #: qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qh:11 msgid "Keepaway" -msgstr "" +msgstr "Trzymaj się z daleka" #: qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh:11 msgid "Gather all the keys to win the round" @@ -1354,10 +1373,6 @@ msgid "Key Hunt" msgstr "Polowanie na Klucz" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Mecz już się rozpoczął" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Nie masz więcej żyć" @@ -1429,23 +1444,23 @@ msgstr "Pomóż swojej drużynie zdobyć więcej punktów niż drużyna przeciwn msgid "Team Deathmatch" msgstr "Drużynowy Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1880,7 +1895,7 @@ msgstr "Maksymalna wielkość czcionki:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Kolor:" @@ -4578,7 +4593,7 @@ msgstr ", tracąc swój %d szał zabijania" msgid ", losing their %d score spree" msgstr ", tracąc ich sekwencję %d zabójstw" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5464,12 +5479,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d dni, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5494,175 +5509,175 @@ msgstr "Główna Drużyna" msgid "Extended Team" msgstr "Rozszerzona Drużyna" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Strona internetowa" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Statystyki" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Grafika" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animacje" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Projektowanie poziomów" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Muzyka / Efekty dżwiękowe" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Kod Gry" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Marketing / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Nota prawna" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Silnik Gry" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Dodatki Do Silnika" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Kompilator" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Inni Aktywni Współpracownicy" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Tłumacze" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Estoński" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Białoruski" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bułgarski" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chiński (Chiny)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Chiński (Tajwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Kornwalijski" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Czeski" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Holenderski" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Angielski (Australia)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Fiński" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Francuski" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Niemiecki" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Grecki" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Węgierski" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Włoski" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kazachski" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Koreański" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polski" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portugalski" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Rumuński" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Rosyjski" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbski" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Hiszpański" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Szwedzki" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ukraiński" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Poprzedni Współpracownicy" @@ -5729,7 +5744,7 @@ msgstr "Rozłącz" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5738,39 +5753,39 @@ msgstr "" "Witamy w Xonotic, wybierz swój język i wpisz imię gracza aby rozpocząć. Te " "opcje można zawsze zmienić później w ustawieniach." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Nazwa:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Nazwa, pod którą pokażesz się w grze" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Język:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "Pozwól statystykom graczy na stats.xonotic.org używać twojego imienia?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Niezdecydowany" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Zapisz ustawienia" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Witaj" @@ -5951,12 +5966,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Dezaktywuj" @@ -6023,7 +6039,8 @@ msgstr "Panel Powiadomień" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6137,7 +6154,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Przejrzystość:" @@ -6305,14 +6322,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Czas:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Pokaż czas jaki upłynął" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Panel czasu" @@ -6443,12 +6468,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Tło:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Rozmiar ramki:" @@ -6458,12 +6483,12 @@ msgid "Team color:" msgstr "Kolor drużyny:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Testuj kolory drużyn w trybie konfiguracji" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6593,9 +6618,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Domyślny" @@ -6787,7 +6812,7 @@ msgid "Game types:" msgstr "Typy gry:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Zamknij" @@ -7097,7 +7122,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Adres:" @@ -7110,118 +7135,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Wyświetl więcej informacji o aktualnie wybranym serwerze" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Dołącz!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^Domyślny" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d zmodyfikowany" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Oficjalny" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A (brak biblioteki auth, nie można połączyć)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (brak biblioteki auth)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Nie obsługiwane (nie można połączyć)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Nie obsługiwane (bez szyfrowania)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Obsługiwane (z szyfrowaniem)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Obsługiwane (bez szyfrowania)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Na żądanie (z szyfrowaniem)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Na żądanie (bez szyfrowania)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Wymagane (nie można połączyć)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Wymagane (z szyfrowaniem)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "statystyki wyłączone" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "statystyki włączone" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Nazwa:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Rodzaj gry:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Mapa:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Wersja:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Ustawienia:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Gracze:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Boty:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Wolne sloty:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Szyfrowanie:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Klucz:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Informacje o serwerze" @@ -9509,6 +9572,22 @@ msgstr "obserwuj" msgid "Team Selection" msgstr "Wybór drużyny " +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Pozwól statystykom gracza użyć Twojego nicka?" @@ -9693,7 +9772,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Nie wciskaj więcej tego przycisku!" @@ -9756,42 +9835,34 @@ msgstr "Mapa" msgid "Type" msgstr "Typ" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "AES poziom %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "żadne" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "szyfrowanie:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "mod: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "zmodyfikowane ustawienia" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "oficjalne ustawienia" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "statystyki wyłączone" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "statystyki włączone" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Ulubione" @@ -10015,29 +10086,29 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (bez rankingu)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Generuje info od nowo addowanych mapach..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Aktualizuj fo %s już teraz!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Użyj domyślnego" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Kolor drużyny:" diff --git a/common.pot b/common.pot index 14293ca76..9ed98ec4c 100644 --- a/common.pot +++ b/common.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,7 +48,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "" @@ -513,7 +513,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -925,12 +925,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1034,8 +1034,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1060,7 +1077,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1073,7 +1090,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1084,43 +1101,43 @@ msgstr "" msgid "No" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1320,10 +1337,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1395,23 +1408,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1846,7 +1859,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4503,7 +4516,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5389,12 +5402,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5419,175 +5432,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5654,46 +5667,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5874,12 +5887,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5946,7 +5960,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6060,7 +6075,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6228,14 +6243,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6366,12 +6389,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6381,12 +6404,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6516,9 +6539,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6710,7 +6733,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7020,7 +7043,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7033,118 +7056,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9421,6 +9482,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9605,7 +9682,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9667,42 +9744,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9926,29 +9995,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.pt.po b/common.pt.po index b725dc5a0..78fdab7ed 100644 --- a/common.pt.po +++ b/common.pt.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Portuguese (http://www.transifex.com/team-xonotic/xonotic/" "language/pt/)\n" @@ -57,7 +57,7 @@ msgstr "" msgid "Generic message" msgstr "Mensagem genérica" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Jogador^7: isto é a área doe conversação." @@ -526,7 +526,7 @@ msgstr "Intermediário %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -938,12 +938,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1047,8 +1047,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1073,7 +1090,7 @@ msgstr "^1Configurar a Interface" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1086,7 +1103,7 @@ msgstr "Sim" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1097,43 +1114,43 @@ msgstr "Sim" msgid "No" msgstr "Não" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Sem munições" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Não tem" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Indisponível" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Estás a tentar remover uma equipa que não está na lista de equipas!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "nós" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (não tem atalho definido)" @@ -1339,10 +1356,6 @@ msgid "Key Hunt" msgstr "Caça as Chaves" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1A partida já começou" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Não tens mais vidas" @@ -1416,23 +1429,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "Mata-mata por Equipa" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1874,7 +1887,7 @@ msgstr "Tamanho máximo da fonte:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Cor:" @@ -4637,7 +4650,7 @@ msgstr ", a perder a sua cadeia de %d execuções" msgid ", losing their %d score spree" msgstr ", a perder a sua cadeia de %d pontuações" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5525,12 +5538,12 @@ msgstr "" "O campo de entidade %s.%s (%s) não está na lista branca. Se achas que é um " "erro, por favor, reporta-o." -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d dias, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5555,175 +5568,175 @@ msgstr "Equipa Principal" msgid "Extended Team" msgstr "Equipa Estendida" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Site" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Estatísticas" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Arte" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animação" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Design de Níveis" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Música / Efeitos de Som" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Codificação do Jogo" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Marketing / Relações Públicas" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Assuntos Legais" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Motor do Jogo" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Adições ao Motor" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Compilador" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Outros Contribuidores Ativos" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Tradutores" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturiano" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Bielorrusso" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Búlgaro" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chinês (China)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Chinês (Taiwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Córnico" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Checo" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Holandês" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Inglês (Austrália)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finlandês" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Francês" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Alemão" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Grego" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Húngaro" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Irlandês" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italiano" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Cazaque" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Coreano" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polaco" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Português" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Romeno" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Russo" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Gaélico Escocês" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Sérvio" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Espanhol" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Sueco" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ucraniano" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Colaboradores Anteriores" @@ -5790,7 +5803,7 @@ msgstr "Desconectar" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5799,41 +5812,41 @@ msgstr "" "Bem-vindo(a) ao Xonotic! Escolhe o teu idioma e introduz o teu apelido para " "começar. Podes alterar estas configurações mais tarde através do menu." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Nome:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "O teu nome que vai aparecer no jogo" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Idioma do texto:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Permitir que as estatísticas de jogador usem o teu apelido em stats.xonotic." "org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Não decidido" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Gravar configurações" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Bem-vindo(a)" @@ -6014,12 +6027,13 @@ msgstr "Painel de Mensagens de Informação" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Desativar" @@ -6086,7 +6100,8 @@ msgstr "Painel de Notificações" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6200,7 +6215,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Alfa:" @@ -6368,14 +6383,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Cronómetro:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Mostrar tempo decorrido" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Painel do Cronómetro" @@ -6506,12 +6529,12 @@ msgid "Panel background defaults:" msgstr "Padrões de fundo do painel:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Fundo:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Tamanho da borda:" @@ -6521,12 +6544,12 @@ msgid "Team color:" msgstr "Cor da equipa:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Testar cor da equipa no modo de configuração" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Preenchimento:" @@ -6658,9 +6681,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Padrão" @@ -6858,7 +6881,7 @@ msgid "Game types:" msgstr "Modos de jogo:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Fechar" @@ -7179,7 +7202,7 @@ msgstr "" "estejam sempre a \"saltar\" do lugar" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Endereço:" @@ -7192,119 +7215,157 @@ msgid "Show more information about the currently highlighted server" msgstr "Mostrar mais informações sobre o servidor atualmente destacado" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Conectar!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "Padrão" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d modificadas" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Oficial" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" "N/A (biblioteca de autenticação não encontrada, não é possível conectar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (biblioteca de autenticação não encontrada)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Não suportado (não é possível conectar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Não suportado (não encriptará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Suportado (irá encriptar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Suportado (não encriptará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Solicitado (irá encriptar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Solicitado (não encriptará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Necessário (não é possível conectar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Necessário (irá encriptar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "estatísticas desativadas" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "estatísticas ativadas" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Nome do servidor:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Modo de jogo:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Mapa:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Versão:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Configurações:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Jogadores:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Robôs:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Vagas livres:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Encriptação:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Chave:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Informações do Servidor" @@ -9614,6 +9675,22 @@ msgstr "assistir" msgid "Team Selection" msgstr "Seleção de Equipa" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Permitir que as estatísticas de jogadores usem o teu apelido?" @@ -9800,7 +9877,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Não pressiones este botão outra vez!" @@ -9864,42 +9941,34 @@ msgstr "Mapa" msgid "Type" msgstr "Tipo" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "Nível AES %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "nenhuma" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "encriptação:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "modificação: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "configurações alteradas" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "configurações oficiais" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "estatísticas desativadas" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "estatísticas ativadas" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Favoritos" @@ -10123,29 +10192,29 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (não classificado)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "A gerar mapinfo automaticamente para os novos mapas adicionados..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Atualizar para %s agora!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Usar padrão" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Cor da Equipa:" diff --git a/common.pt_BR.po b/common.pt_BR.po index 7abebc98b..ca2f42d5a 100644 --- a/common.pt_BR.po +++ b/common.pt_BR.po @@ -9,15 +9,15 @@ # NotThatPrivate Yes , 2015 # Ricardo Manuel da Cruz Coelho da Silva , 2015 # Rui , 2018 -# yy0zz, 2021 +# yy0zz, 2021-2022 # yy0zz, 2021 # zerowhy . , 2021 msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-12-27 13:05+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 12:15+0000\n" "Last-Translator: yy0zz\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/team-xonotic/" "xonotic/language/pt_BR/)\n" @@ -60,7 +60,7 @@ msgstr "Mensagem em %s" msgid "Generic message" msgstr "Mensagem genérica" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Jogador^7: Isto é a área do bate-papo." @@ -528,7 +528,7 @@ msgstr "Intermediário %d" msgid "PENALTY: %.1f (%s)" msgstr "PENALIDADE: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "falta um ponto de checagem" @@ -964,12 +964,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1073,9 +1073,26 @@ msgstr "mi" msgid "nmi" msgstr "nmi" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "AQUECIMENTO" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "Aquecimento" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "Tempo esgotado" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "Morte súbita" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "Prorrogação" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "%dª prorrogação" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1100,7 +1117,7 @@ msgstr "^1Configurar a interface" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1113,7 +1130,7 @@ msgstr "Sim" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1124,44 +1141,44 @@ msgstr "Sim" msgid "No" msgstr "Não" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Sem munição" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Não tem" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Indisponível" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" "Você está tentando remover uma equipe que não está na lista de equipes!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "nós" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (não tem atalho definido)" @@ -1367,10 +1384,6 @@ msgid "Key Hunt" msgstr "Caça a Chaves" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1A partida já começou" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Você não tem mais vidas sobrando" @@ -1442,23 +1455,23 @@ msgstr "Ajude sua equipe a conseguir mais execuções do que a equipe inimiga" msgid "Team Deathmatch" msgstr "Mata-mata por Equipe" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "balas" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "células" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "plasma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "foguetes" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "cartuchos" @@ -1901,7 +1914,7 @@ msgstr "Tamanho da fonte máximo:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Cor:" @@ -2512,8 +2525,7 @@ msgstr "^BG%s^K1 tornou-se inimigo do Senhor do Trabalho em Equipe%s%s" #: qcsrc/common/notifications/all.inc:294 #, c-format msgid "^BG%s^K1 thought they found a nice camping ground%s%s" -msgstr "" -"^BG%s^K1 acharam que tinham encontrado um ótimo lugar para camperar%s%s" +msgstr "^BG%s^K1 pensou que tinha encontrado um ótimo lugar para acampar%s%s" #: qcsrc/common/notifications/all.inc:295 #, c-format @@ -3570,7 +3582,7 @@ msgstr "^F4A rodada não pode iniciar" #: qcsrc/common/notifications/all.inc:537 msgid "^F2Don't camp!" -msgstr "^F2Não campere!" +msgstr "^F2Não acampe!" #: qcsrc/common/notifications/all.inc:541 msgid "" @@ -3826,11 +3838,11 @@ msgstr "^K1Você recebeu uma punição por atacar seus colegas de equipe!" #: qcsrc/common/notifications/all.inc:617 msgid "^K1Die camper!" -msgstr "^K1Morra, camper!" +msgstr "^K1Morra, campista!" #: qcsrc/common/notifications/all.inc:617 msgid "^K1Reconsider your tactics, camper!" -msgstr "^K1Reconsidere suas táticas, camper!" +msgstr "^K1Reconsidere suas táticas, campista!" #: qcsrc/common/notifications/all.inc:618 msgid "^K1You unfairly eliminated yourself!" @@ -4674,7 +4686,7 @@ msgstr ", perdendo sua cadeia de %d execuções" msgid ", losing their %d score spree" msgstr ", perdendo sua cadeia de %d pontuações" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr " com %d %s" @@ -5562,12 +5574,12 @@ msgstr "" "Campo de entidade %s.%s (%s) não está na lista branca. Se você acredita que " "isso é um erro, por favor, reporte-o." -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d dias, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5592,175 +5604,175 @@ msgstr "Equipe Principal" msgid "Extended Team" msgstr "Equipe Estendida" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Site" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Estatísticas" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Arte" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animação" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Design de Mapas" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Música / Efeitos de Som" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Codificação de Jogo" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Marketing / Relações Públicas" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Assuntos Legais" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Motor de Jogo" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Adições ao Motor" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Compilador" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Outros Contribuidores Ativos" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Tradutores" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturiano" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Bielorrusso" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Búlgaro" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Chinês (China)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Chinês (Taiwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Córnico" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Tcheco" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Holandês" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Inglês (Austrália)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finlandês" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Francês" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Alemão" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Grego" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Húngaro" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Irlandês" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italiano" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "Japonês" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Cazaque" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Coreano" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polônes" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Português" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Romeno" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Russo" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Gaélico Escocês" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Sérvio" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Espanhol" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Sueco" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ucraniano" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Colaboradores Passados" @@ -5827,7 +5839,7 @@ msgstr "Desconectar" msgid "Disconnect from the server you are connected to" msgstr "Desconecta você do servidor ao qual se conectou" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5837,31 +5849,31 @@ msgstr "" "apelido para começar. Você pode alterar essas configurações mais tarde pelo " "menu." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Nome:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Seu nome que aparecerá no jogo" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Idioma do texto:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Permitir que as estatísticas de jogador usem o seu apelido em stats.xonotic." "org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Não decidido" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" @@ -5869,11 +5881,11 @@ msgstr "" "As estatísticas de jogador estão ativadas por padrão. Você pode mudar isso " "no menu Perfil." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Salvar configurações" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Bem-vindo(a)" @@ -6054,12 +6066,13 @@ msgstr "Painel de Mensagens de Informação" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Desabilitar" @@ -6126,7 +6139,8 @@ msgstr "Painel de Notificações" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Ativar" @@ -6240,7 +6254,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Alfa:" @@ -6408,14 +6422,22 @@ msgstr "Inativo:" msgid "StrafeHUD Panel" msgstr "Painel do StrafeHUD" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Cronômetro:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Exibir tempo decorrido" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "Cronômetro secundário:" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "Trocado" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Painel do Cronômetro" @@ -6546,12 +6568,12 @@ msgid "Panel background defaults:" msgstr "Padrões de fundo do painel:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Fundo:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Tamanho das bordas:" @@ -6561,12 +6583,12 @@ msgid "Team color:" msgstr "Cor de equipe:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Testar cor de equipe no modo de configuração" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Preenchimento:" @@ -6698,9 +6720,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Padrão" @@ -6897,7 +6919,7 @@ msgid "Game types:" msgstr "Modos de jogo:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Fechar" @@ -7240,7 +7262,7 @@ msgstr "" "fiquem saindo do lugar" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Endereço:" @@ -7253,119 +7275,157 @@ msgid "Show more information about the currently highlighted server" msgstr "Exibir mais informações sobre o servidor atualmente destacado" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Conectar!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "Termos de Serviço não especificados" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "Padrão" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d modificadas" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Oficial" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" "N/A (biblioteca de autenticação não encontrada, não foi possível se conectar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (biblioteca de autenticação não encontrada)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Não suportado (não foi possível se conectar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Não suportado (não encriptará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Suportado (irá encriptar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Suportado (não encriptará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Solicitado (irá encriptar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Solicitado (não encriptará)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Necessário (não foi possível se conectar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Necessário (irá encriptar)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "Use a cvar \"crypto_aeslevel\" para alterar suas preferências" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "servidor de estatísticas personalizado" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "estatísticas desabilitadas" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "estatísticas habilitadas" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "Estado" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "Termos de Serviço" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "Informações de Servidor" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Servidor:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Modo de jogo:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Mapa:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Versão:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Configurações:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Jogadores:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Bots:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Vagas livres:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Encriptação:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Chave:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "Estatísticas:" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Informações do Servidor" @@ -9718,6 +9778,24 @@ msgstr "assistir" msgid "Team Selection" msgstr "Seleção de Equipe" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" +"Os Termos de Serviço foram atualizados. Por favor, leia-os antes de " +"prosseguir:" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "Boas-vindas a Xonotic! Por favor, leia os Termos de Serviço a seguir:" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "Aceitar" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "Não aceitar (sair do jogo)" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Permitir que as estatísticas de jogadores usem o seu apelido?" @@ -9904,7 +9982,7 @@ msgstr "arrastar objeto (sandbox)" msgid "waypoint editor menu" msgstr "menu do editor de ponto de interesse" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Não aperte este botão novamente!" @@ -9972,42 +10050,34 @@ msgstr "Mapa" msgid "Type" msgstr "Modo" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "Nível AES %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "nenhuma" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "encriptação:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "modificação: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "configurações modificadas" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "configurações oficiais" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "estatísticas desabilitadas" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "estatísticas habilitadas" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Favoritos" @@ -10172,7 +10242,7 @@ msgstr "Dezembro" #: qcsrc/menu/xonotic/statslist.qc:46 #, no-c-format msgid "DATE^%m %d, %Y" -msgstr "DATA ^%m %d, %Y" +msgstr "%d de %m de %Y" #: qcsrc/menu/xonotic/statslist.qc:97 msgid "Joined:" @@ -10233,20 +10303,20 @@ msgstr "Percentil:" msgid "%d (unranked)" msgstr "%d (não classificado)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "Atualização disponível para download em:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Gerando mapinfo automaticamente para os novos mapas adicionados..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Atualize para %s agora!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10254,10 +10324,10 @@ msgstr "" "^1ERRO: a compressão de texturas é necessária, mas não é suportada.\n" "^1Espere problemas visuais." -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Usar padrão" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Cor de equipe:" diff --git a/common.ro.po b/common.ro.po index 685799f52..ab44e9ed6 100644 --- a/common.ro.po +++ b/common.ro.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Romanian (http://www.transifex.com/team-xonotic/xonotic/" "language/ro/)\n" @@ -63,7 +63,7 @@ msgstr "Mesaj la %s" msgid "Generic message" msgstr "Mesaj generic" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Jucător^7: Aceasta este zona de conversație." @@ -531,7 +531,7 @@ msgstr "Intermediar %d" msgid "PENALTY: %.1f (%s)" msgstr "^1PENALIZARE: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -944,12 +944,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1053,8 +1053,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1079,7 +1096,7 @@ msgstr "^1Configurează HUD-ul" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1092,7 +1109,7 @@ msgstr "Da" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1103,43 +1120,43 @@ msgstr "Da" msgid "No" msgstr "Nu" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Fără muniție" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Nu are" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Indisponibil" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Se încearcă înlăturarea unei echipe ce nu se află în lista cu echipe!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "noduri" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (nu este atașată)" @@ -1341,10 +1358,6 @@ msgid "Key Hunt" msgstr "Vânătoarea de chei" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Meciul deja a început" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Nu mai ai vieți rămase" @@ -1418,23 +1431,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "Meci până la moarte în echipă" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1872,7 +1885,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Culoare:" @@ -4642,7 +4655,7 @@ msgstr ", pierzându-și șirul de %d ucideri necontenite" msgid ", losing their %d score spree" msgstr ", pierzându-și șirul de %d scoruri fără întreruperi" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5528,12 +5541,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d zile, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5558,175 +5571,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5793,7 +5806,7 @@ msgstr "Deconectează" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5803,39 +5816,39 @@ msgstr "" "dumneavoastra de jucator pentru a incepe. Puteti schimba aceste preferinte " "mai tarziu din cadrul meniului." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Nume:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Limba text:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "Permite statisticilor sa foloseasca numele tau pe stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Nedecis" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Salvare setari" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Bun venit" @@ -6016,12 +6029,13 @@ msgstr "Fereastra Informatii" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Dezactivat" @@ -6088,7 +6102,8 @@ msgstr "Fereastra Notificatii" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6202,7 +6217,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Opacitate:" @@ -6370,14 +6385,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Timp:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Afișează timpul rămas" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Panou de Timp" @@ -6508,12 +6531,12 @@ msgid "Panel background defaults:" msgstr "Setări panou de fundal implicite:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Fundal:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Mărime margine:" @@ -6523,12 +6546,12 @@ msgid "Team color:" msgstr "Culoare echipă:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Testează culoarea echipei în modul de configurare" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Ajustare:" @@ -6658,9 +6681,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Implicit" @@ -6852,7 +6875,7 @@ msgid "Game types:" msgstr "Tipuri de joc:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Închide" @@ -7162,7 +7185,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Adresă:" @@ -7175,118 +7198,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Alăturare!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d modificat" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Oficial" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A (librăria de autentificare lipsește, conexiune imposibilă)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (librăria de autentificare lipsește)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Nesuportat (nu se poate conecta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Nesuportat (nu se poate cripta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Suportat (se va cripta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Suportat (nu se va encripta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Solicitat (se va cripta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Solicitat (nu se va cripta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Necesar (nu se poate conecta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Necesar (se va cripta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Nume server:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Tip de joc:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Harta:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Modificare:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Versiune:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Setări:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Jucători:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Boți:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Sloturi libere:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Criptare:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Cheie:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Informații Server" @@ -9564,6 +9625,22 @@ msgstr "spectator" msgid "Team Selection" msgstr "Selecție Echipă" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9748,7 +9825,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Nu mai apăsa butonul ăsta!" @@ -9810,42 +9887,34 @@ msgstr "Hartă" msgid "Type" msgstr "Tip" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "SLCAT^Favorite" @@ -10069,29 +10138,29 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (neclasat)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Auto-generare mapinfo pentru hărțile proaspăt adaugate..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Actualizați la %s acum!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Utilizare setare normală" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Culoare echipă:" diff --git a/common.ru.po b/common.ru.po index e8225d6a8..bdd5548a5 100644 --- a/common.ru.po +++ b/common.ru.po @@ -6,7 +6,7 @@ # adem4ik, 2014 # Alex Talker , 2014-2015 # Andrei Stepanov, 2014 -# Andrei Stepanov , 2014-2022 +# Andrei Stepanov, 2014-2022 # Andrey P , 2016 # Artem Vorotnikov , 2015 # Blueberryy , 2021 @@ -20,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2022-01-06 17:20+0000\n" -"Last-Translator: Andrei Stepanov \n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 16:35+0000\n" +"Last-Translator: Andrei Stepanov\n" "Language-Team: Russian (http://www.transifex.com/team-xonotic/xonotic/" "language/ru/)\n" "Language: ru\n" @@ -66,7 +66,7 @@ msgstr "Сообщение в течение %s" msgid "Generic message" msgstr "Общее сообщение" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Игрок^7: Это область чата." @@ -97,8 +97,7 @@ msgstr "основной огонь" #: qcsrc/client/hud/panel/infomessages.qc:107 #, c-format msgid "^1Press ^3%s^1 or ^3%s^1 for next or previous player" -msgstr "" -"^1Для перехода к следующему / предыдущему игроку нажмите ^3%s^1 или ^3%s" +msgstr "^1Для перехода к след./пред. игроку нажмите ^3%s^1 / ^3%s" #: qcsrc/client/hud/panel/infomessages.qc:107 #: qcsrc/client/hud/panel/infomessages.qc:111 @@ -221,7 +220,7 @@ msgstr "^3Двойной щелчок ^7по панели для её настр #: qcsrc/client/hud/panel/infomessages.qc:225 msgid "^3CTRL ^7to disable collision testing, ^3SHIFT ^7and" -msgstr "^3CTRL ^7для отключения столкновения со стенами, ^3SHIFT ^7и" +msgstr "^3CTRL ^7для откл. проверки столкновений, ^3SHIFT ^7и" #: qcsrc/client/hud/panel/infomessages.qc:226 msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." @@ -532,7 +531,7 @@ msgstr "Участок %d" msgid "PENALTY: %.1f (%s)" msgstr "ШТРАФ: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "пропущена контрольная точка" @@ -967,12 +966,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "Н/Д" @@ -1076,9 +1075,26 @@ msgstr "mi" msgid "nmi" msgstr "nmi" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "РАЗМИНКА" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "Разминка" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "Таймаут" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "Внезапная смерть" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "Дополнительное время" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "Дополнительное время №%d" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1102,7 +1118,7 @@ msgstr "^1Настроить интерфейс" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1115,7 +1131,7 @@ msgstr "Да" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1126,43 +1142,43 @@ msgstr "Да" msgid "No" msgstr "Нет" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Нет патронов" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Нет" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Нет" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Попытка удалить команду, отсутствующую в списке команд!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "ед/с" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "м/с" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "км/ч" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "миль/ч" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "узлы" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (не связаны)" @@ -1367,10 +1383,6 @@ msgid "Key Hunt" msgstr "Охота за ключами" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Матч уже начался" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1У вас закончились жизни" @@ -1443,23 +1455,23 @@ msgstr "Помогите вашей команде набрать больше msgid "Team Deathmatch" msgstr "Командная битва" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "пули" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" -msgstr "зарядами" +msgstr "заряды" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "плазма" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "ракеты" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "патроны" @@ -1896,7 +1908,7 @@ msgstr "Макс. размер шрифта:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Цвет:" @@ -3510,7 +3522,7 @@ msgstr "^BG%s%s^K1 был сублимирован из Испарителя ^BG #: qcsrc/common/notifications/all.inc:504 #, c-format msgid "^BG%s%s^K1 has been vaporized by ^BG%s^K1's Vortex%s%s" -msgstr "^BG%s%s^K1 был испарён с помощью Вихря ^BG%s^K1%s%s" +msgstr "^BG%s%s^K1 был испарён Вихрем ^BG%s^K1%s%s" #: qcsrc/common/notifications/all.inc:523 msgid "^F4You are now alone!" @@ -3763,7 +3775,7 @@ msgstr "^K1%sВы фрагнули ^BG%s, пока он писал" #: qcsrc/common/notifications/all.inc:604 #, c-format msgid "^K1%sYou scored against ^BG%s^K1 while they were typing" -msgstr "^K1%sВы фрагнули ^BG%s^K1, пока они писали" +msgstr "^K1%sВы фрагнули ^BG%s^K1 во время сообщения" #: qcsrc/common/notifications/all.inc:605 #, c-format @@ -4096,7 +4108,7 @@ msgid "" "The player limit reached maximum capacity." msgstr "" "^K1Вы не можете присоединиться к игре в данный момент.\n" -"Превышено максимальное количество игроков." +"Достигнут максимум вместимости игроков." #: qcsrc/common/notifications/all.inc:695 msgid "^BGYou picked up the ball" @@ -4623,7 +4635,7 @@ msgstr "%s^K1 пролил первую кровь! %s^BG" #: qcsrc/common/notifications/all.qh:590 #, c-format msgid "%s^K1 got the first score! %s^BG" -msgstr "%s^K1 получил первое очко! %s^BG" +msgstr "%s^K1 заработал первое очко! %s^BG" #: qcsrc/common/notifications/all.qh:606 #, c-format @@ -4645,7 +4657,7 @@ msgstr ", прервав серию из %d убийств" msgid ", losing their %d score spree" msgstr ", прервав серию из %d очков" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr " с %d %s" @@ -5533,12 +5545,12 @@ msgstr "" "Поле сущности %s.%s (%s) нет в белом листе. Если вы уверены, что это ошибка, " "пожалуйста, опишите проблему." -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d д, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5563,175 +5575,175 @@ msgstr "Основная команда" msgid "Extended Team" msgstr "Дополнительная команда" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Веб-сайт" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Статистика" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Графика" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Анимация" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Дизайн уровней" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Музыка / звуковые эффекты" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Код игры" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Маркетинг / Связи с общественностью" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Правовые отношения" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Игровой движок" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Дополнения движка" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Компилятор" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Другие активные участники" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Переводчики" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Австрийский" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Белорусский" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Болгарский" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Китайский" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Китайский (Тайвань)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Корнуоллский" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Чешский" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Нидерландский" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Английский (Австралия)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Финский" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Французский" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Немецкий" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Греческий" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Венгерский" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Ирландский" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Итальянский" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "Японский" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Казахский" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Корейский" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Польский" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Португальский" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Румынский" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Русский" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Шотландский" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Сербский" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Испанский" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Шведский" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Украинский" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Прошлые участники" @@ -5798,7 +5810,7 @@ msgstr "Отключиться" msgid "Disconnect from the server you are connected to" msgstr "Отключиться от сервера, к которому вы подключены" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5807,29 +5819,29 @@ msgstr "" "Добро пожаловать в Xonotic. Для начала, пожалуйста, выберите ваш язык и " "введите ваше имя. Позже вы сможете изменить эти настройки в меню." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Имя:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Имя, под которым вы появитесь в игре" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Язык меню:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "Разрешить статистике использовать ваше имя игрока в stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Спросить позже" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" @@ -5837,11 +5849,11 @@ msgstr "" "По умолчанию статистика игрока включена, вы можете изменить это в меню " "Профиля" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Сохранить настройки" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Добро пожаловать" @@ -6022,12 +6034,13 @@ msgstr "Панель информации" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Отключить" @@ -6038,7 +6051,7 @@ msgstr "При наблюдении" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:18 msgid "Enable even playing in warmup" -msgstr "При наблюдении и разминке" +msgstr "При наблюдении/разминке" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:29 msgid "Reduced" @@ -6046,11 +6059,11 @@ msgstr "Уменьшенная" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:32 msgid "Text/icon ratio:" -msgstr "Отношение текста и иконок:" +msgstr "Отношение текста/иконок:" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:35 msgid "Hide spawned items" -msgstr "Прятать появившиеся предметы" +msgstr "Скрывать появившиеся предметы" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:37 msgid "Hide big armor and health" @@ -6094,7 +6107,8 @@ msgstr "Панель уведомлений" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Включить" @@ -6208,7 +6222,7 @@ msgstr "Радар:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Прозрачность:" @@ -6291,7 +6305,7 @@ msgstr "Таблица очков" #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:47 msgid "StrafeHUD mode:" -msgstr "Режим интерфейса распрыжки:" +msgstr "Режим интерфейса:" #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:50 msgid "View angle centered" @@ -6303,7 +6317,7 @@ msgstr "Угол скорости по центру" #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:54 msgid "StrafeHUD style:" -msgstr "Стиль интерфейсa распрыжки:" +msgstr "Стиль интерфейсa:" #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:57 msgid "no styling" @@ -6376,13 +6390,21 @@ msgstr "Неактивный:" msgid "StrafeHUD Panel" msgstr "Панель интерфейса распрыжки" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Таймер:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" -msgstr "Показывать прошедшее время" +msgstr "Отсчитывать прошедшее время" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "Вторичный таймер:" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "Переставленный" #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" @@ -6390,7 +6412,7 @@ msgstr "Панель таймера" #: qcsrc/menu/xonotic/dialog_hudpanel_vote.qc:17 msgid "Alpha after voting:" -msgstr "Прозрач. после голосования:" +msgstr "Прозрачн. по голосовании:" #: qcsrc/menu/xonotic/dialog_hudpanel_vote.qh:6 msgid "Vote Panel" @@ -6514,12 +6536,12 @@ msgid "Panel background defaults:" msgstr "Общие настройки фона панелей:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Фон:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Ширина краёв:" @@ -6529,12 +6551,12 @@ msgid "Team color:" msgstr "Цвет команды:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Применить цвет команды для проверки" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Отступ:" @@ -6564,7 +6586,7 @@ msgstr "Настройки сетки:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:124 msgid "Snap panels to grid" -msgstr "Передвижение панелей по сетке" +msgstr "Привязка панелей к сетке" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:127 msgid "Grid size:" @@ -6664,9 +6686,9 @@ msgstr "Играть по сети, смотреть демки или изме #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Стандартно" @@ -6730,8 +6752,8 @@ msgid "" "The maximum amount of players or bots that can be connected to your server " "at once" msgstr "" -"Предельное количество игроков и ботов, которые могут быть одновременно " -"подключены к серверу" +"Максимум игроков и ботов, которые могут быть одновременно подключены к " +"серверу" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:121 msgid "Number of bots:" @@ -6862,7 +6884,7 @@ msgid "Game types:" msgstr "Режимы игры:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Закрыть" @@ -7199,7 +7221,7 @@ msgstr "" "Приостановить обновление списка для закрепления серверов на одном месте" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Адрес:" @@ -7212,119 +7234,157 @@ msgid "Show more information about the currently highlighted server" msgstr "Показать больше сведений о выбранном сервере" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Присоединиться!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "Условия обслуживания не указаны" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^Стандартный" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d изменено" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Официальные" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "Н/Д (нельзя подключиться, библиотека авторизации не найдена)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "Н/Д (библиотека авторизации не найдена)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Не поддерживается (не могу подключиться)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Не поддерживается (шифрования не будет)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Поддерживается (будет шифровано)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Поддерживается (не будет шифровано)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Запрошено (будет шифровано)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Запрошено (не будет шифровано)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Требуется (не могу подключиться)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Требуется (будет шифровано)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" "Используйте переменную \"crypto_aeslevel\" для изменения ваших настроек" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "пользовательский сервер статистики" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "статистика отключена" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "статистика включена" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "Состояние" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "Условия обслуживания" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "Сведения о сервере" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Имя сервера:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Режим игры:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Арена:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Мод:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Версия:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Настройки:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Игроки:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Боты:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Пустые слоты:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Шифрование:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ИД:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Ключ:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "Статистика:" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Сведения о сервере" @@ -7495,7 +7555,7 @@ msgstr "Вы действительно хотите выйти?" #: qcsrc/menu/xonotic/dialog_quit.qc:15 msgid "Back to work..." -msgstr "Пора саночки возить…" +msgstr "Пора и саночки возить…" #: qcsrc/menu/xonotic/dialog_quit.qc:17 msgid "I got some more fragging to do!" @@ -7688,7 +7748,7 @@ msgstr "Предметы:" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:65 msgid "Pain:" -msgstr "Боль:" +msgstr "Крики боли:" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:72 msgid "Player:" @@ -7852,7 +7912,7 @@ msgstr "Звуки меню" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:162 msgid "Play sounds when clicking menu items" -msgstr "Проигрывать звуки при кликах в меню" +msgstr "Проигрывать звуки при нажатиях в меню" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:163 msgid "Focus sounds" @@ -8249,11 +8309,11 @@ msgstr "Мягкие тени" #: qcsrc/menu/xonotic/dialog_settings_effects.qc:220 msgid "Fade corona according to visibility" -msgstr "Прятать короны в соответствии с их видимостью" +msgstr "Прятать короны с учётом их видимости" #: qcsrc/menu/xonotic/dialog_settings_effects.qc:221 msgid "Fade coronas according to visibility" -msgstr "Постепенно скрывать короны в соответствии с их видимостью" +msgstr "Постепенно скрывать короны исходя из их видимости" #: qcsrc/menu/xonotic/dialog_settings_effects.qc:225 msgid "Bloom" @@ -8960,7 +9020,7 @@ msgstr "Множитель скорости мыши" #: qcsrc/menu/xonotic/dialog_settings_input.qc:64 msgid "Smooth aiming" -msgstr "Сглаживание движений мыши" +msgstr "Сглаживать движения мыши" #: qcsrc/menu/xonotic/dialog_settings_input.qc:65 msgid "Smoothes the mouse movement, but makes aiming slightly less responsive" @@ -9653,6 +9713,25 @@ msgstr "наблюдать" msgid "Team Selection" msgstr "Выбор команды" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" +"Условия обслуживания обновлены. Пожалуйста, прочтите их перед продолжением:" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" +"Добро пожаловать в Xonotic! Пожалуйста, прочтите следующие условия " +"обслуживания:" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "Принять" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "Отклонить (выйти из игры)" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Разрешить статистике использовать ваше имя?" @@ -9735,15 +9814,15 @@ msgstr "бросить оружие / гранату" #: qcsrc/menu/xonotic/keybinder.qc:84 msgid "hold zoom" -msgstr "увеличитель по удержанию" +msgstr "увеличитель по удержании" #: qcsrc/menu/xonotic/keybinder.qc:85 msgid "toggle zoom" -msgstr "увеличитель по нажатию" +msgstr "увеличитель по нажатии" #: qcsrc/menu/xonotic/keybinder.qc:86 msgid "show scores" -msgstr "показать очки" +msgstr "показать счёт" #: qcsrc/menu/xonotic/keybinder.qc:87 msgid "screen shot" @@ -9837,7 +9916,7 @@ msgstr "подвинуть объект (песочница)" msgid "waypoint editor menu" msgstr "меню редактора путевых точек" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Не нажимайте эту кнопку снова!" @@ -9904,42 +9983,34 @@ msgstr "Арена" msgid "Type" msgstr "Режим" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "Уровень AES %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "ENC^нет" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "шифрование:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "мод: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "изменённые настройки" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "официальные настройки" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "статистика отключена" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "статистика включена" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Избранные" @@ -10165,20 +10236,20 @@ msgstr "Процентиль:" msgid "%d (unranked)" msgstr "%d (без рейтинга)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "Обновление может быть загружено с:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Автосоздание mapinfo для новых арен…" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Обновитесь до %s сейчас же!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10186,10 +10257,10 @@ msgstr "" "^1ОШИБКА: Требуется сжатие текстур, но оно не поддерживается.\n" "^1Ожидаются проблемы с отображением." -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" -msgstr "По умолчанию" +msgstr "Стандартно" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Цвет команды:" diff --git a/common.sq.po b/common.sq.po index 4c92167e7..1147e13a1 100644 --- a/common.sq.po +++ b/common.sq.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Albanian (http://www.transifex.com/team-xonotic/xonotic/" "language/sq/)\n" @@ -49,7 +49,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "" @@ -514,7 +514,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -926,12 +926,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1035,8 +1035,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1061,7 +1078,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1074,7 +1091,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1085,43 +1102,43 @@ msgstr "" msgid "No" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1321,10 +1338,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1396,23 +1409,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1847,7 +1860,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4504,7 +4517,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5390,12 +5403,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5420,175 +5433,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5655,46 +5668,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5875,12 +5888,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5947,7 +5961,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6061,7 +6076,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6229,14 +6244,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6367,12 +6390,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6382,12 +6405,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6517,9 +6540,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6711,7 +6734,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7021,7 +7044,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7034,118 +7057,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9422,6 +9483,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9606,7 +9683,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9668,42 +9745,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9927,29 +9996,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.sr.po b/common.sr.po index 846f67bc7..c6a5d15a6 100644 --- a/common.sr.po +++ b/common.sr.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Serbian (http://www.transifex.com/team-xonotic/xonotic/" "language/sr/)\n" @@ -57,7 +57,7 @@ msgstr "Порука у тренутку %s" msgid "Generic message" msgstr "Општа порука" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Играч^7: Ово је простор за ћаскање." @@ -522,7 +522,7 @@ msgstr "Просек %d" msgid "PENALTY: %.1f (%s)" msgstr "КАЗНА: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "промашили сте контролну тачку" @@ -934,12 +934,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "Н/Д" @@ -1043,9 +1043,26 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "ЗАГРЕЈАВАЊЕ" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1069,7 +1086,7 @@ msgstr "^1Подесите ХУД" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1082,7 +1099,7 @@ msgstr "Да" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1093,43 +1110,43 @@ msgstr "Да" msgid "No" msgstr "Не" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Муниција је потрошена" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Нема" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Недоступно" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Покушавам да уклоним екипу која није у списку екипа!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "м/с" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "км/ч" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "чворови" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (није везано)" @@ -1335,10 +1352,6 @@ msgid "Key Hunt" msgstr "Лов на кључеве" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Игра је већ почела" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Немате више живота" @@ -1412,23 +1425,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "Екипна игра на смрт" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1864,7 +1877,7 @@ msgstr "Највећа величина фонта:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Боја:" @@ -4525,7 +4538,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5411,12 +5424,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5441,175 +5454,175 @@ msgstr "Развојно језгро" msgid "Extended Team" msgstr "Проширена екипа" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Веб сајт" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Статистика" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Графика" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Анимација" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Дизајн нивоа" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Музика и монтажа звука" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Код игрице" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Маркетинг и односи са јавношћу" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Правна служба" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Мотор игрице" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Додаци на мотору" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Компајлер" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Други активни доприносиоци" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Преводиоци" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Астуријски" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Белоруски" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Бугарски" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Кинески (Кина)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Кинески (Тајван)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Корнишки" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Чешки" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Холандски" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Енглески (Аустралија)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Фински" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Француски" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Немачки" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Грчки" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Мађарски" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Италијански" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Казахстански" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Корејски" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Пољски" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Португалски" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Румунски" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Руски" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Српски" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Шпански" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Шведски" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Украјински" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Прошли доприносиоци" @@ -5676,7 +5689,7 @@ msgstr "Откачи се" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5685,40 +5698,40 @@ msgstr "" "Добро дошли у Зонотик, изаберите ваш језик и унесите ваше име играча да " "бисте почели. Можете касније променити ове опције кроз мени система." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Име:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Име под којим ћете се појавити у игри" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Језик текста:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Дозволити играчким статистикама да користе ваш надимак на stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Неодлучен" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Сачувај подешавања" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Добродошли" @@ -5899,12 +5912,13 @@ msgstr "Плоча инфо порука" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Онемогући" @@ -5971,7 +5985,8 @@ msgstr "Плоча обавештења" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6085,7 +6100,7 @@ msgstr "Радар:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Алфа:" @@ -6253,14 +6268,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Одбројавач:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Прикажи протекло време" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Плоча са одбројавачем" @@ -6391,12 +6414,12 @@ msgid "Panel background defaults:" msgstr "Подразумевано позадине плоче:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Позадина:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Величина границе:" @@ -6406,12 +6429,12 @@ msgid "Team color:" msgstr "Боја екипе:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Испробај боју екипе у режиму подешавања" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Испуњавање:" @@ -6543,9 +6566,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Подразумевано" @@ -6737,7 +6760,7 @@ msgid "Game types:" msgstr "Врсте игре:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Затвори" @@ -7047,7 +7070,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Адреса:" @@ -7060,118 +7083,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Приступи!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^Подразумевано" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d измењено" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Званичан" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "Н/Д (недостаје библиотека за идентификацију, не могу се повезати)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "Н/Д (недостаје библиотека за идентификацију)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Н/Д (не могу се повезати)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Није подржано (нема шифровања)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Подржано (биће шифровано)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Подржано (нема шифровања)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Затражено (биће шифровано)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Затражено (нема шифровања)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Обавезно (не могу се повезати)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Обавезно (биће шифровано)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "статистика онемогућена" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "статистика омогућена" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Име домаћина:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Врста игре:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Мапа:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Мод:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Издање:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Подешавања:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Играчи:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Ботови:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Слободних места:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Шифровање:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ИБ:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Кључ:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Подаци о серверу" @@ -9458,6 +9519,22 @@ msgstr "посматрај" msgid "Team Selection" msgstr "Одабир екипе" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Омогућити играчким статистикама да користе ваш надимак?" @@ -9642,7 +9719,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Не притискај овај тастер више!" @@ -9704,42 +9781,34 @@ msgstr "Мапа" msgid "Type" msgstr "Врста" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "AES ниво %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "ENC^ништа" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "шифровање:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "мод: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "измењена подешавања" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "званична подешавања" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "статистика онемогућена" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "статистика омогућена" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "SLCAT^Омиљени" @@ -9963,29 +10032,29 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (нерангиран)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Надоградите се на %s сада!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Користи подразумевано" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Боја екипе:" diff --git a/common.sv.po b/common.sv.po index 22cff96c3..9b655213c 100644 --- a/common.sv.po +++ b/common.sv.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Swedish (http://www.transifex.com/team-xonotic/xonotic/" "language/sv/)\n" @@ -52,7 +52,7 @@ msgstr "Meddelande vid tiden %s" msgid "Generic message" msgstr "Generellt meddelande" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Spelare^7: Det här är chattområdet." @@ -63,17 +63,17 @@ msgstr "FPS: %.*f" #: qcsrc/client/hud/panel/infomessages.qc:92 msgid "^1Observing" -msgstr "^1Obververar" +msgstr "^1Observerar" #: qcsrc/client/hud/panel/infomessages.qc:94 #, c-format msgid "^1Spectating: ^7%s" -msgstr "^1Tittar pa: ^7%s" +msgstr "^1Tittar på: ^7%s" #: qcsrc/client/hud/panel/infomessages.qc:105 #, c-format msgid "^1Press ^3%s^1 to spectate" -msgstr "^1Tryck på ^3%s^1 för at åskåda" +msgstr "^1Tryck på ^3%s^1 för att åskåda" #: qcsrc/client/hud/panel/infomessages.qc:105 #: qcsrc/menu/xonotic/keybinder.qc:47 @@ -463,19 +463,19 @@ msgstr "Kalla till röstning" #: qcsrc/client/hud/panel/quickmenu.qc:872 msgid "QMCMD^Restart the map" -msgstr "Starta om kartan" +msgstr "Börja om kartan" #: qcsrc/client/hud/panel/quickmenu.qc:873 msgid "QMCMD^End match" -msgstr "Sluta matchen" +msgstr "Avsluta matchen" #: qcsrc/client/hud/panel/quickmenu.qc:876 msgid "QMCMD^Reduce match time" -msgstr "Minska matchtiden" +msgstr "Förkorta matchtiden" #: qcsrc/client/hud/panel/quickmenu.qc:877 msgid "QMCMD^Extend match time" -msgstr "Utöka matchtiden" +msgstr "Förläng matchtiden" #: qcsrc/client/hud/panel/quickmenu.qc:880 msgid "QMCMD^Shuffle teams" @@ -517,7 +517,7 @@ msgstr "Mellanliggande %d" msgid "PENALTY: %.1f (%s)" msgstr "BESTRAFFNING: %.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "Saknar en kontrollpunkt" @@ -647,7 +647,7 @@ msgstr "Mängden mord minus självmord" #: qcsrc/client/hud/panel/scoreboard.qc:134 msgid "SCO^frags" -msgstr "frags" +msgstr "fragg" #: qcsrc/client/hud/panel/scoreboard.qc:135 msgid "Number of goals scored" @@ -952,12 +952,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1061,9 +1061,26 @@ msgstr "mi" msgid "nmi" msgstr "nmi" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "UPPVÄRMNING" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1087,7 +1104,7 @@ msgstr "^1Konfigurera HUD:en" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1100,7 +1117,7 @@ msgstr "Ja" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1111,43 +1128,43 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Slut på ammunition" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Har inte" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Otillgänglig" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Försöker ta bort ett lag som inte är i laglistan!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "knop" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (ej bunden)" @@ -1354,10 +1371,6 @@ msgid "Key Hunt" msgstr "Key Hunt" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Matchen har redan börjat" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Du har inga mer liv kvar" @@ -1429,23 +1442,23 @@ msgstr "Hjälp ditt lag få så många frags som möjligt mot det andra laget" msgid "Team Deathmatch" msgstr "Team Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "skott" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "celler" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "plasma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "raketer" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "skal" @@ -1493,11 +1506,11 @@ msgstr "bensin" #: qcsrc/common/items/item/jetpack.qh:96 msgid "Fuel regenerator" -msgstr "" +msgstr "Bensinregenerator" #: qcsrc/common/items/item/jetpack.qh:99 msgid "Fuel regen" -msgstr "" +msgstr "Bensinregen" #: qcsrc/common/mapinfo.qc:624 #, no-c-format @@ -1523,7 +1536,7 @@ msgstr "Nuvarande Spel" #: qcsrc/common/minigames/cl_minigames_hud.qc:431 msgid "Exit Menu" -msgstr "Avsluta Meny" +msgstr "Stäng Meny" #: qcsrc/common/minigames/cl_minigames_hud.qc:442 #: qcsrc/menu/xonotic/dialog_multiplayer.qc:16 @@ -1605,7 +1618,7 @@ msgstr "Spara" #: qcsrc/common/minigames/minigame/c4.qc:2 msgid "Connect Four" -msgstr "Koppla Fyra" +msgstr "Fyra-i-Rad" #: qcsrc/common/minigames/minigame/c4.qc:316 #: qcsrc/common/minigames/minigame/c4.qc:322 @@ -1649,7 +1662,7 @@ msgstr "Väntar på din motståndare att göra sin flytt" #: qcsrc/common/minigames/minigame/pp.qc:471 #: qcsrc/common/minigames/minigame/ttt.qc:354 msgid "Click on the game board to place your piece" -msgstr "Klicka på spelbordet för att placera din pjäser" +msgstr "Klicka på spelbordet för att placera din pjäs" #: qcsrc/common/minigames/minigame/nmm.qc:3 msgid "Nine Men's Morris" @@ -1682,7 +1695,7 @@ msgstr "AI" #: qcsrc/common/minigames/minigame/pong.qc:626 msgid "Press ^1Start Match^7 to start the match with the current players" msgstr "" -"Tryck på ^1Starta Matchen^7 för att starta matchen med de nuvarande spelarna" +"Tryck på ^1Börja Matchen^7 för att starta matchen med de nuvarande spelarna" #: qcsrc/common/minigames/minigame/pong.qc:698 msgid "Start Match" @@ -1724,7 +1737,7 @@ msgstr "Nästa Match" #: qcsrc/common/minigames/minigame/ps.qc:2 msgid "Peg Solitaire" -msgstr "Peg Solitaire" +msgstr "Solitär" #: qcsrc/common/minigames/minigame/ps.qc:418 msgid "All pieces cleared!" @@ -1883,7 +1896,7 @@ msgstr "Maximal typsnittsstorlek:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Färg:" @@ -2738,7 +2751,7 @@ msgstr "^BG%s^K1 blev bortsprängd av en Walker-turret%s%s" #: qcsrc/common/notifications/all.inc:336 #, c-format msgid "^BG%s^K1 got caught in the blast of a Bumblebee explosion%s%s" -msgstr "^BG%s%s^K1 var inblandad i sprängningen av en Bumblebee-explotion%s%s" +msgstr "^BG%s^K1 var inblandad i sprängningen av en Bumblebee-explosion%s%s" #: qcsrc/common/notifications/all.inc:337 #, c-format @@ -2873,7 +2886,7 @@ msgstr "^BGDu har inte ^F1%s" #: qcsrc/common/notifications/all.inc:684 #, c-format msgid "^BGYou dropped the ^F1%s^BG%s" -msgstr "^BGDu släppte ^F1%s" +msgstr "^BGDu släppte ^F1%s^BG%s" #: qcsrc/common/notifications/all.inc:371 #: qcsrc/common/notifications/all.inc:685 @@ -3031,7 +3044,7 @@ msgstr "^BG%s^K1 plockade upp Styrka" #: qcsrc/common/notifications/all.inc:410 #, c-format msgid "^BG%s^F3 disconnected" -msgstr "^BG%s^F3 frånkopplade sig" +msgstr "^BG%s^F3 är frånkopplad" #: qcsrc/common/notifications/all.inc:411 #, c-format @@ -3042,7 +3055,7 @@ msgstr "^BG%s^F3 var kickad efter att ha varit stilla i %s sekunder" #, c-format msgid "^BG%s^F3 was moved to^BG spectators^F3 after idling for %s seconds" msgstr "" -"^BG%s^F3 var flyttad till^BG åskådare^F3 eftre att ha stått stilla i %s " +"^BG%s^F3 har flyttats till^BG åskådare^F3 efter att ha stått still i %s " "sekunder" #: qcsrc/common/notifications/all.inc:413 @@ -3203,7 +3216,7 @@ msgstr "^BG%s%s^K1 var skjuten till döds av ^BG%s^K1s Blaster%s%s" #: qcsrc/common/notifications/all.inc:447 #, c-format msgid "^BG%s^K1 shot themself to hell with their Blaster%s%s" -msgstr "^BG%s%s^K1 sköt sig själv till helvetet med deras Blaster%s%s" +msgstr "^BG%s^K1 sköt sig själv till helvetet med deras Blaster%s%s" #: qcsrc/common/notifications/all.inc:448 #, c-format @@ -3213,7 +3226,7 @@ msgstr "^BG%s%s^K1 kände ett starkt drag av ^BG%s^K1s Crylink%s%s" #: qcsrc/common/notifications/all.inc:449 #, c-format msgid "^BG%s^K1 felt the strong pull of their Crylink%s%s" -msgstr "^BG%s%s^K1 kände ett starkt drag av deras Crylink%s%s" +msgstr "^BG%s^K1 kände ett starkt drag av deras Crylink%s%s" #: qcsrc/common/notifications/all.inc:450 #, c-format @@ -3392,7 +3405,7 @@ msgid "" "^BG%s%s^K1 was sawn in half by ^BG%s^K1's Overkill Rocket Propelled Chainsaw" "%s%s" msgstr "" -"^BG%s%s^K1 var sågad i hälften av ^BG%s^K1s Overkill Raketframdriven Motorsåg" +"^BG%s%s^K1 var sågad på mitten av ^BG%s^K1s Overkill Raketframdriven Motorsåg" "%s%s" #: qcsrc/common/notifications/all.inc:484 @@ -3407,15 +3420,15 @@ msgstr "" msgid "" "^BG%s^K1 was sawn in half by their own Overkill Rocket Propelled Chainsaw%s%s" msgstr "" -"^BG%s%s^K1 var sågad i hälften av sin egen Overkill Raketframdriven Motorsåg" -"%s%s" +"^BG%s^K1 var sågad på mitten av sin egen Overkill Raketframdriven Motorsåg%s" +"%s" #: qcsrc/common/notifications/all.inc:486 #, c-format msgid "" "^BG%s^K1 blew themself up with their Overkill Rocket Propelled Chainsaw%s%s" msgstr "" -"^BG%s%s^K1 sprängde upp sig själv med sin egen Overkill Raketframdriven " +"^BG%s^K1 sprängde upp sig själv med sin egen Overkill Raketframdriven " "Motorsåg%s%s" #: qcsrc/common/notifications/all.inc:488 @@ -3561,7 +3574,7 @@ msgid "" "^BGMake some defensive scores before trying again." msgstr "" "^BGDu är nu ^F1sköldad^BG från flaggan/flaggorna\n" -"^BGpå grund av ^F2för många misslyckade försök^BG att ta.\n" +"^BGpå grund av ^F2för många misslyckade försök^BG att fånga.\n" "^BGGör några beskyddande poäng innan du försöker igen." #: qcsrc/common/notifications/all.inc:544 @@ -4066,7 +4079,7 @@ msgstr "^K1A %s har anländigt!" #: qcsrc/common/notifications/all.inc:681 msgid "^BGYou got the ^F1Fuel regenerator" -msgstr "" +msgstr "^BGDu fick tag på ^F1Bensinregenerator" #: qcsrc/common/notifications/all.inc:682 msgid "^BGYou got the ^F1Jetpack" @@ -4316,7 +4329,7 @@ msgstr "^F2Sköld har tagit slut" #: qcsrc/common/notifications/all.inc:746 msgid "^F2You are on speed" -msgstr "^F2Du är nu på hastighet" +msgstr "^F2Du är på hastighet" #: qcsrc/common/notifications/all.inc:747 msgid "^F2Speed has worn off" @@ -4635,7 +4648,7 @@ msgstr ", förlorar sin %d fraggningsrus" msgid ", losing their %d score spree" msgstr ", förlorar sin %d poängrus" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr " med %d %s" @@ -5373,7 +5386,7 @@ msgstr "%d veckor" #: qcsrc/lib/counting.qh:27 #, c-format msgid "CI_DEC^%s days" -msgstr "%d dagar" +msgstr "%s dagar" #: qcsrc/lib/counting.qh:30 #, c-format @@ -5523,12 +5536,12 @@ msgstr "" "Enhetsfält %s.%s (%s) är inte vitlistad. Om du tror detta är ett fel, " "vänligen skicka in ett fråga." -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d dagar, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5553,175 +5566,175 @@ msgstr "Grundteamet" msgid "Extended Team" msgstr "Utökade Teamet" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Webbsida" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "Statistik" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Konst" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Animation" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Kartdesign" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Musik / Ljudeffekter" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Spelkod" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Maknadsföring / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Juridik" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Spelmotor" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Motoradditioner" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Kompilator" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Övriga Aktiva Bidragsgivare" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Översättare" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Österrikiska" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Vitryska" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulgariska" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Kinesiska (Kina)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Kinesiska (Taiwan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Korniska" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Tjeckiska" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Nederländska" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "Engelska (Australien)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Finska" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Franska" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Tyska" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Grekiska" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Ungerska" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "Irländska" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "Italienska" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "Japanska" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kazakiska" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Koreanska" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polska" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portugisiska" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Rumäniska" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Ryska" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "Skotsk Gäliska" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Serbiska" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "Spanska" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "Svenska" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ukrainska" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Föregående Bidragsgivare" @@ -5788,7 +5801,7 @@ msgstr "Koppla bort" msgid "Disconnect from the server you are connected to" msgstr "Koppla bort från servern du är uppkopplad till" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5798,41 +5811,41 @@ msgstr "" "spelarnamn för att komma igång. Du kan senare ändra dessa inställningar via " "menyn." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Namn:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Namn som du kommer att synas som i spelet" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Ställ in språk:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Tillåt spelstatistiken att använda ditt spelarnamn på stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Obeslutad" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" "Spelstatistik är påslagen som standard, du kan ändra på detta i Profilmenyn" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Spara inställningar" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Välkommen" @@ -5916,7 +5929,7 @@ msgstr "Typsnittets skala:" #: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc:41 msgid "Bold font scale:" -msgstr "" +msgstr "Typsnittets skala på tjocktext:" #: qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh:6 msgid "Centerprint Panel" @@ -6013,12 +6026,13 @@ msgstr "Panel För Infomeddelanden" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Inaktivera" @@ -6085,7 +6099,8 @@ msgstr "Notifikationspanel" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Slå på" @@ -6199,7 +6214,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Alfa:" @@ -6367,14 +6382,22 @@ msgstr "Inaktiv:" msgid "StrafeHUD Panel" msgstr "StrafeHUD-Panel" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Tidtagare:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Visa förfluten tid" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Tidspanel" @@ -6505,12 +6528,12 @@ msgid "Panel background defaults:" msgstr "Standardinställningar för panelbakgrund:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Bakgrund:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Ramstorlek:" @@ -6520,12 +6543,12 @@ msgid "Team color:" msgstr "Lagets färg:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Testa lagfärg i konfigureringsläge" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Utfyllnad:" @@ -6657,9 +6680,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Standardinställning" @@ -6855,7 +6878,7 @@ msgid "Game types:" msgstr "Speltyper:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Stäng" @@ -7192,7 +7215,7 @@ msgstr "" "runt\"" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Adress:" @@ -7205,118 +7228,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Visa mer information om den markerade servern" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Anslut!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "Standard" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d modifierad" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Officiell" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A (auktoriseringsbibliotek saknas, kan inte ansluta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A (auktoriseringsbibliotek saknas)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Stöds ej (kan inte ansluta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Stöds ej (kommer inte att kryptera)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Stöds (kommer att kryptera)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Stöds (kommer inte att kryptera)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Begärd (kommer att kryptera)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Begärd (kommer inte att kryptera)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Begärd (kan inte ansluta)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Krävs (kommer att kryptera)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "Använd `crypto_aeslevel` cvaren för att ändra dina preferenser" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "statistik avslagen" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "statistik påslagen" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Värdnamn:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Speltyp:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Karta:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Version:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Inställningar:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Spelare:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Bottar:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Öppna platser:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Kryptering:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Nyckel:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Serverinformation" @@ -7797,7 +7858,7 @@ msgstr "Byt vänster och höger kanal" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:139 msgid "Headphone friendly mode" -msgstr "Hörlursvänligt läge" +msgstr "Hörlurarvänligt läge" #: qcsrc/menu/xonotic/dialog_settings_audio.qc:140 msgid "" @@ -9115,7 +9176,7 @@ msgstr "Visa en graf utav paketstorlekar och annan information" #: qcsrc/menu/xonotic/dialog_settings_misc.qc:69 msgid "Client-side movement prediction" -msgstr "Rörelseprediktering i klienten" +msgstr "Rörelseförutsägning i klienten" #: qcsrc/menu/xonotic/dialog_settings_misc.qc:71 msgid "Movement error compensation" @@ -9195,7 +9256,7 @@ msgstr "Visa nuvarande datum och tid" #: qcsrc/menu/xonotic/dialog_settings_misc.qc:134 msgid "Show current date and time of day, useful on screenshots" -msgstr "Visa nuvarande datum och tid på daget, användbart på skärmdumpar" +msgstr "Visa nuvarande datum och tid på dagen, användbart på skärmdumpar" #: qcsrc/menu/xonotic/dialog_settings_misc.qc:137 msgid "Enable developer mode" @@ -9274,11 +9335,11 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:10 msgid "While connected language changes will be applied only to the menu," -msgstr "Under uppkoppling så sker bara språkförändringar i menyn," +msgstr "Under uppkoppling sker bara språkförändringar i menyn," #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:12 msgid "full language changes will take effect starting from the next game" -msgstr "hela språkförändringar börjar ta kraft efter starten på ett nytt spel" +msgstr "hela språkförändringar börjar få effekt efter starten på ett nytt spel" #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc:16 msgid "Disconnect now" @@ -9643,6 +9704,22 @@ msgstr "åskåda" msgid "Team Selection" msgstr "Lagval" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "Tillåt spelarstatistik att använda ditt spelarnamn?" @@ -9828,7 +9905,7 @@ msgstr "dra objekt (sandlåda)" msgid "waypoint editor menu" msgstr "redigeringsmeny för vägpunkter" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Tryck inte på den här knappen igen!" @@ -9896,42 +9973,34 @@ msgstr "Karta" msgid "Type" msgstr "Typ" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "AES-nivå %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "ingen" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "kryptering:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "mod: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "modifierade inställningar" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "officiella inställningar" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "statistik avslagen" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "statistik påslagen" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Favoriter" @@ -10157,20 +10226,20 @@ msgstr "Percentil:" msgid "%d (unranked)" msgstr "%d (orankad)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "Uppdatering kan laddas ner hos:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Automatgenererar kartinfo för nyligen tillagda kartor..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Uppdatera till %s nu!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." @@ -10178,10 +10247,10 @@ msgstr "" "^1FEL: Texturkomprimering krävs men stöds inte.\n" "^1Förvända dig visuella problem." -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Använd standard" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Lagfärg:" diff --git a/common.tr.po b/common.tr.po index 16a0da7e3..79e28312a 100644 --- a/common.tr.po +++ b/common.tr.po @@ -4,6 +4,8 @@ # # Translators: # Abdurrahman AKKUŞ , 2019 +# Ahmet, 2022 +# Ahmet, 2022 # Big Brother , 2021 # Çağlar Turalı , 2018 # Demiray Muhterem , 2018 @@ -16,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Turkish (http://www.transifex.com/team-xonotic/xonotic/" "language/tr/)\n" @@ -58,7 +60,7 @@ msgstr "%szamanında mesaj" msgid "Generic message" msgstr "Genel mesaj" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Oyuncu^7: Burası sohbet alanı." @@ -524,7 +526,7 @@ msgstr "Orta seviye %d" msgid "PENALTY: %.1f (%s)" msgstr "CEZA:%.1f (%s)" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -936,12 +938,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -998,7 +1000,7 @@ msgstr "^2+%s %s" #: qcsrc/client/hud/panel/scoreboard.qc:1925 #, c-format msgid "^7Map: ^2%s" -msgstr "" +msgstr "^7Harita: ^2%s" #: qcsrc/client/hud/panel/scoreboard.qc:2079 #, c-format @@ -1045,9 +1047,26 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "ISINMA" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1071,7 +1090,7 @@ msgstr "^1HUD'ı Yapılandır" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1084,7 +1103,7 @@ msgstr "Evet" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1095,43 +1114,43 @@ msgstr "Evet" msgid "No" msgstr "Hayır" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Cephane kalmadı" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Sahip değilsin" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Kullanım dışı" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Takım listesinde olmayan bir takımı çıkarmaya çalışma!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "bağ" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (bağlı değil)" @@ -1335,10 +1354,6 @@ msgid "Key Hunt" msgstr "Anahtar Avı" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Karşılaşma çoktan başladı" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1Fazla canın kalmadı" @@ -1411,23 +1426,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "Takım Kapışması" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "mermiler" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "plazma" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "roketler" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1866,7 +1881,7 @@ msgstr "Azami yazı tipi boyutu:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Renk:" @@ -4525,7 +4540,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -4649,11 +4664,11 @@ msgstr "" #: qcsrc/common/turrets/turret/machinegun.qh:13 msgid "Machinegun Turret" -msgstr "" +msgstr "Makineli Tüfek Kulesi" #: qcsrc/common/turrets/turret/machinegun_weapon.qh:7 msgid "Machinegun" -msgstr "" +msgstr "Makineli Tüfek" #: qcsrc/common/turrets/turret/mlrs.qh:13 msgid "MLRS Turret" @@ -4673,11 +4688,11 @@ msgstr "" #: qcsrc/common/turrets/turret/plasma.qh:13 msgid "Plasma Cannon" -msgstr "" +msgstr "Plazma Topu" #: qcsrc/common/turrets/turret/plasma_dual.qh:8 msgid "Dual plasma" -msgstr "" +msgstr "Çift plazma" #: qcsrc/common/turrets/turret/plasma_dual.qh:20 msgid "Dual Plasma Cannon" @@ -5411,12 +5426,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5441,175 +5456,175 @@ msgstr "Çekirdek Takım" msgid "Extended Team" msgstr "İlave Takım" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "Website" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "İstatistikler" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "Sanat" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "Canlandırma" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "Seviye Tasarımı" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "Müzik / Ses FX" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "Oyun Kodu" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "Mağaza / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "Yasal" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "Oyun Motoru" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "Motor Eklemeleri" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "Derleyici" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "Diğer Aktif Geliştiriciler" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "Çevirmenler" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "Asturyaca" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "Beyaz Rusça" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "Bulgarca" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "Çince (Çin)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "Çince (Tayvan)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "Keltçe" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "Çekce" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "Flemenkçe" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "İngilizce (Avustralya)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "Fince" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "Fransızca" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "Almanca" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "Yunanca" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "Macarca" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "İrlandaca" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "İtalyanca" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "Japon" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "Kazakça" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "Korece" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "Polonyaca" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "Portekizce" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "Romanca" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "Rusça" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "İskoçca" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "Sırpça" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "İspanyolca" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "İsveççe" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "Ukraynaca" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "Geçmişte Katkıda Bulunanlar" @@ -5676,7 +5691,7 @@ msgstr "Ayrıl" msgid "Disconnect from the server you are connected to" msgstr "Bağlı olduğunuz sunucudan ayrılın" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5685,41 +5700,41 @@ msgstr "" "Xonotic'e hoş geldiniz, lütfen dil tercihinizi seçin ve başlamak için oyuncu " "adınızı girin. Bu seçenekleri daha sonra menüden değiştirebilirsiniz." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "İsim:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Oyunda görüneceğiniz isim" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Yazı dili:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" "Oyuncu istatistikleri takma adınızı stats.xonotic.org adresinde kullanmasına " "izin verilsin mi?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "Kararsız" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Ayarları kaydet" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Hoşgeldiniz" @@ -5900,12 +5915,13 @@ msgstr "Bilgi Mesajları Paneli" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Devredışı" @@ -5972,7 +5988,8 @@ msgstr "Bildirim Paneli" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "Etkinleştir" @@ -6086,7 +6103,7 @@ msgstr "Radar:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Alfa:" @@ -6254,14 +6271,22 @@ msgstr "Devre dışı:" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Zamanlayıcı:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Geçen zamanı göster" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Zamanlayıcı Paneli" @@ -6392,12 +6417,12 @@ msgid "Panel background defaults:" msgstr "Panel arka plan varsayılanları:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Arkaplan:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Kenarlık boyutu:" @@ -6407,12 +6432,12 @@ msgid "Team color:" msgstr "Takım rengi:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Yapılandırma modunda ekip rengini test et" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Dolgu malzemesi:" @@ -6542,9 +6567,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "Varsayılan" @@ -6736,7 +6761,7 @@ msgid "Game types:" msgstr "Oyun türleri:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Kapat" @@ -7046,7 +7071,7 @@ msgid "" msgstr "Sunucuların yer değişmesini önlemek için listeyi güncellemeyi duraklat" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7059,118 +7084,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Katıl!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "Varsayılan" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Resmi" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "istatistikler kapalı" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "istatistikler açık" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Oyun türü:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Harita:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Mod:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Sürüm:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Ayarlar:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Oyuncular:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Botlar:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Boş yerler:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Şifreleme:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Sunucu bilgisi" @@ -9454,6 +9517,22 @@ msgstr "izle" msgid "Team Selection" msgstr "Takım Seçimi" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9638,7 +9717,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Bu tuşa tekrar basma!" @@ -9700,42 +9779,34 @@ msgstr "Harita" msgid "Type" msgstr "Tür" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "AES seviyesi %d" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "Hiçbiri/yok" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "şifreleme" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "mod: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "Ayarları düzenle" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "Varsayılan ayarlar" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "istatistikler kapalı" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "istatistikler açık" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "Favoriler" @@ -9961,29 +10032,29 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (derecelendirilmemiş)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "Güncelleme şuradan indirilebilir:" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Yeni eklenen haritalar için harita bilgisi oluşturuluyor..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Şimdi %s 'e güncelle!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Varsayılanı kullan" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Takım Rengi:" diff --git a/common.uk.po b/common.uk.po index 526675066..10ac4bcf6 100644 --- a/common.uk.po +++ b/common.uk.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-30 13:08+0000\n" -"Last-Translator: Ihor Andreev\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" +"Last-Translator: divVerent \n" "Language-Team: Ukrainian (http://www.transifex.com/team-xonotic/xonotic/" "language/uk/)\n" "Language: uk\n" @@ -58,7 +58,7 @@ msgstr "Повідомлення протягом %s" msgid "Generic message" msgstr "Загальне повідомлення" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3Гравець^7: Це зона чату." @@ -527,7 +527,7 @@ msgstr "Середнє %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -939,12 +939,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "Н/Д" @@ -1048,8 +1048,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1074,7 +1091,7 @@ msgstr "^1Налаштувати HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1087,7 +1104,7 @@ msgstr "Так" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1098,43 +1115,43 @@ msgstr "Так" msgid "No" msgstr "Ні" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "Боєприпаси скінчилися" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "Немає" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "Недоступно" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "Спроба видалити команду, яка відсутня у списку команд!" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/с" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "м/с" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "км/с" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "милі" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "вузли" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (не пов'язані)" @@ -1334,10 +1351,6 @@ msgid "Key Hunt" msgstr "Key Hunt" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1Матч вже почався" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1У вас не залишилося більше життів" @@ -1409,23 +1422,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "Team Deathmatch" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1860,7 +1873,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "Колір:" @@ -4567,7 +4580,7 @@ msgstr ", втрачаючи %d череду фрагів" msgid ", losing their %d score spree" msgstr ", втрачаючи %d череду очків" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5453,12 +5466,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5483,175 +5496,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5718,7 +5731,7 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 " @@ -5727,39 +5740,39 @@ msgstr "" "Вітаємо у Xonotic! Будь ласка, для початку оберіть свою мову та вкажіть своє " "ім'я. Ви зможете змінити їх через систему меню потім." -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "Ім'я:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "Ім'я під яким ви з'явитесь у грі" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "Мова тексту:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "Дозволити використання імені гравця в статистиці на stats.xonotic.org?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "Зберегти налаштування" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "Вітаємо" @@ -5940,12 +5953,13 @@ msgstr "Панель інформаційних повідомлень" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "Вимкнути" @@ -6012,7 +6026,8 @@ msgstr "Панель сповіщень" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6126,7 +6141,7 @@ msgstr "Радар:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "Прозорість:" @@ -6294,14 +6309,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "Таймер:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "Показувати час що минув" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "Панель таймеру" @@ -6432,12 +6455,12 @@ msgid "Panel background defaults:" msgstr "Фон панелі за замовчуванням:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "Фон:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "Розмір обвідки:" @@ -6447,12 +6470,12 @@ msgid "Team color:" msgstr "Колір команди:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "Протестувати колір команди у конфігураційному режимі" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "Підкладка:" @@ -6584,9 +6607,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "За замовчуванням" @@ -6778,7 +6801,7 @@ msgid "Game types:" msgstr "Типи гри:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "Закрити" @@ -7091,7 +7114,7 @@ msgid "" msgstr "Призупинити оновлення списку серверів для зручнішого вибору" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "Адреса:" @@ -7104,118 +7127,156 @@ msgid "Show more information about the currently highlighted server" msgstr "Показати більше інформації про виділений сервер" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "Приєднатися!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d змінених налаштувань" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "Офіційні налаштування" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "Н/Д (автентична бібліотека відсутня, неможливо з'єднатися)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "Н/Д (відсутня автентична бібліотека)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "Не підтримується (неможливо з'єднатися)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "Не підтримується (не буде шифрувати)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "Підтримується (буде шифрувати)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "Підтримується (не буде шифрувати)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "Запитано (не буде шифрувати)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "Запитано (буде шифрувати)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "Обов'язкове (неможливо з'єднатися)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "Обов'язкове (буде шифрувати)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "Ім'я сервера:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "Тип гри:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "Мапа:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "Мод:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "Версія:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "Налаштування:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "Гравці:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "Боти:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "Вільні місця:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "Кодування:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "Ключ:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "Інформація сервера" @@ -9501,6 +9562,22 @@ msgstr "спостерігати" msgid "Team Selection" msgstr "Вибір команди" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9685,7 +9762,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "Більше не натискайте цю клавішу!" @@ -9748,42 +9825,34 @@ msgstr "Мапа" msgid "Type" msgstr "Тип" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -10007,29 +10076,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "Створення відомостей про нові мапи..." -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "Негайно оновіть версію до %s!" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "Використовувати за замовчуванням" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "Колір команди:" diff --git a/common.uz@Latn.po b/common.uz@Latn.po index fd3af898f..624a9a5c6 100644 --- a/common.uz@Latn.po +++ b/common.uz@Latn.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Uzbek (Latin) (http://www.transifex.com/team-xonotic/xonotic/" "language/uz@Latn/)\n" @@ -49,7 +49,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "" @@ -514,7 +514,7 @@ msgstr "" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -926,12 +926,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "" @@ -1035,8 +1035,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1061,7 +1078,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1074,7 +1091,7 @@ msgstr "" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1085,43 +1102,43 @@ msgstr "" msgid "No" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "" @@ -1321,10 +1338,6 @@ msgid "Key Hunt" msgstr "" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "" @@ -1396,23 +1409,23 @@ msgstr "" msgid "Team Deathmatch" msgstr "" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1847,7 +1860,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "" @@ -4504,7 +4517,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5390,12 +5403,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "" @@ -5420,175 +5433,175 @@ msgstr "" msgid "Extended Team" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "" @@ -5655,46 +5668,46 @@ msgstr "" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "" @@ -5875,12 +5888,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "" @@ -5947,7 +5961,8 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6061,7 +6076,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6229,14 +6244,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "" @@ -6367,12 +6390,12 @@ msgid "Panel background defaults:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "" @@ -6382,12 +6405,12 @@ msgid "Team color:" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6517,9 +6540,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "" @@ -6711,7 +6734,7 @@ msgid "Game types:" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "" @@ -7021,7 +7044,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "" @@ -7034,118 +7057,156 @@ msgid "Show more information about the currently highlighted server" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "" @@ -9422,6 +9483,22 @@ msgstr "" msgid "Team Selection" msgstr "" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9606,7 +9683,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "" @@ -9668,42 +9745,34 @@ msgstr "" msgid "Type" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "" @@ -9927,29 +9996,29 @@ msgstr "" msgid "%d (unranked)" msgstr "" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "" diff --git a/common.zh_CN.po b/common.zh_CN.po index fa27392ae..3fc8cdd23 100644 --- a/common.zh_CN.po +++ b/common.zh_CN.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Chinese (China) (http://www.transifex.com/team-xonotic/" "xonotic/language/zh_CN/)\n" @@ -66,7 +66,7 @@ msgstr "消息显示时长 %s" msgid "Generic message" msgstr "基本消息" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3玩家^7: 这里是聊天区." @@ -531,7 +531,7 @@ msgstr "中间的 %d" msgid "PENALTY: %.1f (%s)" msgstr "惩罚：%.1f（%s）" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "缺失一个检查点" @@ -943,12 +943,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "无" @@ -1052,9 +1052,26 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" -msgstr "热身" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" +msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 msgid "^1You must answer before entering hud configure mode" @@ -1078,7 +1095,7 @@ msgstr "^1设置HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1091,7 +1108,7 @@ msgstr "是" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1102,43 +1119,43 @@ msgstr "是" msgid "No" msgstr "否" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "弹药耗尽" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "没有" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "不可用" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "正在移除不在队伍表的队伍！" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (未绑定)" @@ -1338,10 +1355,6 @@ msgid "Key Hunt" msgstr "钥匙搜索" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1比赛已经开始了" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1你已经用尽你的生命" @@ -1413,23 +1426,23 @@ msgstr "在与敌方队伍的斗争中帮助你的队伍拿到最多人头数" msgid "Team Deathmatch" msgstr "团队式死亡竞赛" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "子弹" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "细胞" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "等离子" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "火箭" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "装甲" @@ -1864,7 +1877,7 @@ msgstr "最大字体大小：" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "色彩：" @@ -4524,7 +4537,7 @@ msgstr "" msgid ", losing their %d score spree" msgstr "" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5410,12 +5423,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d天，%02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5440,175 +5453,175 @@ msgstr "核心团队" msgid "Extended Team" msgstr "扩展团队" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "网址" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "统计" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "美术" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "动画" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "关卡设计" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "音乐/音效FX" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "游戏编码" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "销售 / 人力资源" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "法律信息" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "游戏引擎" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "其他活跃贡献者" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "翻译者" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "白俄罗斯语" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "保加利亚语" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "中文（中国）" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "中文（台湾）" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "康沃尔语" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "捷克语" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "荷兰语" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "英语（澳大利亚）" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "芬兰语" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "法语" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "德语" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "希腊语" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "匈牙利语" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "爱尔兰语" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "意大利语" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "哈萨克语" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "韩语" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "波兰语" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "葡萄牙语" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "罗马尼亚语" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "俄文" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "苏格兰盖尔语" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "塞尔维亚语" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "西班牙语" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "瑞典语" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "乌克兰语" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "过去的贡献者" @@ -5675,46 +5688,46 @@ msgstr "断开" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "名字：" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "你在游戏里的名字" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "文本语言：" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "允许stats.xonotic.org使用你的昵称做玩家统计？" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "未决定" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "保存设置" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "欢迎" @@ -5895,12 +5908,13 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "禁用" @@ -5967,7 +5981,8 @@ msgstr "通知面板" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6081,7 +6096,7 @@ msgstr "雷达:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "" @@ -6249,14 +6264,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "计时器：" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "显示累计时间" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "计时器面板" @@ -6387,12 +6410,12 @@ msgid "Panel background defaults:" msgstr "背景界面默认:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "背景：" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "边框大小：" @@ -6402,12 +6425,12 @@ msgid "Team color:" msgstr "队伍颜色：" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "在配置模式下测试团队的颜色" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "填充：" @@ -6537,9 +6560,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "默认" @@ -6731,7 +6754,7 @@ msgid "Game types:" msgstr "游戏类型：" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "关闭" @@ -7041,7 +7064,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "地址：" @@ -7054,118 +7077,156 @@ msgid "Show more information about the currently highlighted server" msgstr "显示当前高亮服务器的更多信息" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "加入！" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^默认" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d 修改" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "官方" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "N/A （缺失验证库，无法连接）" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "N/A （缺失验证库）" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "不支持（无法连接）" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "不支持（不加密）" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "支持（加密）" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "支持（不加密）" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "禁用统计" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "启动统计" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "主机名称：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "游戏类型：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "地图：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "模组：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "版本：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "设置：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "玩家：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "机器人：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "任意位置：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "加密：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "密码：" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "服务器信息" @@ -9442,6 +9503,22 @@ msgstr "观战" msgid "Team Selection" msgstr "队伍选择" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "允许玩家长期使用你的昵称吗？" @@ -9626,7 +9703,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "不要按这个按钮 ！" @@ -9688,42 +9765,34 @@ msgstr "地图" msgid "Type" msgstr "类型" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "加密:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "模组: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "已更改设定" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "官方设定" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "禁用统计" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "启动统计" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "SLCAT^偏好" @@ -9947,29 +10016,29 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (未评级)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "更新可从以下网址下载：" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "自动生成新增地图的地图信息......" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "现在更新 %s ！" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "使用默认值" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "队伍颜色：" diff --git a/common.zh_TW.po b/common.zh_TW.po index 9a7c35afe..45a326252 100644 --- a/common.zh_TW.po +++ b/common.zh_TW.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 07:22+0100\n" -"PO-Revision-Date: 2021-11-28 06:22+0000\n" +"POT-Creation-Date: 2022-03-06 07:22+0100\n" +"PO-Revision-Date: 2022-03-06 06:22+0000\n" "Last-Translator: divVerent \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/team-xonotic/" "xonotic/language/zh_TW/)\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Generic message" msgstr "" -#: qcsrc/client/hud/panel/chat.qc:98 +#: qcsrc/client/hud/panel/chat.qc:165 msgid "^3Player^7: This is the chat area." msgstr "^3玩家^7: 這裡是對話區." @@ -519,7 +519,7 @@ msgstr "中間的 %d" msgid "PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174 +#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1180 msgid "missing a checkpoint" msgstr "" @@ -931,12 +931,12 @@ msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:665 #: qcsrc/client/hud/panel/scoreboard.qc:672 #: qcsrc/client/hud/panel/scoreboard.qc:727 -#: qcsrc/client/hud/panel/scoreboard.qc:738 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 +#: qcsrc/client/hud/panel/scoreboard.qc:738 qcsrc/common/util.qc:321 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:50 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:51 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:194 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:199 msgid "N/A" msgstr "N/A" @@ -1040,8 +1040,25 @@ msgstr "" msgid "nmi" msgstr "" -#: qcsrc/client/hud/panel/timer.qc:71 -msgid "WARMUP" +#: qcsrc/client/hud/panel/timer.qc:132 +msgid "Warmup" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:134 +msgid "Timeout" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:136 +msgid "Sudden Death" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:138 +msgid "Overtime" +msgstr "" + +#: qcsrc/client/hud/panel/timer.qc:140 +#, c-format +msgid "Overtime #%d" msgstr "" #: qcsrc/client/hud/panel/vote.qc:30 @@ -1066,7 +1083,7 @@ msgstr "^1 設定 HUD" #: qcsrc/client/hud/panel/vote.qc:129 #: qcsrc/menu/xonotic/dialog_disconnect.qc:19 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:82 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:87 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18 #: qcsrc/menu/xonotic/dialog_quit.qc:14 @@ -1079,7 +1096,7 @@ msgstr "是" #: qcsrc/client/hud/panel/vote.qc:131 #: qcsrc/menu/xonotic/dialog_disconnect.qc:22 -#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:88 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21 #: qcsrc/menu/xonotic/dialog_quit.qc:16 @@ -1090,43 +1107,43 @@ msgstr "是" msgid "No" msgstr "不" -#: qcsrc/client/hud/panel/weapons.qc:630 +#: qcsrc/client/hud/panel/weapons.qc:631 msgid "Out of ammo" msgstr "彈藥耗盡" -#: qcsrc/client/hud/panel/weapons.qc:634 +#: qcsrc/client/hud/panel/weapons.qc:635 msgid "Don't have" msgstr "沒有" -#: qcsrc/client/hud/panel/weapons.qc:638 +#: qcsrc/client/hud/panel/weapons.qc:639 msgid "Unavailable" msgstr "不可用" -#: qcsrc/client/main.qc:289 +#: qcsrc/client/main.qc:292 msgid "Trying to remove a team which is not in the teamlist!" msgstr "" -#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 +#: qcsrc/client/main.qc:1082 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51 msgid "qu/s" msgstr "qu/s" -#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 +#: qcsrc/client/main.qc:1083 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52 msgid "m/s" msgstr "m/s" -#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 +#: qcsrc/client/main.qc:1084 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53 msgid "km/h" msgstr "km/h" -#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 +#: qcsrc/client/main.qc:1085 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54 msgid "mph" msgstr "mph" -#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 +#: qcsrc/client/main.qc:1086 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55 msgid "knots" msgstr "knots" -#: qcsrc/client/main.qc:1325 +#: qcsrc/client/main.qc:1331 #, c-format msgid "%s (not bound)" msgstr "%s (沒有綁定)" @@ -1326,10 +1343,6 @@ msgid "Key Hunt" msgstr "搜索鑰匙" #: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18 -msgid "^1Match has already begun" -msgstr "^1比賽已經開始" - -#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25 msgid "^1You have no more lives left" msgstr "^1你已經沒有更多生命了" @@ -1401,23 +1414,23 @@ msgstr "幫助你的團隊擊敗敵方團隊來取得分數" msgid "Team Deathmatch" msgstr "團隊競技" -#: qcsrc/common/items/item/ammo.qh:67 +#: qcsrc/common/items/item/ammo.qh:52 msgid "bullets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:97 +#: qcsrc/common/items/item/ammo.qh:82 msgid "cells" msgstr "" -#: qcsrc/common/items/item/ammo.qh:127 +#: qcsrc/common/items/item/ammo.qh:112 msgid "plasma" msgstr "" -#: qcsrc/common/items/item/ammo.qh:157 +#: qcsrc/common/items/item/ammo.qh:142 msgid "rockets" msgstr "" -#: qcsrc/common/items/item/ammo.qh:191 +#: qcsrc/common/items/item/ammo.qh:176 msgid "shells" msgstr "" @@ -1852,7 +1865,7 @@ msgstr "字體大小最大值：" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:102 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:60 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:109 -#: qcsrc/menu/xonotic/util.qc:775 +#: qcsrc/menu/xonotic/util.qc:787 msgid "Color:" msgstr "顏色:" @@ -4513,7 +4526,7 @@ msgstr ", 失去其 %d 擊敗狂潮" msgid ", losing their %d score spree" msgstr ", 失去其 %d 得分狂潮" -#: qcsrc/common/notifications/all.qh:647 +#: qcsrc/common/notifications/all.qh:648 #, c-format msgid " with %d %s" msgstr "" @@ -5399,12 +5412,12 @@ msgid "" "please file an issue." msgstr "" -#: qcsrc/lib/string.qh:138 +#: qcsrc/lib/string.qh:170 #, c-format msgid "%d days, %02d:%02d:%02d" msgstr "%d 天, %02d:%02d:%02d" -#: qcsrc/lib/string.qh:139 +#: qcsrc/lib/string.qh:171 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" @@ -5429,175 +5442,175 @@ msgstr "核心團隊" msgid "Extended Team" msgstr "擴展團隊" -#: qcsrc/menu/xonotic/credits.qc:29 +#: qcsrc/menu/xonotic/credits.qc:32 msgid "Website" msgstr "網址" -#: qcsrc/menu/xonotic/credits.qc:34 +#: qcsrc/menu/xonotic/credits.qc:37 msgid "Stats" msgstr "統計" -#: qcsrc/menu/xonotic/credits.qc:38 +#: qcsrc/menu/xonotic/credits.qc:41 msgid "Art" msgstr "美術" -#: qcsrc/menu/xonotic/credits.qc:46 +#: qcsrc/menu/xonotic/credits.qc:49 msgid "Animation" msgstr "動畫" -#: qcsrc/menu/xonotic/credits.qc:50 +#: qcsrc/menu/xonotic/credits.qc:53 msgid "Level Design" msgstr "關卡設計" -#: qcsrc/menu/xonotic/credits.qc:73 +#: qcsrc/menu/xonotic/credits.qc:76 msgid "Music / Sound FX" msgstr "音樂/音效FX" -#: qcsrc/menu/xonotic/credits.qc:89 +#: qcsrc/menu/xonotic/credits.qc:92 msgid "Game Code" msgstr "遊戲編碼" -#: qcsrc/menu/xonotic/credits.qc:101 +#: qcsrc/menu/xonotic/credits.qc:106 msgid "Marketing / PR" msgstr "市場營銷 / PR" -#: qcsrc/menu/xonotic/credits.qc:107 +#: qcsrc/menu/xonotic/credits.qc:112 msgid "Legal" msgstr "版權" -#: qcsrc/menu/xonotic/credits.qc:112 +#: qcsrc/menu/xonotic/credits.qc:117 msgid "Game Engine" msgstr "遊戲引擎" -#: qcsrc/menu/xonotic/credits.qc:116 +#: qcsrc/menu/xonotic/credits.qc:121 msgid "Engine Additions" msgstr "附加引擎" -#: qcsrc/menu/xonotic/credits.qc:122 +#: qcsrc/menu/xonotic/credits.qc:127 msgid "Compiler" msgstr "編譯器" -#: qcsrc/menu/xonotic/credits.qc:128 +#: qcsrc/menu/xonotic/credits.qc:133 msgid "Other Active Contributors" msgstr "其他活躍的貢獻者" -#: qcsrc/menu/xonotic/credits.qc:136 +#: qcsrc/menu/xonotic/credits.qc:141 msgid "Translators" msgstr "翻譯者" -#: qcsrc/menu/xonotic/credits.qc:138 +#: qcsrc/menu/xonotic/credits.qc:143 msgid "Asturian" msgstr "阿斯圖里亞斯語" -#: qcsrc/menu/xonotic/credits.qc:143 +#: qcsrc/menu/xonotic/credits.qc:148 msgid "Belarusian" msgstr "白俄羅斯語" -#: qcsrc/menu/xonotic/credits.qc:146 +#: qcsrc/menu/xonotic/credits.qc:151 msgid "Bulgarian" msgstr "保加利亞語" -#: qcsrc/menu/xonotic/credits.qc:153 +#: qcsrc/menu/xonotic/credits.qc:158 msgid "Chinese (China)" msgstr "漢語(中國)" -#: qcsrc/menu/xonotic/credits.qc:159 +#: qcsrc/menu/xonotic/credits.qc:164 msgid "Chinese (Taiwan)" msgstr "中文 (臺灣)" -#: qcsrc/menu/xonotic/credits.qc:164 +#: qcsrc/menu/xonotic/credits.qc:169 msgid "Cornish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:167 +#: qcsrc/menu/xonotic/credits.qc:172 msgid "Czech" msgstr "捷克語" -#: qcsrc/menu/xonotic/credits.qc:172 +#: qcsrc/menu/xonotic/credits.qc:177 msgid "Dutch" msgstr "荷蘭語" -#: qcsrc/menu/xonotic/credits.qc:179 +#: qcsrc/menu/xonotic/credits.qc:184 msgid "English (Australia)" msgstr "英語 (澳大利亞)" -#: qcsrc/menu/xonotic/credits.qc:184 +#: qcsrc/menu/xonotic/credits.qc:189 msgid "Finnish" msgstr "芬蘭語" -#: qcsrc/menu/xonotic/credits.qc:189 +#: qcsrc/menu/xonotic/credits.qc:194 msgid "French" msgstr "法語" -#: qcsrc/menu/xonotic/credits.qc:197 +#: qcsrc/menu/xonotic/credits.qc:202 msgid "German" msgstr "德語" -#: qcsrc/menu/xonotic/credits.qc:208 +#: qcsrc/menu/xonotic/credits.qc:213 msgid "Greek" msgstr "希臘語" -#: qcsrc/menu/xonotic/credits.qc:214 +#: qcsrc/menu/xonotic/credits.qc:219 msgid "Hungarian" msgstr "匈牙利語" -#: qcsrc/menu/xonotic/credits.qc:218 +#: qcsrc/menu/xonotic/credits.qc:223 msgid "Irish" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:221 +#: qcsrc/menu/xonotic/credits.qc:226 msgid "Italian" msgstr "意大利語" -#: qcsrc/menu/xonotic/credits.qc:227 +#: qcsrc/menu/xonotic/credits.qc:232 msgid "Japanese" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:230 +#: qcsrc/menu/xonotic/credits.qc:235 msgid "Kazakh" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:233 +#: qcsrc/menu/xonotic/credits.qc:238 msgid "Korean" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:237 +#: qcsrc/menu/xonotic/credits.qc:242 msgid "Polish" msgstr "波蘭語" -#: qcsrc/menu/xonotic/credits.qc:245 +#: qcsrc/menu/xonotic/credits.qc:250 msgid "Portuguese" msgstr "葡萄牙語" -#: qcsrc/menu/xonotic/credits.qc:251 +#: qcsrc/menu/xonotic/credits.qc:256 msgid "Romanian" msgstr "羅馬尼亞語" -#: qcsrc/menu/xonotic/credits.qc:258 +#: qcsrc/menu/xonotic/credits.qc:263 msgid "Russian" msgstr "俄語" -#: qcsrc/menu/xonotic/credits.qc:269 +#: qcsrc/menu/xonotic/credits.qc:274 msgid "Scottish Gaelic" msgstr "" -#: qcsrc/menu/xonotic/credits.qc:272 +#: qcsrc/menu/xonotic/credits.qc:277 msgid "Serbian" msgstr "塞爾維亞語" -#: qcsrc/menu/xonotic/credits.qc:278 +#: qcsrc/menu/xonotic/credits.qc:283 msgid "Spanish" msgstr "西班牙語" -#: qcsrc/menu/xonotic/credits.qc:290 +#: qcsrc/menu/xonotic/credits.qc:295 msgid "Swedish" msgstr "瑞典語" -#: qcsrc/menu/xonotic/credits.qc:294 +#: qcsrc/menu/xonotic/credits.qc:299 msgid "Ukrainian" msgstr "烏克蘭語" -#: qcsrc/menu/xonotic/credits.qc:301 +#: qcsrc/menu/xonotic/credits.qc:306 msgid "Past Contributors" msgstr "過去的貢獻者" @@ -5664,46 +5677,46 @@ msgstr "斷開連接" msgid "Disconnect from the server you are connected to" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:39 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:44 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 "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:45 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:50 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.qc:28 msgid "Name:" msgstr "名字:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:53 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:58 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62 msgid "Name under which you will appear in the game" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:69 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:74 msgid "Text language:" msgstr "文體語言:" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:78 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:83 msgid "Allow player statistics to use your nickname at stats.xonotic.org?" msgstr "應許玩家統計使用你的綽號在stats.xonotic.org嗎?" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:84 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:89 msgid "Undecided" msgstr "未決定" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:86 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:91 msgid "" "Player statistics are enabled by default, you can change this in the Profile " "menu" msgstr "" -#: qcsrc/menu/xonotic/dialog_firstrun.qc:90 +#: qcsrc/menu/xonotic/dialog_firstrun.qc:95 msgid "Save settings" msgstr "儲存設定" -#: qcsrc/menu/xonotic/dialog_firstrun.qh:6 +#: qcsrc/menu/xonotic/dialog_firstrun.qh:7 msgid "Welcome" msgstr "歡迎" @@ -5884,12 +5897,13 @@ msgstr "消息板面" #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:38 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:77 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:116 -#: qcsrc/menu/xonotic/util.qc:770 qcsrc/menu/xonotic/util.qc:786 -#: qcsrc/menu/xonotic/util.qc:803 +#: qcsrc/menu/xonotic/util.qc:782 qcsrc/menu/xonotic/util.qc:798 +#: qcsrc/menu/xonotic/util.qc:815 msgid "Disable" msgstr "禁用" @@ -5956,7 +5970,8 @@ msgstr "通知板面" #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_strafehud.qc:39 -#: qcsrc/menu/xonotic/util.qc:758 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:26 +#: qcsrc/menu/xonotic/util.qc:770 msgid "Enable" msgstr "" @@ -6070,7 +6085,7 @@ msgstr "雷達:" #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:45 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:70 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:124 -#: qcsrc/menu/xonotic/util.qc:792 +#: qcsrc/menu/xonotic/util.qc:804 msgid "Alpha:" msgstr "原型:" @@ -6238,14 +6253,22 @@ msgstr "" msgid "StrafeHUD Panel" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:17 msgid "Timer:" msgstr "計時器:" -#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:19 +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:20 msgid "Show elapsed time" msgstr "顯示累計時間" +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:23 +msgid "Secondary timer:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_hudpanel_timer.qc:27 +msgid "Swapped" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_timer.qh:6 msgid "Timer Panel" msgstr "計時器板面" @@ -6376,12 +6399,12 @@ msgid "Panel background defaults:" msgstr "板面背景默認:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:48 -#: qcsrc/menu/xonotic/util.qc:767 +#: qcsrc/menu/xonotic/util.qc:779 msgid "Background:" msgstr "背景:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:60 -#: qcsrc/menu/xonotic/util.qc:783 +#: qcsrc/menu/xonotic/util.qc:795 msgid "Border size:" msgstr "邊框大小:" @@ -6391,12 +6414,12 @@ msgid "Team color:" msgstr "團隊顏色:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:83 -#: qcsrc/menu/xonotic/util.qc:809 +#: qcsrc/menu/xonotic/util.qc:821 msgid "Test team color in configure mode" msgstr "在配置模式下測試團隊顏色" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:86 -#: qcsrc/menu/xonotic/util.qc:812 +#: qcsrc/menu/xonotic/util.qc:824 msgid "Padding:" msgstr "" @@ -6526,9 +6549,9 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111 -#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:769 -#: qcsrc/menu/xonotic/util.qc:785 qcsrc/menu/xonotic/util.qc:794 -#: qcsrc/menu/xonotic/util.qc:802 qcsrc/menu/xonotic/util.qc:814 +#: qcsrc/menu/xonotic/skinlist.qc:88 qcsrc/menu/xonotic/util.qc:781 +#: qcsrc/menu/xonotic/util.qc:797 qcsrc/menu/xonotic/util.qc:806 +#: qcsrc/menu/xonotic/util.qc:814 qcsrc/menu/xonotic/util.qc:826 msgid "Default" msgstr "默認" @@ -6720,7 +6743,7 @@ msgid "Game types:" msgstr "遊戲類型:" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:85 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:257 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:220 msgid "Close" msgstr "關閉" @@ -7030,7 +7053,7 @@ msgid "" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:74 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:184 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:30 msgid "Address:" msgstr "地址:" @@ -7043,118 +7066,156 @@ msgid "Show more information about the currently highlighted server" msgstr "顯示更多信息關於當前已標記的服務器" #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:96 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:264 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:227 msgid "Join!" msgstr "加入!" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:114 -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:93 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:105 +msgid "No Terms of Service specified" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:144 +#: qcsrc/menu/xonotic/serverlist.qc:1052 msgid "MOD^Default" msgstr "MOD^默認" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 #, c-format msgid "%d modified" msgstr "%d 已修改" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 msgid "Official" msgstr "官方" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:129 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:159 msgid "N/A (auth library missing, can't connect)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:131 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 msgid "N/A (auth library missing)" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:137 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:167 msgid "Not supported (can't connect)" msgstr "不支持 (不可連接)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:139 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169 msgid "Not supported (won't encrypt)" msgstr "不支持 (將不加密)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:143 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:173 msgid "Supported (will encrypt)" msgstr "支持 (將會加密)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:175 msgid "Supported (won't encrypt)" msgstr "支持 (將不加密)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:149 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:179 msgid "Requested (will encrypt)" msgstr "請求 (將會加密)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:151 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:181 msgid "Requested (won't encrypt)" msgstr "請求 (將不加密)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:155 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:185 msgid "Required (can't connect)" msgstr "需要 (不可連接)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:157 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:187 msgid "Required (will encrypt)" msgstr "需要 (將會加密)" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:191 msgid "Use the `crypto_aeslevel` cvar to change your preferences" msgstr "" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "custom stats server" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats disabled" +msgstr "關閉統計" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:203 +#: qcsrc/menu/xonotic/serverlist.qc:1056 +msgid "stats enabled" +msgstr "開啟統計" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:213 +msgid "Status" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7 +#: qcsrc/menu/xonotic/dialog_termsofservice.qh:11 +msgid "Terms of Service" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +msgid "Server Info" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24 msgid "Hostname:" msgstr "主機名稱:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:192 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:38 msgid "Gametype:" msgstr "遊戲類型:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:197 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:43 msgid "Map:" msgstr "地圖:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:202 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:48 msgid "Mod:" msgstr "模組:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:207 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:53 msgid "Version:" msgstr "版本:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:212 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:58 msgid "Settings:" msgstr "設定:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:219 -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:251 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:65 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:102 msgid "Players:" msgstr "玩家:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:224 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:70 msgid "Bots:" msgstr "電腦玩家:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:229 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:75 msgid "Free slots:" msgstr "空位:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:235 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:81 msgid "Encryption:" msgstr "加密:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:240 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:86 msgid "ID:" msgstr "ID:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:245 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:91 msgid "Key:" msgstr "密碼:" -#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7 +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96 +msgid "Stats:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6 msgid "Server Information" msgstr "服務器信息" @@ -9431,6 +9492,22 @@ msgstr "觀看" msgid "Team Selection" msgstr "選擇團隊" +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:78 +msgid "Terms of Service have been updated. Please read them before continuing:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:80 +msgid "Welcome to Xonotic! Please read the following Terms of Service:" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:93 +msgid "Accept" +msgstr "" + +#: qcsrc/menu/xonotic/dialog_termsofservice.qc:97 +msgid "Don't accept (quit the game)" +msgstr "" + #: qcsrc/menu/xonotic/dialog_uid2name.qc:10 msgid "Allow player statistics to use your nickname?" msgstr "" @@ -9615,7 +9692,7 @@ msgstr "" msgid "waypoint editor menu" msgstr "" -#: qcsrc/menu/xonotic/mainwindow.qc:97 qcsrc/menu/xonotic/mainwindow.qc:100 +#: qcsrc/menu/xonotic/mainwindow.qc:104 qcsrc/menu/xonotic/mainwindow.qc:107 msgid "Do not press this button again!" msgstr "不要在按這個按鈕！" @@ -9677,42 +9754,34 @@ msgstr "地圖" msgid "Type" msgstr "類型" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 #, c-format msgid "AES level %d" msgstr "" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "ENC^none" msgstr "ENC^無" -#: qcsrc/menu/xonotic/serverlist.qc:1046 +#: qcsrc/menu/xonotic/serverlist.qc:1051 msgid "encryption:" msgstr "加密:" -#: qcsrc/menu/xonotic/serverlist.qc:1047 +#: qcsrc/menu/xonotic/serverlist.qc:1052 #, c-format msgid "mod: %s" msgstr "模組: %s" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "modified settings" msgstr "已更動設定" -#: qcsrc/menu/xonotic/serverlist.qc:1049 +#: qcsrc/menu/xonotic/serverlist.qc:1054 #, c-format msgid "official settings" msgstr "官方設定" -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats disabled" -msgstr "關閉統計" - -#: qcsrc/menu/xonotic/serverlist.qc:1051 -msgid "stats enabled" -msgstr "開啟統計" - #: qcsrc/menu/xonotic/serverlist.qh:153 msgid "SLCAT^Favorites" msgstr "SLCAT^偏好" @@ -9936,29 +10005,29 @@ msgstr "" msgid "%d (unranked)" msgstr "%d (為排名)" -#: qcsrc/menu/xonotic/util.qc:420 +#: qcsrc/menu/xonotic/util.qc:426 msgid "Update can be downloaded at:" msgstr "" -#: qcsrc/menu/xonotic/util.qc:528 +#: qcsrc/menu/xonotic/util.qc:539 msgid "Autogenerating mapinfo for newly added maps..." msgstr "" -#: qcsrc/menu/xonotic/util.qc:566 +#: qcsrc/menu/xonotic/util.qc:577 #, c-format msgid "Update to %s now!" msgstr "現在更新到 %s ！" -#: qcsrc/menu/xonotic/util.qc:650 +#: qcsrc/menu/xonotic/util.qc:662 msgid "" "^1ERROR: Texture compression is required but not supported.\n" "^1Expect visual problems." msgstr "" -#: qcsrc/menu/xonotic/util.qc:780 +#: qcsrc/menu/xonotic/util.qc:792 msgid "Use default" msgstr "使用默認" -#: qcsrc/menu/xonotic/util.qc:800 +#: qcsrc/menu/xonotic/util.qc:812 msgid "Team Color:" msgstr "團隊顏色:" diff --git a/effectinfo.txt b/effectinfo.txt index 0f9f2f23c..7fc732b7d 100644 --- a/effectinfo.txt +++ b/effectinfo.txt @@ -6825,93 +6825,6 @@ effect nade_neutral trailspacing 16 underwater velocityjitter 16 16 16 -effect nade_green - type smoke - alpha 100 100 250 - color 0x40ff9b 0x40ff9b - sizeincrease -1 - size 3 3 - tex 65 65 - trailspacing 1 -effect nade_green - type smoke - alpha 30 30 150 - color 0xff0000 0xffa2a2 - notunderwater - sizeincrease -10 - size 15 25 - tex 65 65 - trailspacing 8 -effect nade_green - type bubble - alpha 256 256 256 - bounce 1.500000 - color 0x40ff9b 0x40ff9b - gravity -0.125000 - liquidfriction 4 - size 1 1 - tex 62 62 - trailspacing 16 - underwater - velocityjitter 16 16 16 -effect nade_brown - type smoke - alpha 100 100 250 - color 0xa85400 0xa85400 - sizeincrease -1 - size 3 3 - tex 65 65 - trailspacing 1 -effect nade_brown - type smoke - alpha 30 30 150 - color 0xff0000 0xffa2a2 - notunderwater - sizeincrease -10 - size 15 25 - tex 65 65 - trailspacing 8 -effect nade_brown - type bubble - alpha 256 256 256 - bounce 1.500000 - color 0xa85400 0xa85400 - gravity -0.125000 - liquidfriction 4 - size 1 1 - tex 62 62 - trailspacing 16 - underwater - velocityjitter 16 16 16 -effect nade_purple - type smoke - alpha 100 100 250 - color 0x540054 0x540054 - sizeincrease -1 - size 3 3 - tex 65 65 - trailspacing 1 -effect nade_purple - type smoke - alpha 30 30 150 - color 0xff0000 0xffa2a2 - notunderwater - sizeincrease -10 - size 15 25 - tex 65 65 - trailspacing 8 -effect nade_purple - type bubble - alpha 256 256 256 - bounce 1.500000 - color 0x540054 0x540054 - gravity -0.125000 - liquidfriction 4 - size 1 1 - tex 62 62 - trailspacing 16 - underwater - velocityjitter 16 16 16 effect nade_red_burn type smoke alpha 100 100 250 @@ -7112,126 +7025,6 @@ effect nade_neutral_burn tex 71 73 trailspacing 16 velocityjitter 10 10 10 -effect nade_green_burn - type smoke - alpha 100 100 250 - color 0x40ff9b 0xff3c00 - sizeincrease -1 - size 5 5 - tex 65 65 - trailspacing 1 -effect nade_green_burn - type smoke - alpha 200 200 1000 - color 0xff0000 0xffa2a2 - notunderwater - sizeincrease -30 - size 45 25 - tex 65 65 - trailspacing 64 -effect nade_green_burn - type bubble - alpha 256 256 256 - bounce 1.500000 - color 0x40ff9b 0xff3c00 - gravity -0.125000 - liquidfriction 4 - size 1 1 - tex 62 62 - trailspacing 16 - underwater - velocityjitter 16 16 16 -effect nade_green_burn - type smoke - alpha 300 900 1500 - color 0x40ff9b 0xff3c00 - originjitter 2 2 2 - rotate -180 180 20 -20 - sizeincrease -40 - size 15 25 - tex 71 73 - trailspacing 16 - velocityjitter 10 10 10 -effect nade_brown_burn - type smoke - alpha 100 100 250 - color 0xa85400 0xff3c00 - sizeincrease -1 - size 5 5 - tex 65 65 - trailspacing 1 -effect nade_brown_burn - type smoke - alpha 200 200 1000 - color 0xff0000 0xffa2a2 - notunderwater - sizeincrease -30 - size 45 25 - tex 65 65 - trailspacing 64 -effect nade_brown_burn - type bubble - alpha 256 256 256 - bounce 1.500000 - color 0xa85400 0xff3c00 - gravity -0.125000 - liquidfriction 4 - size 1 1 - tex 62 62 - trailspacing 16 - underwater - velocityjitter 16 16 16 -effect nade_brown_burn - type smoke - alpha 300 900 1500 - color 0xa85400 0xff3c00 - originjitter 2 2 2 - rotate -180 180 20 -20 - sizeincrease -40 - size 15 25 - tex 71 73 - trailspacing 16 - velocityjitter 10 10 10 -effect nade_purple_burn - type smoke - alpha 100 100 250 - color 0x540054 0xff3c00 - sizeincrease -1 - size 5 5 - tex 65 65 - trailspacing 1 -effect nade_purple_burn - type smoke - alpha 200 200 1000 - color 0xff0000 0xffa2a2 - notunderwater - sizeincrease -30 - size 45 25 - tex 65 65 - trailspacing 64 -effect nade_purple_burn - type bubble - alpha 256 256 256 - bounce 1.500000 - color 0x540054 0xff3c00 - gravity -0.125000 - liquidfriction 4 - size 1 1 - tex 62 62 - trailspacing 16 - underwater - velocityjitter 16 16 16 -effect nade_purple_burn - type smoke - alpha 300 900 1500 - color 0x540054 0xff3c00 - originjitter 2 2 2 - rotate -180 180 20 -20 - sizeincrease -40 - size 15 25 - tex 71 73 - trailspacing 16 - velocityjitter 10 10 10 effect nade_blue_explode type decal alpha 256 256 0 @@ -7782,336 +7575,6 @@ effect nade_neutral_explode size 20 40 tex 71 73 velocityjitter 324 324 324 -effect nade_green_explode - type decal - alpha 256 256 0 - countabsolute 1 - lightcolor 100 20 20 - lightradiusfade 1500 - lightradius 300 - originjitter 26 26 26 - size 88 88 - tex 8 16 -effect nade_green_explode - type smoke - alpha 80 80 650 - color 0xff0000 0xffa2a2 - countabsolute 1 - sizeincrease 1800 - size 32 32 - tex 33 33 - velocitymultiplier 44 -effect nade_green_explode - type smoke - airfriction 30 - alpha 400 656 2000 - color 0x40ff9b 0xa647d3 - count 16 - notunderwater - originjitter 50 50 50 - rotate -180 180 -9 9 - sizeincrease 555 - size 20 24 - tex 48 55 - velocityjitter 320 320 320 -effect nade_green_explode - type spark - airfriction -9 - alpha 1500 3000 13000 - color 0x40ff9b 0xff4200 - count 8 - sizeincrease 40 - size 60 90 - stretchfactor 80 - tex 48 55 - velocityjitter 30 30 30 -effect nade_green_explode - type smoke - airfriction 0.040000 - alpha 128 328 390 - blend alpha - color 0x222222 0x000000 - count 32 - gravity 0.400000 - originjitter 50 50 10 - rotate -180 180 2 -2 - sizeincrease 50 - size 60 30 - tex 0 7 - velocityjitter 200 200 200 - velocityoffset 0 0 180 -effect nade_green_explode - type bubble - alpha 128 256 64 - bounce 1.500000 - color 0x404040 0x808080 - count 32 - gravity -0.125000 - liquidfriction 0.250000 - originjitter 16 16 16 - size 3 6 - tex 62 62 - underwater - velocityjitter 196 196 196 -effect nade_green_explode - type spark - airfriction 1 - alpha 644 956 484 - bounce 1.600000 - color 0xff0000 0xffa2a2 - count 8 - gravity 1 - liquidfriction 0.800000 - notunderwater - originjitter 16 16 16 - size 1 2 - tex 40 40 - velocityjitter 424 424 624 - velocityoffset 0 0 80 -effect nade_green_explode - type spark - airfriction 0.700000 - alpha 644 956 684 - color 0xff0000 0xffa2a2 - count 16 - gravity 0.500000 - liquidfriction 0.800000 - originjitter 16 16 16 - size 1 2 - tex 40 40 - velocityjitter 424 424 624 - velocityoffset 0 0 80 -effect nade_green_explode - type smoke - alpha 644 956 2500 - color 0xff0000 0xffa2a2 - count 8 - notunderwater - originjitter 64 64 64 - rotate -180 180 -100 100 - size 20 40 - tex 71 73 - velocityjitter 324 324 324 -effect nade_brown_explode - type decal - alpha 256 256 0 - countabsolute 1 - lightcolor 100 20 20 - lightradiusfade 1500 - lightradius 300 - originjitter 26 26 26 - size 88 88 - tex 8 16 -effect nade_brown_explode - type smoke - alpha 80 80 650 - color 0xff0000 0xffa2a2 - countabsolute 1 - sizeincrease 1800 - size 32 32 - tex 33 33 - velocitymultiplier 44 -effect nade_brown_explode - type smoke - airfriction 30 - alpha 400 656 2000 - color 0xa85400 0xa647d3 - count 16 - notunderwater - originjitter 50 50 50 - rotate -180 180 -9 9 - sizeincrease 555 - size 20 24 - tex 48 55 - velocityjitter 320 320 320 -effect nade_brown_explode - type spark - airfriction -9 - alpha 1500 3000 13000 - color 0xa85400 0xff4200 - count 8 - sizeincrease 40 - size 60 90 - stretchfactor 80 - tex 48 55 - velocityjitter 30 30 30 -effect nade_brown_explode - type smoke - airfriction 0.040000 - alpha 128 328 390 - blend alpha - color 0x222222 0x000000 - count 32 - gravity 0.400000 - originjitter 50 50 10 - rotate -180 180 2 -2 - sizeincrease 50 - size 60 30 - tex 0 7 - velocityjitter 200 200 200 - velocityoffset 0 0 180 -effect nade_brown_explode - type bubble - alpha 128 256 64 - bounce 1.500000 - color 0x404040 0x808080 - count 32 - gravity -0.125000 - liquidfriction 0.250000 - originjitter 16 16 16 - size 3 6 - tex 62 62 - underwater - velocityjitter 196 196 196 -effect nade_brown_explode - type spark - airfriction 1 - alpha 644 956 484 - bounce 1.600000 - color 0xff0000 0xffa2a2 - count 8 - gravity 1 - liquidfriction 0.800000 - notunderwater - originjitter 16 16 16 - size 1 2 - tex 40 40 - velocityjitter 424 424 624 - velocityoffset 0 0 80 -effect nade_brown_explode - type spark - airfriction 0.700000 - alpha 644 956 684 - color 0xff0000 0xffa2a2 - count 16 - gravity 0.500000 - liquidfriction 0.800000 - originjitter 16 16 16 - size 1 2 - tex 40 40 - velocityjitter 424 424 624 - velocityoffset 0 0 80 -effect nade_brown_explode - type smoke - alpha 644 956 2500 - color 0xff0000 0xffa2a2 - count 8 - notunderwater - originjitter 64 64 64 - rotate -180 180 -100 100 - size 20 40 - tex 71 73 - velocityjitter 324 324 324 -effect nade_purple_explode - type decal - alpha 256 256 0 - countabsolute 1 - lightcolor 100 20 20 - lightradiusfade 1500 - lightradius 300 - originjitter 26 26 26 - size 88 88 - tex 8 16 -effect nade_purple_explode - type smoke - alpha 80 80 650 - color 0xff0000 0xffa2a2 - countabsolute 1 - sizeincrease 1800 - size 32 32 - tex 33 33 - velocitymultiplier 44 -effect nade_purple_explode - type smoke - airfriction 30 - alpha 400 656 2000 - color 0x540054 0xa647d3 - count 16 - notunderwater - originjitter 50 50 50 - rotate -180 180 -9 9 - sizeincrease 555 - size 20 24 - tex 48 55 - velocityjitter 320 320 320 -effect nade_purple_explode - type spark - airfriction -9 - alpha 1500 3000 13000 - color 0x540054 0xff4200 - count 8 - sizeincrease 40 - size 60 90 - stretchfactor 80 - tex 48 55 - velocityjitter 30 30 30 -effect nade_purple_explode - type smoke - airfriction 0.040000 - alpha 128 328 390 - blend alpha - color 0x222222 0x000000 - count 32 - gravity 0.400000 - originjitter 50 50 10 - rotate -180 180 2 -2 - sizeincrease 50 - size 60 30 - tex 0 7 - velocityjitter 200 200 200 - velocityoffset 0 0 180 -effect nade_purple_explode - type bubble - alpha 128 256 64 - bounce 1.500000 - color 0x404040 0x808080 - count 32 - gravity -0.125000 - liquidfriction 0.250000 - originjitter 16 16 16 - size 3 6 - tex 62 62 - underwater - velocityjitter 196 196 196 -effect nade_purple_explode - type spark - airfriction 1 - alpha 644 956 484 - bounce 1.600000 - color 0xff0000 0xffa2a2 - count 8 - gravity 1 - liquidfriction 0.800000 - notunderwater - originjitter 16 16 16 - size 1 2 - tex 40 40 - velocityjitter 424 424 624 - velocityoffset 0 0 80 -effect nade_purple_explode - type spark - airfriction 0.700000 - alpha 644 956 684 - color 0xff0000 0xffa2a2 - count 16 - gravity 0.500000 - liquidfriction 0.800000 - originjitter 16 16 16 - size 1 2 - tex 40 40 - velocityjitter 424 424 624 - velocityoffset 0 0 80 -effect nade_purple_explode - type smoke - alpha 644 956 2500 - color 0xff0000 0xffa2a2 - count 8 - notunderwater - originjitter 64 64 64 - rotate -180 180 -100 100 - size 20 40 - tex 71 73 - velocityjitter 324 324 324 effect shockwave_attack type spark airfriction 1 diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg index 62570e523..9e2e52392 100644 --- a/gamemodes-server.cfg +++ b/gamemodes-server.cfg @@ -209,7 +209,6 @@ set g_duel_respawn_delay_max 0 set g_duel_respawn_waves 0 set g_duel_weapon_stay 0 - // ========= // assault // ========= @@ -224,7 +223,7 @@ set g_ca_point_limit -1 "Clan Arena point limit overriding the mapinfo specified set g_ca_point_leadlimit -1 "Clan Arena point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" set g_ca_spectate_enemies 0 "allow eliminated players to spectate enemy players during Clan Arena games" set g_ca_warmup 10 "time players get to run around before the round starts" -set g_ca_damage2score_multiplier 0.01 +set g_ca_damage2score 100 "every this amount of damage done give players 1 point" set g_ca_round_timelimit 180 "round time limit in seconds" set g_ca_teams_override 0 set g_ca_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any" @@ -445,7 +444,8 @@ set g_keyhunt_team_spawns 0 "when 1, players spawn from the team spawnpoints of set g_lms 0 "Last Man Standing: everyone starts with a certain amount of lives, and the survivor wins" set g_lms_lives_override -1 set g_lms_extra_lives 0 -set g_lms_regenerate 0 +set g_lms_regenerate 0 "health and/or armor regeneration, according to g_balance_health_regen and g_balance_armor_regen" +set g_lms_rot 0 "health and/or armor rotting, according to g_balance_health_rot and g_balance_armor_rot" set g_lms_last_join 3 "if g_lms_join_anytime is 0, new players can only join if the worst active player has (fraglimit - g_lms_last_join) or more lives; in other words, new players can no longer join once the worst player loses more than g_lms_last_join lives" set g_lms_join_anytime 1 "1: new players can join, but get same amount of lives as the worst player; 0: new players can only join if the worst active player has (fraglimit - g_lms_last_join) or more lives" set g_lms_items 0 "enables items to spawn, weaponarena still disables weapons and ammo (to force all items to spawn, use g_pickup_items 1 instead)" diff --git a/gfx/hud/default/nade_ammo.tga b/gfx/hud/default/nade_ammo.tga deleted file mode 100644 index 31cf048fd545702177694be723446a3bd23e0f52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65580 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 Y-#os{F#boJLdtGCWFvvKKNde&Ocx}W>| zJKgvFthImkv!DOW|EBzG%FilX?2mrh{?r2nr3cLHB2iqF5s9LLs3fY0BvDmVi)?vZ zE<#ytON)}CScD?l78abdkodW{prG`{551icJKxcHVEgFfYqP1u%+KCRLQ)tV+ zKTg#?uSpTSr-f)Hnux}tf#AH!!tDsV!N#ze5`uPI_(SjWfA{s##{&PP-z$phqP{>Y zv_nU9?IC)LzM{VvB!)y7rY#H?*&-_huNx?MUxw%@(nLprowO0y2X?{dx=j#ch&R|` zQBmmM-B&-P&sTq3I5$hqzm-U6zDrjj1?2aL@`-RIS0HZNAR98 zVuZj}unTMgd*E~03t~%4f$h}hAMre+1XgF2O5VOTxF;C1F4@Ow1Z8SW`>v%oyn<+RCcENeGh1){9_QSS7TxclB z6=6FdUj1YT-_j1$XBP>4zN~Pcr+@J|;yityA&BevDH=@|_X>1;L_8suil@Xf@w9kG zERV1vwDoMW)`~Ymtk?bqu~EDwHbwA#wmiR1 ztQMRLo4_6xi3I{1!`3E=@dEqH6d8i{VV~GRBY_=M5s9LtC@g*&N91D%>KnADpFG~z z*FJsOLG%>#^C&S{pu@ug|3;^^V$+#3XSRLu#TPqIojSGm#EBF8KmYvm{W=bNBka@m zz?WZsc}UM4((Cfj&gxdk} zAXyN{E)&GHi}LA$AMIiKL=Y=0h#G=^Yc238`V>FI=kRy>9vxniUK^#`cImkPlTSW5 zx_$fhQ_ns3oDCbCW&P4KY~=6}_NRBZnO*~5o<4p0%+~j|*n~;rY+%0u)<3k z1A6zf%v%T9UDK!9x;KAk|NFoHYkKXc*n@0pmp=uu~6Xe_~J(S_m1@& zH+*#eoVjOa-F3I!HR(?4)w+wdO>S;A6RKL}(iN?GLS<`wbpyNQrViG-doSzS?iRbY zMm?)q=1NN{RX#!mZ7b+lC974wx}LwrQd+jL(W7p+=bwMx)~#Fj+4}YCPrUi&o1co0 zH*MN<;DZl7*dzORSMAs&h!5BTd4e|16gdJrz;?Tc6wy@F7D=M4AQt?n>jGUr+Lsir zeG~2DGd%=(9)BX%FBZ?q_cr|f?|H7Z-%8eM+1 z)hkuQ5{q1BWq(oHt|(H*$`!rbDwIgDT9;O}Hsu;yLXk`Dio#`L6M6lWB@!(;@hWS1 zO;by2-`O&{^|n6U(yez|FYDJM!^VvrV}JO=AHGz~Ii`F=zQ7jNix&iTKuzLyKwiiY zokVLvY$Fzw6I}a`G9T!=qx~N3$(ua|eMY>WC+N@BCr_T-viZHYKU(yE7oE9tbBC(8Y4@m|%b1_t(?PFNf4l?1210JXj(Y z2x1qtVy3{Zv2U)G`mmxXEq+w%F1lW?_3(T8f!K)ly#;Y|iol1KiP!)3x4&&){NxkI zZ>ZhOu1&0MO%m!_!%J&fgHkmET>rY4R119Hb$9J66-~73FK-a|Jhl*io;VT2ijej^ zCWch}Wr9`zRV8aurjB7-4NE6mwO?In3572W;!34U$^|**y4nq`N7rulKd-%bQh8yo z+Pp=q71XBKFLuB+QO9J64x)vqBd863G&Z1XEhI_^;ve}wTKj1_MjmDCweIlY!|y-z z(880=t2MH^rInwh1A5mlRXqBX1i`93cm-MjG#UwAG8$p#E-%Tbe$K7Vj@9M=QkGa_xJ`i^dn-W*l_IFv0cAe z^qW&nuWD#lm#P~0A38KEQ_otLz1C6^nppe9=GM7mLunpkHHzr(X zH(k-xQU&kfaodE(c0<`l*6Q+xfo)(P*pTa7uVl5rHn0zL#|GG9ci2UA%)oXk7Qe#k zCe^a`ty8Ucw_cW=J@kt=|KA%QefHUBQ{0a_2D4VMYIw>3LDUM77>httBFP; zMWhSYev$T{Q%&{O-o1PGJhX7(XU(czYmLfWZ8s;ju#V+gT3UrRfz~~*OtoGS(yzS9 zobDBG%!>o~ew|CMvJQG5c5*JTk7%$5Vngjqs#?=BbpzWV2P7$W5F=vQK)GLDZq$!H zrf5{_8k=$NU8gl(p-v_cTX5Yc*!}xJ*fH;8u#0hLCTHA9yCQbnMg1?gk zum$o6kI5lbi)q{_J0KQ#-iT!n<%^ZII!Vcvk&$j6e7Ns#8pAMVTp=D5*Z^^$v!EWR zEh>tV;s>*KplkWLC@#qP)O%bjc0WW=7crMdj@)we=+Q$DKJb7wsou~Mi(MYncjy|{ zIo7^w?^|*LS`p*10b)LyqI;}3fQ`gD&g;nqXipAcOOBxS)?9fxtUvo6_u0qS(Hfn2ExO?QXhEzdXHYL( z^{a|O-G}c&a`DQ+>!{~=J$a&D$?Aco)RUg`sS7;za}2NnhsS&l@8SKNi!lTBWrbgs z&9edO5OP9ltG4$3`|p3Knt)uu_-2k6EBXrhh5n&7N)*LJfnGCE`@P;LuGJH*1#zF8 zKTA*(ZP>kg_kr2dXW5V@>6THoL!cY|hwqZx@p*DTeoE~|-4?Fv=zFi**_P2b08M!x zc7jff4}s(OEufd%1Y3L={Q%847kLEV=kv$|e3sjY+l1Qz_D9@tTkx1bETA^1dBs&W zpl?5HV7GF?T3tKy1oXow!T6W?0cxXa0-q^dkQWAMf8;v2o+g5^FY#`YctpIcG2X7( z(`VX{>omt!rG21x?@H~0{-)p28~-MLyXKwBw+if`TgA3P48R}hV>EN!&=&oP5j;=4 zMjM|u2ygLWf6P95qMh3kk3G&{d)Nv-&XyPwJ}VTZu`eVmEi5v!;Pi67X5 z+ZwS3JHjTt9$=i=5A4Xud9^!54b z&-=phpT4I5c|S3QJVH)J_b~a{0QzG;9{=%e{NMGbjnUfY_n3BYF2;(y#^V6<1kLJR zXaDokiwCrR;Pv3W>KAH(biq0(H52oLB}IW552&rge#S6f_i-)MH`Ka}dsd09s)LT_ z^c!W}E2jkdQ^S83{i)N#{*V6n9q|GEy>1I@AKs6)1N6t|(F;E(*WXg^`XD#q|JWO! zk)P(_tf7z*e@KyE6V}kh*@<3<7n2_-RepIBO)Pia& zvA>L{Du`pmvq55t;2K|7?%Ox#o_lS0^M2O3LhJ9PKkIv8{qZs8_Zc&wKlve+|L11| z=uiFV`eRGfB7pwb8=n!@Ilq10>thYhNxM7-FgHLwIC;vXziT~ti~5B;;PV1~wa<8f zTChOH0JXP>2*>_3JsvJ*iKiLwFMR01lef3J)p}LFDTuA~>38*i>ISc~-M`4e)Q;z? zKepg;0R5@s@NxW~bD=#k0R4SEF+a`2$Ep8Ze_{af!1ZTKEzl_W8hhd8=l`a;?{(^* zC4%w5FhR~NP%%L5y+APES3xkZP2EpE8zZpo=l-;F`_9qrGp$#Zn*x2vt?2(<^FQ-^ z=J?b?8pXd2JtaYq?Ug!Gb|KxzM{_K+nhToQb zTD2hKf#<{mF6Pxo~D)1UsdUv&U6V6m7kybfrp{px}_p}1ZjQv1mLr3Ja4abJ7EoX-^T znC8D6uLzs>j$J;>2v{pn+JHu@8<@#kotXP&|5YQoRq z|KtnwL3`!^h#}l#KwKggFh1aTw7*9`CWr7^_kZ?jr)$rax#2pMlI^yvVW#_?cB`LW z6_1L^0^gy2#+R5&DJ9}|PEc*5_A4tGw@|x;$Nf)gth@2o(!~I(P?gS>StHH*SMC_p4)i1bhb`czypGols?y~(eSU|}#~$2vd=AKS0CNIi-F=@rkng3ak9MiAR*Of(BtZ^nFFXfO zU&Un(P`io=Y?OM1x`q0MI%cj|p?mn>o;Lc9uj!Akx&HJi`JcJ_K9$-B8lrEYb@enG zlHBbpWY&xvQ%#Bg5^wQY^dI;=w0E1KJ!nh3AU4o8YEIUtu>+vS1mc+61hpR8^Iqx? z*Wc|Vx(-DDj2^xD4$^-0mCprGH!%(f&jrL~4p19?>|as)#42JIv5Oc+EL*8D?iT5P zGTQ&W_9w0qYw`6wT|;_vED!lTzVDB*i>#}A1h#>1qCc^pc=2t>NV++&IbsL!7+uK~ z;q#DNJpYhus6&Yj*oE5z`&^UP|7^J*1)nEZg>8U)%DZ*!%KZU{)mPL2PYd!U@w2C3 zE`_*CevP|vfZ7yG{|p^xE@Qq}dGO%Dty4!$IypEwE%0yp4?LFo{Z-WN)QEw;u5(1| zJpb48{+fQ$37f$;(Tce?G@x$7->A9ByXOP(nfCzuyqEJ~Pi-`oaDS&3pzXvcz&5yF z1-l?uF#e=H*aYKG{Gao%^%?;E-3FKoY}=%@ty!~%?;pOS{#qrN3z{G@M2cWeg}I;- zBCh6w)E@MwUHE@}L3=X<`g0vCKm72+t@uCs(|7n6K1-~nKdA$#y&1FR>5TuQwYJy; zS`&+1Yho)k7WF@VMIBaJ@t<>`3w}vXARdPyXGeoRt`X<-T#jDk7C=wxIdsE5&=ViW zF31Z$?sS{LF0gA}M{Xb{P*?ES+Z@CLjRU!deD2))PD}sy)n6}*MPjn>abRQZGq*ww z5Le$HQ+vKi|5XPL9C+uhaZ~;|Fu7|`zh%|#VPOVe)iubmXogLY_wgmP_IX_TjW~*( z(69I;n)w(IU9bUOPv2u_=tJM<2j>aH>#-{z%Mk;xPahkw&*z0}erisS>%3vq<&<1x=;n;rw03+DUC8Yk~nf36iz2(JM;Yrm;rZl$bp)Hhv_cP`2cq`o_4uIc&wT~? z=^uR@TR=b8pY!s$_&;%-_7M}p`ul5RZMg>W5!&;9&gFJM%%H8DkMAxs2GBg<0rl4g z!8`yp0ApyzQjDp*1}K_0@fHU=YFBvOKUVx-b^Q48t#^%?a&knA{<$$dq&vQkR``nh zHFXtz?taJCHJ~4XW5j}J{n7io>W?1S96pVn)N1I(XQ4g#95AnmCfWwDW1m;#`utpO z2gEn*t#V`xpx-q(qW;`0xL2I96Jsc9X`crm#}*fHGY>#pM6CRe{|EJ-;@XxOIa5#G z)+8hFf6wdG>0T@2i}-oCuf5M>ZFwDYclfCLKYmGnqCewE#+KjK|2e1YPh2POdz-L3 zY6s#>wD#f0ZU>(Gu~YW39rnoqoD)01{}}`H>fD1lfKSzD?}%06K|u}3{d1{;8j$t1 zk|J*I3sPI$|EW*I{_py)(E8Tf%btDuSa#Elpq3-nQ!i5w;TM4K5i9BASb9ev<8^2o z)}MYyAM!u8h5q;-W6S7RAL}vkhu5RKYe;?P`m-gbf0O=hKje5m2hGV<)CatmxWaMj z0BoXKsY=#Gzg3|)`MLVgYrsdeKS{)O4XE~=OaFO#o>;b7HNfFJM@+QA^}7dSYxFe{=pL{?cQlkNVie`+neLTiE5Pv>j{W%{t71p0Qim?9V2jWcF-(&657UrjO z_0Rnd0`|bU{rt3H<{*1)K#`etPziisbYxeB)kT^O#5-O9;~)R$A5BF zhQR;P{~7Vtr=Na$@PT;?Y*@1l>zR}qjOBb>?f(C5^~Yvhf9e2qVD1gy#|H2(^heY4 zu>t&_*P#pNLTB_te_}OTouhl| z22@+3^~e7ivy2j~|2?g7&Bhry(~f4<=@HcB)aGd9>nZ4tFT4Kqb$+-VP$!T#!uk_S z>0jms(4Y7ct$(x~pikHi&>!7ge{wjwGbZITvDNd{A3Gxdxc=0D9E;YU$IJm_4as!< zSqDIW`j38OJ&kp>dLmd0j)S3p&;+%|^{=RXum8~>|9Aa2X#M{a=6TQ_h|%cpH6Z%a zx9FRn_Tl5M1zKSP?*I4`dZ9n(&rg511GeFKfd1rd*Pngbg#K)aDcBj$v&|2lcm1&e z@;}hlSo*ULm^pZmDOUPA5Oov%M?cb^#8vv2evX?t0JX*S_wipi{?qd&{u3c>uT&jGg6enY_=U?~w7bAW0G`jd~s{!hI^-Eyx8;{QFYH;WFA zXxZO-RyzCJPVU$Ak(+jnMytt9Hp-GYIYl@q59d?hit1bf;gjB_8wMZ({@K zPRwwyA=-eRzK;!r?EsC#vB2%XZ2|ixjt~p5Y4Q$R@)G&O#{+yHfcromdSv0}nlIa~ zetSVYC}R14Nga=i_#g3q?*B~`wFPU{J;Vrs{!hvO*Dqhb{KL^VWmMQi+< z96*0C_M&fHXWxG9elXn+nkn#ohsV4Qz3|m@Y47)VdK~ar5KDh_ckMZMwEi9s!gk$d}B+U>AOW-&b^xXdbP*>yO?6 zZWHJ5{rvPN=7(({tUKDDkN(lIfXALIJT`ER#5k_q?Sr_*91#DTK3(JkJjD^w0l$0MY)B{vP|;=BK~=e0b~r&(?iCe9UVCj}6!W*G*l6{|EYO49I;z z`i+#G>NEF$*3p>%iOcbSME?ubKE@zHel1NP?JI@lnmozh^tR z7esb|mc&MCEi}xF{p9I|%23bLk&Td&Z~StIXUl_o)Bs z!e0itj=G2W&vq4>+jTV>*z9?;xCiu*`fGz&DrSgbg7shOYQ|R;L|plQj2fVs+DHvR z+o=JcR1LWC{ss3RM}NQHH_xwQjp@#%y+0Q#4n%AqJpS{%;A27j9Dl|y@k4x*`6RE$ zeeQ;N8|LqP+)jPM+#k;~)@0m*hCWw;9~0BPE+Dq^dgiE^BLwEBivLH^0PG>DM0x!W zqWU&_?kxMqKmPHh`ik1`RYBgIDyXBVr_rDB75Wz!adQu7ME^o+6XTL3!8nEassUo6 zcv!roxy_w-3?2Uk_W`&Kcn|*lSq8AnkVBf))c^-)EoP%7BUo-A!Zj#SpP081l(4X^HD3)OL zDqn4POrGfXe)-(rsz{$r(sqczms$$+FDK$o{}?$SJP$BSZ6*e+*Zk)G`)1Czu^orn z(E7d3eh+}}`FI@g?Kf#3dY(K$J&(`P_xLJ0FfZt9L~NOF0d(P>G1uPb;(YGjx2*4k z?ZCB;-l8eTu!mn3Djd8g@NaxP0-wp}a8B%mIo}R#+nK%}W$K&L>ZASQEwNlI5a>@G zjs7h}ErI@V_dURf{uiljWkglMIH0{C22clbJuAc}#km8kRzGjQ)_8Duvwk+Tp6r0{ zfbhM5NG%xDfzfqeNN=8}MrRJe?;*#x(HnnrJns6|ZNYt?bpz&JeC^oR^U=rS0s7iX1U5>nA_kDV$YJENM+EcQoAsT5{rU~W&xi%TPQTswZb)DUj19te5FHEj zn7GcGfyZ)kG_jVoIKT#owf-CM>__YG>qY2IP9`4no&T`T_%#0PvEJi15!nA!FmAo?4tr3 z;D2lGRxCKSapOjteb-F;b#K{$)(D0*Oh0Q2;jy8#r*8A{GWxTw;%oYD1Na)669e!; z`Wsz{yWzYZt#!2CuDffDzUSf>|L3CMv#1ZLHypGF);P&Y#0Kn+IKaA3gPQeh!6Wmi z|Bk3%-WKG4=Kf;EfBZjg?*Bvc@Sob|F@SawubK+xgIL34Jji$e8(@9&4Y6JDd$=dx zdFLIQH|Ktvta*Y7J%$G{!EJ&3PL0l*5&i4;?qCDxj~$>pdeg7yjb9VH@oVC;gYIGN zJ&vP)el~#5pG$k5Lw`P-_POS)MWH(|79chdduSi8bsK0@tAVY4{gr=2`r}1yiIr1C zrU>W%xYi$AP-e-e}(>q3tb$17JeT~e{6uf zK%3qF-3FNZyDfW|Y3*-!q)#5xcAD_=Q?I&*10#_U*G}%a+-kIdc>fCRmST-P5Dr4W=Kd-SHv!bGB%X4Mb~C z4DdJ*)<4$(r<`iYB61bvh(!sGvf zqW{m;ZfZf+1*-{afi{9`aT}Pfed=81x~K`(i7kRya7dicZ-<%w&$r!k_bj`$Nq4J% z>Dlk+Mc3-CJ^F`j;C%Hb55$W9`Ne+p4uk(wD^TZAqmT!p;XVN3RxJJd_vwrN)BtaZ zr^IYALi7;S($v&(JN^sT0iis=TqSL;AsPwp55)!s33353ZoYUzP!qf^HVf9k@rC1B z54Zd7xzDEEeuq`moC$sB+Oy>`oUi`Te((9;^~VPM7_ar$GZt{dwPEx=8Z$S@S|%_b z;qV-Fs>glba{phS9_f4s^iy3k`H(q)IbxLHej4H@xwL{P9^KdR`dDqfSgR?Kly+fko@J^vt=%T?||xepib)A-x2u2Jb{m-3u0$I zQK0mX#DOAeH}?lHH;fH86U+}2*D^(P99X4eYX!MrkG?y4^uC$*o|!)GPD?75_%;1q zKacqy|2aw9edz7N)h z{5}WT!RNRQ@LQlw>ol?#UU=b4{gzJj4bE-94`mL)`y;>tjl{19AcPb7Umt-YXj3GIv27AU-fwb^GMAu|NLL{P?kB zS^p>Zy&$NK!usPo1pA39<^tIAnEquR5WTU7Fn-K^AG`4wfIVOryq9w^&ZK5{7{37;1F@Xv z7?ZLVh`y{rMBguf9dL~27$4Bau>RNp_kZ2mx4&uJL;cH`2w#ZSzrfUg;h3Q7U_4M% zcpjjZZ6Z=cniwdkb*2j9-cmsf2<8c2S+n~1^a)cf=~uZi8*S)!*8m-W`Bk3-#x~I1 z<35kEi(FgDouegIQ?L7&&FgjYG{^AOv!9duJ#M!#&c{Bv-t|Rehht$l&YCl01KJs_ zKV!gty)qc@?ACRoKmI>Pqzin7J}VI8zp(bcueP&3R5Ef6o(Ed$F?oO-H%#P+*@75A zE%=6bU;iWe*vvboTl2E@gE>Iv((uFZcdPJ!*B_m+1Lj+qheu2Low}U$dgc-R{&W16 zdo;++tm~sa=f^hCp3mSsoEyL8yx0|=$DAaZ`kH@OZ}wx^0-wixWq$f^-MSV3$M*39 ze8R_n)XxbbZodET+Mdr=?e-W@M*Ecn*V9<|n9ySYV?tuz(}MBfyP6yScw+WA>yniF z8=Ls0`+n|s`EtM8iC$>O92|PG_K$ype`kn$Zn@V3{m}w^oQ92{KQSSe{;oZrn$drb7%sYq zrh=G>@5I$_fV#HlvsK$K6vaez9l$yvcFuTkyqG1(0rbNr%>ffn&YTRgTuK4Qz1E)XH65q$~!#3cy za901^7=Zq~K5PTw{7-x#$FK!*3ig&8TXOFgx*P`7N9S822(Cv`DNJ8^msXH|E4| zmn{v}0|&S7YZ=#fvp$Wx1Z#txt~~2+?q_ZX_$nHO<2^bP`#FX!xOT29uXi{fU|VO& z^?yEt_)mUE*IbRi{{7S7dj?fH*}!W0UTO_}Uq!!%KB!ij4XoeIvTx9Ra2c8Q-i{rI zbe-7yd@({WHf|=W3vy=M{Pv$~`favqKk*;`NB;ytPV>0{#sSnio&%<8pMH2!&?l^m z>{Tsr{JrC&ateMjW`nrZ_{oTJvs5afV~ z;$Go%0gMI7jr+tg-7E2>>H^|raQ}4wTY6iA%WDO-HRA!V-LM1yz8$)L6JFa9pSi~r z{rtOvXpenhOX$lS0684J85=OC$hZ!eJEpedHMHfXa?LEIL2H|N_uaN)#R_}nl~-)T zh7BfLKCaxhN7wO|u4}nq+&4;u$NhO3!n~oL97?sL|_Bjo)&y(+J+AtW_2&m{f!-;_d^r($9H4tj@H!cjN4pid>Xyc zpZHHLz&L|?jWGfK4a^f$zq4gdnR^bIH)g((`FvkfVw^{PSLKol*5JqpvYW@WRyT|w23;Kl|Nq-gCabL*yiTx!+89_Zu{YU!|^*>Yo5oa(HXzSpMA{7mN8)T zT7b_5;{U$hfDJ&{2GAd_EOtfk8xPq-hT0$g@CTYr+jk4DhZ=|R4%bWU>n2(XawGjz zTomNGpS;i94`Y97e_}s#fYdehL=!>$cm1*d5dvRe983&YB323V0JXp_aaept4j4Lk zh}A7yBk%rizXuqM6c0C54`$qBTDZOu}Z^AQYM)b_37B|*JEQ;Zb7MXKO_8GIjKDX?{) z+FpqE3)jA^_OWTMt(IVHOO4xBbQJji05M$T2yy^*Abms(pudQh?~486ICa3V%&+V3 zHsJc97r6m#AgnpLg4d(H>mRlOpJ(P=?E9Rc$APd7cs}5@zV<+E$o&hf^R>Sr)s*vT zJJ+#H%n=g=c25mNf6zDO1il|P-}gS>Tpx+~7pm>ldt3uK%(W-)*AV!AV?nG-5nMa^ z(+}uR4KPj26_1Fg#B*Yu*dmCZA4~r;{B{cdj}BoS(Goq-oh>@&2k&!uALnu#V13bl z%MJZm6AH%w&jXwrJ0tG+91rKh-h%IZ=sSO-M~*W6Uo_$uw!BDC?|a-Q4%Qb*qCn<- zwL2W|OX@LWSL(fr0>4Ll@;)&RTj!doce)7T-yq@o(>M2uhs9E{Qmhf1#QWlq^#6S5 zpj`itrGMBS*mwQ?I9qIkc;Gg|F+fXnC;qd|wSnB;QP#X^cD00xsbe=APQ8?ul8ObE~4E6-N{{C2f9}gTo-W- zzjy6hYrmbq_j`!`Vu% zf$wLFF=C>aF7OfbUo4&xFAH+#HnCs&pSXS4aJwe4R-k`a`|y6)2G~b?#_2v@l!79c`1Tgi1q&ojm3FTHlR{P3)GMZERroe)i$t4jhZL{V{DP z3$B^iN8b<|=|AeFxSs1%`z{dF^|Td#r``B^4H2z*D;;Yq(3~8{^`?oQ0^1)TGKFhD zUi*^-v46IhFBXX<0{veU=)YC$(HzRLrT_I?Yj)MOR`ZhF`~UEJv_(&J@S2S+{*AWO zXZWVC`=B4k(Vulc_8s(h8{i!5GiSj361IZg9LFwlx7C94rj~DJY1g!~NjVc)+x<-K zeOIgy_lgk$+b0Ls7fFJeFRsUXY9Fz_m_T{UHL~ z=?h{$Ie)T1`&nY1!1wW&Ck1^+{73&SVz>C1|DV*Z$&GgPrB~&}0JL|l@lV&AwI9Fl z1O0*A&6d~jT43GR;{bMm=J-CZWlahFsSVJaHu`}6q0g#|1W{DP?Oc!AhR;)*Bntc;-5Uzxm*?}2+DC6}8~>)Z#mC9* zt~d2PaURXbiySdop!*Dg-@EpYYJZ7%TC5VQ#d?AN?-EBemwM*TX;bX_T1~9}6}mSt zA=z4#Z)oi*={K1x>K?BOxwI*l`+XeZvfn@A_kOtk*nrzXv<;BwnN!4uum`l}HJ&r5 z{X19GnsCjw)-ScEJ^AcYtm&Ur8+VE|0z2j!vjlMvU!e~xh!P?$J`{mx+~v*iS!F z|Gy*9|FHN>b1L@eP`dPQ;9j(cg`hNc9 z*90-Z;{dv06CMk~Hb5@mF|i))u>oGs*4LDIOgy-`LQ6~2Jqn{UN7$xKn^>DTrnYSt zuZkzcOhKQ}SHwta;<%3cY9HDYmoAI6wT`w;1-j$s_&C0uEj)%#(*6{It)nm34QPyS zqw^er*5r5eCeEWd{_eUzrTu4wYfnGEAvTG3#cpv(;A5s38>|QE|7jZEA7yPoV{LrU zbRV&e9zN2pudVw&wH}9lu0Q^ahQtK71GfRzfP7t$HC@()!|O?`6LB93_oQ@daI@W+ zGdcL)s_OhBY7#a|%tw2!otT#{=sV(O+}HbRBifgZv=yJnZt?dFfsdp4WPuN(DSAFA z$aCnqNT6vL^o7NOzQM$tKxZ^ZdyfNd1JnZ?^R+|t#s&LeVg1qD9}~~H*9VPRFLbS4e~xiKPg-T&Ypi%bb;^_=w=GNH@mTVb8A`lnjof=-^ueH>s@oU)N=Sd+M}`Oc;bB6 z2KYagU6WI+-;F(N;Uf$A&F(XiHesLSsAYnBW{MatdJAHHfzUp(c6X85dzq*qT8VUl z_VWbSM?BuHzCU#Q#EH*0yuHC@&Yfw)v$8F#|6t1+FxZ9<8D`@~kFiOUCfY;4S!l2Q zZq1qPJKj6B?}HDH>v!)ym34t4Z@CN=K6AtAS}^V*KQjtvk8JQk4W(H*U+ z^C5iyU!Gl5)^EnDz8`h#ZMJgdO0*~MVAJHK7sV1mKAa@71pSsOnh5$bQQ%i`>GwXj zul5xc6$Ej=vml0{J#lTbblZRM(7`h=zxJ{XA2!Td)NE`Guh4fU67+wM%GL_*#j1OG z4Q*>!9l^0W33^Y(0-e)`_pAl|EJy7JJUMXPO+5oxxZ!Y z{^a8*#?s7-Fi*m~n9q+Vm#A#DOKDEFjONW`7xl~Pdp6igS>0n(UcaAHr>Ui-=>IWv z?_+~{53nKq2HDu#N87lOV=SXnFT3g58?15py4L6l&C!aMi4BAJ&Ke7!?S$JCZ3DE8 z+K;$SUMK%k^YdP8fcN@&n7{8>{RZpTriaa%G1K%NO~#bOBy!Xm!B}OXAlFml4-{QQ z8-f2+7w-3QS?jsqN3_2{?JX&&`MHK{fo*T5o__hwS8PCPy4`eT^SnOtzKXRC_oY9N z@1X(ntjwYLno3>SNxjm#XIA&}HcHTUa1!;~dE)x=*9JPbN@$ojHuH1E+Pe0>xrtOtSBbp-tS%iNDRPUs|c=Tkif>dZhoiH4jnpV8{gV! z%b#0r6DQ|b&la8RmSlZD^Qu`c%SyYx0;PRK{~~HP^AqGRav9gj zT*k{{i`XlU$RAF8di?KS{(j5vZRvk4wRxIn$(b<026pKitb5*ERsRF6Qu8221a-pq zh!fw&e(-tMoUO+K&JotyAM<=*D;h7P)z7W(UwiE}^85*1C*#h|B0AoW)G=x!&-K)K z$)chtBk04poYxEcdaQl5yO1a)stX_gVFPmnW1JVnT0tIU9JpJx!2$WnQTj~r;qzzy zd$~;-`)eCLaJXgn8f*h@N)P5sm@CC5s2|83*abf4@Hj;}_;de~I3oMFv7F+9KIi77 z>jS9q`m{{5S<~;f9Xocgc5s+$6K@D=Uuqza_rtW`TXYok4}MZZR1oxAf&HBZw+CGV z_DkJLJZmk8aoJ*$V2n$DJS73g&FTs|`?>pfk3F zy^)*9QOwz*b>=PoY zeb4puRS6N-_iwnq-?Y_rPzO@GVAI$@OM$)j71X-aJ<|oYKt6mzEED(&b0OqPe23q0 z+9I~eCU&ZR*sC~kkl%IDnEv<&AAE39b@gZO|M|~f>U)s<4kF)&41AF9$&rW8Io6Ob zqcd@X*AZLLnK(l%@2h#bVd;ZyiD z`E0k^OH8Bf&xl3BeIDD-5S>LELA9FitSA6fLs zY35zLj&O~6d~+4e(Io4CxHr~!H9PjP5&9nB*x{pt_`>|};w6vUmMvS(?A^QfbFBxQ zICA93QO#c*K5^p2hl=le^qD*LIq!-sf;Q1U)~{$g*TFT764ZD-MSFoCG!Vr5ih^8U zRK)e1-udVq>or`Lz_t?vV;bTeaj&iDB#4D>3nR2ooiI_jJ6KuZwje&o;FGzVzDv(4!9@&+akEhIh}j5xS>ilxm96gGX4-$Z~6hSEBIXO63wwy;@G`{wsRd>qPM`_x!$It zj-VeBMUd;YEs%9yEWKkL)AjvaVB^?2HjnMs7xYJK(N54u*g}TDU+6pRft)#BOcJqd zf*8A4(En~1#0%^Kn|Mn)?$DajhtiktPVl?XNBN%_;-GY9!5xiviX8%-@#nY18)B_^ zRd7D+4ZGuWmI&;T+)fUgA!sA*C9Yx9T|}yAA@KQRQAu1T@QDKbz1&z@=XXrkdVwe` zN(f>B{eT@14;qPP!fm0W_R~a9ks$_%Opz@{3VbU^OcB!reLq{w6AJ`>xL7=aMnko2fG^aho1$LVu&>fp@CAhZQ zBJA_{!Vfau=cm6P=eh;gPwc}EhzHd~vIyG(eMij1f3OGol=zS?`U~t~n4sTB2{f1} zu!-pceeg>(drY7swFLg_@E99;QsB>v1v+Ct?$_9rYt6Z_J3b3L%oenxub^$61nq4p z8jCuDYvUT-=YJ6Oz3cg1x9X3J1a?p|(l_O_tt9BLS^`^WD4K{Cg4mEE+6($QP4pDK z1@?gN4H0O9HfV%aQ^gE{j`%GxVtxed1MU?(KTBXcyl1lD{o@7pH9}+w^d2BG1e#-) zw5g4to%lPtR~KAQg5Vkpiyw5J|F*V3e+ajO651~#=&uT*il7f`2>P>uz^BL)#0L61 zRdf)YMYKH()UhmqJ)j@XPK?3{A5ZD`^gZ&ZTiBI@C zHrha7x77r?mleb~bT4poxZhUG@B4c7(S?z|Dy}X4M!ZZE#7=C1ex-l0h57G+k(die3clDJ)kGx$Kd;Hd7jttdbB2{qj!oxZ{kiP zQBSy^W1F+frQRF6PhCoYu|*ym4L=O^61=(zg)=K^~uCeWd@2>W&oEP6NEPhaPv;QJ_{_UrgPQ(kh5p)CMGXBaIu%AK^e)8de hyJ|l*prH0Zmrh-8NK5IQ(&6Uh?rl=q-B9ai{~xuq{3HMX diff --git a/gfx/hud/default/nade_emerald.tga b/gfx/hud/default/nade_emerald.tga deleted file mode 100644 index 86c3d99e79ee5d4cc753306d12c15ab8a50f7975..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65580 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 xvq_1H@6z>ue=WOi^!*t8-yegGNn z!$_c|(7r8g;e|qhvce8zIp6PpOLCMDTKawsZ6Us{bIDq_r00LmxzD~W%Weh#>a03z zPxSi(Wf0q?L^8o37hpGO@gRc#r>3?td zOxBv-YIu&%bx(%`yI9?eyIS3gx?0CT$CmkTb>C0ChS%x!dY|6kaU<*GK{=6D z7y3N$M8qPO6|q!$!eKeRcFX2E@I8M7pnMNM@xb+zoOPH2<|~muu6y`wuK!Xn z&j9aS@YyJ=z-^N->}DNX(%tG+c8t|eRDLXUoHd|A)WaGis)VWn#QlNL03Pel>&)xR zjw;eB1Rr!nCq%%H(g}V(kiB5*63Pevnk(|-StWpdN1N4Ql3(V-XMz0!a8E@Kuk+*H zwGhlpz`Pu}1*buky{(w)zF-W#jRUOMra@M0bCea=GT4f5j<$TQF_y2z&8^!?;5MPf zV_1q9d_6$(h)c>`ZJ4A>D6I z@;}e(5}JIxFJA9womkd$TXBuimb)1Pe(bNj(_J=jyau-8Zrb31{Ow?m4vknLzYXk{vBz_5C2QSEj)L#cUiiR+Zi%*H>IYd-HT|uD=!D+rgJaMK9ShhOayw%SMDo4G1KO|9 z1Kp15f$zr0e%TKjsr^2H{Zg>c!H(aAO~>Bex4aj!*UuU(+?%3>ht1m<@9;GyITFA- zq4@+bAMQ$Q9_31E8SPAI84HaE*HgHi08I=_X_?d^rDbx5lt!p|a#(W9Bp0OTpi_A5 zcy7n){aOb;7{R(Hvi?v$Cz;Rl@wu^lehlAZ5c^I)t6xQLt4CQ6bQ8KDkNtps%FhG* z4(wLNDExlnce@flzE}CLkL+i&f6hYgg*`T2C!_DN>(IG_kh$pk!N|PFimQ*eymiTr zxY`r!-ntR?_`1lzJCbS_I1_6Z`l)6yw~GSz7x3JC zUNbN7`dJQN%?zyrO@dCbduztQ=M$ZR-R~iDo(b= zZa&2xS2o4rEt~0xFPmrgl`VvpI((a#Lo1VBq!=Xp(>qbFPqQ$v-q58w%D?XmS^)AK6|+3t{j4G7|%Ww zV@1~vvIbx$_QEddjNd3dpuHey6NZfo^1$D}59BR4CMp>Sc3AWh68IIV3`Hr}PrH;6bD;?gA=?-r}mNUK} z#}!|Y=kyh9fHpaOn+l!2!eXezi9%Uyngx#qEj zQ|+<&^Btbt6%J2!hSQyu3l+HBStTw{R)s4zs|Kof#jb6HT3p_BtuAlQY0&A=nE^U0 z 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 Nn#IY^>1}S?{|8o9Ui<(6 diff --git a/gfx/hud/luma/nade_emerald.tga b/gfx/hud/luma/nade_emerald.tga deleted file mode 100644 index 7588761b975c8ce4c9ad5b7e2cd9572557c4cb2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65580 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 Z^JgcReYdzK)&bdeC%r&R^Z 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

M1elLyt!cO?5|#kp~)i6 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 diff --git a/gfx/menu/luminos/gametype_mmm.tga b/gfx/menu/luminos/gametype_mmm.tga deleted file mode 100644 index 8bacd80fdc7bcfbd221a81c4c227b105e45d7903..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32567 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 Mb?xZp>C!~{KYq%(Z2$lO diff --git a/gfx/menu/wickedx/gametype_mmm.tga b/gfx/menu/wickedx/gametype_mmm.tga deleted file mode 100644 index 8bacd80fdc7bcfbd221a81c4c227b105e45d7903..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32567 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 Mb?xZp>C!~{KYq%(Z2$lO diff --git a/gfx/menu/xaw/gametype_mmm.tga b/gfx/menu/xaw/gametype_mmm.tga deleted file mode 100644 index 938b529ef235e6dd14b3072cf03cea4454efa97a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65580 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 qfl3QhTAG?j&nT# diff --git a/hud_luma.cfg b/hud_luma.cfg index 7bcbef2b9..36f91775c 100644 --- a/hud_luma.cfg +++ b/hud_luma.cfg @@ -133,8 +133,8 @@ seta hud_panel_notify_time "10" seta hud_panel_notify_fadetime "3" seta hud_panel_notify_icon_aspect "1" -seta hud_panel_timer_pos "0.456000 0" -seta hud_panel_timer_size "0.088000 0.030000" +seta hud_panel_timer_pos "0.455000 0" +seta hud_panel_timer_size "0.090000 0.050000" seta hud_panel_timer_bg "border_plain_north" seta hud_panel_timer_bg_color "" seta hud_panel_timer_bg_color_team "" @@ -275,16 +275,6 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" -seta hud_panel_centerprint_time "3" -seta hud_panel_centerprint_fade_in "0.15" -seta hud_panel_centerprint_fade_out "0.15" -seta hud_panel_centerprint_fade_subsequent "1" -seta hud_panel_centerprint_fade_subsequent_passone "3" -seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_passtwo "10" -seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" -seta hud_panel_centerprint_fade_minfontsize "0" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 715d57efd..4b862b37a 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -133,8 +133,8 @@ seta hud_panel_notify_time "10" seta hud_panel_notify_fadetime "3" seta hud_panel_notify_icon_aspect "2" -seta hud_panel_timer_pos "0.800000 0.040000" -seta hud_panel_timer_size "0.070000 0.040000" +seta hud_panel_timer_pos "0.790000 0.040000" +seta hud_panel_timer_size "0.090000 0.050000" seta hud_panel_timer_bg "border_small_timer" seta hud_panel_timer_bg_color "" seta hud_panel_timer_bg_color_team "" @@ -275,16 +275,6 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" -seta hud_panel_centerprint_time "3" -seta hud_panel_centerprint_fade_in "0.15" -seta hud_panel_centerprint_fade_out "0.15" -seta hud_panel_centerprint_fade_subsequent "1" -seta hud_panel_centerprint_fade_subsequent_passone "3" -seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_passtwo "10" -seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" -seta hud_panel_centerprint_fade_minfontsize "0" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 25f871bf1..1da5ad1ee 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -133,8 +133,8 @@ seta hud_panel_notify_time "10" seta hud_panel_notify_fadetime "3" seta hud_panel_notify_icon_aspect "2" -seta hud_panel_timer_pos "0.435000 0" -seta hud_panel_timer_size "0.135000 0.060000" +seta hud_panel_timer_pos "0.430000 0" +seta hud_panel_timer_size "0.140000 0.060000" seta hud_panel_timer_bg "0" seta hud_panel_timer_bg_color "" seta hud_panel_timer_bg_color_team "" @@ -159,7 +159,7 @@ seta hud_panel_radar_maximized_size "0.5 0.5" seta hud_panel_radar_maximized_rotation "1" seta hud_panel_radar_maximized_zoommode "3" -seta hud_panel_score_pos "0.465000 0.045000" +seta hud_panel_score_pos "0.465000 0.060000" seta hud_panel_score_size "0.090000 0.060000" seta hud_panel_score_bg "" seta hud_panel_score_bg_color "" @@ -169,7 +169,7 @@ seta hud_panel_score_bg_border "" seta hud_panel_score_bg_padding "" seta hud_panel_score_rankings "1" -seta hud_panel_racetimer_pos "0.360000 0.090000" +seta hud_panel_racetimer_pos "0.360000 0.130000" seta hud_panel_racetimer_size "0.280000 0.090000" seta hud_panel_racetimer_bg "0" seta hud_panel_racetimer_bg_color "" @@ -188,7 +188,7 @@ seta hud_panel_vote_bg_border "" seta hud_panel_vote_bg_padding "" seta hud_panel_vote_alreadyvoted_alpha "0.8" -seta hud_panel_modicons_pos "0.560000 0" +seta hud_panel_modicons_pos "0.580000 0" seta hud_panel_modicons_size "0.050000 0.100000" seta hud_panel_modicons_bg "" seta hud_panel_modicons_bg_color "" @@ -275,16 +275,6 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" -seta hud_panel_centerprint_time "3" -seta hud_panel_centerprint_fade_in "0.15" -seta hud_panel_centerprint_fade_out "0.15" -seta hud_panel_centerprint_fade_subsequent "1" -seta hud_panel_centerprint_fade_subsequent_passone "3" -seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_passtwo "10" -seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" -seta hud_panel_centerprint_fade_minfontsize "0" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg index e3e857b0a..056160bee 100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@ -133,8 +133,8 @@ seta hud_panel_notify_time "10" seta hud_panel_notify_fadetime "3" seta hud_panel_notify_icon_aspect "2" -seta hud_panel_timer_pos "0.435000 0" -seta hud_panel_timer_size "0.135000 0.060000" +seta hud_panel_timer_pos "0.430000 0" +seta hud_panel_timer_size "0.140000 0.060000" seta hud_panel_timer_bg "0" seta hud_panel_timer_bg_color "" seta hud_panel_timer_bg_color_team "" @@ -159,7 +159,7 @@ seta hud_panel_radar_maximized_size "0.5 0.5" seta hud_panel_radar_maximized_rotation "1" seta hud_panel_radar_maximized_zoommode "3" -seta hud_panel_score_pos "0.465000 0.045000" +seta hud_panel_score_pos "0.465000 0.060000" seta hud_panel_score_size "0.090000 0.060000" seta hud_panel_score_bg "" seta hud_panel_score_bg_color "" @@ -169,7 +169,7 @@ seta hud_panel_score_bg_border "" seta hud_panel_score_bg_padding "" seta hud_panel_score_rankings "1" -seta hud_panel_racetimer_pos "0.360000 0.090000" +seta hud_panel_racetimer_pos "0.360000 0.130000" seta hud_panel_racetimer_size "0.280000 0.090000" seta hud_panel_racetimer_bg "0" seta hud_panel_racetimer_bg_color "" @@ -188,7 +188,7 @@ seta hud_panel_vote_bg_border "" seta hud_panel_vote_bg_padding "" seta hud_panel_vote_alreadyvoted_alpha "0.8" -seta hud_panel_modicons_pos "0.560000 0" +seta hud_panel_modicons_pos "0.580000 0" seta hud_panel_modicons_size "0.050000 0.100000" seta hud_panel_modicons_bg "" seta hud_panel_modicons_bg_color "" @@ -275,16 +275,6 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" -seta hud_panel_centerprint_time "3" -seta hud_panel_centerprint_fade_in "0.15" -seta hud_panel_centerprint_fade_out "0.15" -seta hud_panel_centerprint_fade_subsequent "1" -seta hud_panel_centerprint_fade_subsequent_passone "3" -seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_passtwo "10" -seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" -seta hud_panel_centerprint_fade_minfontsize "0" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg index fdf1efff3..b71d44cea 100644 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@ -134,7 +134,7 @@ seta hud_panel_notify_fadetime "3" seta hud_panel_notify_icon_aspect "2" seta hud_panel_timer_pos "0.870000 0" -seta hud_panel_timer_size "0.130000 0.060000" +seta hud_panel_timer_size "0.130000 0.090000" seta hud_panel_timer_bg "0" seta hud_panel_timer_bg_color "" seta hud_panel_timer_bg_color_team "" @@ -275,16 +275,6 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" -seta hud_panel_centerprint_time "3" -seta hud_panel_centerprint_fade_in "0.15" -seta hud_panel_centerprint_fade_out "0.15" -seta hud_panel_centerprint_fade_subsequent "1" -seta hud_panel_centerprint_fade_subsequent_passone "3" -seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_passtwo "10" -seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" -seta hud_panel_centerprint_fade_minfontsize "0" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index 74132c08a..78b69a72f 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -134,7 +134,7 @@ seta hud_panel_notify_fadetime "3" seta hud_panel_notify_icon_aspect "2" seta hud_panel_timer_pos "0.850000 0" -seta hud_panel_timer_size "0.150000 0.060000" +seta hud_panel_timer_size "0.150000 0.080000" seta hud_panel_timer_bg "" seta hud_panel_timer_bg_color "0 0.5 0.35" seta hud_panel_timer_bg_color_team "" @@ -275,16 +275,6 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" -seta hud_panel_centerprint_time "3" -seta hud_panel_centerprint_fade_in "0.15" -seta hud_panel_centerprint_fade_out "0.15" -seta hud_panel_centerprint_fade_subsequent "1" -seta hud_panel_centerprint_fade_subsequent_passone "3" -seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_passtwo "10" -seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" -seta hud_panel_centerprint_fade_minfontsize "0" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/languages.txt b/languages.txt index 6f7df341c..df10a5f45 100644 --- a/languages.txt +++ b/languages.txt @@ -2,28 +2,28 @@ ast "Asturian" "Asturianu" 77% de "German" "Deutsch" 100% de_CH "German (Switzerland)" "Deutsch (Schweiz)" 100% en "English" "English" 100% -en_AU "English (Australia)" "English (Australia)" 73% -es "Spanish" "Español" 100% +en_AU "English (Australia)" "English (Australia)" 72% +es "Spanish" "Español" 99% fr "French" "Français" 100% ga "Irish" "Irish" 31% it "Italian" "Italiano" 100% hu "Hungarian" "Magyar" 46% -nl "Dutch" "Nederlands" 60% +nl "Dutch" "Nederlands" 59% pl "Polish" "Polski" 72% -pt "Portuguese" "Português" 82% +pt "Portuguese" "Português" 81% pt_BR "Portuguese (Brazil)" "Português (Brasil)" 100% -ro "Romanian" "Romana" 72% -fi "Finnish" "Suomi" 98% -sv "Swedish" "Svenska" 98% +ro "Romanian" "Romana" 71% +fi "Finnish" "Suomi" 99% +sv "Swedish" "Svenska" 97% tr "Turkish" "Türkçe" 52% -cs "Czech" "Čeština" 33% +cs "Czech" "Čeština" 32% el "Greek" "Ελληνική" 46% be "Belarusian" "Беларуская" 52% bg "Bulgarian" "Български" 61% ru "Russian" "Русский" 100% -sr "Serbian" "Српски" 62% +sr "Serbian" "Српски" 61% uk "Ukrainian" "Українська" 49% -zh_CN "Chinese (China)" "中文" 60% -zh_TW "Chinese (Taiwan)" "國語" 59% -ja_JP "Japanese" "日本語" 100% +zh_CN "Chinese (China)" "中文" 59% +zh_TW "Chinese (Taiwan)" "國語" 58% +ja_JP "Japanese" "日本語" 99% ko "Korean" "한국의" 28% diff --git a/models/sprites/make-sprites.sh b/models/sprites/make-sprites.sh index 27971f9a0..28223944d 100644 --- a/models/sprites/make-sprites.sh +++ b/models/sprites/make-sprites.sh @@ -130,7 +130,7 @@ sprite() shift shift pngsprite "${name}_frame$frame" "$color" "$bgcolor" "$text" - convert "${name}_frame$frame.png" "${name}_frame$frame.tga" + convert "${name}_frame$frame.png" -auto-orient "${name}_frame$frame.tga" rm -f "${name}_frame$frame.png" args="$args -sprite ${name}_frame$frame.tga $(($sprwidth / 2)) $(($sprheight - 1)) $interval" frame=$(($frame + 1)) diff --git a/models/weapons/make-sprites.sh b/models/weapons/make-sprites.sh index 50f3fc672..3b8c43721 100755 --- a/models/weapons/make-sprites.sh +++ b/models/weapons/make-sprites.sh @@ -12,6 +12,7 @@ sprite() # Text exec {FD}< <(convert \ + -auto-orient \ -size 185x120 \ -background transparent \ -fill "#$color" \ @@ -38,6 +39,7 @@ sprite() yb2=$((yb1+15-1)) exec {FD}< <(convert \ + -auto-orient \ -size 256x256 \ -background transparent \ -fill "#$color" \ diff --git a/mutators.cfg b/mutators.cfg index ac965a2e1..8949ed8b8 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -160,7 +160,7 @@ set g_touchexplode_force 300 // ================ // super spectate // ================ -set g_superspectate 0 "server side, allows extended spectator functions through the cmd interface. followpowerup, followstrength, followstshield or followfc [red|blue] will transfer spectation to the relevent player, if any" +set g_superspectate 0 "server side, allows extended spectator functions through the cmd interface. followpowerup, followstrength, followshield or followfc [red|blue] will transfer spectation to the relevent player, if any" // ================== @@ -263,7 +263,7 @@ set g_nades_ice_teamcheck 0 "Don't freeze teammates" set g_nades_spawn_count 3 "Number of times player will spawn at their spawn nade explosion location" // Heal (6) -set g_nades_heal_time 5 "How long the heling field will last" +set g_nades_heal_time 5 "How long the healing field will last" set g_nades_heal_rate 30 "Health given per second" set g_nades_heal_friend 1 "Multiplier of health given to team mates" set g_nades_heal_foe -2 "Multiplier of health given to enemies" diff --git a/notifications.cfg b/notifications.cfg index 7ee1b1525..a23eb5539 100644 --- a/notifications.cfg +++ b/notifications.cfg @@ -276,11 +276,6 @@ seta notification_INFO_SUPERSPEC_MISSING_UID "2" "0 = off, 1 = print to console, seta notification_INFO_SUPERWEAPON_PICKUP "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_TEAMCHANGE_LARGERTEAM "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_TEAMCHANGE_NOTALLOWED "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" - -//LegendGuard adds mmm notifications for MMM 20-02-2021 -seta notification_INFO_MMM_MURDERER_WIN "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -seta notification_INFO_MMM_CIVILIAN_WIN "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" - seta notification_INFO_VERSION_BETA "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_VERSION_OLD "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_VERSION_OUTDATED "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" @@ -535,14 +530,6 @@ seta notification_CENTER_TEAMCHANGE_SPECTATE "1" "0 = off, 1 = centerprint" seta notification_CENTER_TEAMCHANGE_SUICIDE "1" "0 = off, 1 = centerprint" seta notification_CENTER_TIMEOUT_BEGINNING "1" "0 = off, 1 = centerprint" seta notification_CENTER_TIMEOUT_ENDING "1" "0 = off, 1 = centerprint" - -//LegendGuard adds mmm notification for MMM 20-02-2021 -seta notification_CENTER_MMM_MURDERER "1" "0 = off, 1 = centerprint" -seta notification_CENTER_MMM_MURDERER_WIN "1" "0 = off, 1 = centerprint" -seta notification_CENTER_MMM_CIVILIAN "1" "0 = off, 1 = centerprint" -seta notification_CENTER_MMM_CIVILIAN_WIN "1" "0 = off, 1 = centerprint" -seta notification_CENTER_MMM_SLEUTH "1" "0 = off, 1 = centerprint" - seta notification_CENTER_VEHICLE_ENTER "1" "0 = off, 1 = centerprint" seta notification_CENTER_VEHICLE_ENTER_GUNNER "1" "0 = off, 1 = centerprint" seta notification_CENTER_VEHICLE_ENTER_STEAL "1" "0 = off, 1 = centerprint" diff --git a/qcsrc/client/_mod.inc b/qcsrc/client/_mod.inc index 8f56739df..8a25226ab 100644 --- a/qcsrc/client/_mod.inc +++ b/qcsrc/client/_mod.inc @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include diff --git a/qcsrc/client/_mod.qh b/qcsrc/client/_mod.qh index 5f82413c4..d17165d3d 100644 --- a/qcsrc/client/_mod.qh +++ b/qcsrc/client/_mod.qh @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index 5baaddeff..ca27ccf0e 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -4,6 +4,10 @@ #include #include #include +#include + +#include +#include bool announcer_1min; bool announcer_5min; @@ -21,13 +25,17 @@ void Announcer_Countdown(entity this) { float starttime = STAT(GAMESTARTTIME); float roundstarttime = STAT(ROUNDSTARTTIME); - if(roundstarttime == -1) + bool game_timeout = (STAT(TIMEOUT_LAST) > 0); + + if(roundstarttime == -1 || game_timeout) { Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP); delete(this); announcer_countdown = NULL; + centerprint_ClearTitle(); return; } + if(starttime <= time && roundstarttime != starttime) // game start time has passed announcer_5min = announcer_1min = false; // reset maptime announcers now as well @@ -35,12 +43,15 @@ void Announcer_Countdown(entity this) float countdown = (inround ? roundstarttime - time : starttime - time); float countdown_rounded = floor(0.5 + countdown); + if(time >= starttime) centerprint_ClearTitle(); + if(countdown <= 0) // countdown has finished, starttime is now { Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN); Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN); delete(this); announcer_countdown = NULL; + centerprint_ClearTitle(); return; } else // countdown is still going @@ -102,10 +113,26 @@ void Announcer_Gamestart() setthink(announcer_countdown, Announcer_Countdown); } + // z411 set title + if(time < STAT(GAMESTARTTIME) && !warmup_stage) { + if(gametype == MAPINFO_TYPE_DUEL) { + entity pl1 = players.sort_next; + entity pl2 = pl1.sort_next; + + centerprint_SetTitle(strcat(entcs_GetName(pl1.sv_entnum), " vs ", entcs_GetName(pl2.sv_entnum))); + } else { + centerprint_SetTitle(MapInfo_Type_ToText(gametype)); + } + } + if(time + 5.0 < startTime) // if connecting to server while restart was active don't always play prepareforbattle - if(time > announcer_countdown.nextthink) // don't play it again if countdown was already going - Local_Notification(MSG_ANNCE, ANNCE_PREPARE); - + if(time > announcer_countdown.nextthink && !warmup_stage && time < STAT(GAMESTARTTIME)) { // don't play it again if countdown was already going + if(teamplay) + Local_Notification(MSG_ANNCE, ANNCE_PREPARE_TEAM); + else + Local_Notification(MSG_ANNCE, ANNCE_PREPARE); + } + announcer_countdown.nextthink = startTime - floor(startTime - time + 0.5); //synchronize nextthink to startTime } } @@ -127,9 +154,25 @@ MACRO_END void Announcer_Time() { + static bool warmup_stage_prev; + if(intermission) return; + if (warmup_stage != warmup_stage_prev) + { + announcer_5min = announcer_1min = false; + warmup_stage_prev = warmup_stage; + return; + } + + float starttime = STAT(GAMESTARTTIME); + if(time < starttime) + { + announcer_5min = announcer_1min = false; + return; + } + float timeleft; if(warmup_stage) { @@ -140,7 +183,7 @@ void Announcer_Time() timeleft = 0; } else - timeleft = max(0, STAT(TIMELIMIT) * 60 + STAT(GAMESTARTTIME) - time); + timeleft = max(0, STAT(TIMELIMIT) * 60 + starttime - time); if(autocvar_cl_announcer_maptime >= 2) ANNOUNCER_CHECKMINUTE(5); diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh index d45cb90b1..a97fda141 100644 --- a/qcsrc/client/hud/hud.qh +++ b/qcsrc/client/hud/hud.qh @@ -277,7 +277,7 @@ REGISTER_HUD_PANEL(ITEMSTIME, HUD_ItemsTime, PANEL_CONFIG_MAIN | PANE REGISTER_HUD_PANEL(QUICKMENU, HUD_QuickMenu, PANEL_CONFIG_MAIN , PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME ) // QUICKMENU REGISTER_HUD_PANEL(SCOREBOARD, Scoreboard_Draw, PANEL_CONFIG_NO , PANEL_SHOW_MAINGAME | PANEL_SHOW_MINIGAME | PANEL_SHOW_MAPVOTE | PANEL_SHOW_WITH_SB) // SCOREBOARD REGISTER_HUD_PANEL(STRAFEHUD, HUD_StrafeHUD, PANEL_CONFIG_MAIN | PANEL_CONFIG_CANBEOFF, PANEL_SHOW_MAINGAME ) // STRAFEHUD -REGISTER_HUD_PANEL(SPECTHUD, HUD_SpectHUD, PANEL_CONFIG_NO | PANEL_CONFIG_CANBEOFF, PANEL_SHOW_MAINGAME) // SPECTHUD +REGISTER_HUD_PANEL(SPECTHUD, HUD_SpectHUD, PANEL_CONFIG_NO | PANEL_CONFIG_CANBEOFF, PANEL_SHOW_MAINGAME ) // SPECTHUD // always add new panels to the end of list // Because calling lots of functions in QC apparently cuts fps in half on many machines: diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc index b4a7b6040..0cc1f2395 100644 --- a/qcsrc/client/hud/panel/ammo.qc +++ b/qcsrc/client/hud/panel/ammo.qc @@ -4,6 +4,7 @@ #include #include #include +#include #include // Ammo (#1) @@ -31,7 +32,7 @@ void DrawNadeProgressBar(vector myPos, vector mySize, float progress, vector col autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); } -void DrawAmmoItem(vector myPos, vector mySize, int ammoType, bool isCurrent, bool isInfinite) +void DrawAmmoItem(vector myPos, vector mySize, Resource ammoType, bool isCurrent, bool isInfinite) { TC(bool, isCurrent); TC(bool, isInfinite); if(ammoType == RES_NONE) @@ -216,11 +217,12 @@ void HUD_Ammo() } else { - int ammotype; row = column = 0; - for(i = 0; i < AMMO_COUNT; ++i) + // disabling new-style loop for now to restore original order of ammo types + //FOREACH(Resources, it.instanceOfAmmoResource && !it.m_hidden, + for(int j = 0; j < AMMO_COUNT; ++j) { - ammotype = GetAmmoTypeFromNum(i); + Resource ammotype = GetAmmoTypeFromNum(j); DrawAmmoItem( pos + vec2(column * (ammo_size.x + offset.x), row * (ammo_size.y + offset.y)), ammo_size, diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc index 2a6cf238c..8c4968556 100644 --- a/qcsrc/client/hud/panel/centerprint.qc +++ b/qcsrc/client/hud/panel/centerprint.qc @@ -52,6 +52,7 @@ string centerprint_title; void centerprint_ClearTitle() { + centerprint_title = string_null; centerprint_title_show = false; } void centerprint_SetTitle(string title) @@ -359,11 +360,15 @@ void HUD_CenterPrint() all_messages_expired = false; + float fade_in_time = autocvar_hud_panel_centerprint_fade_in; + if (centerprint_time[j] <= 2) + fade_in_time = autocvar_hud_panel_centerprint_fade_in_short; + // fade - //if(centerprint_time[j] < 0) // Expired but forced. Expire time is the fade-in time. - // a = (time - centerprint_expire_time[j]) / max(0.0001, autocvar_hud_panel_centerprint_fade_in); - if(centerprint_time[j] < 0 || centerprint_expire_time[j] - autocvar_hud_panel_centerprint_fade_out > time) // Regularily printed. Not fading out yet. - a = 1; + if(centerprint_time[j] < 0) // Expired but forced. Expire time is the fade-in time. + a = (time - centerprint_expire_time[j]) / max(0.0001, fade_in_time); + else if(centerprint_expire_time[j] - autocvar_hud_panel_centerprint_fade_out > time) // Regularily printed. Not fading out yet. + a = (time - (centerprint_expire_time[j] - centerprint_time[j])) / max(0.0001, fade_in_time); else // Expiring soon, so fade it out. a = (centerprint_expire_time[j] - time) / max(0.0001, autocvar_hud_panel_centerprint_fade_out); diff --git a/qcsrc/client/hud/panel/centerprint.qh b/qcsrc/client/hud/panel/centerprint.qh index 1a1ce172d..57329f88c 100644 --- a/qcsrc/client/hud/panel/centerprint.qh +++ b/qcsrc/client/hud/panel/centerprint.qh @@ -3,7 +3,8 @@ bool autocvar_hud_panel_centerprint; float autocvar_hud_panel_centerprint_align; -//float autocvar_hud_panel_centerprint_fade_in = 0.15; +float autocvar_hud_panel_centerprint_fade_in = 0.15; +float autocvar_hud_panel_centerprint_fade_in_short = 0; float autocvar_hud_panel_centerprint_fade_out = 0.15; float autocvar_hud_panel_centerprint_fade_subsequent = 1; float autocvar_hud_panel_centerprint_fade_subsequent_passone = 3; diff --git a/qcsrc/client/hud/panel/chat.qc b/qcsrc/client/hud/panel/chat.qc index 863394825..859a51491 100644 --- a/qcsrc/client/hud/panel/chat.qc +++ b/qcsrc/client/hud/panel/chat.qc @@ -13,6 +13,62 @@ void HUD_Chat_Export(int fh) // allow saving cvars that aesthetically change the panel into hud skin files } +float chat_maximized_scroll_ofs; +float chat_maximized_reset_scroll_time; +float HUD_Panel_Chat_InputEvent(float bInputType, float nPrimary, float nSecondary) +{ + if(bInputType == 3) + { + mousepos.x = nPrimary; + mousepos.y = nSecondary; + return true; + } + + if(bInputType == 2) + return false; + + // at this point bInputType can only be 0 or 1 (key pressed or released) + bool key_pressed = (bInputType == 0); + + if(!autocvar__con_chat_maximized) + return false; + + if(nPrimary == K_MWHEELUP) + { + if (!key_pressed) + return true; + chat_maximized_scroll_ofs += 5 * cvar("con_chatsize"); + return true; + } + else if(nPrimary == K_MWHEELDOWN) + { + if (!key_pressed) + return true; + chat_maximized_scroll_ofs -= 5 * cvar("con_chatsize"); + if (chat_maximized_scroll_ofs < 0) + chat_maximized_scroll_ofs = 0; + return true; + } + else if(nPrimary == K_PGUP) + { + if (!key_pressed) + return true; + chat_maximized_scroll_ofs += vid_conheight / 2; + return true; + } + else if(nPrimary == K_PGDN) + { + if (!key_pressed) + return true; + chat_maximized_scroll_ofs -= vid_conheight / 2; + if (chat_maximized_scroll_ofs < 0) + chat_maximized_scroll_ofs = 0; + return true; + } + + return false; +} + void HUD_Chat() { if(!autocvar__hud_configure) @@ -25,16 +81,26 @@ void HUD_Chat() cvar_set("con_chat", "-1"); return; } + if(autocvar__con_chat_maximized) { if(!hud_draw_maximized) return; + + chat_maximized_reset_scroll_time = time + 3; } - else if(chat_panel_modified) + else { - panel.update_time = time; // forces reload of panel attributes - chat_panel_modified = false; + if(chat_panel_modified) + { + panel.update_time = time; // forces reload of panel attributes + chat_panel_modified = false; + } + if (time > chat_maximized_reset_scroll_time) + chat_maximized_scroll_ofs = 0; } } + else + chat_maximized_scroll_ofs = 0; HUD_Panel_LoadCvars(); @@ -61,6 +127,7 @@ void HUD_Chat() chat_panel_modified = true; } panel_bg_alpha = max(0.75, panel_bg_alpha); + panel_size.y += chat_maximized_scroll_ofs; } vector pos, mySize; diff --git a/qcsrc/client/hud/panel/chat.qh b/qcsrc/client/hud/panel/chat.qh index 9ed87d9f3..b17ba1a9a 100644 --- a/qcsrc/client/hud/panel/chat.qh +++ b/qcsrc/client/hud/panel/chat.qh @@ -13,3 +13,5 @@ bool autocvar_con_chatrect; //float autocvar_con_chatrect_x; //float autocvar_con_chatrect_y; float autocvar_con_chatwidth; + +float HUD_Panel_Chat_InputEvent(float bInputType, float nPrimary, float nSecondary); diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc index f84a37330..e5320ebbd 100644 --- a/qcsrc/client/hud/panel/healtharmor.qc +++ b/qcsrc/client/hud/panel/healtharmor.qc @@ -22,7 +22,7 @@ void HUD_HealthArmor_Export(int fh) void HUD_HealthArmor() { - int armor, health, fuel, air_time; + int armor, health, health_real, fuel, air_time; if(!autocvar__hud_configure) { if((!autocvar_hud_panel_healtharmor) || (spectatee_status == -1)) @@ -30,8 +30,10 @@ void HUD_HealthArmor() if(hud != HUD_NORMAL) return; health = STAT(HEALTH); + health_real = health; if(health <= 0) { + health_real = max(health, -999); health = 0; prev_health = -1; if(autocvar_hud_panel_healtharmor_hide_ondeath) @@ -70,6 +72,7 @@ void HUD_HealthArmor() else { health = 150; + health_real = 150; armor = 75; fuel = 20; air_time = 6; @@ -246,7 +249,7 @@ void HUD_HealthArmor() HUD_Panel_DrawProgressBar(pos + health_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_health, p_health/maxhealth, is_vertical, health_baralign, autocvar_hud_progressbar_health_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * pain_health_alpha, DRAWFLAG_NORMAL); } if(autocvar_hud_panel_healtharmor_text) - DrawNumIcon(pos + health_offset, mySize, health, "health", is_vertical, false, health_iconalign, HUD_Get_Num_Color(health, maxhealth, true), 1); + DrawNumIcon(pos + health_offset, mySize, health_real, "health", is_vertical, false, health_iconalign, HUD_Get_Num_Color(health, maxhealth, true), 1); } //if(armor) diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc index f4bae2024..ef209633b 100644 --- a/qcsrc/client/hud/panel/radar.qc +++ b/qcsrc/client/hud/panel/radar.qc @@ -2,10 +2,10 @@ #include #include -#include #include #include #include +#include // Radar (#6) diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc index dca00c4cb..b6a60cddd 100644 --- a/qcsrc/client/hud/panel/score.qc +++ b/qcsrc/client/hud/panel/score.qc @@ -2,6 +2,7 @@ #include #include +#include #include #include diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 1a7fd038e..f3b8581e1 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -663,8 +664,10 @@ string Scoreboard_GetName(entity pl) sbt_field_icon2_rgb = colormapPaletteColor(f % 16, 1); } } - - return entcs_GetName(pl.sv_entnum); + if(entcs_GetRank(pl.sv_entnum) != "") + return strcat(entcs_GetRank(pl.sv_entnum), "^7 ", entcs_GetName(pl.sv_entnum)); + else + return entcs_GetName(pl.sv_entnum); } //LegendGuard adds GetCountrycode function 05-04-2021 @@ -1133,7 +1136,11 @@ vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity else if(autocvar_hud_panel_scoreboard_others_showscore) field = Scoreboard_GetField(pl, SP_SCORE); - string str = entcs_GetName(pl.sv_entnum); + string str; + if(entcs_GetRank(pl.sv_entnum) != "") + str = strcat(entcs_GetRank(pl.sv_entnum), "^7 ", entcs_GetName(pl.sv_entnum)); + else + str = entcs_GetName(pl.sv_entnum); if (autocvar_hud_panel_scoreboard_playerid) str = Scoreboard_AddPlayerId(str, pl); str = textShortenToWidth(str, namesize, hud_fontsize, stringwidth_colors); @@ -1295,14 +1302,28 @@ void Scoreboard_Duel_DrawTable(vector pos, bool invert, entity pl, entity tm) drawstring(tmp_in, tmp_str, duel_score_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); draw_endBoldFont(); - // Player name - tmp_str = Scoreboard_GetField(pl, SP_NAME); tmp_in = tmp; + tmp_in.y += (duel_score_size.y - duel_name_fontsize.y) / 2; + + // RJZ rank + string rank_str = entcs_GetRank(pl.sv_entnum); + if(rank_str != "") { + if(invert) + tmp_in.x -= stringwidth_colors(rank_str, duel_name_fontsize) + duel_name_fontsize.x * 0.5; + else + tmp_in.x += duel_score_size.x + duel_name_fontsize.x * 0.5; + + draw_beginBoldFont(); + drawcolorcodedstring(tmp_in, rank_str, duel_name_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + draw_endBoldFont(); + } + + // Player name + tmp_str = entcs_GetName(pl.sv_entnum); if(invert) tmp_in.x -= stringwidth_colors(tmp_str, duel_name_fontsize) + duel_name_fontsize.x * 0.5; else - tmp_in.x += duel_score_size.x + duel_name_fontsize.x * 0.5; - tmp_in.y += (duel_score_size.y - duel_name_fontsize.y) / 2; + tmp_in.x += (rank_str != "" ? stringwidth_colors(rank_str, duel_name_fontsize) : duel_score_size.x) + duel_name_fontsize.x * 0.5; drawcolorcodedstring(tmp_in, tmp_str, duel_name_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); //LegendGuard adds a conditional sentence for country column 05-04-2021 @@ -1635,7 +1656,7 @@ bool Scoreboard_WouldDraw() return true; else if (intermission == 2) return false; - else if (spectatee_status != -1 && STAT(HEALTH) <= 0 && autocvar_cl_deathscoreboard && !MUTATOR_CALLHOOK(DrawDeathScoreboard) + else if (!spectatee_status && STAT(HEALTH) <= 0 && autocvar_cl_deathscoreboard && !MUTATOR_CALLHOOK(DrawDeathScoreboard) && (!HUD_MinigameMenu_IsOpened() || !active_minigame)) { return true; @@ -2042,7 +2063,6 @@ vector Scoreboard_MapStats_Draw(vector pos, vector rgb, vector bg_size) { } */ - int rankings_rows = 0; int rankings_columns = 0; int rankings_cnt = 0; @@ -2334,7 +2354,7 @@ void Scoreboard_Draw() scoreboard_top = panel_pos.y; vector pos = panel_pos; - entity pl, tm; + entity tm; string str; vector str_pos; @@ -2633,24 +2653,6 @@ void Scoreboard_Draw() else rankings_cnt = 0; - // List spectators - for(pl = players.sort_next; pl; pl = pl.sort_next) - { - if(pl.team == NUM_SPECTATOR) - { - for(tm = teams.sort_next; tm; tm = tm.sort_next) - if(tm.team == NUM_SPECTATOR) - break; - str = sprintf("%s (%d)", _("Spectators"), tm.team_size); - draw_beginBoldFont(); - drawstring(pos, str, hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - draw_endBoldFont(); - pos.y += 1.25 * hud_fontsize.y; - - break; - } - } - // draw scoreboard spectators after rankings if (autocvar_hud_panel_scoreboard_spectators_position == 2) { pos = Scoreboard_Spectators_Draw(pos); diff --git a/qcsrc/client/hud/panel/spect.qc b/qcsrc/client/hud/panel/spect.qc index 1f8c730e2..fc67de3eb 100644 --- a/qcsrc/client/hud/panel/spect.qc +++ b/qcsrc/client/hud/panel/spect.qc @@ -2,6 +2,12 @@ #include #include +#include +#include +#include +#include +#include +#include vector teamscore_size; vector teamscore_fontsize; @@ -15,14 +21,16 @@ void HUD_SpectHUD_Export(int fh) void HUD_SpectHUD_drawCurrentName(vector pos) { vector tmp; + string s; tmp = pos; - string s = entcs_GetName(current_player); + + s = entcs_GetName(current_player); tmp.x -= stringwidth_colors(s, hud_fontsize * 2) / 2; drawcolorcodedstring(tmp, s, hud_fontsize * 2, panel_fg_alpha, DRAWFLAG_NORMAL); - + tmp = pos; - s = "Spectating"; + s = (entcs_GetRank(current_player) != "" ? entcs_GetRank(current_player) : "Spectating"); tmp.x -= stringwidth_colors(s, hud_fontsize) / 2; tmp.y -= hud_fontsize.y; drawcolorcodedstring(tmp, s, hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); @@ -58,15 +66,17 @@ void HUD_SpectHUD_drawTeamPlayers(vector pos, entity tm, vector rgb, bool invert tmp_over = pos; vector total_sz = vec2(line_sz.x, line_sz.y + line_sz_sub.y); - if(pl.eliminated) { + bool dead = entcs_IsDead(pl.sv_entnum) || pl.eliminated; + + if(dead) { // z411 TODO : Unhardcode luma icon = "gfx/hud/luma/notify_death.tga"; icon_rgb = rgb; } else { entity entcs = entcs_receiver(pl.sv_entnum); if(entcs.m_entcs_private) { - health = (entcs.healthvalue / autocvar_hud_panel_healtharmor_maxhealth) * line_sz.x; - armor = (GetResource(entcs, RES_ARMOR) / autocvar_hud_panel_healtharmor_maxarmor) * line_sz_sub.x; + health = (min(entcs.healthvalue, autocvar_hud_panel_healtharmor_maxhealth) / autocvar_hud_panel_healtharmor_maxhealth) * line_sz.x; + armor = (min(GetResource(entcs, RES_ARMOR), autocvar_hud_panel_healtharmor_maxarmor) / autocvar_hud_panel_healtharmor_maxarmor) * line_sz_sub.x; Weapon wep = REGISTRY_GET(Weapons, entcs.activewepid); icon = strcat("gfx/hud/luma/", wep.model2); @@ -99,7 +109,13 @@ void HUD_SpectHUD_drawTeamPlayers(vector pos, entity tm, vector rgb, bool invert } // Get player's name - playername = textShortenToWidth(entcs_GetName(pl.sv_entnum), line_sz.x * 0.8, hud_fontsize, stringwidth_colors); + string playername; + if(entcs_GetRank(pl.sv_entnum) != "") + playername = strcat(entcs_GetRank(pl.sv_entnum), "^7 ", entcs_GetName(pl.sv_entnum)); + else + playername = entcs_GetName(pl.sv_entnum); + + playername = textShortenToWidth(playername, line_sz.x * 0.8, hud_fontsize, stringwidth_colors); // Draw health and name drawfill(pos, line_sz, rgb * 0.7, a * 0.3, DRAWFLAG_NORMAL); @@ -115,7 +131,7 @@ void HUD_SpectHUD_drawTeamPlayers(vector pos, entity tm, vector rgb, bool invert // Highlight current player if(pl.sv_entnum == current_player && spectatee_status != -1) drawfill(tmp_over, total_sz, '1 1 1', 0.3, DRAWFLAG_NORMAL); - if(pl.eliminated) + if(dead || pl.eliminated) drawfill(tmp_over, total_sz, '0 0 0', 0.4, DRAWFLAG_NORMAL); if(!invert) @@ -176,8 +192,8 @@ void HUD_SpectHUD_drawDuelScore(vector pos, entity pl, bool invert) entity entcs = entcs_receiver(pl.sv_entnum); if(entcs.m_entcs_private) { - health = (entcs.healthvalue / autocvar_hud_panel_healtharmor_maxhealth) * health_sz.x; - armor = (GetResource(entcs, RES_ARMOR) / autocvar_hud_panel_healtharmor_maxarmor) * armor_sz.x; + health = (min(entcs.healthvalue, autocvar_hud_panel_healtharmor_maxhealth) / autocvar_hud_panel_healtharmor_maxhealth) * health_sz.x; + armor = (min(GetResource(entcs, RES_ARMOR), autocvar_hud_panel_healtharmor_maxarmor) / autocvar_hud_panel_healtharmor_maxarmor) * armor_sz.x; } if(invert) @@ -189,6 +205,9 @@ void HUD_SpectHUD_drawDuelScore(vector pos, entity pl, bool invert) if(pl.sv_entnum == current_player && spectatee_status != -1) drawfill(tmp, total_sz, '1 1 1', 0.3, DRAWFLAG_NORMAL); + + if(entcs_IsDead(pl.sv_entnum)) + drawfill(tmp, total_sz, '0 0 0', 0.4, DRAWFLAG_NORMAL); // Player score tmp_str = ftos(pl.(scores(ps_primary))); @@ -240,16 +259,31 @@ void HUD_SpectHUD_drawDuelScore(vector pos, entity pl, bool invert) drawfill(tmp, vec2(armor, armor_sz.y), autocvar_hud_progressbar_armor_color, 0.7, DRAWFLAG_NORMAL); } + // Align vertically + tmp = pos; + tmp.y += ((teamscore_size.y / 2) - teamname_fontsize.y) / 2; + tmp.y += teamscore_size.y / 2; + + // RJZ rank + string rank_str = entcs_GetRank(pl.sv_entnum); + if(rank_str != "") { + if(invert) + tmp.x -= stringwidth_colors(rank_str, teamname_fontsize) + teamname_fontsize.x * 0.5; + else + tmp.x += teamscore_size.x + teamname_fontsize.x * 0.5; + + draw_beginBoldFont(); + drawcolorcodedstring(tmp, rank_str, teamname_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); + draw_endBoldFont(); + } + // Player name tmp_str = entcs_GetName(pl.sv_entnum); - tmp = pos; if(invert) tmp.x -= stringwidth_colors(tmp_str, teamname_fontsize) + teamname_fontsize.x * 0.5; else - tmp.x += teamscore_size.x + teamname_fontsize.x * 0.5; - tmp.y += ((teamscore_size.y / 2) - teamname_fontsize.y) / 2; - tmp.y += teamscore_size.y / 2; + tmp.x += (rank_str != "" ? stringwidth_colors(rank_str, teamname_fontsize) : teamscore_size.x) + teamname_fontsize.x * 0.5; drawcolorcodedstring(tmp, tmp_str, teamname_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); } diff --git a/qcsrc/client/hud/panel/strafehud.qc b/qcsrc/client/hud/panel/strafehud.qc index 5ddc30d23..e4e339c44 100644 --- a/qcsrc/client/hud/panel/strafehud.qc +++ b/qcsrc/client/hud/panel/strafehud.qc @@ -4,13 +4,13 @@ #include #include -#include #include #include #include #include #include #include +#include #include // StrafeHUD (#25) diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc index 906e942ad..0fdf2bc10 100644 --- a/qcsrc/client/hud/panel/timer.qc +++ b/qcsrc/client/hud/panel/timer.qc @@ -3,15 +3,38 @@ #include #include -// Timer (#5) -float last_timeleft; -bool autocvar_hud_panel_timer_count = true; void HUD_Timer_Export(int fh) { // allow saving cvars that aesthetically change the panel into hud skin files } +vector HUD_Timer_Color(float timeleft) +{ + if(timeleft <= 60) + return '1 0 0'; // red + else if(timeleft <= 300) + return '1 1 0'; // yellow + else + return '1 1 1'; // white +} + +float HUD_Timer_TimeElapsed(float curtime, float starttime) +{ + float time_elapsed = curtime - starttime; + if (!autocvar_hud_panel_timer_unbound) + time_elapsed = max(0, time_elapsed); + return floor(time_elapsed); +} + +float HUD_Timer_TimeLeft(float curtime, float starttime, float timelimit) +{ + float timeleft = timelimit + starttime - curtime; + if (!autocvar_hud_panel_timer_unbound) + timeleft = bound(0, timeleft, timelimit); + return ceil(timeleft); +} + void HUD_Timer() { if(!autocvar__hud_configure) @@ -31,98 +54,107 @@ void HUD_Timer() HUD_Scale_Enable(); else HUD_Scale_Disable(); - HUD_Panel_DrawBg(); if(panel_bg_padding) { pos += '1 1 0' * panel_bg_padding; mySize -= '2 2 0' * panel_bg_padding; } - string timer_sub = ""; - float timelimit, timeleft, minutesLeft, overtimes, timeout_last; - - timelimit = STAT(TIMELIMIT); - overtimes = STAT(OVERTIMESADDED); - timeout_last = STAT(TIMEOUT_LAST); - - timeleft = bound(0, timelimit * 60 + STAT(GAMESTARTTIME) - time, timelimit * 60); - timeleft = ceil(timeleft); - - // countdown sound - if(autocvar_hud_panel_timer_count && timeleft > 0 && timeleft != last_timeleft && timeleft <= 10) + string timer; + string subtimer = string_null; + string subtext = string_null; + float curtime, timelimit, timeleft; + vector timer_size, subtext_size, subtimer_size; + vector timer_color = '1 1 1'; + vector subtimer_color = '1 1 1'; + bool swap = (autocvar_hud_panel_timer_secondary == 2 && STAT(ROUNDSTARTTIME)); + + // Use real or frozen time and get the time limit + curtime = (intermission_time ? intermission_time : time); + if(warmup_stage) { - sound(NULL, CH_INFO, SND_ENDCOUNT, VOL_BASE, ATTN_NONE); - last_timeleft = timeleft; + timelimit = STAT(WARMUP_TIMELIMIT); + if(timelimit == 0) + timelimit = STAT(TIMELIMIT) * 60; } - - minutesLeft = floor(timeleft / 60); - - float warmup_timeleft = 0; - if(warmup_stage) + else { - float warmup_timelimit = STAT(WARMUP_TIMELIMIT); - if(warmup_timelimit > 0) - warmup_timeleft = max(0, warmup_timelimit - time + STAT(GAMESTARTTIME)); - else if(warmup_timelimit == 0) - warmup_timeleft = timeleft; - warmup_timeleft = ceil(warmup_timeleft); + timelimit = STAT(TIMELIMIT) * 60; } - vector timer_color; - if(intermission_time || minutesLeft >= 5 || warmup_stage || timelimit == 0) - timer_color = '1 1 1'; //white - else if(minutesLeft >= 1) - timer_color = '1 1 0'; //yellow + // Calculate time left + timeleft = HUD_Timer_TimeLeft(curtime, STAT(GAMESTARTTIME), timelimit); + + // Timer color + if(!intermission_time && !warmup_stage && timelimit > 0) + timer_color = HUD_Timer_Color(timeleft); + + // Timer text + if (autocvar_hud_panel_timer_increment || timelimit == 0) + timer = seconds_tostring(HUD_Timer_TimeElapsed(curtime, STAT(GAMESTARTTIME))); else - timer_color = '1 0 0'; //red - - if (intermission_time) { - timer = max(0, floor(intermission_time - STAT(GAMESTARTTIME))); - timer_sub = "Intermission"; - //} else if (autocvar_hud_panel_timer_increment || (!warmup_stage && timelimit == 0) || (warmup_stage && warmup_timeleft <= 0)) { - } else if (timeout_last) { - if(autocvar_hud_panel_timer_increment) - timer = max(0, floor(timeout_last - STAT(GAMESTARTTIME))); - else - timer = ceil(max(0, timelimit * 60 + STAT(GAMESTARTTIME) - timeout_last)); - timer_sub = "Timeout"; - } else if (autocvar_hud_panel_timer_increment || timelimit == 0) { - // Time elapsed timer - if((warmup_stage && warmup_timeleft <= 0) || time < STAT(GAMESTARTTIME)) - timer = 0; - else - timer = floor(time - STAT(GAMESTARTTIME)); - } else { - // Time left timer - if(warmup_stage) { - if(warmup_timeleft <= 0) - timer = floor(timelimit * 60); - else - timer = warmup_timeleft; + timer = seconds_tostring(timeleft); + + // Secondary timer for round-based game modes + if(STAT(ROUNDSTARTTIME) && autocvar_hud_panel_timer_secondary) + { + if(STAT(ROUNDSTARTTIME) == -1) { + // Round can't start + subtimer = "--:--"; + subtimer_color = '1 0 0'; } else { - if (time < STAT(GAMESTARTTIME)) - timer = floor(timelimit * 60); - //else if (overtimes > 0) - // timer = floor(time - STAT(OVERTIMESTARTTIME)); + float round_curtime, round_timelimit, round_timeleft; + + // Use real or frozen time and get the time limit + round_curtime = (game_stopped_time ? game_stopped_time : time); + round_timelimit = STAT(ROUND_TIMELIMIT); + + // Calculate time left + round_timeleft = HUD_Timer_TimeLeft(round_curtime, STAT(ROUNDSTARTTIME), round_timelimit); + + // Subtimer color + if(!intermission_time && round_timelimit > 0) + subtimer_color = HUD_Timer_Color(round_timeleft); + + // Subtimer text + if (autocvar_hud_panel_timer_increment || round_timelimit <= 0) + subtimer = seconds_tostring(HUD_Timer_TimeElapsed(round_curtime, STAT(ROUNDSTARTTIME))); else - timer = timeleft; + subtimer = seconds_tostring(round_timeleft); } } - - if(warmup_stage) - timer_sub = "Warmup"; + + // Subtext + int overtimes = STAT(OVERTIMES); + + if(warmup_stage || autocvar__hud_configure) + subtext = _("Warmup"); + else if(STAT(TIMEOUT_STATUS) == 2) + subtext = _("Timeout"); + else if (overtimes == -1) + subtext = _("Sudden Death"); else if(overtimes == 1) - timer_sub = "Overtime"; - else if (overtimes > 1) - timer_sub = sprintf("Overtime #%d", overtimes); - - drawstring_aspect(pos, seconds_tostring(timer), mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL); - - if(timer_sub != "") { - pos.y += mySize.y; - mySize.y = mySize.y / 2; - drawstring_aspect(pos, timer_sub, mySize, '1 0 0', panel_fg_alpha, DRAWFLAG_NORMAL); + subtext = _("Overtime"); + else if (overtimes >= 2) + subtext = sprintf(_("Overtime #%d"), overtimes); + + subtext_size = vec2(mySize.x, mySize.y / 3); + timer_size = vec2(mySize.x, mySize.y - subtext_size.y); + subtimer_size = vec2(mySize.x / 3, mySize.y - subtext_size.y); + + panel_size.y -= subtext_size.y; + HUD_Panel_DrawBg(); + + if(subtimer) { + float subtimer_padding = subtimer_size.y / 5; + timer_size.x -= subtimer_size.x; + drawstring_aspect(pos + eX * timer_size.x + eY * subtimer_padding, (swap ? timer : subtimer), subtimer_size - eY * subtimer_padding * 2, (swap ? timer_color : subtimer_color), panel_fg_alpha, DRAWFLAG_NORMAL); } + drawstring_aspect(pos, (swap ? subtimer : timer), timer_size, (swap ? subtimer_color : timer_color), panel_fg_alpha, DRAWFLAG_NORMAL); + + if(subtext) + drawstring_aspect(pos + eY * timer_size.y, subtext, subtext_size, '0 1 0', panel_fg_alpha, DRAWFLAG_NORMAL); + draw_endBoldFont(); } diff --git a/qcsrc/client/hud/panel/timer.qh b/qcsrc/client/hud/panel/timer.qh index 309f04249..3790f4777 100644 --- a/qcsrc/client/hud/panel/timer.qh +++ b/qcsrc/client/hud/panel/timer.qh @@ -4,3 +4,9 @@ bool autocvar_hud_panel_timer; bool autocvar_hud_panel_timer_dynamichud = true; bool autocvar_hud_panel_timer_increment; +int autocvar_hud_panel_timer_secondary = 1; +bool autocvar_hud_panel_timer_unbound; + +vector HUD_Timer_Color(float timeleft); +float HUD_Timer_TimeElapsed(float curtime, float starttime); +float HUD_Timer_TimeLeft(float curtime, float starttime, float timelimit); diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc index 36a4a4df8..a3e3b568e 100644 --- a/qcsrc/client/hud/panel/weapons.qc +++ b/qcsrc/client/hud/panel/weapons.qc @@ -583,6 +583,7 @@ void HUD_Weapons() if(a > 0) { + // TODO: registry handles switch (it.ammo_type) { case RES_SHELLS: ammo_full = autocvar_hud_panel_weapons_ammo_full_shells; break; diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 2850dfc63..4aa29e380 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -57,7 +58,7 @@ void CSQC_Init() maxclients = i; } - ReplicateVars_Send_All(); + ReplicateVars(REPLICATEVARS_SEND_ALL); // needs to be done so early because of the constants they create static_init(); @@ -192,7 +193,7 @@ void Shutdown() deactivate_minigame(); HUD_MinigameMenu_Close(NULL, NULL, NULL); - ReplicateVars_Destroy(); + ReplicateVars(REPLICATEVARS_DESTROY); } void AuditLists() @@ -455,10 +456,13 @@ float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary) { TC(int, bInputType); bool override = false; + override |= HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary); if (override) return true; + override |= HUD_Panel_Chat_InputEvent(bInputType, nPrimary, nSecondary); + override |= QuickMenu_InputEvent(bInputType, nPrimary, nSecondary); override |= HUD_Radar_InputEvent(bInputType, nPrimary, nSecondary); @@ -1065,6 +1069,8 @@ NET_HANDLE(ENT_CLIENT_INIT, bool isnew) strcpy(hostname_full, ReadString()); strcpy(motd_permanent, ReadString()); + + sv_timer_countdown = ReadByte(); return = true; diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh index 1820fe369..41fdb48e6 100644 --- a/qcsrc/client/main.qh +++ b/qcsrc/client/main.qh @@ -7,6 +7,7 @@ // z411 string hostname_full; string motd_permanent; +int sv_timer_countdown; bool autocvar_cl_db_saveasdump; bool autocvar_cl_spawn_event_particles; @@ -168,6 +169,7 @@ string GetSpeedUnit(int speed_unit); .int team; .int team_size; .int countrycode; +.string rank; int binddb; @@ -194,3 +196,4 @@ float serverprevtime, serverdeltatime; float ticrate; int serverflags; + diff --git a/qcsrc/client/resources.qc b/qcsrc/client/resources.qc deleted file mode 100644 index 5408872b4..000000000 --- a/qcsrc/client/resources.qc +++ /dev/null @@ -1,85 +0,0 @@ -#include "resources.qh" - -#include - -/// \file -/// \brief Source file that contains implementation of the resource system. -/// \copyright GNU GPLv2 or any later version. - -float GetResource(entity e, int res_type) -{ - return e.(GetResourceField(res_type)); -} - -bool SetResourceExplicit(entity e, int res_type, float amount) -{ - .float res_field = GetResourceField(res_type); - if (e.(res_field) != amount) - { - e.(res_field) = amount; - return true; - } - return false; -} - -void SetResource(entity e, int res_type, float amount) -{ - SetResourceExplicit(e, res_type, amount); -} - -void TakeResource(entity receiver, int res_type, float amount) -{ - if (amount == 0) - { - return; - } - SetResource(receiver, res_type, GetResource(receiver, res_type) - amount); -} - -void TakeResourceWithLimit(entity receiver, int res_type, float amount, float limit) -{ - if (amount == 0) - { - return; - } - float current_amount = GetResource(receiver, res_type); - if (current_amount - amount < limit) - { - amount = limit + current_amount; - } - TakeResource(receiver, res_type, amount); -} - -int GetResourceType(.float res_field) -{ - switch (res_field) - { - case health: { return RES_HEALTH; } - case armorvalue: { return RES_ARMOR; } - case ammo_shells: { return RES_SHELLS; } - case ammo_nails: { return RES_BULLETS; } - case ammo_rockets: { return RES_ROCKETS; } - case ammo_cells: { return RES_CELLS; } - case ammo_plasma: { return RES_PLASMA; } - case ammo_fuel: { return RES_FUEL; } - } - error("GetResourceType: Invalid field."); - return 0; -} - -.float GetResourceField(int res_type) -{ - switch (res_type) - { - case RES_HEALTH: { return health; } - case RES_ARMOR: { return armorvalue; } - case RES_SHELLS: { return ammo_shells; } - case RES_BULLETS: { return ammo_nails; } - case RES_ROCKETS: { return ammo_rockets; } - case RES_CELLS: { return ammo_cells; } - case RES_PLASMA: { return ammo_plasma; } - case RES_FUEL: { return ammo_fuel; } - } - error("GetResourceField: Invalid resource type."); - return health; -} diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index 27157a5a1..3f0688d61 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -2,11 +2,11 @@ #include #include -#include #include #include #include #include +#include #include #include diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 466e2005f..26a290991 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -1547,7 +1547,7 @@ void CSQC_UpdateView(entity this, float w, float h) stats_get(); hud = STAT(HUD); - ReplicateVars_Check(); + ReplicateVars(REPLICATEVARS_CHECK); HUD_Scale_Disable(); @@ -1646,6 +1646,11 @@ void CSQC_UpdateView(entity this, float w, float h) if(intermission && !intermission_time) intermission_time = time; + if(STAT(GAME_STOPPED) && !game_stopped_time) + game_stopped_time = time; + else if(game_stopped_time && !STAT(GAME_STOPPED)) + game_stopped_time = 0; + if(intermission && !isdemo() && !(calledhooks & HOOK_END)) { if(calledhooks & HOOK_START) diff --git a/qcsrc/client/view.qh b/qcsrc/client/view.qh index 0abcb13fe..45959383b 100644 --- a/qcsrc/client/view.qh +++ b/qcsrc/client/view.qh @@ -125,3 +125,4 @@ float blurtest_time0, blurtest_time1, blurtest_radius, blurtest_power; #endif float intermission_time; +float game_stopped_time; diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc index fa80064c9..8f85fcf72 100644 --- a/qcsrc/common/_all.inc +++ b/qcsrc/common/_all.inc @@ -1,5 +1,8 @@ noref float autocvar_net_connecttimeout = 30; +#include "announcer.qc" +#include "colors.qc" + #ifdef GAMEQC #include "anim.qc" #include "animdecide.qc" @@ -49,3 +52,5 @@ noref float autocvar_net_connecttimeout = 30; #include "mutators/_mod.inc" #include "gamemodes/_mod.inc" + +#include "resources/_mod.inc" diff --git a/qcsrc/common/_mod.inc b/qcsrc/common/_mod.inc index 4a45c1edb..84d6789c7 100644 --- a/qcsrc/common/_mod.inc +++ b/qcsrc/common/_mod.inc @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/common/announcer.qc b/qcsrc/common/announcer.qc new file mode 100644 index 000000000..02583c36f --- /dev/null +++ b/qcsrc/common/announcer.qc @@ -0,0 +1,45 @@ +//FEATURE: Custom default announcers on the server side, that clients can override if desired + +#ifdef GAMEQC +REGISTER_MUTATOR(announcer, true); +#endif + +#ifdef SVQC + +AUTOCVAR(sv_announcer, string, "", "Force client announcer to this"); + +MUTATOR_HOOKFUNCTION(announcer, Ent_Init, CBC_ORDER_FIRST) +{ + WriteString(MSG_ONE, autocvar_sv_announcer); +} + +#elif defined(CSQC) + +string sv_announcer; + +AUTOCVAR_SAVE(cl_announcer_force, bool, false, "Don't allow server to override default announcer"); + +void Announcer_Precache() +{ + FOREACH(Notifications, it.nent_type == MSG_ANNCE, { + if(it.nent_enabled) + precache_sound(sprintf("announcer/%s/%s.wav", AnnouncerOption(), it.nent_snd)); + }); +} + +MUTATOR_HOOKFUNCTION(announcer, AnnouncerOption) +{ + if(autocvar_cl_announcer_force || sv_announcer == "" || !sv_announcer || autocvar_cl_announcer != "default") + return false; + + M_ARGV(0, string) = sv_announcer; +} + +MUTATOR_HOOKFUNCTION(announcer, Ent_Init, CBC_ORDER_FIRST) +{ + sv_announcer = strzone(ReadString()); + + if(sv_announcer != "" && sv_announcer) { Announcer_Precache(); } +} + +#endif diff --git a/qcsrc/common/colors.qc b/qcsrc/common/colors.qc new file mode 100644 index 000000000..f60dd35e4 --- /dev/null +++ b/qcsrc/common/colors.qc @@ -0,0 +1,181 @@ +#ifdef GAMEQC + +string mod_translate_clean(string s) +{ + if(ColorTranslateMode & 1) + return strdecolorize(s); + + if(s == "" || !s) + return s; + + s = strreplace("^x664", "^7", s); + s = strreplace("^x665", "^3", s); + s = strreplace("^x666", "^1", s); + s = strreplace("^x667", "^2", s); + s = strreplace("^x668", "^4", s); + s = strreplace("^x669", "^0", s); + return s; +} + +string mod_playername(string thename, int teamid, bool team_colorize) +{ + TC(int, teamid); + bool do_colorize = (teamplay && team_colorize && Team_IsValidTeam(teamid)); + +#ifdef SVQC + if(do_colorize && !intermission_running) +#else + if(do_colorize) +#endif + { + string t = Team_ColorCode(teamid); + return strcat(t, strdecolorize(thename)); + } + else + return mod_translate_clean(thename); +} + +#endif + +#ifdef CSQC +AUTOCVAR(cl_stripfancystuff, bool, false, "Turn off the fancy blinking colorful names"); + +vector mod_get_num_color(int num) +{ + vector color; + float thenum = 0; + switch(num) + { + case 1: color = vec3(sin(2 * M_PI * time), 1, sin(2 * M_PI * time)); thenum = 200; break; + default: + case 2: color = '1 0 0'; thenum = 1; break; + case 3: color = '0 0 1'; thenum = 1; break; + case 4: color = vec3(1, 1, sin(2 * M_PI * time)); thenum = 200; break; + case 5: color = vec3(sin(2 * M_PI * time), sin(2 * M_PI * time), sin(2 * M_PI * time)); thenum = 200; break; + case 6: color = '1 1 1'; thenum = 1; break; + case 7: color = vec3(0.69, 0.12, sin(2 * M_PI * time)); thenum = 200; break; + } + + float blinkingamt = (1 - thenum/200/0.25); + if(blinkingamt > 0) + { + color.x = color.x - color.x * blinkingamt * sin(2*M_PI*time); + color.y = color.y - color.y * blinkingamt * sin(2*M_PI*time); + color.z = color.z - color.z * blinkingamt * sin(2*M_PI*time); + } + return color; +} + +string mod_translate(string s) +{ + if(autocvar_cl_stripfancystuff) + return mod_translate_clean(s); + + if(ColorTranslateMode & 1) + return strdecolorize(s); + + if(s == "" || !s) + return s; + + string theword = ""; + int fancy = 0; + FOREACH_CHAR(s, true, + { + string realch = chr2str(it); + if(realch == "^") + { + string nc1 = chr2str(str2chr(iter_s, iter_i)); + string nc2 = chr2str(str2chr(iter_s, iter_i + 1)); + string nc3 = chr2str(str2chr(iter_s, iter_i + 2)); + string nc4 = chr2str(str2chr(iter_s, iter_i + 3)); + int fc4 = stoi(nc4); + if(nc1 == "x" && nc2 == "6" && nc3 == "6" && (fc4 >= 3 && fc4 <= 9)) // so far so good + { + switch(fc4) + { + case 3: fancy = 7; break; + case 4: fancy = 6; break; + case 5: fancy = 4; break; + default: + case 6: fancy = 2; break; + case 7: fancy = 1; break; + case 8: fancy = 3; break; + case 9: fancy = 5; break; + } + int pos = iter_i + 4; // skip the color code + STRING_ITERATOR_LOAD(iter, pos); + continue; + } + else + { + fancy = 0; + // not a valid hax, but also a color, add normally and continue! + theword = strcat(theword, realch); + continue; + } + } + else if(fancy) + { + vector thecolor = mod_get_num_color(fancy); + thecolor.x = bound(0, thecolor.x, 1); + thecolor.y = bound(0, thecolor.y, 1); + thecolor.z = bound(0, thecolor.z, 1); + theword = strcat(theword, rgb_to_hexcolor(thecolor), strdecolorize(realch)); + } + else + theword = strcat(theword, realch); + }); + + return theword; +} + +void mod_parse_print(string strMessage) +{ + if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Parse_Print(\"%s\")", strMessage); + print(mod_translate_clean(strMessage)); +} + +string mod_ccr(string input) +{ + // See the autocvar declarations in util.qh for default values + + // foreground/normal colors + input = strreplace("^F1", strcat("^", autocvar_hud_colorset_foreground_1), input); + input = strreplace("^F2", strcat("^", autocvar_hud_colorset_foreground_2), input); + input = strreplace("^F3", strcat("^", autocvar_hud_colorset_foreground_3), input); + input = strreplace("^F4", strcat("^", autocvar_hud_colorset_foreground_4), input); + + // "kill" colors + input = strreplace("^K1", strcat("^", autocvar_hud_colorset_kill_1), input); + input = strreplace("^K2", strcat("^", autocvar_hud_colorset_kill_2), input); + input = strreplace("^K3", strcat("^", autocvar_hud_colorset_kill_3), input); + + // background colors + input = strreplace("^BG", strcat("^", autocvar_hud_colorset_background), input); + input = strreplace("^N", "^7", input); // "none"-- reset to white... + input = mod_translate_clean(input); + return input; +} +#endif + +STATIC_INIT_LATE(mod_functions_override) +{ +#ifdef CSQC + ColorTranslateRGB = mod_translate; + CSQC_Parse_Print = mod_parse_print; + CCR = mod_ccr; + //Scoreboard_GetName = mod_scoreboard_getname; +#elif defined(SVQC) + playername = mod_playername; +#endif +} + +#ifdef SVQC +REGISTER_MUTATOR(namecolors, true); +MUTATOR_HOOKFUNCTION(namecolors, PreFormatMessage) +{ + string themsg = mod_translate_clean(M_ARGV(1, string)); + + M_ARGV(1, string) = themsg; +} +#endif diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 43236b2b8..de93c94c3 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -7,15 +7,16 @@ const int FRAGS_PLAYER_OUT_OF_GAME = -616; /////////////////////////// // cvar constants -const int CVAR_SAVE = 1; -const int CVAR_NOTIFY = 2; -const int CVAR_READONLY = 4; +const int CVAR_SAVE = BIT(0); +const int CVAR_NOTIFY = BIT(1); +const int CVAR_READONLY = BIT(2); // server flags -const int SERVERFLAG_ALLOW_FULLBRIGHT = 1; -const int SERVERFLAG_TEAMPLAY = 2; -const int SERVERFLAG_PLAYERSTATS = 4; -const int SERVERFLAG_FORBID_PICKUPTIMER = 8; +const int SERVERFLAG_ALLOW_FULLBRIGHT = BIT(0); +const int SERVERFLAG_TEAMPLAY = BIT(1); +const int SERVERFLAG_PLAYERSTATS = BIT(2); +const int SERVERFLAG_PLAYERSTATS_CUSTOM = BIT(3); +const int SERVERFLAG_FORBID_PICKUPTIMER = BIT(4); const int SPECIES_HUMAN = 0; const int SPECIES_ROBOT_SOLID = 1; diff --git a/qcsrc/common/deathtypes/all.inc b/qcsrc/common/deathtypes/all.inc index a2064744d..c11e5fedf 100644 --- a/qcsrc/common/deathtypes/all.inc +++ b/qcsrc/common/deathtypes/all.inc @@ -59,5 +59,3 @@ REGISTER_DEATHTYPE(VH_WAKI_DEATH, DEATH_SELF_VH_WAKI_DEATH, DEAT REGISTER_DEATHTYPE(VH_WAKI_GUN, NULL, DEATH_MURDER_VH_WAKI_GUN, "vehicle") REGISTER_DEATHTYPE(VH_WAKI_ROCKET, DEATH_SELF_VH_WAKI_ROCKET, DEATH_MURDER_VH_WAKI_ROCKET, "vehicle") REGISTER_DEATHTYPE(WEAPON, NULL, NULL, "") - -//REGISTER_DEATHTYPE(VH_CCHOP_DEATH, DEATH_SELF_VH_CCHOP_DEATH, DEATH_MURDER_VH_CCHOP_DEATH, "vehicle") diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh index e63a7f04f..ca0e28f04 100644 --- a/qcsrc/common/debug.qh +++ b/qcsrc/common/debug.qh @@ -2,8 +2,8 @@ #ifdef CSQC #include -#include #include +#include #endif diff --git a/qcsrc/common/effects/all.inc b/qcsrc/common/effects/all.inc index 31abb0daf..60f33f38e 100644 --- a/qcsrc/common/effects/all.inc +++ b/qcsrc/common/effects/all.inc @@ -161,9 +161,6 @@ EFFECT(0, SPAWN_BLUE, "spawn_event_blue") EFFECT(0, SPAWN_YELLOW, "spawn_event_yellow") EFFECT(0, SPAWN_PINK, "spawn_event_pink") EFFECT(0, SPAWN_NEUTRAL, "spawn_event_neutral") -EFFECT(0, SPAWN_GREEN, "spawn_event_green") -EFFECT(0, SPAWN_BROWN, "spawn_event_brown") -EFFECT(0, SPAWN_PURPLE, "spawn_event_purple") entity EFFECT_SPAWN(int teamid) { switch (teamid) { diff --git a/qcsrc/common/effects/effectinfo_nades.inc b/qcsrc/common/effects/effectinfo_nades.inc index b8af3fbf2..9c655579a 100644 --- a/qcsrc/common/effects/effectinfo_nades.inc +++ b/qcsrc/common/effects/effectinfo_nades.inc @@ -54,9 +54,6 @@ nade(red, "0xff0000", "0xff3c00", "0xff0000", "0xffa2a2") nade(yellow, "0xFFFF0F", "0xFFFF0F", "0xFFFF0F", "0xFFFF0F") nade(pink, "0xFF0FFF", "0xFF0FFF", "0xFF0FFF", "0xFF0FFF") nade(neutral, "0xFFFFFF", "0xFFFFFF", "0xFFFFFF", "0xFFFFFF") -nade(green, "0x40ff9b", "0x40ff9b", "0x40ff9b", "0xffa2a2") -nade(brown, "0xa85400", "0xa85400", "0xa85400", "0xffa2a2") -nade(purple, "0x540054", "0x540054", "0x540054", "0xffa2a2") #undef nade #define nade_burn(name, colormin1, colormax1, colormin2, colormax2) \ @@ -135,9 +132,6 @@ nade_burn(blue, "0x006cff", "0x0600ff", "0x0600ff", "0x9794ff") nade_burn(yellow, "0xFFFF0F", "0xFFFF0F", "0xFFFF0F", "0xFFFF0F") nade_burn(pink, "0xFF0FFF", "0xFF0FFF", "0xFF0FFF", "0xFF0FFF") nade_burn(neutral, "0xFFFFFF", "0xFFFFFF", "0xFFFFFF", "0xFFFFFF") -nade_burn(green, "0x40ff9b", "0x40ff9b", "0x40ff9b", "0xffa2a2") -nade_burn(brown, "0xa85400", "0xa85400", "0xa85400", "0xffa2a2") -nade_burn(purple, "0x540054", "0x540054", "0x540054", "0xffa2a2") #undef nade_burn #define nade_explode(name, colorlight, colormin1, colormax1, colormin2, colormax2, colormin3, colormax3) \ @@ -319,7 +313,4 @@ nade_explode(red, '100.0 20.0 20.0', "0xff0000", "0xffa2a2", "0xff0000", " nade_explode(yellow, '100.0 20.0 20.0', "0xff0000", "0xffa2a2", "0xFFFF0F", "0xFFFF0F", "0xff0000", "0xffa2a2") nade_explode(pink, '100.0 20.0 20.0', "0xff0000", "0xffa2a2", "0xFF0FFF", "0xFF0FFF", "0xff0000", "0xffa2a2") nade_explode(neutral, '100.0 20.0 20.0', "0xff0000", "0xffa2a2", "0xFFFFFF", "0xFFFFFF", "0xff0000", "0xffa2a2") -nade_explode(green, '100.0 20.0 20.0', "0x40ff9b", "0xffa2a2", "0x40ff9b", "0x40ff9b", "0xff0000", "0xffa2a2") -nade_explode(brown, '100.0 20.0 20.0', "0xa85400", "0xffa2a2", "0xa85400", "0xa85400", "0xff0000", "0xffa2a2") -nade_explode(purple, '100.0 20.0 20.0', "0x540054", "0xffa2a2", "0x540054", "0x540054", "0xff0000", "0xffa2a2") #undef nade_explode diff --git a/qcsrc/common/effects/qc/casings.qc b/qcsrc/common/effects/qc/casings.qc index 10dfa385d..c0c7f5ac9 100644 --- a/qcsrc/common/effects/qc/casings.qc +++ b/qcsrc/common/effects/qc/casings.qc @@ -10,13 +10,6 @@ REGISTER_NET_TEMP(casings) -#if defined(SVQC) -.bool cvar_cl_casings; -.int cvar_r_drawviewmodel; -#elif defined(CSQC) -bool cvar_cl_casings; -int cvar_r_drawviewmodel; -#endif REPLICATE(cvar_cl_casings, bool, "cl_casings"); REPLICATE(cvar_r_drawviewmodel, int, "r_drawviewmodel"); diff --git a/qcsrc/common/effects/qc/casings.qh b/qcsrc/common/effects/qc/casings.qh index 25f1087e4..f4884cb23 100644 --- a/qcsrc/common/effects/qc/casings.qh +++ b/qcsrc/common/effects/qc/casings.qh @@ -8,6 +8,11 @@ bool autocvar_cl_casings_sloppy = 1; float autocvar_cl_casings_ticrate = 0.1; #endif +#ifdef GAMEQC +REPLICATE_INIT(bool, cvar_cl_casings); +REPLICATE_INIT(int, cvar_r_drawviewmodel); +#endif + #ifdef SVQC int autocvar_g_casings; diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc index 43a489105..f5eaf11cd 100644 --- a/qcsrc/common/effects/qc/globalsound.qc +++ b/qcsrc/common/effects/qc/globalsound.qc @@ -7,6 +7,12 @@ REGISTER_NET_TEMP(globalsound) REGISTER_NET_TEMP(playersound) + #ifdef GAMEQC + REPLICATE(cvar_cl_autotaunt, float, "cl_autotaunt"); + REPLICATE(cvar_cl_voice_directional, int, "cl_voice_directional"); + REPLICATE(cvar_cl_voice_directional_taunt_attenuation, float, "cl_voice_directional_taunt_attenuation"); + #endif + #ifdef SVQC /** * @param from the source entity, its position is sent diff --git a/qcsrc/common/effects/qc/globalsound.qh b/qcsrc/common/effects/qc/globalsound.qh index af98a24d0..e24496162 100644 --- a/qcsrc/common/effects/qc/globalsound.qh +++ b/qcsrc/common/effects/qc/globalsound.qh @@ -16,6 +16,10 @@ .string m_playersoundstr; ..string m_playersoundfld; +REPLICATE_INIT(float, cvar_cl_autotaunt); +REPLICATE_INIT(int, cvar_cl_voice_directional); +REPLICATE_INIT(float, cvar_cl_voice_directional_taunt_attenuation); + REGISTRY(PlayerSounds, BITS(8) - 1) #define REGISTER_PLAYERSOUND(id) \ .string _playersound_##id; \ diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc index 59f5fae4e..c7b79a045 100644 --- a/qcsrc/common/ent_cs.qc +++ b/qcsrc/common/ent_cs.qc @@ -2,12 +2,12 @@ #if defined(CSQC) #include - #include + #include #elif defined(MENUQC) #elif defined(SVQC) #include - #include - #include + #include + #include #endif REGISTRY(EntCSProps, BITS(16) - 1) @@ -156,6 +156,10 @@ ENTCS_PROP(COUNTRYCODE, true, countrycode, countrycode, ENTCS_SET_NORMAL, { WriteByte(chan, ent.countrycode); }, { ent.countrycode = ReadByte(); }) +ENTCS_PROP(RANK, true, rank, rank, ENTCS_SET_NORMAL, + { WriteString(chan, ent.rank); }, + { strcpy(ent.rank, ReadString()); }) + // use sv_solid to avoid changing solidity state of entcs entities ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL, { WriteByte(chan, ent.sv_solid); }, diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh index 0b65c08cb..bd76c6b6b 100644 --- a/qcsrc/common/ent_cs.qh +++ b/qcsrc/common/ent_cs.qh @@ -139,6 +139,12 @@ REGISTER_NET_TEMP(CLIENT_ENTCS) entity e = entcs_receiver(i); return e.countrycode; } + + string entcs_GetRank(int i) + { + entity e = entcs_receiver(i); + return e.rank; + } /** * @param i zero indexed player diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc index 771f4ebcd..7cfdc7b30 100644 --- a/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc +++ b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc @@ -2,11 +2,20 @@ /*#include +#include + void HUD_Mod_CA_Export(int fh) { HUD_Write_Cvar("hud_panel_modicons_ca_layout"); } +REGISTER_MUTATOR(cl_ca, true); + +MUTATOR_HOOKFUNCTION(cl_ca, DrawInfoMessages) +{ + return (ISGAMETYPE(CA) && entcs_GetSpecState(player_localnum) == ENTCS_SPEC_IN_SCOREBOARD); +} + void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, int i) { TC(int, layout); TC(int, i); diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc index 087d9b1bf..c94d583c0 100644 --- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc +++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc @@ -1,6 +1,6 @@ #include "sv_clanarena.qh" -float autocvar_g_ca_damage2score_multiplier; +float autocvar_g_ca_damage2score = 100; bool autocvar_g_ca_spectate_enemies; float autocvar_g_ca_start_health = 200; @@ -12,6 +12,8 @@ float autocvar_g_ca_start_ammo_cells = 180; float autocvar_g_ca_start_ammo_plasma = 180; float autocvar_g_ca_start_ammo_fuel = 0; +.float ca_damage_counter; + void CA_count_alive_players() { total_players = 0; @@ -85,7 +87,7 @@ float CA_CheckWinner() int winner_team = Team_GetWinnerAliveTeam(); if (!winner_team) return 0; - + bool perfect = false; if(winner_team > 0) { @@ -210,6 +212,8 @@ MUTATOR_HOOKFUNCTION(ca, PlayerSpawn) entity player = M_ARGV(0, entity); INGAME_STATUS_SET(player, INGAME_STATUS_JOINED); + if (time <= game_starttime) // reset on game restart, not on round start + player.ca_damage_counter = 0; if (!warmup_stage) eliminatedPlayers.SendFlags |= 1; } @@ -260,6 +264,12 @@ MUTATOR_HOOKFUNCTION(ca, reset_map_players) return true; } +MUTATOR_HOOKFUNCTION(ca, Scores_CountFragsRemaining) +{ + // announce remaining frags + return true; +} + MUTATOR_HOOKFUNCTION(ca, reset_map_global) { allowed_to_spawn = true; @@ -316,6 +326,7 @@ MUTATOR_HOOKFUNCTION(ca, PlayerDies) return true; } + MUTATOR_HOOKFUNCTION(ca, ClientDisconnect) { entity player = M_ARGV(0, entity); @@ -421,28 +432,42 @@ MUTATOR_HOOKFUNCTION(ca, PlayerDamage_SplitHealthArmor) float excess = max(0, frag_damage - damage_take - damage_save); - //non-friendly fire - if (frag_target != frag_attacker && IS_PLAYER(frag_attacker) && DIFF_TEAM(frag_target, frag_attacker)) - GameRules_scoring_add_team(frag_attacker, SCORE, (frag_damage - excess) * autocvar_g_ca_damage2score_multiplier); - - //friendly fire - if (SAME_TEAM(frag_target, frag_attacker)) - GameRules_scoring_add_team(frag_attacker, SCORE, (-1 * (frag_damage - excess)) * autocvar_g_ca_damage2score_multiplier); - - //handle (environmental hazard) suiciding, check first if player has a registered attacker who most likely pushed them there to avoid punishing pushed players as pushers are already rewarded - //deathtypes: - //kill = suicide, drown = drown in water/liquid, hurttrigger = out of the map void or hurt triggers inside maps like electric sparks - //camp = campcheck, lava = lava, slime = slime - //team change / rebalance suicides are currently not included - if (!IS_PLAYER(frag_attacker) && ( - frag_deathtype == DEATH_KILL.m_id || - frag_deathtype == DEATH_DROWN.m_id || - frag_deathtype == DEATH_HURTTRIGGER.m_id || - frag_deathtype == DEATH_CAMP.m_id || - frag_deathtype == DEATH_LAVA.m_id || - frag_deathtype == DEATH_SLIME.m_id || - frag_deathtype == DEATH_SWAMP.m_id)) - GameRules_scoring_add_team(frag_target, SCORE, (-1 * (frag_damage - excess)) * autocvar_g_ca_damage2score_multiplier); + if (autocvar_g_ca_damage2score <= 0 || frag_damage - excess == 0) return; + + entity scorer = NULL; + float scorer_damage = 0; + + if (IS_PLAYER(frag_attacker)) + { + if (DIFF_TEAM(frag_target, frag_attacker)) + scorer_damage = frag_damage - excess; + else // friendly fire + scorer_damage = -(frag_damage - excess); + + scorer = frag_attacker; + } + else + { + //handle (environmental hazard) suiciding, check first if player has a registered attacker who most likely pushed them there to avoid punishing pushed players as pushers are already rewarded + //deathtypes: + //kill = suicide, drown = drown in water/liquid, hurttrigger = out of the map void or hurt triggers inside maps like electric sparks + //camp = campcheck, lava = lava, slime = slime + //team change / rebalance suicides are currently not included + if (frag_deathtype == DEATH_KILL.m_id || + frag_deathtype == DEATH_DROWN.m_id || + frag_deathtype == DEATH_HURTTRIGGER.m_id || + frag_deathtype == DEATH_CAMP.m_id || + frag_deathtype == DEATH_LAVA.m_id || + frag_deathtype == DEATH_SLIME.m_id || + frag_deathtype == DEATH_SWAMP.m_id) + { + scorer_damage = -(frag_damage - excess); + scorer = frag_target; + } + } + + if (scorer) + GameRules_scoring_add_float2int(scorer, SCORE, scorer_damage, ca_damage_counter, autocvar_g_ca_damage2score); } MUTATOR_HOOKFUNCTION(ca, CalculateRespawnTime) diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qh b/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qh index 3f59c932d..6f70f09be 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qh +++ b/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qh @@ -1,2 +1 @@ #pragma once - diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index fbf6cd451..034bda1af 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc @@ -1,7 +1,7 @@ #include "sv_freezetag.qh" +#include #include -#include float autocvar_g_freezetag_frozen_maxtime; float autocvar_g_freezetag_revive_clearspeed; @@ -485,6 +485,12 @@ MUTATOR_HOOKFUNCTION(ft, Unfreeze) { entity targ = M_ARGV(0, entity); targ.freezetag_frozen_time = 0; + + if(autocvar_g_freezetag_revive_respawn) { + targ.freezetag_frozen_timeout = -1; + PutClientInServer(targ); + } + targ.freezetag_frozen_timeout = 0; } diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh index 87f37b532..705553d90 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh @@ -49,4 +49,5 @@ float autocvar_g_freezetag_revive_speed_t2s = 0.25; float autocvar_g_freezetag_revive_time_to_score = 1.5; bool autocvar_g_freezetag_revive_nade; float autocvar_g_freezetag_revive_nade_health; -float autocvar_g_freezetag_revive_spawnshield = 1; \ No newline at end of file +bool autocvar_g_freezetag_revive_respawn; +float autocvar_g_freezetag_revive_spawnshield = 1; diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc index aa63238eb..4ad694de8 100644 --- a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc +++ b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc @@ -77,15 +77,29 @@ void ka_RespawnBall(entity this) // runs whenever the ball needs to be relocated sound(this, CH_TRIGGER, SND_KA_RESPAWN, VOL_BASE, ATTEN_NONE); // ATTEN_NONE (it's a sound intended to be heard anywhere) } +.float timepoints_counter; +MUTATOR_HOOKFUNCTION(ka, reset_map_global) +{ + FOREACH_CLIENT(true, + { + it.timepoints_counter = 0; + }); + return true; +} + void ka_TimeScoring(entity this) { if(this.owner.ballcarried) { // add points for holding the ball after a certain amount of time + float timescore = 0; if(autocvar_g_keepaway_score_timepoints) - GameRules_scoring_add(this.owner, SCORE, autocvar_g_keepaway_score_timepoints); + timescore = autocvar_g_keepaway_score_timepoints / max(0.001, autocvar_g_keepaway_score_timeinterval); + + if (timescore) + GameRules_scoring_add_float2int(this.owner, SCORE, timescore, timepoints_counter, 1); - GameRules_scoring_add(this.owner, KEEPAWAY_BCTIME, autocvar_g_keepaway_score_timeinterval); - this.nextthink = time + autocvar_g_keepaway_score_timeinterval; + GameRules_scoring_add(this.owner, KEEPAWAY_BCTIME, 1); + this.nextthink = time + 1; } } @@ -129,7 +143,7 @@ void ka_TouchEvent(entity this, entity toucher) // runs any time that the ball c this.effects |= EF_NODRAW; settouch(this, func_null); setthink(this, ka_TimeScoring); - this.nextthink = time + autocvar_g_keepaway_score_timeinterval; + this.nextthink = time + 1; this.takedamage = DAMAGE_NO; this.event_damage = func_null; this.damagedbycontents = false; diff --git a/qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc index 7be2d31bc..05e335597 100644 --- a/qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc +++ b/qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc @@ -13,14 +13,7 @@ MUTATOR_HOOKFUNCTION(cl_lms, DrawInfoMessages) vector mySize = M_ARGV(1, vector); vector fontsize = '0.2 0.2 0' * mySize.y; int img_curr_group = M_ARGV(2, int); - if(sk.(scores(ps_primary)) >= 666) - { - InfoMessage(_("^1Match has already begun")); - M_ARGV(0, vector) = pos; - M_ARGV(2, int) = img_curr_group; - return true; - } - else if(sk.(scores(ps_primary)) > 0) + if(sk.(scores(ps_primary)) > 0) { InfoMessage(_("^1You have no more lives left")); M_ARGV(0, vector) = pos; diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc index c8cc0e6e5..ffc7768e2 100644 --- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc +++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc @@ -11,6 +11,7 @@ bool autocvar_g_lms_join_anytime; int autocvar_g_lms_last_join; bool autocvar_g_lms_items; bool autocvar_g_lms_regenerate; +bool autocvar_g_lms_rot; // main functions int LMS_NewPlayerLives() @@ -54,7 +55,7 @@ int WinningCondition_LMS() { // two or more active players - continue with the game - if (autocvar_g_campaign) + if (autocvar_g_campaign && campaign_bots_may_start) { FOREACH_CLIENT(IS_REAL_CLIENT(it), { float pl_lives = GameRules_scoring_add(it, LMS_LIVES, 0); @@ -358,9 +359,11 @@ MUTATOR_HOOKFUNCTION(lms, PlayerPreThink) MUTATOR_HOOKFUNCTION(lms, PlayerRegen) { - if(autocvar_g_lms_regenerate) - return false; - return true; + if(!autocvar_g_lms_regenerate) + M_ARGV(2, float) = 0; + if(!autocvar_g_lms_rot) + M_ARGV(3, float) = 0; + return (!autocvar_g_lms_regenerate && !autocvar_g_lms_rot); } MUTATOR_HOOKFUNCTION(lms, ForbidThrowCurrentWeapon) diff --git a/qcsrc/common/gamemodes/sv_rules.qc b/qcsrc/common/gamemodes/sv_rules.qc index 898ef3a4f..84d89909f 100644 --- a/qcsrc/common/gamemodes/sv_rules.qc +++ b/qcsrc/common/gamemodes/sv_rules.qc @@ -104,6 +104,25 @@ bool GameRules_scoring_is_vip(entity player) return player.m_GameRules_scoring_vip; } +// Uses client.float_field to accumulate and consume float score and adds score to the player as int (rounded) +// only when at least one unit of score has been accumulated. It works with negative score too +// Float scores can't be used as score because they aren't supported by the QC score networking system +// and online server browsers (e.g. qstat) +float _GameRules_scoring_add_float2int(entity client, entity sp, float value, .float float_field, float score_factor) +{ + client.(float_field) += value; + float score_counter = client.(float_field) / score_factor; + if (score_counter >= -0.5 && score_counter < 0.5) + return 0; + + // NOTE: this code works for subtracting score too + int points = floor(score_counter + 0.5); + client.(float_field) -= points * score_factor; + if (!points) + return 0; + return PlayerScore_Add(client, sp, points); +} + float _GameRules_scoring_add(entity client, entity sp, float value) { return PlayerScore_Add(client, sp, value); diff --git a/qcsrc/common/gamemodes/sv_rules.qh b/qcsrc/common/gamemodes/sv_rules.qh index 4fabea39c..2efcf1973 100644 --- a/qcsrc/common/gamemodes/sv_rules.qh +++ b/qcsrc/common/gamemodes/sv_rules.qh @@ -72,6 +72,9 @@ void _GameRules_scoring_end(); void GameRules_scoring_vip(entity player, bool value); bool GameRules_scoring_is_vip(entity player); +#define GameRules_scoring_add_float2int(client, fld, value, float_field, score_factor) \ + _GameRules_scoring_add_float2int(client, SP_##fld, value, float_field, score_factor) +float _GameRules_scoring_add_float2int(entity client, entity sp, float value, .float field, float score_factor); #define GameRules_scoring_add(client, fld, value) _GameRules_scoring_add(client, SP_##fld, value) float _GameRules_scoring_add(entity client, entity sp, float value); #define GameRules_scoring_add_team(client, fld, value) _GameRules_scoring_add_team(client, SP_##fld, ST_##fld, value) diff --git a/qcsrc/common/items/inventory.qh b/qcsrc/common/items/inventory.qh index f01d7dc21..5ebaea9be 100644 --- a/qcsrc/common/items/inventory.qh +++ b/qcsrc/common/items/inventory.qh @@ -226,16 +226,4 @@ void Inventory_clear(entity store) void InventoryStorage_attach(entity e) { e.inventory_store = NEW(Inventory); e.inventory_store.drawonlytoclient = e; } void InventoryStorage_delete(entity e) { delete(e.inventory_store); } - -void Inventory_ClearAll() { - FOREACH_CLIENT(IS_PLAYER(it), - { - entity store = PS(it); - if (store) - { - Inventory_clear(store.inventory); - Inventory_update(store); - } - }); -} #endif diff --git a/qcsrc/common/items/item/ammo.qh b/qcsrc/common/items/item/ammo.qh index 02857d8ae..bf22a7e81 100644 --- a/qcsrc/common/items/item/ammo.qh +++ b/qcsrc/common/items/item/ammo.qh @@ -2,25 +2,10 @@ #include "pickup.qh" #include +#include #ifdef SVQC - #include + #include #include - #include -#endif - -#if 1 -.int ammo_none; -.int ammo_shells; -.int ammo_nails; -.int ammo_rockets; -.int ammo_cells; -#ifdef SVQC -const .int ammo_plasma = _STAT(PLASMA); -const .int ammo_fuel = _STAT(FUEL); -#else -.int ammo_plasma; -.int ammo_fuel; -#endif #endif #ifdef GAMEQC diff --git a/qcsrc/common/minigames/sv_minigames.qc b/qcsrc/common/minigames/sv_minigames.qc index a1fb3631d..57f6f46b6 100644 --- a/qcsrc/common/minigames/sv_minigames.qc +++ b/qcsrc/common/minigames/sv_minigames.qc @@ -148,7 +148,7 @@ int minigame_addplayer(entity minigame_session, entity player) Net_LinkEntity(player_pointer, false, 0, minigame_SendEntity); if ( !IS_OBSERVER(player) && autocvar_sv_minigames_observer ) - PutObserverInServer(player, true); + PutObserverInServer(player, true, true); if ( autocvar_sv_minigames_observer == 2 ) Player_SetForcedTeamIndex(player, TEAM_FORCE_SPECTATOR); diff --git a/qcsrc/common/mutators/mutator/_mod.inc b/qcsrc/common/mutators/mutator/_mod.inc index c463c429f..57e591d48 100644 --- a/qcsrc/common/mutators/mutator/_mod.inc +++ b/qcsrc/common/mutators/mutator/_mod.inc @@ -1,5 +1,6 @@ // generated file; do not modify +#include #include #include #include diff --git a/qcsrc/common/mutators/mutator/_mod.qh b/qcsrc/common/mutators/mutator/_mod.qh index 3b4eba7cb..5128166ec 100644 --- a/qcsrc/common/mutators/mutator/_mod.qh +++ b/qcsrc/common/mutators/mutator/_mod.qh @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/common/mutators/mutator/attackertext/_mod.inc b/qcsrc/common/mutators/mutator/attackertext/_mod.inc new file mode 100644 index 000000000..52b56df94 --- /dev/null +++ b/qcsrc/common/mutators/mutator/attackertext/_mod.inc @@ -0,0 +1,8 @@ +// generated file; do not modify +#include +#ifdef CSQC + #include +#endif +#ifdef SVQC + #include +#endif diff --git a/qcsrc/common/mutators/mutator/attackertext/_mod.qh b/qcsrc/common/mutators/mutator/attackertext/_mod.qh new file mode 100644 index 000000000..e712e37c9 --- /dev/null +++ b/qcsrc/common/mutators/mutator/attackertext/_mod.qh @@ -0,0 +1,11 @@ +// generated file; do not modify +#include +#ifdef CSQC + #include +#endif +#ifdef SVQC + #include +#endif +#ifdef MENUQC + #include +#endif diff --git a/qcsrc/common/mutators/mutator/attackertext/attackertext.qc b/qcsrc/common/mutators/mutator/attackertext/attackertext.qc new file mode 100644 index 000000000..dafd533c7 --- /dev/null +++ b/qcsrc/common/mutators/mutator/attackertext/attackertext.qc @@ -0,0 +1,3 @@ +#include "attackertext.qh" + +REGISTER_NET_TEMP(attackertext) diff --git a/qcsrc/common/mutators/mutator/attackertext/attackertext.qh b/qcsrc/common/mutators/mutator/attackertext/attackertext.qh new file mode 100644 index 000000000..96d63a7af --- /dev/null +++ b/qcsrc/common/mutators/mutator/attackertext/attackertext.qh @@ -0,0 +1,4 @@ +#pragma once + +const int ATFLAG_SAMETEAM = BIT(0); + diff --git a/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qc b/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qc new file mode 100644 index 000000000..e191cf20d --- /dev/null +++ b/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qc @@ -0,0 +1,61 @@ +#include "cl_attackertext.qh" + +AUTOCVAR_SAVE(cl_attackertext, bool, true, "Draw damage dealt where you hit the enemy"); +AUTOCVAR_SAVE(cl_attackertext_friendlyfire, bool, false, "Show for friendlyfire"); +AUTOCVAR_SAVE(cl_attackertext_time, float, 3, "Time to show"); +AUTOCVAR_SAVE(cl_attackertext_fadetime, float, 2, "Time to fade"); +AUTOCVAR_SAVE(cl_attackertext_decolorize, int, 1, "1 = decolorize names when teamplay, 2 = decolorize always"); + +REGISTER_MUTATOR(attackertext, true); + +MUTATOR_HOOKFUNCTION(attackertext, DrawInfoMessages) +{ + if (autocvar_cl_attackertext == 0) return false; + + float fade_start = max(0, autocvar_cl_attackertext_time); + float fade_time = max(0, autocvar_cl_attackertext_fadetime); + + if (last_attack_time && last_attack_time > time - fade_start - fade_time) { + vector pos = M_ARGV(0, vector); + vector mySize = M_ARGV(1, vector); + vector fontsize = '0.3 0.3 0' * mySize.y; + int img_curr_group = M_ARGV(2, int); + + float alpha_ = 0; + + if (last_attack_time + fade_start > time) + alpha_ = panel_fg_alpha; + else if (fade_time != 0) + alpha_ = panel_fg_alpha - bound(0, (time - last_attack_time - fade_start) * (1 / fade_time), 1); + else + return true; + + pos = InfoMessages_drawstring(last_attack_name, pos, mySize, alpha_, fontsize); + img_curr_group = -1; + + return true; + } + + return false; +} + + +NET_HANDLE(attackertext, bool isNew) +{ + int server_entity_index = ReadByte(); + int flags = ReadByte(); + bool friendlyfire = flags & ATFLAG_SAMETEAM; + + return = true; + + if (autocvar_cl_attackertext == 0) return; + if (friendlyfire && autocvar_cl_attackertext_friendlyfire == 0) return; + + string s = entcs_GetName(server_entity_index - 1); + if ((autocvar_cl_attackertext_decolorize == 1 && teamplay) || autocvar_cl_attackertext_decolorize == 2) + s = playername(s, entcs_GetTeam(server_entity_index - 1), true); + + last_attack_time = time; + strfree(last_attack_name); + strcpy(last_attack_name, s); +} diff --git a/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qh b/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qh new file mode 100644 index 000000000..c2c6d6e47 --- /dev/null +++ b/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qh @@ -0,0 +1,4 @@ +#pragma once + +float last_attack_time; +string last_attack_name; \ No newline at end of file diff --git a/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qc b/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qc new file mode 100644 index 000000000..2a2556d7c --- /dev/null +++ b/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qc @@ -0,0 +1,34 @@ +#include "sv_attackertext.qh" + +AUTOCVAR(sv_attackertext, int, 1, "0: disabled, 1: visible"); + +REGISTER_MUTATOR(attackertext, true); + +#define SV_ATTACKERTEXT_DISABLED() (autocvar_sv_attackertext <= 0) +#define SV_ATTACKERTEXT_ENABLED() (autocvar_sv_attackertext >= 1) + +void attackertext_Send(entity to, entity attacker, int sf) +{ + if(IS_REAL_CLIENT(to)) { + msg_entity = to; + WriteHeader(MSG_ONE, attackertext); + WriteByte(MSG_ONE, etof(attacker)); + WriteByte(MSG_ONE, sf); + } +} + +MUTATOR_HOOKFUNCTION(attackertext, PlayerDamaged) { + if (SV_ATTACKERTEXT_DISABLED()) return; + + entity attacker = M_ARGV(0, entity); + entity hit = M_ARGV(1, entity); + + if (hit == attacker) return; + if (!IS_PLAYER(attacker)) return; + + int sf = 0; + if (SAME_TEAM(hit, attacker)) sf |= ATFLAG_SAMETEAM; + + attackertext_Send(hit, attacker, sf); + FOREACH_CLIENT(IS_SPEC(it) && it.(enemy) == hit, { attackertext_Send(it, attacker, sf); }); +} diff --git a/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qh b/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qh new file mode 100644 index 000000000..6f70f09be --- /dev/null +++ b/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qc b/qcsrc/common/mutators/mutator/buffs/buffs.qc index 15cc19960..ce51e4fa4 100644 --- a/qcsrc/common/mutators/mutator/buffs/buffs.qc +++ b/qcsrc/common/mutators/mutator/buffs/buffs.qc @@ -5,3 +5,7 @@ string BUFF_NAME(int i) Buff b = REGISTRY_GET(StatusEffect, i); return strcat(rgb_to_hexcolor(b.m_color), b.m_name); } + +#ifdef GAMEQC +REPLICATE(cvar_cl_buffs_autoreplace, bool, "cl_buffs_autoreplace"); +#endif diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qh b/qcsrc/common/mutators/mutator/buffs/buffs.qh index f4fad84de..163176d5b 100644 --- a/qcsrc/common/mutators/mutator/buffs/buffs.qh +++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh @@ -72,3 +72,7 @@ string Buff_UndeprecateName(string buffname); BUFF_SPAWNFUNCS(random, NULL) #include "all.inc" + +#ifdef GAMEQC +REPLICATE_INIT(bool, cvar_cl_buffs_autoreplace); +#endif diff --git a/qcsrc/common/mutators/mutator/buffs/cl_buffs.qh b/qcsrc/common/mutators/mutator/buffs/cl_buffs.qh index c9dbe5add..c93902291 100644 --- a/qcsrc/common/mutators/mutator/buffs/cl_buffs.qh +++ b/qcsrc/common/mutators/mutator/buffs/cl_buffs.qh @@ -1,6 +1,3 @@ #pragma once #include "buffs.qh" - -float cvar_cl_buffs_autoreplace; -REPLICATE(cvar_cl_buffs_autoreplace, bool, "cl_buffs_autoreplace"); diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc index 866b5426d..14f6f4902 100644 --- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc +++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc @@ -939,7 +939,7 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink) { entity player = M_ARGV(0, entity); - if(game_stopped || IS_DEAD(player) || !IS_PLAYER(player)) return; + if(game_stopped || game_timeout || IS_DEAD(player) || frametime || !IS_PLAYER(player)) return; // NOTE: this is kept here to ensure crouches are picked up each player movement frame if(StatusEffects_active(BUFF_FLIGHT, player)) @@ -969,8 +969,6 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerRegen) } } -REPLICATE(cvar_cl_buffs_autoreplace, bool, "cl_buffs_autoreplace"); - MUTATOR_HOOKFUNCTION(buffs, BuildMutatorsString) { if(autocvar_g_buffs > 0) // only report as a mutator if they're enabled diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh index 7635df6b6..c8b2b363d 100644 --- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh +++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh @@ -77,9 +77,6 @@ float autocvar_g_buffs_luck_damagemultiplier = 3; const vector BUFF_MIN = ('-16 -16 0'); const vector BUFF_MAX = ('16 16 60'); -// client side options -.float cvar_cl_buffs_autoreplace; - float buff_Available(entity buff); void buff_RemoveAll(entity actor, int removal_type); diff --git a/qcsrc/common/mutators/mutator/dodging/cl_dodging.qc b/qcsrc/common/mutators/mutator/dodging/cl_dodging.qc index a9d10efa7..237ff0e9f 100644 --- a/qcsrc/common/mutators/mutator/dodging/cl_dodging.qc +++ b/qcsrc/common/mutators/mutator/dodging/cl_dodging.qc @@ -1 +1,4 @@ #include "cl_dodging.qh" + +REPLICATE(cvar_cl_dodging_timeout, float, "cl_dodging_timeout"); +REPLICATE(cvar_cl_dodging, bool, "cl_dodging"); diff --git a/qcsrc/common/mutators/mutator/dodging/cl_dodging.qh b/qcsrc/common/mutators/mutator/dodging/cl_dodging.qh index 696a2d9e5..319a1d237 100644 --- a/qcsrc/common/mutators/mutator/dodging/cl_dodging.qh +++ b/qcsrc/common/mutators/mutator/dodging/cl_dodging.qh @@ -1,7 +1,4 @@ #pragma once -float cvar_cl_dodging_timeout; -REPLICATE(cvar_cl_dodging_timeout, float, "cl_dodging_timeout"); - -float cvar_cl_dodging; -REPLICATE(cvar_cl_dodging, float, "cl_dodging"); +REPLICATE_INIT(float, cvar_cl_dodging_timeout); +REPLICATE_INIT(bool, cvar_cl_dodging); diff --git a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc index 53effbae2..8af509222 100644 --- a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc +++ b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc @@ -42,22 +42,21 @@ #endif #ifdef CSQC - float cvar_cl_dodging_timeout; - bool cvar_cl_dodging; bool autocvar_cl_dodging; #define PHYS_DODGING_FRAMETIME (1 / (frametime <= 0 ? 60 : frametime)) #define PHYS_DODGING_TIMEOUT(s) STAT(DODGING_TIMEOUT) #define PHYS_DODGING_PRESSED_KEYS(s) (s).pressedkeys #define PHYS_DODGING_ENABLED(s) autocvar_cl_dodging #elif defined(SVQC) - .float cvar_cl_dodging_timeout; - .bool cvar_cl_dodging; #define PHYS_DODGING_FRAMETIME sys_frametime #define PHYS_DODGING_TIMEOUT(s) CS_CVAR(s).cvar_cl_dodging_timeout #define PHYS_DODGING_PRESSED_KEYS(s) CS(s).pressedkeys #define PHYS_DODGING_ENABLED(s) CS_CVAR(s).cvar_cl_dodging #endif +REPLICATE(cvar_cl_dodging_timeout, float, "cl_dodging_timeout"); +REPLICATE(cvar_cl_dodging, bool, "cl_dodging"); + #ifdef SVQC bool autocvar_sv_dodging_sound; @@ -307,9 +306,6 @@ MUTATOR_HOOKFUNCTION(dodging, PlayerPhysics) #ifdef SVQC -REPLICATE(cvar_cl_dodging_timeout, float, "cl_dodging_timeout"); -REPLICATE(cvar_cl_dodging, bool, "cl_dodging"); - void dodging_ResetPlayer(entity this) { this.last_dodging_time = 0; diff --git a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qh b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qh index 6f70f09be..45dc67b57 100644 --- a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qh +++ b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qh @@ -1 +1,4 @@ #pragma once + +REPLICATE_INIT(bool, cvar_cl_dodging); +REPLICATE_INIT(float, cvar_cl_dodging_timeout); diff --git a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc index d30f16943..bc14a48d4 100644 --- a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc +++ b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc @@ -25,6 +25,15 @@ NET_HANDLE(itemstime, bool isNew) return = true; ItemsTime_time[i] = f; } + +NET_HANDLE(TE_CSQC_TOTALSHARDS, bool isNew) +{ + // for RJZ + total_shards = ReadInt24_t(); + + return = true; +} + #endif #ifdef CSQC @@ -200,6 +209,25 @@ void HUD_ItemsTime_Export(int fh) HUD_Write_Cvar("hud_panel_itemstime_dynamicsize"); } +// for RJZ +void DrawItemsTimeItemFixed(vector myPos, vector mySize, float ar, string item_icon, float t, vector color) +{ + vector picpos, numpos; + if (autocvar_hud_panel_itemstime_iconalign) + { + numpos = myPos; + picpos = myPos + eX * (ar - 1) * mySize_y; + } + else + { + numpos = myPos + eX * mySize_y; + picpos = myPos; + } + + drawstring_aspect(numpos, (t < 0 ? "-" : ftos(t)), vec2(((ar - 1)/ar) * mySize.x, mySize.y), color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect(picpos, item_icon, '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); +} + void DrawItemsTimeItem(vector myPos, vector mySize, float ar, string item_icon, float item_time, bool item_available, float item_availableTime) { float t = 0; @@ -323,6 +351,10 @@ void HUD_ItemsTime() }); count += (Item_ItemsTime_GetTime(REGISTRY_MAX(Items)) != -1); } + // for RJZ + if (total_shards != -1) + count++; + if (count == 0) return; @@ -388,6 +420,9 @@ void HUD_ItemsTime() itemstime_size.y = newSize; } } + + if (total_shards != -1) + panel_size.y += itemstime_size.y * 0.5; HUD_Scale_Enable(); HUD_Panel_DrawBg(); @@ -399,6 +434,7 @@ void HUD_ItemsTime() FOREACH(Items, Item_ItemsTime_Allow(it) && Item_ItemsTime_GetTime(it.m_id) != -1, { id = it.m_id; icon = it.m_icon; + LABEL(iteration) float item_time = Item_ItemsTime_GetTime(id); @@ -441,6 +477,18 @@ LABEL(iteration) if(id == REGISTRY_MAX(Items)) // can happen only in the last fake iteration break; }); + + // for RJZ + if(total_shards != -1) { + DrawItemsTimeItemFixed(pos + vec2(column * (itemstime_size.x + offset.x), row * (itemstime_size.y + offset.y) + itemstime_size.y * 0.5), itemstime_size, ar, "gfx/shards.tga", total_shards, '0.16 0.7 0.83'); + ++row; + if (row >= rows) + { + row = 0; + column = column + 1; + } + } + // add another fake iteration for superweapons time if(id < REGISTRY_MAX(Items) && Item_ItemsTime_GetTime(REGISTRY_MAX(Items)) != -1) { diff --git a/qcsrc/common/mutators/mutator/itemstime/itemstime.qh b/qcsrc/common/mutators/mutator/itemstime/itemstime.qh index abbb1de48..50a89602f 100644 --- a/qcsrc/common/mutators/mutator/itemstime/itemstime.qh +++ b/qcsrc/common/mutators/mutator/itemstime/itemstime.qh @@ -1,5 +1,9 @@ #pragma once +#ifdef CSQC +int total_shards = -1; +#endif + #ifdef SVQC int autocvar_sv_itemstime; #endif diff --git a/qcsrc/common/mutators/mutator/multijump/multijump.qc b/qcsrc/common/mutators/mutator/multijump/multijump.qc index 9642ab0b3..5f904ecf1 100644 --- a/qcsrc/common/mutators/mutator/multijump/multijump.qc +++ b/qcsrc/common/mutators/mutator/multijump/multijump.qc @@ -2,6 +2,8 @@ #ifdef GAMEQC +REPLICATE(cvar_cl_multijump, bool, "cl_multijump"); + #ifdef SVQC #include #endif @@ -25,13 +27,9 @@ REGISTER_MUTATOR(multijump, true); .bool multijump_ready; #ifdef CSQC -int cvar_cl_multijump; int autocvar_cl_multijump = -1; - #define PHYS_MULTIJUMP_CLIENT(s) autocvar_cl_multijump #elif defined(SVQC) -.int cvar_cl_multijump; - #define PHYS_MULTIJUMP_CLIENT(s) CS_CVAR(s).cvar_cl_multijump #endif @@ -118,8 +116,6 @@ MUTATOR_HOOKFUNCTION(multijump, PlayerJump) } } -REPLICATE(cvar_cl_multijump, int, "cl_multijump"); - #ifdef SVQC MUTATOR_HOOKFUNCTION(multijump, BuildMutatorsString) diff --git a/qcsrc/common/mutators/mutator/multijump/multijump.qh b/qcsrc/common/mutators/mutator/multijump/multijump.qh index 6f70f09be..85cdfb5a5 100644 --- a/qcsrc/common/mutators/mutator/multijump/multijump.qh +++ b/qcsrc/common/mutators/mutator/multijump/multijump.qh @@ -1 +1,5 @@ #pragma once + +#ifdef GAMEQC +REPLICATE_INIT(int, cvar_cl_multijump); +#endif diff --git a/qcsrc/common/mutators/mutator/nades/effects.inc b/qcsrc/common/mutators/mutator/nades/effects.inc index 19bc67e5f..83cf74247 100644 --- a/qcsrc/common/mutators/mutator/nades/effects.inc +++ b/qcsrc/common/mutators/mutator/nades/effects.inc @@ -1,16 +1,10 @@ #include -//LegendGuard adds purple nade parts 08-02-2021 -//LegendGuard adds green nade parts 11-02-2021 -//LegendGuard adds brown nade parts 13-02-2021 + EFFECT(0, NADE_EXPLODE_RED, "nade_red_explode") EFFECT(0, NADE_EXPLODE_BLUE, "nade_blue_explode") EFFECT(0, NADE_EXPLODE_YELLOW, "nade_yellow_explode") EFFECT(0, NADE_EXPLODE_PINK, "nade_pink_explode") EFFECT(0, NADE_EXPLODE_NEUTRAL, "nade_neutral_explode") -EFFECT(0, NADE_EXPLODE_GREEN, "nade_green_explode") -EFFECT(0, NADE_EXPLODE_BROWN, "nade_brown_explode") -EFFECT(0, NADE_EXPLODE_PURPLE, "nade_purple_explode") - entity EFFECT_NADE_EXPLODE(int teamid) { switch (teamid) { @@ -27,9 +21,6 @@ EFFECT(1, NADE_TRAIL_BLUE, "nade_blue") EFFECT(1, NADE_TRAIL_YELLOW, "nade_yellow") EFFECT(1, NADE_TRAIL_PINK, "nade_pink") EFFECT(1, NADE_TRAIL_NEUTRAL, "nade_neutral") -EFFECT(1, NADE_TRAIL_GREEN, "nade_green") -EFFECT(1, NADE_TRAIL_BROWN, "nade_brown") -EFFECT(1, NADE_TRAIL_PURPLE, "nade_purple") entity EFFECT_NADE_TRAIL(int teamid) { switch (teamid) { @@ -46,9 +37,6 @@ EFFECT(1, NADE_TRAIL_BURN_BLUE, "nade_blue_burn") EFFECT(1, NADE_TRAIL_BURN_YELLOW, "nade_yellow_burn") EFFECT(1, NADE_TRAIL_BURN_PINK, "nade_pink_burn") EFFECT(1, NADE_TRAIL_BURN_NEUTRAL, "nade_neutral_burn") -EFFECT(1, NADE_TRAIL_BURN_GREEN, "nade_green_burn") -EFFECT(1, NADE_TRAIL_BURN_BROWN, "nade_brown_burn") -EFFECT(1, NADE_TRAIL_BURN_PURPLE, "nade_purple_burn") entity EFFECT_NADE_TRAIL_BURN(int teamid) { switch (teamid) { diff --git a/qcsrc/common/mutators/mutator/nades/nades.inc b/qcsrc/common/mutators/mutator/nades/nades.inc index ae69d682b..3270e719f 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.inc +++ b/qcsrc/common/mutators/mutator/nades/nades.inc @@ -93,36 +93,3 @@ REGISTER_NADE(VEIL) { NADE_PROJECTILE(1, PROJECTILE_NADE_VEIL_BURN, EFFECT_NADE_TRAIL_BURN_NEUTRAL); #endif } - -//LegendGuard writes Emerald nade code 01-03-2021 -REGISTER_NADE(EMERALD) { - this.m_color = '0.33 1 0.66'; - this.m_name = _("Emerald grenade"); - this.m_icon = "nade_emerald"; -#ifdef GAMEQC - NADE_PROJECTILE(0, PROJECTILE_NADE_EMERALD, EFFECT_NADE_TRAIL_GREEN); - NADE_PROJECTILE(1, PROJECTILE_NADE_EMERALD_BURN, EFFECT_NADE_TRAIL_BURN_GREEN); -#endif -} - -//LegendGuard writes Ammo nade code 13-02-2021 -REGISTER_NADE(AMMO) { - this.m_color = '0.66 0.33 0'; - this.m_name = _("Ammo grenade"); - this.m_icon = "nade_ammo"; -#ifdef GAMEQC - NADE_PROJECTILE(0, PROJECTILE_NADE_AMMO, EFFECT_NADE_TRAIL_BROWN); - NADE_PROJECTILE(1, PROJECTILE_NADE_AMMO_BURN, EFFECT_NADE_TRAIL_BURN_BROWN); -#endif -} - -//LegendGuard writes Dark nade code 08-02-2021 -REGISTER_NADE(DARK) { - this.m_color = '0.23 0 0.23'; - this.m_name = _("Dark grenade"); - this.m_icon = "nade_dark"; -#ifdef GAMEQC - NADE_PROJECTILE(0, PROJECTILE_NADE_DARK, EFFECT_NADE_TRAIL_PURPLE); - NADE_PROJECTILE(1, PROJECTILE_NADE_DARK_BURN, EFFECT_Null); -#endif -} \ No newline at end of file diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 943cabcc2..7a00bd686 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -11,9 +11,9 @@ float autocvar_g_nades_spread = 0.04; REGISTER_STAT(NADES_SMALL, int, autocvar_g_nades_nade_small) #ifdef GAMEQC + REPLICATE(cvar_cl_nade_type, int, "cl_nade_type"); REPLICATE(cvar_cl_pokenade_type, string, "cl_pokenade_type"); -REPLICATE(cvar_cl_tandemnade_type, int, "cl_tandemnade_type"); entity Nade_TrailEffect(int proj, int nade_team) { @@ -62,18 +62,6 @@ MUTATOR_HOOKFUNCTION(cl_nades, HUD_Draw_overlay) M_ARGV(1, float) = STAT(VEIL_ORB_ALPHA); return true; } - if (STAT(AMMUNITIONING_ORB) > time) //LegendGuard adds new nade STAT ORB (keep in mind: qcsrc/common/stats.qh) 13-02-2021 - { - M_ARGV(0, vector) = NADE_TYPE_AMMO.m_color; - M_ARGV(1, float) = STAT(AMMUNITIONING_ORB_ALPHA); - return true; - } - if (STAT(DARK_ORB) > time) //LegendGuard adds new nade STAT ORB (keep in mind: qcsrc/common/stats.qh) 08-02-2021 - { - M_ARGV(0, vector) = NADE_TYPE_DARK.m_color; - M_ARGV(1, float) = STAT(DARK_ORB_ALPHA); - return true; - } return false; } MUTATOR_HOOKFUNCTION(cl_nades, Ent_Projectile) @@ -175,10 +163,6 @@ void DrawAmmoNades(vector myPos, vector mySize, bool draw_expanding, float expan #include #include #include -//LegendGuard adds include for spawning vehicles 20-06-2021 -#include -//LegendGuard adds include for spawning turrets 22-06-2021 -#include .float nade_time_primed; .float nade_lifetime; @@ -630,7 +614,7 @@ void nade_heal_touch(entity this, entity toucher) { float maxhealth; float health_factor; - if(IS_PLAYER(toucher) || IS_MONSTER(toucher) || IS_VEHICLE(toucher)) + if(IS_PLAYER(toucher) || IS_MONSTER(toucher)) if(!IS_DEAD(toucher)) if(!STAT(FROZEN, toucher)) { @@ -717,629 +701,7 @@ void nade_veil_boom(entity this) settouch(orb, nade_veil_touch); orb.colormod = NADE_TYPE_VEIL.m_color; } -/**************LEGENDGUARD NEW NADES: EMERALD, AMMO AND DARK NADES functions "cl_nade_type 10", "cl_nade_type 11" and "cl_nade_type 12" *** //more ideas: SPAWNING MINI SPIDERS NADE, SPARKING NADE ***********************/ -// All nade icons are in these directories, samples: gfx/hud/default/nade_emerald.tga and gfx/hud/luma/nade_emerald.tga 02-03-2021 -// Mario suggests to rename itemdrop nade name to "emerald" nade 02-03-2021 -void nade_emerald_dropitem(entity e, vector org, entity itm) -{ - Item_SetLoot(e, true); - e.reset = SUB_Remove; - e.noalign = true; - StartItem(e, itm); - e.gravity = 1; - setorigin(e, org); - e.velocity = randomvec() * 175 + '0 0 325'; - e.item_spawnshieldtime = time + 0.7; - SUB_SetFade(e, time + autocvar_g_nades_emerald_lifetime, 1); - Send_Effect(EFFECT_SMOKE_LARGE, e.origin, '0 0 0', 1); - //EFFECT_SMOKE_LARGE is like a small white smoke - //See effect MACROS in qcsrc/common/effects/all.inc -} - -//LegendGuard adds weapon item spawn option for emerald nade 25-05-2021 -void nade_emerald_SpawnWeapon(entity ent, vector org, entity wep) -{ - Item_SetLoot(ent, true); - ent.pickup_anyway = true; - ent.angles = '0 0 0'; - ent.gravity = 1; - setorigin(ent, org); - ent.velocity = randomvec() * 150 + '0 0 325'; - ent.spawnfunc_checked = true; - ent.glowmod = weaponentity_glowmod(wep, ent, 0, NULL); - weapon_defaultspawnfunc(ent, wep); - // fading handled globally -} - -//LegendGuard adds random weapon item spawn function for emerald nade 25-05-2021 -void nade_emerald_randomweapons(entity e, vector org) -{ - if (random() > 0.5) - { - RandomSelection_Init(); - FOREACH(Weapons, it != WEP_Null && (!((it.spawnflags & WEP_FLAG_HIDDEN) || (it.spawnflags & WEP_FLAG_MUTATORBLOCKED)) || autocvar_g_nades_emerald_randomweapons_includespecial), - { - if((it.spawnflags & WEP_FLAG_HIDDEN) && (it.spawnflags & WEP_FLAG_MUTATORBLOCKED)) - continue; - float chancewep = 1; - if(it.spawnflags & WEP_FLAG_SPECIALATTACK) //LegendGuard fixes the strange part of the code - chancewep = 0; - if (W_IsWeaponThrowable(e, it.m_id)) - RandomSelection_AddEnt(it, chancewep, 1); - }); - nade_emerald_SpawnWeapon(e, org, RandomSelection_chosen_ent); - } - else - return; -} - -//LegendGuard adds vehicle spawn option for emerald nade 20-06-2021 -void nade_emerald_SpawnVehicle(entity ent, vector org, entity veh) -{ - ent.noalign = true; // don't drop to floor - ent.angles = '0 0 0'; - ent.gravity = 1; - setorigin(ent, org); - ent.velocity = randomvec() * 150 + '0 0 325'; - ent.spawnfunc_checked = true; - time = 0.5; - vehicle_initialize(ent, veh, 1); -} - -//LegendGuard adds random vehicle spawn selection function for emerald nade 20-06-2021 -void nade_emerald_randomvehicles(entity e, vector org) -{ - RandomSelection_Init(); - FOREACH(Vehicles, it != VEH_Null && (!((it.spawnflags & VHF_MULTISLOT))), - { - if(it.spawnflags & VHF_MULTISLOT || it.classname == "Bumblebee") //No Bumblebee, please - continue; - float chanceveh = 1; - if(it.spawnflags & VHF_MOVE_FLY) - chanceveh = 0; - RandomSelection_AddEnt(it, chanceveh, 1); - }); - nade_emerald_SpawnVehicle(e, org, RandomSelection_chosen_ent); -} - -//LegendGuard adds turret spawn option for emerald nade 22-06-2021 -//EXPERIMENTAL -//TODO: turrets must be spawned by owner team, cannot be spawned to attack owner team or both -/* -void nade_emerald_SpawnTurret(entity ent, vector org, entity tur) -{ - //FOREACH_CLIENT(IS_PLAYER(it), - //{ - if (turspawncount < autocvar_g_nades_emerald_turretspawnlimit) - { - //ent = spawn(); - //ent.owner = it.owner; - //ent.realowner = it.realowner; - //ent.team = ent.realowner.team; - //FOREACH_CLIENT(!IS_OBSERVER(it.realowner), ent.team = it.team;); - ent.noalign = true; // don't drop to floor - //ent.angles = '0 0 0'; - //ent.gravity = 1; - setorigin(ent, org); - //ent.velocity = randomvec() * 150 + '0 0 325'; - ent.spawnfunc_checked = true; - //ent.solid = SOLID_CORPSE; - //setthink(ent, turrets_respawn); - // fading handled globally - //bool turret_initialize(entity this, Turret tur) - //turret_validate_target(ent.realowner, ent.enemy, ent.target_validate_flags); - turret_initialize(ent, tur); - //turspawncount++; - //PrintToChatAll(sprintf("^1AFTER^7 turspawncount: ^3%f", turspawncount)); - //if (!IS_ONGROUND(ent)) - // ent.gravity = 1; setorigin(ent, org); - } - else - { - //centerprint(it, strcat(BOLD_OPERATOR, "^1You cannot spawn more turrets!")); - PrintToChatAll("^1Someone tried to spawn more turrets than the maximum allowed! Sorry, cannot be spawned, spawn limit has been reached!"); - } - //PrintToChatAll(sprintf("^4tur- ^2it.netname: %s", it.netname)); - //PrintToChatAll(sprintf("^4tur- ^1tur.classname: %s", tur.classname)); - // return; - //}); -} - -//LegendGuard adds random turret spawn function for emerald nade 22-06-2021 -//EXPERIMENTAL -void nade_emerald_randomturrets(entity e, vector org) -{ - //in: qcsrc/common/turrets/turret.qh , look constants - - RandomSelection_Init(); - FOREACH(Turrets, it != TUR_Null && (!((it.spawnflags & TSF_SUSPENDED))), - { - if(it.spawnflags & TSF_SUSPENDED) - continue; - float chancetur = 1; - if(it.spawnflags & TSF_NO_PATHBREAK) - chancetur = 0; - RandomSelection_AddEnt(it, chancetur, 1); - }); - nade_emerald_SpawnTurret(e, org, RandomSelection_chosen_ent); -}*/ - -void nade_emerald_randomitem(entity e, vector org) -{ - float a = random(); - float b = random(); - float c = random(); - float d = random(); - - if (a > b) - { - if (a > 0.5) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall)); - else if (d < 0.2) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Shells : ITEM_Bullets)); - } - else if (c > d) - { - if (c > 0.5) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Rockets : ITEM_Cells)); - else if (b < 0.2) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Cells : ITEM_Shells)); - } - else if (autocvar_g_nades_emerald_powerupjetpack_randomdrop) - { - if (a < 0.5) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Jetpack : ITEM_JetpackFuel)); - else if (c < 0.5) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Shield : ITEM_Strength)); - else - { - if(IS_GAMETYPE(FREEZETAG) || IS_GAMETYPE(LMS)) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall)); - else - nade_emerald_randomweapons(e, org); - } - } - else - { - if (a > 0.5) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall)); - else if (d < 0.2) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Shells : ITEM_Rockets)); - else - { - if(IS_GAMETYPE(FREEZETAG) || IS_GAMETYPE(LMS)) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall)); - else - nade_emerald_randomweapons(e, org); - } - return; - } -} - -void nade_emerald_allammoitemdrop(entity e, vector org) -{ - float wa = random(); - float wb = random(); - - if (wa > wb) - { - if (wa > 0.5) - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Shells : ITEM_Bullets)); - else - nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Rockets : ITEM_Cells)); - } - else - return; -} - -void nade_emerald_dropping(vector org) -{ - //look item MACROS in qcsrc/server/items/items.qc - //ITEM_Shells; ITEM_Bullets; ITEM_Rockets; ITEM_Cells; ITEM_Plasma; ITEM_JetpackFuel; - //ITEM_Strength; ITEM_Shield; - int itemcount = autocvar_g_nades_emerald_spawncount; - entity e = spawn(); - e.spawnfunc_checked = true; - if(!IS_GAMETYPE(CA) && !autocvar_g_instagib) - { - //int cvar which manages the ONLY dropping per each type of item 14-03-2021 - switch (autocvar_g_nades_emerald_dropitemselect) - { - case 0: for(int j = 0; j < itemcount; ++j){ nade_emerald_randomitem(e, org); return;} - case 1: for(int j = 0; j < itemcount; ++j){ nade_emerald_dropitem(e, org, ITEM_HealthSmall); return;} - case 2: for(int j = 0; j < itemcount; ++j){ nade_emerald_dropitem(e, org, ITEM_ArmorSmall); return;} - case 3: for(int j = 0; j < itemcount; ++j){ nade_emerald_allammoitemdrop(e, org); return;} - case 4: for(int j = 0; j < itemcount; ++j){ nade_emerald_dropitem(e, org, ITEM_Shells); return;} - case 5: for(int j = 0; j < itemcount; ++j){ nade_emerald_dropitem(e, org, ITEM_Bullets); return;} - case 6: for(int j = 0; j < itemcount; ++j){ nade_emerald_dropitem(e, org, ITEM_Rockets); return;} - case 7: for(int j = 0; j < itemcount; ++j){ nade_emerald_dropitem(e, org, ITEM_Cells); return;} - case 8: for(int j = 0; j < itemcount; ++j){ nade_emerald_dropitem(e, org, ITEM_Jetpack); return;} - case 9: for(int j = 0; j < itemcount; ++j){ nade_emerald_dropitem(e, org, ITEM_JetpackFuel); return;} - case 10: for(int j = 0; j < itemcount; ++j){ nade_emerald_dropitem(e, org, ITEM_Shield); return;} - case 11: for(int j = 0; j < itemcount; ++j){ nade_emerald_dropitem(e, org, ITEM_Strength); return;} - case 12: for(int j = 0; j < itemcount; ++j){ nade_emerald_randomweapons(e, org); return;} - default: for(int j = 0; j < itemcount; ++j){ nade_emerald_randomitem(e, org); return;} - } - } -} - -void emerald_ball_think(entity this) -{ - if(round_handler_IsActive()) - if(!round_handler_IsRoundStarted()) - { - delete(this); - return; - } - - if(time > this.pushltime) - { - delete(this); - return; - } - - vector midpoint = ((this.absmin + this.absmax) * 0.5); - if(pointcontents(midpoint) == CONTENT_WATER) - { - this.velocity = this.velocity * 0.5; - - if(pointcontents(midpoint + '0 0 16') == CONTENT_WATER) - { this.velocity_z = 200; } - } - - this.angles = vectoangles(this.velocity); - - nade_emerald_dropping(this.origin); - - this.nextthink = time + 0.1; -} - -void nade_emerald_ball(entity this) -{ - entity proj; - vector kick; - - spamsound(this, CH_SHOTS, SND_FIREBALL_FIRE, VOL_BASE, ATTEN_NORM); - - proj = new(grenade); - proj.bot_dodge = true; - set_movetype(proj, MOVETYPE_BOUNCE); - setmodel(proj, MDL_Null); - proj.scale = 1;//0.5; - setsize(proj, '-4 -4 -4', '4 4 4'); - setorigin(proj, this.origin); - setthink(proj, emerald_ball_think); - proj.nextthink = time; - proj.effects = EF_LOWPRECISION; - - kick.x =(random() - 0.5) * 2 * autocvar_g_nades_emerald_ball_spread; - kick.y = (random() - 0.5) * 2 * autocvar_g_nades_emerald_ball_spread; - kick.z = (random()/2+0.5) * autocvar_g_nades_emerald_ball_spread; - proj.velocity = kick; - - proj.pushltime = time + autocvar_g_nades_emerald_ball_lifetime; - - proj.angles = vectoangles(proj.velocity); - proj.flags = FL_PROJECTILE; - IL_PUSH(g_projectiles, proj); - IL_PUSH(g_bot_dodge, proj); - proj.missile_flags = MIF_SPLASH | MIF_PROXY | MIF_ARC; - - //CSQCProjectile(proj, true, PROJECTILE_NAPALM_FIRE, true); -} - -void emerald_fountain_think(entity this) -{ - if(round_handler_IsActive()) - if(!round_handler_IsRoundStarted()) - { - delete(this); - return; - } - - if(time >= this.ltime) - { - Send_Effect(EFFECT_SMOKE_SMALL, this.origin + '0 0 1', '0 0 0', 1); - sound(this, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM); - - delete(this); - return; - } - - vector midpoint = ((this.absmin + this.absmax) * 0.5); - if(pointcontents(midpoint) == CONTENT_WATER) - { - this.velocity = this.velocity * 0.5; - - if(pointcontents(midpoint + '0 0 16') == CONTENT_WATER) - { this.velocity_z = 200; } - - UpdateCSQCProjectile(this); - } - - this.nextthink = time + 0.1; - if(time >= this.nade_special_time) - { - this.nade_special_time = time + autocvar_g_nades_emerald_fountain_delay; - nade_emerald_ball(this); - } -} - -void nade_emerald_boom(entity this) -{ - entity e = spawn(); - bool spawnlimited = false; - - switch (this.tandemnade_type) - { - case 1: - { - FOREACH_CLIENT(IS_PLAYER(it), - { - if (vehspawncount < autocvar_g_nades_emerald_vehiclespawnlimit) - { - spawnlimited = false; - //PrintToChatAll(sprintf("^2BEFORE^7 vehspawncount: ^3%f", vehspawncount)); - vehspawncount++; - //PrintToChatAll(sprintf("^1AFTER^7 vehspawncount: ^3%f", vehspawncount)); - } - else - spawnlimited = true; - }); - if(spawnlimited == true) - PrintToChatAll("^1Someone tried to spawn more vehicles than the maximum allowed! Sorry, cannot be spawned, spawn limit has been reached!"); - else - nade_emerald_randomvehicles(e, this.origin); - - return; - } - /*case 2: - { - nade_emerald_randomturrets(e, this.origin); - return; //EXPERIMENTAL - }*/ - default: - { - for (int c = 0; c < autocvar_g_nades_emerald_ball_count; c++) - nade_emerald_ball(this); - - entity fountain = new(nade_emerald_fountain); - fountain.owner = this.owner; - fountain.realowner = this.realowner; - fountain.origin = this.origin; - fountain.flags = FL_PROJECTILE; - IL_PUSH(g_projectiles, fountain); - IL_PUSH(g_bot_dodge, fountain); - setorigin(fountain, fountain.origin); - setthink(fountain, emerald_fountain_think); - fountain.nextthink = time; - fountain.ltime = time + autocvar_g_nades_emerald_fountain_lifetime; - fountain.pushltime = fountain.ltime; - fountain.team = this.team; - - //nade model maintaining - setmodel(fountain, MDL_PROJECTILE_GRENADE); - entity timer = new(nade_timer); - setmodel(timer, MDL_NADE_TIMER); - setattachment(timer, fountain, ""); - timer.colormap = this.colormap; - timer.glowmod = this.glowmod; - setthink(timer, nade_timer_think); - timer.nextthink = time; - timer.wait = fountain.ltime; - timer.owner = fountain; - timer.skin = 10; - - set_movetype(fountain, MOVETYPE_TOSS); - fountain.bot_dodge = true; - fountain.nade_special_time = time; - setsize(fountain, '-16 -16 -16', '16 16 16'); - CSQCProjectile(fountain, true, PROJECTILE_NADE_EMERALD_BURN, true); - nade_emerald_dropping(fountain.origin); - } - } -} - -/***********************************************************************************/ -//LegendGuard develops ammo nade 13-02-2021 -void nade_ammo_touch(entity this, entity toucher) -{ - float maxammo = 999; - float ammo_factor; - float amshells = GetResource(toucher, RES_SHELLS); - float ambullets = GetResource(toucher, RES_BULLETS); - float amrockets = GetResource(toucher, RES_ROCKETS); - float amcells = GetResource(toucher, RES_CELLS); - float amplasma = GetResource(toucher, RES_PLASMA); - if(IS_PLAYER(toucher) || IS_MONSTER(toucher)) - if(!IS_DEAD(toucher)) - if(!STAT(FROZEN, toucher)) - { - ammo_factor = autocvar_g_nades_ammo_rate*frametime/2; - if ( toucher != this.realowner ) - { - if ( SAME_TEAM(toucher,this) ) - ammo_factor *= autocvar_g_nades_ammo_friend; - else - ammo_factor *= autocvar_g_nades_ammo_foe; - } - if ( ammo_factor > 0 ) - { - if (amshells < maxammo) - GiveResourceWithLimit(toucher, RES_SHELLS, ammo_factor, maxammo); - - if (ambullets < maxammo) - GiveResourceWithLimit(toucher, RES_BULLETS, ammo_factor, maxammo); - - if (amrockets < maxammo) - GiveResourceWithLimit(toucher, RES_ROCKETS, ammo_factor, maxammo); - - if (amcells < maxammo) - GiveResourceWithLimit(toucher, RES_CELLS, ammo_factor, maxammo); - - if (amplasma < maxammo) - GiveResourceWithLimit(toucher, RES_PLASMA, ammo_factor, maxammo); - - if (this.nade_show_particles) - Send_Effect(EFFECT_HEALING, toucher.origin, '0 0 0', 1); - } - else if ( ammo_factor < 0 ) - { - //Foe drops ammo points - if (amshells > 0) - SetResource(toucher, RES_SHELLS, amshells + ammo_factor); - - if (ambullets > 0) - SetResource(toucher, RES_BULLETS, ambullets + ammo_factor); - - if (amrockets > 0) - SetResource(toucher, RES_ROCKETS, amrockets + ammo_factor); - - if (amcells > 0) - SetResource(toucher, RES_CELLS, amcells + ammo_factor); - - if (amplasma > 0) - SetResource(toucher, RES_PLASMA, amplasma + ammo_factor); - - return; - } - } - - if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) ) - { - entity show_brown = (IS_VEHICLE(toucher) && toucher.owner) ? toucher.owner : toucher; - STAT(AMMUNITIONING_ORB, show_brown) = time+0.1; - STAT(AMMUNITIONING_ORB_ALPHA, show_brown) = 0.75 * (this.ltime - time) / this.orb_lifetime; - } -} - -void nade_ammo_boom(entity this) -{ - entity orb = nades_spawn_orb(this.owner, this.realowner, this.origin, autocvar_g_nades_ammo_time, autocvar_g_nades_nade_radius); - - settouch(orb, nade_ammo_touch); - orb.colormod = '0.66 0.33 0'; -} -/***********************************************************************************/ -//remember to put an image in gfx/hud/luma and gfx/hud/default per each nade_blabla.tga -//dark nade does damage like a normal nade but the damage is minor -//add Dark smoke effect when exploded 28-02-2021 -void dark_damage(entity this, float radius, float damage) -{ - entity e; - - if ( damage < 0 ) - return; - - for(e = WarpZone_FindRadius(this.origin, radius, true); e; e = e.chain) - if(!IS_DEAD(e)) - if(e.takedamage == DAMAGE_AIM) - if(!IS_PLAYER(e) || !this.realowner || DIFF_TEAM(e, this) || !IS_MONSTER(e)) - if(!STAT(FROZEN, e)) - { - Damage(this, this, this.realowner, damage, DEATH_NADE.m_id, DMG_NOWEP, this.origin, '0 0 0'); - Damage_DamageInfo(this.origin, damage, autocvar_g_nades_nade_edgedamage, - radius, '1 1 1' * 0, DEATH_NADE.m_id, 0, this); - } -} - -void nade_dark_fountain_think(entity this) -{ - if(round_handler_IsActive()) - if(!round_handler_IsRoundStarted()) - { - delete(this); - return; - } - - if(time >= this.ltime) - { - Send_Effect(EFFECT_SMOKE_SMALL, this.origin + '0 0 1', '0 0 0', 1); - delete(this); - return; - } - - this.nextthink = time + 0.1; - - // gaussian - float randomr; - randomr = random(); - randomr = exp(-5*randomr*randomr)*autocvar_g_nades_dark_radius; - float randomw; - randomw = random()*M_PI*2; - vector randomp; - randomp.x = randomr*cos(randomw); - randomp.y = randomr*sin(randomw); - randomp.z = 1; - Send_Effect(EFFECT_SMOKE_SMALL, this.origin + randomp, '0 0 0', 1); - - if(time >= this.nade_special_time) - { - this.nade_special_time = time + 0.7; - Send_Effect(EFFECT_SMOKE_SMALL, this.origin, '0 0 0', 1); - } -} - -void DarkBlinking(entity e); -//copy of the special.qc function contents for DarkBlinking -void nade_dark_touch(entity this, entity toucher) -{ - if ( IS_REAL_CLIENT(toucher) || (IS_VEHICLE(toucher) && toucher.owner) ) - { - entity show_tint = (IS_VEHICLE(toucher) && toucher.owner) ? toucher.owner : toucher; - - float tint_alpha = 0.75; - if(SAME_TEAM(toucher, this.realowner) || SAME_TEAM(toucher, this)) - { - tint_alpha = 0.45; - if(!STAT(DARK_ORB, show_tint)) - { - toucher.nade_dark_prevalpha = toucher.alpha; - toucher.alpha = 1; - } - } - else - { - tint_alpha = 0.45; - if(!STAT(DARK_ORB, show_tint)) - { - DarkBlinking(toucher); - dark_damage(toucher, autocvar_g_nades_dark_radius, autocvar_g_nades_dark_damage); - } - } - - STAT(DARK_ORB, show_tint) = time + 0.1; - STAT(DARK_ORB_ALPHA, show_tint) = tint_alpha * (this.ltime - time) / this.orb_lifetime; - } -} -void nade_dark_boom(entity this) -{ - entity orb = nades_spawn_orb(this.owner, this.realowner, this.origin, autocvar_g_nades_dark_time, autocvar_g_nades_dark_radius); - entity fountain = new(nade_dark_fountain); - - fountain.owner = this.owner; - fountain.realowner = this.realowner; - fountain.origin = this.origin; - fountain.flags = FL_PROJECTILE; - IL_PUSH(g_projectiles, fountain); - IL_PUSH(g_bot_dodge, fountain); - setorigin(fountain, fountain.origin); - setthink(fountain, nade_dark_fountain_think); - fountain.nextthink = time; - fountain.ltime = time + autocvar_g_nades_dark_time; - fountain.pushltime = fountain.wait = fountain.ltime; - fountain.team = this.team; - fountain.bot_dodge = false; - setsize(fountain, '-16 -16 -16', '16 16 16'); - fountain.nade_special_time = time + 0.3; - fountain.angles = this.angles; - - settouch(orb, nade_dark_touch); - orb.colormod = NADE_TYPE_DARK.m_color; - //CSQCProjectile(fountain, true, PROJECTILE_NADE_DARK_BURN, true); -} -/***********************************************************************************/ void nade_boom(entity this) { entity expef = NULL; @@ -1384,21 +746,6 @@ void nade_boom(entity this) nade_blast = false; expef = EFFECT_SPAWN_NEUTRAL; break; - - case NADE_TYPE_EMERALD: //LegendGuard adds nade case 11-02-2021 - nade_blast = false; - expef = EFFECT_EXPLOSION_SMALL; - break; - - case NADE_TYPE_AMMO: //LegendGuard adds nade case 13-02-2021 - nade_blast = false; - expef = EFFECT_SPAWN_BROWN; - break; - - case NADE_TYPE_DARK: //LegendGuard adds nade case 08-02-2021 - nade_blast = false; - expef = EFFECT_EXPLOSION_MEDIUM; - break; default: case NADE_TYPE_NORMAL: @@ -1432,9 +779,6 @@ void nade_boom(entity this) case NADE_TYPE_MONSTER: nade_monster_boom(this); break; case NADE_TYPE_ENTRAP: nade_entrap_boom(this); break; case NADE_TYPE_VEIL: nade_veil_boom(this); break; - case NADE_TYPE_EMERALD: nade_emerald_boom(this); break; //LegendGuard adds the register of new nade 11-02-2021 - case NADE_TYPE_AMMO: nade_ammo_boom(this); break; //LegendGuard adds the register of new nade 13-02-2021 - case NADE_TYPE_DARK: nade_dark_boom(this); break; //LegendGuard adds the register of new nade 08-02-2021 } IL_EACH(g_projectiles, it.classname == "grapplinghook" && it.aiment == this, @@ -1445,10 +789,10 @@ void nade_boom(entity this) delete(this); } -void spawn_held_nade(entity player, entity nowner, float ntime, int ntype, string pntype, int tntype); +void spawn_held_nade(entity player, entity nowner, float ntime, int ntype, string pntype); void nade_pickup(entity this, entity thenade) { - spawn_held_nade(this, thenade.realowner, autocvar_g_nades_pickup_time, STAT(NADE_BONUS_TYPE, thenade), thenade.pokenade_type, thenade.tandemnade_type); + spawn_held_nade(this, thenade.realowner, autocvar_g_nades_pickup_time, STAT(NADE_BONUS_TYPE, thenade), thenade.pokenade_type); // set refire so player can't even this.nade_refire = time + autocvar_g_nades_nade_refire; @@ -1734,13 +1078,12 @@ bool nade_customize(entity this, entity client) return true; } -void spawn_held_nade(entity player, entity nowner, float ntime, int ntype, string pntype, int tntype) +void spawn_held_nade(entity player, entity nowner, float ntime, int ntype, string pntype) { entity n = new(nade), fn = new(fake_nade); STAT(NADE_BONUS_TYPE, n) = max(1, ntype); n.pokenade_type = pntype; - n.tandemnade_type = tntype; if(REGISTRY_GET(Nades, STAT(NADE_BONUS_TYPE, n)) == NADE_TYPE_Null) STAT(NADE_BONUS_TYPE, n) = NADE_TYPE_NORMAL.m_id; @@ -1796,7 +1139,6 @@ void nade_prime(entity this) this.fake_nade = NULL; int ntype; - int tntype = this.tandemnade_type; string pntype = this.pokenade_type; if(StatusEffects_active(STATUSEFFECT_Strength, this) && autocvar_g_nades_bonus_onstrength) @@ -1805,17 +1147,15 @@ void nade_prime(entity this) { ntype = STAT(NADE_BONUS_TYPE, this); pntype = this.pokenade_type; - tntype = this.tandemnade_type; STAT(NADE_BONUS, this) -= 1; } else { ntype = ((autocvar_g_nades_client_select) ? CS_CVAR(this).cvar_cl_nade_type : autocvar_g_nades_nade_type); pntype = ((autocvar_g_nades_client_select) ? CS_CVAR(this).cvar_cl_pokenade_type : autocvar_g_nades_pokenade_monster_type); - tntype = ((autocvar_g_nades_client_select) ? CS_CVAR(this).cvar_cl_tandemnade_type : autocvar_g_nades_tandemnade_type); } - spawn_held_nade(this, this, autocvar_g_nades_nade_lifetime, ntype, pntype, tntype); + spawn_held_nade(this, this, autocvar_g_nades_nade_lifetime, ntype, pntype); } bool CanThrowNade(entity this) @@ -1975,13 +1315,11 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink) { STAT(NADE_BONUS_TYPE, player) = CS_CVAR(player).cvar_cl_nade_type; player.pokenade_type = CS_CVAR(player).cvar_cl_pokenade_type; - player.tandemnade_type = CS_CVAR(player).cvar_cl_tandemnade_type; } else { STAT(NADE_BONUS_TYPE, player) = autocvar_g_nades_bonus_type; player.pokenade_type = autocvar_g_nades_pokenade_monster_type; - player.tandemnade_type = autocvar_g_nades_tandemnade_type; } STAT(NADE_BONUS_TYPE, player) = bound(1, STAT(NADE_BONUS_TYPE, player), Nades_COUNT); @@ -2002,15 +1340,6 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink) else player.alpha = player.nade_veil_prevalpha; } - //LegendGuard adds nade if STAT DARK_ORB 08-02-2021 - if(STAT(DARK_ORB, player) && STAT(DARK_ORB, player) <= time) - { - STAT(DARK_ORB, player) = 0; - if(player.vehicle) - player.vehicle.alpha = player.vehicle.nade_dark_prevalpha; - else - player.alpha = player.nade_dark_prevalpha; - } } if (!(frametime && IS_PLAYER(player))) @@ -2096,12 +1425,6 @@ MUTATOR_HOOKFUNCTION(nades, MonsterMove) mon.alpha = mon.nade_veil_prevalpha; STAT(VEIL_ORB, mon) = 0; } - //LegendGuard adds nade if STAT ORB 08-02-2021 - if (STAT(DARK_ORB, mon) && STAT(DARK_ORB, mon) <= time) - { - mon.alpha = mon.nade_dark_prevalpha; - STAT(DARK_ORB, mon) = 0; - } } MUTATOR_HOOKFUNCTION(nades, PlayerSpawn) @@ -2231,7 +1554,6 @@ MUTATOR_HOOKFUNCTION(nades, SpectateCopy) STAT(NADE_TIMER, client) = STAT(NADE_TIMER, spectatee); STAT(NADE_BONUS_TYPE, client) = STAT(NADE_BONUS_TYPE, spectatee); client.pokenade_type = spectatee.pokenade_type; - client.tandemnade_type = spectatee.tandemnade_type; STAT(NADE_BONUS, client) = STAT(NADE_BONUS, spectatee); STAT(NADE_BONUS_SCORE, client) = STAT(NADE_BONUS_SCORE, spectatee); STAT(HEALING_ORB, client) = STAT(HEALING_ORB, spectatee); @@ -2240,10 +1562,6 @@ MUTATOR_HOOKFUNCTION(nades, SpectateCopy) STAT(ENTRAP_ORB_ALPHA, client) = STAT(ENTRAP_ORB_ALPHA, spectatee); STAT(VEIL_ORB, client) = STAT(VEIL_ORB, spectatee); STAT(VEIL_ORB_ALPHA, client) = STAT(VEIL_ORB_ALPHA, spectatee); - STAT(AMMUNITIONING_ORB, client) = STAT(AMMUNITIONING_ORB, spectatee); //LegendGuard adds nade STAT client 13-02-2021 - STAT(AMMUNITIONING_ORB_ALPHA, client) = STAT(AMMUNITIONING_ORB_ALPHA, spectatee); - STAT(DARK_ORB, client) = STAT(DARK_ORB, spectatee); //LegendGuard adds nade STAT client 08-02-2021 - STAT(DARK_ORB_ALPHA, client) = STAT(DARK_ORB_ALPHA, spectatee); } MUTATOR_HOOKFUNCTION(nades, BuildMutatorsString) diff --git a/qcsrc/common/mutators/mutator/nades/nades.qh b/qcsrc/common/mutators/mutator/nades/nades.qh index 8e3cca874..460c21571 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qh +++ b/qcsrc/common/mutators/mutator/nades/nades.qh @@ -64,27 +64,7 @@ float autocvar_g_nades_entrap_radius = 500; float autocvar_g_nades_entrap_time = 10; float autocvar_g_nades_veil_time = 8; float autocvar_g_nades_veil_radius = 300; -float autocvar_g_nades_emerald_lifetime = 5; //LegendGuard adds new nade cvars 28-02-2021 -bool autocvar_g_nades_emerald_randomweapons_includespecial = false; -float autocvar_g_nades_emerald_spawncount = 1; -float autocvar_g_nades_emerald_ball_spread = 0.5; -float autocvar_g_nades_emerald_ball_lifetime = 1; //if much time, many items will spawn -float autocvar_g_nades_emerald_fountain_delay = 5; -float autocvar_g_nades_emerald_ball_count = 3; -float autocvar_g_nades_emerald_fountain_lifetime = 1; //if much time, fountain will remain -bool autocvar_g_nades_emerald_powerupjetpack_randomdrop = 0; -int autocvar_g_nades_emerald_dropitemselect = 0; //admin/user selects which item wants to drop in-game, if not will be random -int autocvar_g_nades_emerald_vehiclespawnlimit = 6; //LegendGuard adds new nade cvar of vehicle spawn count limit for the server 26-06-2021 -//int autocvar_g_nades_emerald_turretspawnlimit = 4; // EXPERIMENTAL 26-06-2021 -float autocvar_g_nades_ammo_time = 5; //LegendGuard adds new nade cvars 13-02-2021 -float autocvar_g_nades_ammo_rate = 30; -float autocvar_g_nades_ammo_friend = 1; -float autocvar_g_nades_ammo_foe = -2; -float autocvar_g_nades_dark_damage = 25; //LegendGuard adds new nade cvars 08-02-2021 -float autocvar_g_nades_dark_time = 13; -float autocvar_g_nades_dark_radius = 700; string autocvar_g_nades_pokenade_monster_type; -int autocvar_g_nades_tandemnade_type; //LegendGuard adds new nade cvar for emerald nade options 01-07-2021 float autocvar_g_nades_pokenade_monster_lifetime; #endif @@ -106,12 +86,6 @@ const int PROJECTILE_NADE_ENTRAP = 84; const int PROJECTILE_NADE_ENTRAP_BURN = 85; const int PROJECTILE_NADE_VEIL = 86; const int PROJECTILE_NADE_VEIL_BURN = 87; -const int PROJECTILE_NADE_EMERALD = 88; //LegendGuard adds new nade MACROS 11-02-2021 -const int PROJECTILE_NADE_EMERALD_BURN = 89; -const int PROJECTILE_NADE_AMMO = 90; //LegendGuard adds new nade MACROS 13-02-2021 -const int PROJECTILE_NADE_AMMO_BURN = 91; -const int PROJECTILE_NADE_DARK = 92; //LegendGuard adds new nade MACROS 08-02-2021 -const int PROJECTILE_NADE_DARK_BURN = 93; REGISTRY(Nades, BITS(4)) REGISTER_REGISTRY(Nades) @@ -155,6 +129,11 @@ Nade Nade_FromProjectile(int proj) .float orb_lifetime; .float orb_radius; +#ifdef GAMEQC +REPLICATE_INIT(int, cvar_cl_nade_type); +REPLICATE_INIT(string, cvar_cl_pokenade_type); +#endif + #ifdef SVQC .entity nade; @@ -162,17 +141,10 @@ Nade Nade_FromProjectile(int proj) .float nade_refire; .float nade_special_time; .string pokenade_type; -.float tandemnade_type; //LegendGuard adds new cvar nade .variable 01-07-2021 .entity nade_damage_target; -.float cvar_cl_nade_type; -.string cvar_cl_pokenade_type; -.int cvar_cl_tandemnade_type; //LegendGuard adds new cvar nade .variable 01-07-2021 .float toss_time; .float nade_show_particles; .float nade_veil_prevalpha; -.float nade_dark_prevalpha; //LegendGuard adds new nade .variable 08-02-2021 -int vehspawncount; //LegendGuard adds new .variable 22-06-2021 -//int turspawncount; //EXPERIMENTAL 26-06-2021 bool orb_send(entity this, entity to, int sf); @@ -197,99 +169,6 @@ MUTATOR_HOOKABLE(Nade_Damage, EV_Nade_Damage); #endif -REGISTER_NET_TEMP(TE_CSQC_DARKBLINKING); //LegendGuard registers dark blinking nade feature 09-02-2021 - -#ifdef CSQC -#include -#include - -float cvar_cl_nade_type; -string cvar_cl_pokenade_type; -float cvar_cl_tandemnade_type; //LegendGuard adds new cl variable for emerald nade 01-07-2021 -//LegendGuard sets variables for dark nade 09-02-2021 -float dark_appeartime; -float dark_fadetime; -/***************************************************************/ -void HUD_DarkBlinking() -{ - // vectors for top right, bottom right, bottom and bottom left corners - //vector topright = vec2(vid_conwidth, 0); - //vector bottom = vec2(vid_conwidth / 2, vid_conheight); - vector bottomright = vec2(vid_conwidth, vid_conheight); - //vector bottomleft = vec2(0, vid_conheight); - - /* - drawfill function parameters (qcsrc/dpdefs/menudefs.qc): - float drawfill(vector position, vector size, vector rgb, float alpha, float flag) - */ - drawfill('0 0 0', bottomright, '0.23 0 0.23', 0.98, DRAWFLAG_NORMAL); -} - -#elif defined(SVQC) -#include - -void DarkBlinking(entity e) -{ - if(e == NULL) - return; - - int accepted = VerifyClientEntity(e, true, false); - - if(accepted > 0) - { - msg_entity = e; - WriteHeader(MSG_ONE, TE_CSQC_DARKBLINKING); - } -} -#endif - -#ifdef CSQC - -bool darkblink; - -REGISTER_MUTATOR(cl_darkblink, true); - -MUTATOR_HOOKFUNCTION(cl_darkblink, DrawScoreboard) -{ - return darkblink; -} - -MUTATOR_HOOKFUNCTION(cl_darkblink, HUD_Draw_overlay) -{ - if(!darkblink) - return false; - - if (g_stat_HEALTH < 0) - darkblink = false; - - if(STAT(GAME_STOPPED)) - darkblink = false; - - if(time <= dark_fadetime) - { - HUD_DarkBlinking(); - return false; - } - else - darkblink = false; - - return false; -} - -NET_HANDLE(TE_CSQC_DARKBLINKING, bool isNew) -{ - return = true; - - if(darkblink) - return; - - localcmd("play2 sound/misc/blind\n"); - darkblink = true; - dark_appeartime = time; - dark_fadetime = time + 7; -} -#endif -/***************************************************************/ #ifdef CSQC bool Projectile_isnade(int proj); // TODO: remove diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc index e23d533ed..c53c76eb7 100644 --- a/qcsrc/common/mutators/mutator/nix/sv_nix.qc +++ b/qcsrc/common/mutators/mutator/nix/sv_nix.qc @@ -135,6 +135,7 @@ void NIX_GiveCurrentWeapon(entity this) // get weapon info entity wpn = REGISTRY_GET(Weapons, nix_weapon); + // TODO: registry handles if(nix_nextchange != this.nix_lastchange_id) // this shall only be called once per round! { SetResource(this, RES_SHELLS, 0); diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qh b/qcsrc/common/mutators/mutator/overkill/okhmg.qh index 8a00b4d77..8f597e01b 100644 --- a/qcsrc/common/mutators/mutator/overkill/okhmg.qh +++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qh @@ -4,7 +4,7 @@ CLASS(OverkillHeavyMachineGun, Weapon) /* spawnfunc */ ATTRIB(OverkillHeavyMachineGun, m_canonical_spawnfunc, string, "weapon_okhmg"); -/* ammotype */ ATTRIB(OverkillHeavyMachineGun, ammo_type, int, RES_BULLETS); +/* ammotype */ ATTRIB(OverkillHeavyMachineGun, ammo_type, Resource, RES_BULLETS); /* impulse */ ATTRIB(OverkillHeavyMachineGun, impulse, int, 3); /* flags */ ATTRIB(OverkillHeavyMachineGun, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_SUPERWEAPON | WEP_FLAG_PENETRATEWALLS); /* rating */ ATTRIB(OverkillHeavyMachineGun, bot_pickupbasevalue, float, 10000); diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh index 10f3b9c09..7cf072b33 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh @@ -2,7 +2,7 @@ CLASS(OverkillMachineGun, Weapon) /* spawnfunc */ ATTRIB(OverkillMachineGun, m_canonical_spawnfunc, string, "weapon_okmachinegun"); -/* ammotype */ ATTRIB(OverkillMachineGun, ammo_type, int, RES_BULLETS); +/* ammotype */ ATTRIB(OverkillMachineGun, ammo_type, Resource, RES_BULLETS); /* impulse */ ATTRIB(OverkillMachineGun, impulse, int, 3); /* flags */ ATTRIB(OverkillMachineGun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillMachineGun, bot_pickupbasevalue, float, 7000); diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh index 1ffaf78b8..21bbfaa2f 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qh +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh @@ -2,7 +2,7 @@ CLASS(OverkillNex, Weapon) /* spawnfunc */ ATTRIB(OverkillNex, m_canonical_spawnfunc, string, "weapon_oknex"); -/* ammotype */ ATTRIB(OverkillNex, ammo_type, int, RES_CELLS); +/* ammotype */ ATTRIB(OverkillNex, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(OverkillNex, impulse, int, 7); /* flags */ ATTRIB(OverkillNex, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillNex, bot_pickupbasevalue, float, 8000); diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qh b/qcsrc/common/mutators/mutator/overkill/okrpc.qh index 6b6763ce7..60c0c9a2d 100644 --- a/qcsrc/common/mutators/mutator/overkill/okrpc.qh +++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qh @@ -4,7 +4,7 @@ CLASS(OverkillRocketPropelledChainsaw, Weapon) /* spawnfunc */ ATTRIB(OverkillRocketPropelledChainsaw, m_canonical_spawnfunc, string, "weapon_okrpc"); -/* ammotype */ ATTRIB(OverkillRocketPropelledChainsaw, ammo_type, int, RES_ROCKETS); +/* ammotype */ ATTRIB(OverkillRocketPropelledChainsaw, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(OverkillRocketPropelledChainsaw, impulse, int, 9); /* flags */ ATTRIB(OverkillRocketPropelledChainsaw, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON); /* rating */ ATTRIB(OverkillRocketPropelledChainsaw, bot_pickupbasevalue, float, 10000); diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh index 2c75681d9..e70fc4326 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh @@ -2,7 +2,7 @@ CLASS(OverkillShotgun, Weapon) /* spawnfunc */ ATTRIB(OverkillShotgun, m_canonical_spawnfunc, string, "weapon_okshotgun"); -/* ammotype */ ATTRIB(OverkillShotgun, ammo_type, int, RES_SHELLS); +/* ammotype */ ATTRIB(OverkillShotgun, ammo_type, Resource, RES_SHELLS); /* impulse */ ATTRIB(OverkillShotgun, impulse, int, 2); /* flags */ ATTRIB(OverkillShotgun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillShotgun, bot_pickupbasevalue, float, 6000); diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/cl_spawn_near_teammate.qh b/qcsrc/common/mutators/mutator/spawn_near_teammate/cl_spawn_near_teammate.qh index 640a7255f..6f70f09be 100644 --- a/qcsrc/common/mutators/mutator/spawn_near_teammate/cl_spawn_near_teammate.qh +++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/cl_spawn_near_teammate.qh @@ -1,4 +1 @@ #pragma once - -float cvar_cl_spawn_near_teammate; -REPLICATE(cvar_cl_spawn_near_teammate, bool, "cl_spawn_near_teammate"); diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc index 745374770..218e00ef2 100644 --- a/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc +++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc @@ -1 +1,5 @@ #include "spawn_near_teammate.qh" + +#ifdef GAMEQC +REPLICATE(cvar_cl_spawn_near_teammate, bool, "cl_spawn_near_teammate"); +#endif diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh index 3f59c932d..be3a73637 100644 --- a/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh +++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh @@ -1,2 +1,5 @@ #pragma once +#ifdef GAMEQC +REPLICATE_INIT(bool, cvar_cl_spawn_near_teammate); +#endif diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc index 2f0c79431..c2a3250d8 100644 --- a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc +++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc @@ -19,8 +19,6 @@ REGISTER_MUTATOR(spawn_near_teammate, expr_evaluate(autocvar_g_spawn_near_teamma .float msnt_timer; -.float cvar_cl_spawn_near_teammate; - MUTATOR_HOOKFUNCTION(spawn_near_teammate, Spawn_Score) { if (!teamplay) return; @@ -228,5 +226,3 @@ LABEL(skip) */ } } - -REPLICATE(cvar_cl_spawn_near_teammate, bool, "cl_spawn_near_teammate"); diff --git a/qcsrc/common/mutators/mutator/status_effects/sv_status_effects.qc b/qcsrc/common/mutators/mutator/status_effects/sv_status_effects.qc index 90fda09cb..9d97e94b6 100644 --- a/qcsrc/common/mutators/mutator/status_effects/sv_status_effects.qc +++ b/qcsrc/common/mutators/mutator/status_effects/sv_status_effects.qc @@ -70,11 +70,20 @@ MUTATOR_HOOKFUNCTION(status_effects, PlayerDies) StatusEffects_removeall(frag_target, STATUSEFFECT_REMOVE_NORMAL); } +MUTATOR_HOOKFUNCTION(status_effects, ClientDisconnect) +{ + entity player = M_ARGV(0, entity); + + StatusEffects_removeall(player, STATUSEFFECT_REMOVE_NORMAL); // just to get rid of the pickup sound + return true; +} + MUTATOR_HOOKFUNCTION(status_effects, MakePlayerObserver) { entity player = M_ARGV(0, entity); // no need to network updates, as there is no statuseffects object attached + StatusEffects_removeall(player, STATUSEFFECT_REMOVE_NORMAL); // just to get rid of the pickup sound StatusEffects_clearall(player.statuseffects_store); // don't delete spectatee's effects! @@ -86,6 +95,7 @@ MUTATOR_HOOKFUNCTION(status_effects, reset_map_global) { FOREACH_CLIENT(IS_PLAYER(it) && it.statuseffects, { + StatusEffects_removeall(it, STATUSEFFECT_REMOVE_NORMAL); // just to get rid of the pickup sound StatusEffects_clearall(it.statuseffects); StatusEffects_update(it); }); diff --git a/qcsrc/common/net_linked.qh b/qcsrc/common/net_linked.qh index 4e888e7c3..e8e32cc06 100644 --- a/qcsrc/common/net_linked.qh +++ b/qcsrc/common/net_linked.qh @@ -10,6 +10,7 @@ REGISTER_NET_TEMP(TE_CSQC_VEHICLESETUP) REGISTER_NET_TEMP(TE_CSQC_TEAMNAMES) REGISTER_NET_TEMP(TE_CSQC_CHATSOUND) REGISTER_NET_TEMP(TE_CSQC_WEAPONPICKUP) +REGISTER_NET_TEMP(TE_CSQC_TOTALSHARDS) // for RJZ const int RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder const int RACE_NET_CHECKPOINT_CLEAR = 1; diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc index 395225729..0dfde6c10 100644 --- a/qcsrc/common/notifications/all.inc +++ b/qcsrc/common/notifications/all.inc @@ -161,6 +161,17 @@ MSG_ANNCE_NOTIF(NUM_GAMESTART_9, N___NEVER, "9", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) MSG_ANNCE_NOTIF(NUM_GAMESTART_10, N___NEVER, "10", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_IDLE_1, N___NEVER, "1", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_IDLE_2, N___NEVER, "2", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_IDLE_3, N___NEVER, "3", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_IDLE_4, N___NEVER, "4", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_IDLE_5, N___NEVER, "5", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_IDLE_6, N___NEVER, "6", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_IDLE_7, N___NEVER, "7", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_IDLE_8, N___NEVER, "8", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_IDLE_9, N___NEVER, "9", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_IDLE_10, N___NEVER, "10", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) + MSG_ANNCE_NOTIF(NUM_KILL_1, N___NEVER, "1", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) MSG_ANNCE_NOTIF(NUM_KILL_2, N___NEVER, "2", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) MSG_ANNCE_NOTIF(NUM_KILL_3, N___NEVER, "3", CH_INFO, VOL_BASEVOICE, ATTEN_NONE, -1) @@ -479,9 +490,9 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_INFO_NOTIF(POWERUP_STRENGTH, N_CONSOLE, 1, 0, "s1", "s1", "strength", _("^BG%s^K1 picked up Strength"), "") MSG_INFO_NOTIF(QUIT_DISCONNECT, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 disconnected"), "") - MSG_INFO_NOTIF(QUIT_KICK, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 was kicked"), "") - MSG_INFO_NOTIF(QUIT_KICK_IDLING, N_CHATCON, 1, 1, "s1 f1", "", "", _("^BG%s^F3 was kicked after idling for %s seconds"), "") - MSG_INFO_NOTIF(MOVETOSPEC_IDLING, N_CHATCON, 1, 1, "s1 f1", "", "", _("^BG%s^F3 was moved to^BG spectators^F3 after idling for %s seconds"), "") + MSG_INFO_NOTIF(QUIT_KICK, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 was kicked"), "") + MSG_INFO_NOTIF(QUIT_KICK_IDLING, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 was kicked for idling"), "") + MSG_INFO_NOTIF(MOVETOSPEC_IDLING, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 was moved to spectator for idling"), "") MSG_INFO_NOTIF(QUIT_KICK_SPECTATING, N_CONSOLE, 0, 0, "", "", "", _("^F2You were kicked from the server because you are a spectator and spectators aren't allowed at the moment."), "") MSG_INFO_NOTIF(QUIT_KICK_TEAMKILL, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 was kicked for excessive teamkilling"), "") MSG_INFO_NOTIF(QUIT_SPECTATE, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 is now^BG spectating"), "") @@ -506,6 +517,7 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_INFO_NOTIF(TEAMCHANGE_LARGERTEAM, N_CONSOLE, 0, 0, "", "", "", _("^BGYou cannot change to a larger team"), "") MSG_INFO_NOTIF(TEAMCHANGE_NOTALLOWED, N_CONSOLE, 0, 0, "", "", "", _("^BGYou are not allowed to change teams"), "") + MSG_INFO_NOTIF(VERSION_BETA, N_CONSOLE, 2, 0, "s1 s2", "", "", _("^F4NOTE: ^BGThe server is running ^F1Xonotic %s (beta)^BG, you have ^F2Xonotic %s"), "") MSG_INFO_NOTIF(VERSION_OLD, N_CHATCON, 2, 0, "s1 s2", "", "", _("^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s"), "") MSG_INFO_NOTIF(VERSION_OUTDATED, N_CHATCON, 2, 0, "s1 s2", "", "", _("^F4NOTE: ^F1Xonotic %s^BG is out, and you still have ^F2Xonotic %s^BG - get the update from ^F3http://www.xonotic.org/^BG!"), "") @@ -644,12 +656,12 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != #define VERBOSE_MURDER(type) strcat(MURDER_##type, "^BG%s") - #define MURDER_FRAG BOLD(_("^K3%sYou fragged ^BG%s")) - #define MURDER_FRAG2 BOLD(_("^K3%sYou scored against ^BG%s")) + #define MURDER_FRAG strcat(BOLD_OPERATOR, _("^K3%sYou fragged ^BG%s")) + #define MURDER_FRAG2 strcat(BOLD_OPERATOR, _("^K3%sYou scored against ^BG%s")) #define MURDER_FRAG3 strcat(BOLD_OPERATOR, _("^K3%sYou fragged ^BG%s"), "\n", "%s^BG place with %s") #define MURDER_FRAG4 strcat(BOLD_OPERATOR, _("^K3%sYou fragged ^BG%s"), "\n", "%s^BG with %s") - #define MURDER_FRAGGED BOLD(_("^K1%sYou were fragged by ^BG%s")) - #define MURDER_FRAGGED2 BOLD(_("^K1%sYou were scored against by ^BG%s")) + #define MURDER_FRAGGED _("^K1%sYou were fragged by ^BG%s") + #define MURDER_FRAGGED2 _("^K1%sYou were scored against by ^BG%s") MSG_CENTER_NOTIF(DEATH_MURDER_FRAG, N_ENABLE, 1, 1, "spree_cen s1", CPID_Null, "0 0", MURDER_FRAG, MURDER_FRAG2 ) MSG_CENTER_NOTIF(DEATH_MURDER_DM, N_ENABLE, 1, 2, "spree_cen s1 frag_pos f2", CPID_Null, "0 0", MURDER_FRAG3, "") MSG_CENTER_NOTIF(DEATH_MURDER_DUEL, N_ENABLE, 2, 2, "spree_cen s1 s2 f2", CPID_Null, "0 0", MURDER_FRAG4, "") @@ -809,6 +821,7 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_CENTER_NOTIF(OVERTIME_FRAG, N_ENABLE, 0, 0, "", CPID_OVERTIME, "0 0", _("^F2Now playing ^F4OVERTIME^F2!\nKeep fragging until we have a winner!"), _("^F2Now playing ^F4OVERTIME^F2!\nKeep scoring until we have a winner!")) MSG_CENTER_NOTIF(OVERTIME_CONTROLPOINT, N_ENABLE, 0, 0, "", CPID_OVERTIME, "5 0", _("^F2Now playing ^F4OVERTIME^F2!\n\nGenerators are now decaying.\nThe more control points your team holds,\nthe faster the enemy generator decays"), "") MSG_CENTER_NOTIF(OVERTIME_TIME, N_ENABLE, 0, 1, "f1time", CPID_OVERTIME, "0 0", _("^F2Now playing ^F4OVERTIME^F2!\n^BGAdded ^F4%s^BG to the game!"), "") + MSG_CENTER_NOTIF(PORTO_CREATED_IN, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1In^BG-portal created"), "") MSG_CENTER_NOTIF(PORTO_CREATED_OUT, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^F3Out^BG-portal created"), "") MSG_CENTER_NOTIF(PORTO_FAILED, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^F1Portal creation failed"), "") @@ -843,6 +856,7 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_CENTER_NOTIF(TIMEOUT_BEGINNING, N_ENABLE, 0, 1, "", CPID_TIMEOUT, "1 f1", _("^F4Timeout begins in ^COUNT"), "") MSG_CENTER_NOTIF(TIMEOUT_ENDING, N_ENABLE, 0, 1, "", CPID_TIMEIN, "1 f1", _("^F4Timeout ends in ^COUNT"), "") MSG_CENTER_NOTIF(TIMEOUT_ONGOING, N_ENABLE, 0, 0, "", CPID_TIMEIN, "1 f1", _("^F4Match paused"), "") + MSG_CENTER_NOTIF(JOIN_PREVENT_MINIGAME, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1Cannot join given minigame session!"), "" ) MSG_CENTER_NOTIF(VEHICLE_ENTER, N_ENABLE, 0, 0, "pass_key", CPID_VEHICLES, "0 0", _("^BGPress ^F2%s^BG to enter/exit the vehicle"), "") diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index eb0028eb4..513ce28f3 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -380,8 +380,8 @@ float autocvar_notification_show_sprees_center_specialonly = true; f1points: point or points depending on f1 f1ord: count_ordinal of f1 f1time: process_time of f1 - f1race_time: mmssss of f1 - f2race_time: mmssss of f2 + f1race_time: mmssth of f1 + f2race_time: mmssth of f2 race_col: color of race time/position (i.e. good or bad) race_diff: show time difference between f2 and f3 missing_teams: show which teams still need players @@ -453,11 +453,11 @@ string BUFF_NAME(int i); ARG_CASE(ARG_CS, "f1points", (f1 == 1 ? _("point") : _("points"))) \ ARG_CASE(ARG_CS_SV, "f1ord", count_ordinal(f1)) \ ARG_CASE(ARG_CS_SV, "f1time", process_time(2, f1)) \ - ARG_CASE(ARG_CS_SV_HA, "f1race_time", mmssss(f1)) \ - ARG_CASE(ARG_CS_SV_HA, "f2race_time", mmssss(f2)) \ - ARG_CASE(ARG_CS_SV_HA, "f3race_time", mmssss(f3)) \ + ARG_CASE(ARG_CS_SV_HA, "f1race_time", mmssth(f1)) \ + ARG_CASE(ARG_CS_SV_HA, "f2race_time", mmssth(f2)) \ + ARG_CASE(ARG_CS_SV_HA, "f3race_time", mmssth(f3)) \ ARG_CASE(ARG_CS_SV, "race_col", CCR(((f1 == 1) ? "^F1" : "^F2"))) \ - ARG_CASE(ARG_CS_SV, "race_diff", ((f2 > f3) ? sprintf(CCR("^1[+%s]"), mmssss(f2 - f3)) : sprintf(CCR("^2[-%s]"), mmssss(f3 - f2)))) \ + ARG_CASE(ARG_CS_SV, "race_diff", ((f2 > f3) ? sprintf(CCR("^1[+%s]"), mmssth(f2 - f3)) : sprintf(CCR("^2[-%s]"), mmssth(f3 - f2)))) \ ARG_CASE(ARG_CS, "missing_teams", notif_arg_missing_teams(f1)) \ ARG_CASE(ARG_CS, "pass_key", getcommandkey(_("drop flag"), "+use")) \ ARG_CASE(ARG_CS, "nade_key", getcommandkey(_("throw nade"), "dropweapon")) \ @@ -730,6 +730,7 @@ string notif_arg_item_wepammo(float f1, float f2) { string ammoitems = ""; Weapon wep = REGISTRY_GET(Weapons, f1); + // TODO: registry handles switch (wep.ammo_type) { case RES_SHELLS: ammoitems = ITEM_Shells.m_name; break; diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc index 2b3c51374..75ebfd2ce 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -3,6 +3,12 @@ #include #include +#ifdef GAMEQC +REPLICATE(cvar_cl_physics, string, "cl_physics"); +REPLICATE(cvar_cl_jetpack_jump, bool, "cl_jetpack_jump"); +REPLICATE(cvar_cl_movement_track_canjump, bool, "cl_movement_track_canjump"); +#endif + #ifdef SVQC #include #include diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh index 7bfdeb94f..0a5b049f5 100644 --- a/qcsrc/common/physics/player.qh +++ b/qcsrc/common/physics/player.qh @@ -71,6 +71,12 @@ float AdjustAirAccelQW(float accelqw, float factor); bool IsFlying(entity a); +#ifdef GAMEQC +REPLICATE_INIT(string, cvar_cl_physics); +REPLICATE_INIT(bool, cvar_cl_jetpack_jump); +REPLICATE_INIT(bool, cvar_cl_movement_track_canjump); +#endif + #define PHYS_PL_MAX(s) STAT(PL_MAX, s) #define PHYS_PL_MIN(s) STAT(PL_MIN, s) #define PHYS_PL_CROUCH_MAX(s) STAT(PL_CROUCH_MAX, s) diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index 3d0ca1ee6..2ac431b75 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -15,6 +15,17 @@ #include #endif + +#ifdef GAMEQC +REPLICATE(cvar_cl_allow_uid2name, int, "cl_allow_uid2name"); +REPLICATE(cvar_cl_allow_uidranking, bool, "cl_allow_uidranking"); +REPLICATE(cvar_cl_allow_uidtracking, int, "cl_allow_uidtracking"); +#endif + +#ifdef SVQC +REPLICATE_APPLYCHANGE("cl_allow_uidtracking", { PlayerStats_GameReport_AddPlayer(this); }); +#endif + #ifdef SVQC void PlayerStats_Prematch() { @@ -268,6 +279,10 @@ void PlayerStats_GameReport_Init() // initiated before InitGameplayMode so that PlayerStats_GameReport_DelayMapVote = true; serverflags |= SERVERFLAG_PLAYERSTATS; + if(autocvar_g_playerstats_gamereport_uri != cvar_defstring("g_playerstats_gamereport_uri")) + { + serverflags |= SERVERFLAG_PLAYERSTATS_CUSTOM; + } PlayerStats_GameReport_AddEvent(PLAYERSTATS_ALIVETIME); PlayerStats_GameReport_AddEvent(PLAYERSTATS_AVGLATENCY); diff --git a/qcsrc/common/playerstats.qh b/qcsrc/common/playerstats.qh index 39ffab623..d5664d9d6 100644 --- a/qcsrc/common/playerstats.qh +++ b/qcsrc/common/playerstats.qh @@ -117,4 +117,13 @@ float autocvar_g_playerstats_playerdetail_autoupdatetime = 1800; // automaticall void PlayerStats_PlayerDetail(); void PlayerStats_PlayerDetail_CheckUpdate(); void PlayerStats_PlayerDetail_Handler(entity fh, entity p, float status); + +#endif + +#ifdef GAMEQC + +REPLICATE_INIT(int, cvar_cl_allow_uid2name); +REPLICATE_INIT(bool, cvar_cl_allow_uidranking); +REPLICATE_INIT(int, cvar_cl_allow_uidtracking); + #endif diff --git a/qcsrc/common/replicate.qh b/qcsrc/common/replicate.qh index 6726f9d01..868b0b3b3 100644 --- a/qcsrc/common/replicate.qh +++ b/qcsrc/common/replicate.qh @@ -1,106 +1,20 @@ #pragma once -// TODO: sort/merge these! -#if defined(CSQC) - float autoswitch; - bool cvar_cl_allow_uid2name; - float cvar_cl_allow_uidtracking; - bool cvar_cl_allow_uidranking; - float cvar_cl_autoscreenshot; - float cvar_cl_autotaunt; - bool cvar_cl_clippedspectating; - int cvar_cl_gunalign; - bool cvar_cl_chat_sounds; - float cvar_cl_handicap; - float cvar_cl_jetpack_jump; - float cvar_cl_movement_track_canjump; - float cvar_cl_noantilag; - string cvar_cl_physics; - float cvar_cl_voice_directional; - float cvar_cl_voice_directional_taunt_attenuation; - float cvar_cl_weaponimpulsemode; - - string cvar_g_xonoticversion; - string cvar_cl_weaponpriority; - string cvar_cl_weaponpriorities[10]; - float cvar_cl_cts_noautoswitch; - bool cvar_cl_weapon_switch_reload; - bool cvar_cl_weapon_switch_fallback_to_impulse; -#elif defined(SVQC) - .float cvar_cl_handicap; - .int cvar_cl_gunalign; - .bool cvar_cl_chat_sounds; - .bool cvar_cl_clippedspectating; - .float cvar_cl_autoscreenshot; - .float cvar_cl_jetpack_jump; - .float cvar_cl_movement_track_canjump; - .float cvar_cl_newusekeysupported; - .float cvar_cl_cts_noautoswitch; - .bool cvar_cl_weapon_switch_reload; - .bool cvar_cl_weapon_switch_fallback_to_impulse; - - .string cvar_g_xonoticversion; - .string cvar_cl_weaponpriority; - .string cvar_cl_weaponpriorities[10]; - .float cvar_cl_noantilag; - - // WEAPONTODO - .float autoswitch; - .float cvar_cl_weaponimpulsemode; - - .float cvar_cl_allow_uid2name; - .float cvar_cl_allow_uidtracking; - .bool cvar_cl_allow_uidranking; - - .string cvar_cl_physics; - - // autotaunt system - .float cvar_cl_autotaunt; - .float cvar_cl_voice_directional; - .float cvar_cl_voice_directional_taunt_attenuation; -#endif - #ifdef GAMEQC -REPLICATE(autoswitch, bool, "cl_autoswitch"); -REPLICATE(cvar_cl_allow_uid2name, bool, "cl_allow_uid2name"); -REPLICATE(cvar_cl_allow_uidranking, bool, "cl_allow_uidranking"); +REPLICATE_INIT(bool, cvar_cl_autoswitch); +REPLICATE_INIT(int, cvar_cl_autoscreenshot); +REPLICATE_INIT(bool, cvar_cl_clippedspectating); +REPLICATE_INIT(bool, cvar_cl_cts_noautoswitch); +REPLICATE_INIT(float, cvar_cl_handicap); +REPLICATE_INIT(bool, cvar_cl_noantilag); +REPLICATE_INIT(bool, cvar_cl_chat_sounds); +REPLICATE_INIT(string, cvar_g_xonoticversion); +REPLICATE(cvar_cl_autoswitch, bool, "cl_autoswitch"); REPLICATE(cvar_cl_autoscreenshot, int, "cl_autoscreenshot"); -REPLICATE(cvar_cl_autotaunt, float, "cl_autotaunt"); REPLICATE(cvar_cl_clippedspectating, bool, "cl_clippedspectating"); -REPLICATE(cvar_cl_gunalign, int, "cl_gunalign"); -REPLICATE(cvar_cl_chat_sounds, bool, "cl_chat_sounds"); +REPLICATE(cvar_cl_cts_noautoswitch, bool, "cl_cts_noautoswitch"); REPLICATE(cvar_cl_handicap, float, "cl_handicap"); -REPLICATE(cvar_cl_jetpack_jump, bool, "cl_jetpack_jump"); -REPLICATE(cvar_cl_movement_track_canjump, bool, "cl_movement_track_canjump"); REPLICATE(cvar_cl_noantilag, bool, "cl_noantilag"); -REPLICATE(cvar_cl_physics, string, "cl_physics"); -REPLICATE(cvar_cl_voice_directional, int, "cl_voice_directional"); -REPLICATE(cvar_cl_voice_directional_taunt_attenuation, float, "cl_voice_directional_taunt_attenuation"); -REPLICATE(cvar_cl_weaponimpulsemode, int, "cl_weaponimpulsemode"); +REPLICATE(cvar_cl_chat_sounds, bool, "cl_chat_sounds"); REPLICATE(cvar_g_xonoticversion, string, "g_xonoticversion"); -REPLICATE(cvar_cl_cts_noautoswitch, bool, "cl_cts_noautoswitch"); -REPLICATE(cvar_cl_weapon_switch_reload, bool, "cl_weapon_switch_reload"); -REPLICATE(cvar_cl_weapon_switch_fallback_to_impulse, bool, "cl_weapon_switch_fallback_to_impulse"); -/* -// cvar cl_newusekeysupported doesn't exist -float cvar_cl_newusekeysupported; -REPLICATE(cvar_cl_newusekeysupported, bool, "cl_newusekeysupported"); -*/ -// cvar_cl_allow_uidtracking is handled specially on the server -#ifdef CSQC -REPLICATE(cvar_cl_allow_uidtracking, int, "cl_allow_uidtracking"); -#endif - -REPLICATE(cvar_cl_weaponpriority, string, "cl_weaponpriority"); - -REPLICATE(cvar_cl_weaponpriorities[0], string, "cl_weaponpriority0"); -REPLICATE(cvar_cl_weaponpriorities[1], string, "cl_weaponpriority1"); -REPLICATE(cvar_cl_weaponpriorities[2], string, "cl_weaponpriority2"); -REPLICATE(cvar_cl_weaponpriorities[3], string, "cl_weaponpriority3"); -REPLICATE(cvar_cl_weaponpriorities[4], string, "cl_weaponpriority4"); -REPLICATE(cvar_cl_weaponpriorities[5], string, "cl_weaponpriority5"); -REPLICATE(cvar_cl_weaponpriorities[6], string, "cl_weaponpriority6"); -REPLICATE(cvar_cl_weaponpriorities[7], string, "cl_weaponpriority7"); -REPLICATE(cvar_cl_weaponpriorities[8], string, "cl_weaponpriority8"); -REPLICATE(cvar_cl_weaponpriorities[9], string, "cl_weaponpriority9"); #endif diff --git a/qcsrc/common/resources.qh b/qcsrc/common/resources.qh deleted file mode 100644 index 81f4eb54a..000000000 --- a/qcsrc/common/resources.qh +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -/// \file -/// \brief Header file that describes resource types. -/// \author Lyberta -/// \copyright GNU GPLv2 or any later version. - -/// \brief Unconditional maximum amount of resources the entity can have. -const int RES_AMOUNT_HARD_LIMIT = 999; -const int RES_LIMIT_NONE = -1; - -/// \brief Describes the available resource types. -enum -{ - RES_NONE, ///< Indicates the lack of resource. Use with caution. - RES_HEALTH, ///< Health. - RES_ARMOR, ///< Armor. - RES_SHELLS, ///< Shells (used by shotgun). - RES_BULLETS, ///< Bullets (used by machinegun, rifle, HMG) - RES_ROCKETS, ///< Rockets (used by mortar, hagar, devastator, etc). - RES_CELLS, ///< Cells (used by electro, crylink, vortex, etc) - RES_PLASMA, ///< Plasma (unused). - RES_FUEL ///< Fuel (used by jetpack). -}; diff --git a/qcsrc/common/resources/_mod.inc b/qcsrc/common/resources/_mod.inc new file mode 100644 index 000000000..27e682319 --- /dev/null +++ b/qcsrc/common/resources/_mod.inc @@ -0,0 +1,8 @@ +// generated file; do not modify +#include +#ifdef CSQC + #include +#endif +#ifdef SVQC + #include +#endif diff --git a/qcsrc/common/resources/_mod.qh b/qcsrc/common/resources/_mod.qh new file mode 100644 index 000000000..d1ef95f4e --- /dev/null +++ b/qcsrc/common/resources/_mod.qh @@ -0,0 +1,8 @@ +// generated file; do not modify +#include +#ifdef CSQC + #include +#endif +#ifdef SVQC + #include +#endif diff --git a/qcsrc/common/resources/all.inc b/qcsrc/common/resources/all.inc new file mode 100644 index 000000000..51e0bccad --- /dev/null +++ b/qcsrc/common/resources/all.inc @@ -0,0 +1,61 @@ +REGISTER_RESOURCE(HEALTH, NEW(Resource)) { + this.netname = "health"; +#ifdef GAMEQC + this.m_field = health; +#endif +} +REGISTER_RESOURCE(ARMOR, NEW(Resource)) { + this.netname = "armor"; +#ifdef GAMEQC + this.m_field = armorvalue; +#endif +} + +CLASS(AmmoResource, Resource) +#ifdef CSQC + ATTRIB(AmmoResource, m_hidden, bool, false); +#endif +ENDCLASS(AmmoResource) + +REGISTER_RESOURCE(SHELLS, NEW(AmmoResource)) { + this.netname = "shells"; +#ifdef GAMEQC + this.m_field = ammo_shells; +#endif +} +REGISTER_RESOURCE(BULLETS, NEW(AmmoResource)) { + this.netname = "bullets"; +#ifdef GAMEQC + this.m_field = ammo_nails; +#endif +} +REGISTER_RESOURCE(ROCKETS, NEW(AmmoResource)) { + this.netname = "rockets"; +#ifdef GAMEQC + this.m_field = ammo_rockets; +#endif +} +REGISTER_RESOURCE(CELLS, NEW(AmmoResource)) { + this.netname = "cells"; +#ifdef GAMEQC + this.m_field = ammo_cells; +#endif +} +REGISTER_RESOURCE(PLASMA, NEW(AmmoResource)) { + this.netname = "plasma"; +#ifdef GAMEQC + this.m_field = ammo_plasma; +#endif +#ifdef CSQC + this.m_hidden = true; // WIP ammo type +#endif +} +REGISTER_RESOURCE(FUEL, NEW(AmmoResource)) { + this.netname = "fuel"; +#ifdef GAMEQC + this.m_field = ammo_fuel; +#endif +#ifdef CSQC + this.m_hidden = true; // displayed in a separate panel +#endif +} diff --git a/qcsrc/common/resources/cl_resources.qc b/qcsrc/common/resources/cl_resources.qc new file mode 100644 index 000000000..fc259005d --- /dev/null +++ b/qcsrc/common/resources/cl_resources.qc @@ -0,0 +1,52 @@ +#include "cl_resources.qh" + +#include +#include + +/// \file +/// \brief Source file that contains implementation of the resource system. +/// \copyright GNU GPLv2 or any later version. + +float GetResource(entity e, Resource res_type) +{ + return e.(GetResourceField(res_type)); +} + +bool SetResourceExplicit(entity e, Resource res_type, float amount) +{ + .float res_field = GetResourceField(res_type); + if (e.(res_field) != amount) + { + e.(res_field) = amount; + return true; + } + return false; +} + +void SetResource(entity e, Resource res_type, float amount) +{ + SetResourceExplicit(e, res_type, amount); +} + +void TakeResource(entity receiver, Resource res_type, float amount) +{ + if (amount == 0) + { + return; + } + SetResource(receiver, res_type, GetResource(receiver, res_type) - amount); +} + +void TakeResourceWithLimit(entity receiver, Resource res_type, float amount, float limit) +{ + if (amount == 0) + { + return; + } + float current_amount = GetResource(receiver, res_type); + if (current_amount - amount < limit) + { + amount = limit + current_amount; + } + TakeResource(receiver, res_type, amount); +} diff --git a/qcsrc/client/resources.qh b/qcsrc/common/resources/cl_resources.qh similarity index 62% rename from qcsrc/client/resources.qh rename to qcsrc/common/resources/cl_resources.qh index 4b0eaa8e7..f03c1dc3d 100644 --- a/qcsrc/client/resources.qh +++ b/qcsrc/common/resources/cl_resources.qh @@ -4,7 +4,7 @@ /// \brief Header file that describes the resource system. /// \copyright GNU GPLv2 or any later version. -#include +#include // ============================ Public API ==================================== @@ -12,28 +12,28 @@ /// \param[in] e Entity to check. /// \param[in] res_type Type of the resource (a RES_* constant). /// \return Current amount of resource the given entity has. -float GetResource(entity e, int res_type); +float GetResource(entity e, Resource res_type); /// \brief Sets the resource amount of an entity without calling any hooks. /// \param[in,out] e Entity to adjust. /// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to set. /// \return Boolean for whether the ammo amount was changed -bool SetResourceExplicit(entity e, int res_type, float amount); +bool SetResourceExplicit(entity e, Resource res_type, float amount); /// \brief Sets the current amount of resource the given entity will have. /// \param[in,out] e Entity to adjust. /// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to set. /// \return No return. -void SetResource(entity e, int res_type, float amount); +void SetResource(entity e, Resource res_type, float amount); /// \brief Takes an entity some resource. /// \param[in,out] receiver Entity to take resource from. /// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to take. /// \return No return. -void TakeResource(entity receiver, int res_type, float amount); +void TakeResource(entity receiver, Resource res_type, float amount); /// \brief Takes an entity some resource but not less than a limit. /// \param[in,out] receiver Entity to take resource from. @@ -41,20 +41,4 @@ void TakeResource(entity receiver, int res_type, float amount); /// \param[in] amount Amount of resource to take. /// \param[in] limit Limit of resources to take. /// \return No return. -void TakeResourceWithLimit(entity receiver, int res_type, float amount, float limit); - -// ===================== Legacy and/or internal API =========================== - -/// \brief Converts an entity field to resource type. -/// \param[in] res_field Entity field to convert. -/// \return Resource type (a RES_* constant). -int GetResourceType(.float res_field); - -/// \brief Converts resource type (a RES_* constant) to entity field. -/// \param[in] res_type Type of the resource. -/// \return Entity field for that resource. -.float GetResourceField(int res_type); - -/// \brief Legacy fields for the resources. To be removed. -.float health; -.float armorvalue; +void TakeResourceWithLimit(entity receiver, Resource res_type, float amount, float limit); diff --git a/qcsrc/common/resources/resources.qc b/qcsrc/common/resources/resources.qc new file mode 100644 index 000000000..84bb25ab4 --- /dev/null +++ b/qcsrc/common/resources/resources.qc @@ -0,0 +1,15 @@ +#include "resources.qh" + +#ifdef GAMEQC +Resource GetResourceType(.float res_field) +{ + FOREACH(Resources, it.m_field == res_field, return it); + error("GetResourceType: Invalid field."); + return RES_NONE; +} + +.float GetResourceField(Resource res_type) +{ + return res_type.m_field; +} +#endif diff --git a/qcsrc/common/resources/resources.qh b/qcsrc/common/resources/resources.qh new file mode 100644 index 000000000..0ecd29da2 --- /dev/null +++ b/qcsrc/common/resources/resources.qh @@ -0,0 +1,65 @@ +#pragma once + +#ifdef SVQC + #include +#endif + +#ifdef CSQC +/// \brief Legacy fields for the resources. To be removed. +.float health; +.float armorvalue; +#endif + +#if 1 +.int ammo_none; +.int ammo_shells; +.int ammo_nails; +.int ammo_rockets; +.int ammo_cells; +#ifdef SVQC +const .int ammo_plasma = _STAT(PLASMA); +const .int ammo_fuel = _STAT(FUEL); +#else +.int ammo_plasma; +.int ammo_fuel; +#endif +#endif + +CLASS(Resource, Object) + ATTRIB(Resource, netname, string, ""); +#ifdef GAMEQC + ATTRIB(Resource, m_field, .float, health); +#endif +ENDCLASS(Resource) + +#define REGISTER_RESOURCE(id, inst) REGISTER(Resources, RES, id, m_id, inst) +REGISTRY(Resources, BITS(4)); +REGISTER_REGISTRY(Resources) +REGISTRY_SORT(Resources); +REGISTRY_CHECK(Resources); + +REGISTRY_DEFINE_GET(Resources, NULL) +STATIC_INIT(Resources_renumber) { FOREACH(Resources, true, it.m_id = i); } + +/// \brief Unconditional maximum amount of resources the entity can have. +const int RES_AMOUNT_HARD_LIMIT = 999; +const int RES_LIMIT_NONE = -1; + +/// \brief Describes the available resource types. +REGISTER_RESOURCE(NONE, NEW(Resource)); ///< Indicates the lack of resource. Use with caution. + +#include "all.inc" + +#ifdef GAMEQC +// ===================== Legacy and/or internal API =========================== + +/// \brief Converts an entity field to resource type. +/// \param[in] res_field Entity field to convert. +/// \return Resource type (a RES_* constant). +Resource GetResourceType(.float res_field); + +/// \brief Converts resource type (a RES_* constant) to entity field. +/// \param[in] res_type Type of the resource. +/// \return Entity field for that resource. +.float GetResourceField(Resource res_type); +#endif diff --git a/qcsrc/server/resources.qc b/qcsrc/common/resources/sv_resources.qc similarity index 71% rename from qcsrc/server/resources.qc rename to qcsrc/common/resources/sv_resources.qc index e0b8995f1..9984e9111 100644 --- a/qcsrc/server/resources.qc +++ b/qcsrc/common/resources/sv_resources.qc @@ -1,19 +1,21 @@ -#include "resources.qh" +#include "sv_resources.qh" /// \file /// \brief Source file that contains implementation of the resource system. /// \author Lyberta /// \copyright GNU GPLv2 or any later version. +#include #include #include -float GetResourceLimit(entity e, int res_type) +float GetResourceLimit(entity e, Resource res_type) { if(!IS_PLAYER(e)) return RES_LIMIT_NONE; // no limits on non-players float limit; + // TODO: registry handles switch (res_type) { case RES_HEALTH: @@ -71,12 +73,12 @@ float GetResourceLimit(entity e, int res_type) return limit; } -float GetResource(entity e, int res_type) +float GetResource(entity e, Resource res_type) { return e.(GetResourceField(res_type)); } -bool SetResourceExplicit(entity e, int res_type, float amount) +bool SetResourceExplicit(entity e, Resource res_type, float amount) { .float res_field = GetResourceField(res_type); if (e.(res_field) != amount) @@ -87,14 +89,14 @@ bool SetResourceExplicit(entity e, int res_type, float amount) return false; } -void SetResource(entity e, int res_type, float amount) +void SetResource(entity e, Resource res_type, float amount) { bool forbid = MUTATOR_CALLHOOK(SetResource, e, res_type, amount); if (forbid) { return; } - res_type = M_ARGV(1, int); + res_type = M_ARGV(1, entity); amount = M_ARGV(2, float); float max_amount = GetResourceLimit(e, res_type); // TODO: should allow overriding these limits if cheats are enabled! float amount_wasted = 0; @@ -115,7 +117,7 @@ void SetResource(entity e, int res_type, float amount) MUTATOR_CALLHOOK(ResourceWasted, e, res_type, amount_wasted); } -void GiveResource(entity receiver, int res_type, float amount) +void GiveResource(entity receiver, Resource res_type, float amount) { if (amount <= 0) { @@ -126,13 +128,14 @@ void GiveResource(entity receiver, int res_type, float amount) { return; } - res_type = M_ARGV(1, int); + res_type = M_ARGV(1, entity); amount = M_ARGV(2, float); if (amount <= 0) { return; } SetResource(receiver, res_type, GetResource(receiver, res_type) + amount); + // TODO: registry handles switch (res_type) { case RES_HEALTH: @@ -158,7 +161,7 @@ void GiveResource(entity receiver, int res_type, float amount) } } -void GiveResourceWithLimit(entity receiver, int res_type, float amount, float limit) +void GiveResourceWithLimit(entity receiver, Resource res_type, float amount, float limit) { if (amount <= 0) { @@ -169,7 +172,7 @@ void GiveResourceWithLimit(entity receiver, int res_type, float amount, float li { return; } - res_type = M_ARGV(1, int); + res_type = M_ARGV(1, entity); amount = M_ARGV(2, float); limit = M_ARGV(3, float); if (amount <= 0) @@ -184,7 +187,7 @@ void GiveResourceWithLimit(entity receiver, int res_type, float amount, float li GiveResource(receiver, res_type, amount); } -void TakeResource(entity receiver, int res_type, float amount) +void TakeResource(entity receiver, Resource res_type, float amount) { if (amount <= 0) { @@ -195,7 +198,7 @@ void TakeResource(entity receiver, int res_type, float amount) { return; } - res_type = M_ARGV(1, int); + res_type = M_ARGV(1, entity); amount = M_ARGV(2, float); if (amount <= 0) { @@ -204,7 +207,7 @@ void TakeResource(entity receiver, int res_type, float amount) SetResource(receiver, res_type, GetResource(receiver, res_type) - amount); } -void TakeResourceWithLimit(entity receiver, int res_type, float amount, float limit) +void TakeResourceWithLimit(entity receiver, Resource res_type, float amount, float limit) { if (amount <= 0) { @@ -215,7 +218,7 @@ void TakeResourceWithLimit(entity receiver, int res_type, float amount, float li { return; } - res_type = M_ARGV(1, int); + res_type = M_ARGV(1, entity); amount = M_ARGV(2, float); limit = M_ARGV(3, float); if (amount <= 0) @@ -229,37 +232,3 @@ void TakeResourceWithLimit(entity receiver, int res_type, float amount, float li } TakeResource(receiver, res_type, amount); } - -int GetResourceType(.float res_field) -{ - switch (res_field) - { - case health: { return RES_HEALTH; } - case armorvalue: { return RES_ARMOR; } - case ammo_shells: { return RES_SHELLS; } - case ammo_nails: { return RES_BULLETS; } - case ammo_rockets: { return RES_ROCKETS; } - case ammo_cells: { return RES_CELLS; } - case ammo_plasma: { return RES_PLASMA; } - case ammo_fuel: { return RES_FUEL; } - } - error("GetResourceType: Invalid field."); - return 0; -} - -.float GetResourceField(int res_type) -{ - switch (res_type) - { - case RES_HEALTH: { return health; } - case RES_ARMOR: { return armorvalue; } - case RES_SHELLS: { return ammo_shells; } - case RES_BULLETS: { return ammo_nails; } - case RES_ROCKETS: { return ammo_rockets; } - case RES_CELLS: { return ammo_cells; } - case RES_PLASMA: { return ammo_plasma; } - case RES_FUEL: { return ammo_fuel; } - } - error("GetResourceField: Invalid resource type."); - return health; -} diff --git a/qcsrc/server/resources.qh b/qcsrc/common/resources/sv_resources.qh similarity index 77% rename from qcsrc/server/resources.qh rename to qcsrc/common/resources/sv_resources.qh index 05cb602c3..738501433 100644 --- a/qcsrc/server/resources.qh +++ b/qcsrc/common/resources/sv_resources.qh @@ -5,7 +5,7 @@ /// \author Lyberta /// \copyright GNU GPLv2 or any later version. -#include +#include // TODO: split resources into their own files, registry based float autocvar_g_balance_health_limit; @@ -41,20 +41,20 @@ float autocvar_g_balance_pause_health_rot; /// \param[in] e Entity to check. /// \param[in] res_type Type of the resource (a RES_* constant). /// \return Maximum amount of the given resource. -float GetResourceLimit(entity e, int res_type); +float GetResourceLimit(entity e, Resource res_type); /// \brief Returns the current amount of resource the given entity has. /// \param[in] e Entity to check. /// \param[in] res_type Type of the resource (a RES_* constant). /// \return Current amount of resource the given entity has. -float GetResource(entity e, int res_type); +float GetResource(entity e, Resource res_type); /// \brief Sets the resource amount of an entity without calling any hooks. /// \param[in,out] e Entity to adjust. /// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to set. /// \return Boolean for whether the ammo amount was changed -bool SetResourceExplicit(entity e, int res_type, float amount); +bool SetResourceExplicit(entity e, Resource res_type, float amount); /// \brief Sets the current amount of resource the given entity will have /// but limited to the max amount allowed for the resource type. @@ -62,14 +62,14 @@ bool SetResourceExplicit(entity e, int res_type, float amount); /// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to set. /// \return No return. -void SetResource(entity e, int res_type, float amount); +void SetResource(entity e, Resource res_type, float amount); /// \brief Gives an entity some resource. /// \param[in,out] receiver Entity to give resource to. /// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to give. /// \return No return. -void GiveResource(entity receiver, int res_type, float amount); +void GiveResource(entity receiver, Resource res_type, float amount); /// \brief Gives an entity some resource but not more than a limit. /// \param[in,out] receiver Entity to give resource to. @@ -77,14 +77,14 @@ void GiveResource(entity receiver, int res_type, float amount); /// \param[in] amount Amount of resource to give. /// \param[in] limit Limit of resources to give. /// \return No return. -void GiveResourceWithLimit(entity receiver, int res_type, float amount, float limit); +void GiveResourceWithLimit(entity receiver, Resource res_type, float amount, float limit); /// \brief Takes an entity some resource. /// \param[in,out] receiver Entity to take resource from. /// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to take. /// \return No return. -void TakeResource(entity receiver, int res_type, float amount); +void TakeResource(entity receiver, Resource res_type, float amount); /// \brief Takes an entity some resource but not less than a limit. /// \param[in,out] receiver Entity to take resource from. @@ -92,16 +92,4 @@ void TakeResource(entity receiver, int res_type, float amount); /// \param[in] amount Amount of resource to take. /// \param[in] limit Limit of resources to take. /// \return No return. -void TakeResourceWithLimit(entity receiver, int res_type, float amount, float limit); - -// ===================== Legacy and/or internal API =========================== - -/// \brief Converts an entity field to resource type. -/// \param[in] res_field Entity field to convert. -/// \return Resource type (a RES_* constant). -int GetResourceType(.float res_field); - -/// \brief Converts resource type (a RES_* constant) to entity field. -/// \param[in] res_type Type of the resource. -/// \return Entity field for that resource. -.float GetResourceField(int res_type); +void TakeResourceWithLimit(entity receiver, Resource res_type, float amount, float limit); diff --git a/qcsrc/common/scores.qh b/qcsrc/common/scores.qh index 63e49ae5f..05cc03e6a 100644 --- a/qcsrc/common/scores.qh +++ b/qcsrc/common/scores.qh @@ -15,7 +15,6 @@ STATIC_INIT(Scores_renumber) { FOREACH(Scores, true, it.m_id = i); } * Score indices */ -// game mode specific indices are not in common/, but in server/scores_rules.qc! #ifdef GAMEQC // fields not networked via the score system REGISTER_SP(END); @@ -111,6 +110,7 @@ REGISTER_SP(MEDAL_KILLSTREAK_03); REGISTER_SP(MEDAL_KILLSTREAK_05); REGISTER_SP(MEDAL_KILLSTREAK_10); REGISTER_SP(MEDAL_KILLSTREAK_15); +REGISTER_SP(MMM_KARMA); //LegendGuard adds REGISTER_SP for MMM Karma points 21-02-2021 #endif diff --git a/qcsrc/common/sounds/all.inc b/qcsrc/common/sounds/all.inc index 46bd39ca2..7b94cacd2 100644 --- a/qcsrc/common/sounds/all.inc +++ b/qcsrc/common/sounds/all.inc @@ -280,6 +280,8 @@ SOUND(ENDMATCH, "misc/endmatch"); SOUND(OVERTIME, "misc/overtime"); SOUND(TIMEOUT, "misc/timeout"); +SOUND(MIDAIR, "misc/midair"); + SOUND(SPAWN, "misc/spawn"); SOUND(TALK, "misc/talk"); diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc index 126b61768..9738c8378 100644 --- a/qcsrc/common/state.qc +++ b/qcsrc/common/state.qc @@ -6,7 +6,6 @@ void Inventory_new(PlayerState this); void Inventory_delete(entity this); void Inventory_clear(PlayerState this); -//void Inventory_ClearAll(); void InventoryStorage_attach(PlayerState this); void InventoryStorage_delete(PlayerState this); diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index 1b8c74e15..0563b5930 100644 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@ -80,12 +80,14 @@ float game_starttime; //point in time when the countdown to game start is over float round_starttime; //point in time when the countdown to round start is over float overtime_starttime; // z411 point in time where first overtime started -float checkrules_overtimesadded; // z411 add float timeout_last; float timeout_total_time; bool game_timeout; int autocvar_leadlimit; +int overtimes; // overtimes added (-1 = sudden death) +int timeout_status; // (values: 0, 1, 2) contains whether a timeout is not active (0), was called but still at leadtime (1) or is active (2) + // TODO: world.qh can't be included here due to circular includes! #define autocvar_fraglimit cvar("fraglimit") #define autocvar_fraglimit_override cvar("fraglimit_override") @@ -101,7 +103,6 @@ REGISTER_STAT(GAMESTARTTIME, float, game_starttime) /** arc heat in [0,1] */ REGISTER_STAT(PRESSED_KEYS, int) REGISTER_STAT(FUEL, int) -REGISTER_STAT(NB_METERSTART, float) /** compressShotOrigin */ REGISTER_STAT(SHOTORG, int) REGISTER_STAT(LEADLIMIT, float, autocvar_leadlimit) @@ -126,8 +127,8 @@ REGISTER_STAT(NADE_TIMER, float) //REGISTER_STAT(SECRETS_FOUND, int, secrets_found) REGISTER_STAT(RESPAWN_TIME, float) REGISTER_STAT(ROUNDSTARTTIME, float, round_starttime) -REGISTER_STAT(OVERTIMESTARTTIME, float, overtime_starttime) -REGISTER_STAT(OVERTIMESADDED, float, checkrules_overtimesadded) +REGISTER_STAT(OVERTIMES, int, overtimes) +REGISTER_STAT(TIMEOUT_STATUS, int, timeout_status) REGISTER_STAT(MONSTERS_TOTAL, int) REGISTER_STAT(MONSTERS_KILLED, int) REGISTER_STAT(NADE_BONUS, float) @@ -146,11 +147,6 @@ REGISTER_STAT(ITEMSTIME, int, autocvar_sv_itemstime) REGISTER_STAT(KILL_TIME, float) REGISTER_STAT(VEIL_ORB, float) REGISTER_STAT(VEIL_ORB_ALPHA, float) -REGISTER_STAT(AMMUNITIONING_ORB, float) //LegendGuard registers new STAT 11-02-2021 -REGISTER_STAT(AMMUNITIONING_ORB_ALPHA, float) -REGISTER_STAT(DARK_ORB, float) //LegendGuard registers new STAT 08-02-2021 -REGISTER_STAT(DARK_ORB_ALPHA, float) - #ifdef SVQC float autocvar_sv_showfps = 0; #endif @@ -354,6 +350,9 @@ REGISTER_STAT(DOM_PPS_BLUE, float) REGISTER_STAT(DOM_PPS_YELLOW, float) REGISTER_STAT(DOM_PPS_PINK, float) +// nexball +REGISTER_STAT(NB_METERSTART, float) + #ifdef SVQC float autocvar_g_teleport_maxspeed; #endif @@ -374,6 +373,7 @@ REGISTER_STAT(Q3COMPAT, int, q3compat) #ifdef SVQC #include "physics/movetypes/movetypes.qh" float warmup_limit; +float round_limit; #endif #ifdef SVQC @@ -413,6 +413,7 @@ REGISTER_STAT(MOVEVARS_AIRCONTROL, float) REGISTER_STAT(FRAGLIMIT, float, autocvar_fraglimit) REGISTER_STAT(TIMELIMIT, float, autocvar_timelimit) REGISTER_STAT(WARMUP_TIMELIMIT, float, warmup_limit) +REGISTER_STAT(ROUND_TIMELIMIT, float, round_limit) #ifdef SVQC float autocvar_sv_wallfriction; #define autocvar_sv_gravity cvar("sv_gravity") @@ -444,3 +445,5 @@ REGISTER_STAT(GUNALIGN, int) #ifdef SVQC SPECTATE_COPYFIELD(_STAT(GUNALIGN)) #endif + +REGISTER_STAT(MMM_ROUNDTIMER, float) //LegendGuard adds MMM_ROUNDTIMER for MMM 20-02-2021 diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index f41eb45d5..896070812 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -318,7 +318,7 @@ string ScoreString(int pFlags, float pValue) if((pValue == 0) && (pFlags & (SFL_HIDE_ZERO | SFL_RANK | SFL_TIME))) valstr = ""; else if(pFlags & SFL_RANK) - valstr = count_ordinal(pValue); + valstr = (pValue < 256 ? count_ordinal(pValue) : _("N/A")); else if(pFlags & SFL_TIME) valstr = TIME_ENCODED_TOSTRING(pValue); else diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 63fd27839..1334f5ec3 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -54,7 +54,7 @@ void depthfirst(entity start, .entity up, .entity downleft, .entity right, void( const int TIME_DECIMALS = 2; const float TIME_FACTOR = 100; -#define TIME_ENCODED_TOSTRING(n) mmssss(n) +#define TIME_ENCODED_TOSTRING(n) mmssth(n) #define RACE_RECORD "/race100record/" #define CTS_RECORD "/cts100record/" #define CTF_RECORD "/ctf100record/" diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc index bbecb83da..302b39a0d 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qc +++ b/qcsrc/common/vehicles/sv_vehicles.qc @@ -569,7 +569,7 @@ void vehicles_regen(entity this, float timer, .float regen_field, float field_ma } } -void vehicles_regen_resource(entity this, float timer, .float regen_field, float field_max, float rpause, float regen, float delta_time, float _healthscale, int resource) +void vehicles_regen_resource(entity this, float timer, .float regen_field, float field_max, float rpause, float regen, float delta_time, float _healthscale, Resource resource) { float resource_amount = GetResource(this, resource); diff --git a/qcsrc/common/vehicles/vehicle/_mod.inc b/qcsrc/common/vehicles/vehicle/_mod.inc index d29eaa5d0..065f760d2 100644 --- a/qcsrc/common/vehicles/vehicle/_mod.inc +++ b/qcsrc/common/vehicles/vehicle/_mod.inc @@ -7,7 +7,3 @@ #include #include #include - -//LegendGuard's Cyberchopper vehicle -//#include -//#include diff --git a/qcsrc/common/vehicles/vehicle/_mod.qh b/qcsrc/common/vehicles/vehicle/_mod.qh index 1c6fee5d8..3d6606eb9 100644 --- a/qcsrc/common/vehicles/vehicle/_mod.qh +++ b/qcsrc/common/vehicles/vehicle/_mod.qh @@ -7,7 +7,3 @@ #include #include #include - -//LegendGuard's Cyberchopper vehicle -//#include -//#include \ No newline at end of file diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 7ef3cc1e8..6bf2d105f 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -202,7 +202,8 @@ WepSet W_RandomWeapons(entity e, WepSet remaining, int n) return result; } -string GetAmmoPicture(int ammotype) +// TODO: registry handles for below functions +string GetAmmoPicture(Resource ammotype) { switch (ammotype) { @@ -216,7 +217,7 @@ string GetAmmoPicture(int ammotype) } } -string GetAmmoName(int ammotype) +string GetAmmoName(Resource ammotype) { switch (ammotype) { @@ -230,7 +231,7 @@ string GetAmmoName(int ammotype) } } -entity GetAmmoItem(int ammotype) +entity GetAmmoItem(Resource ammotype) { switch (ammotype) { @@ -241,14 +242,14 @@ entity GetAmmoItem(int ammotype) case RES_PLASMA: return ITEM_Plasma; case RES_FUEL: return ITEM_JetpackFuel; } - LOG_WARNF("Invalid ammo type %d ", ammotype); + LOG_WARNF("Invalid ammo type %d ", ammotype.m_id); return NULL; // WEAPONTODO: use this generic func to reduce duplication ? // GetAmmoPicture GetAmmoName notif_arg_item_wepammo ammo_pickupevalfunc ? } #ifdef CSQC -int GetAmmoTypeFromNum(int i) +Resource GetAmmoTypeFromNum(int i) { switch (i) { @@ -262,7 +263,7 @@ int GetAmmoTypeFromNum(int i) } } -int GetAmmoStat(int ammotype) +int GetAmmoStat(Resource ammotype) { switch (ammotype) { @@ -826,3 +827,35 @@ NET_HANDLE(w_muzzleflash, bool isNew) #endif #endif + +#ifdef SVQC +string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(entity this, string wo) +{ + string o = W_FixWeaponOrder_ForceComplete(wo); + strcpy(CS_CVAR(this).weaponorder_byimpulse, W_FixWeaponOrder_BuildImpulseList(o)); + return o; +} +#endif + +#ifdef CSQC +REPLICATE(cvar_cl_accuracy_data_share, bool, "cl_accuracy_data_share"); +REPLICATE(cvar_cl_accuracy_data_receive, bool, "cl_accuracy_data_receive"); +#endif + +#ifdef GAMEQC +REPLICATE(cvar_cl_gunalign, int, "cl_gunalign"); +REPLICATE(cvar_cl_weapon_switch_reload, bool, "cl_weapon_switch_reload"); +REPLICATE(cvar_cl_weapon_switch_fallback_to_impulse, bool, "cl_weapon_switch_fallback_to_impulse"); +REPLICATE(cvar_cl_weaponimpulsemode, int, "cl_weaponimpulsemode"); +REPLICATE(cvar_cl_weaponpriority, string, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList); +REPLICATE(cvar_cl_weaponpriorities[0], string, "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete); +REPLICATE(cvar_cl_weaponpriorities[1], string, "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete); +REPLICATE(cvar_cl_weaponpriorities[2], string, "cl_weaponpriority2", W_FixWeaponOrder_AllowIncomplete); +REPLICATE(cvar_cl_weaponpriorities[3], string, "cl_weaponpriority3", W_FixWeaponOrder_AllowIncomplete); +REPLICATE(cvar_cl_weaponpriorities[4], string, "cl_weaponpriority4", W_FixWeaponOrder_AllowIncomplete); +REPLICATE(cvar_cl_weaponpriorities[5], string, "cl_weaponpriority5", W_FixWeaponOrder_AllowIncomplete); +REPLICATE(cvar_cl_weaponpriorities[6], string, "cl_weaponpriority6", W_FixWeaponOrder_AllowIncomplete); +REPLICATE(cvar_cl_weaponpriorities[7], string, "cl_weaponpriority7", W_FixWeaponOrder_AllowIncomplete); +REPLICATE(cvar_cl_weaponpriorities[8], string, "cl_weaponpriority8", W_FixWeaponOrder_AllowIncomplete); +REPLICATE(cvar_cl_weaponpriorities[9], string, "cl_weaponpriority9", W_FixWeaponOrder_AllowIncomplete); +#endif diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 24057a0b8..682468043 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -394,18 +394,26 @@ ENUMCLASS_END(WFRAME) vector shotorg_adjust_values(vector vecs, bool y_is_right, bool visual, int algn); void CL_WeaponEntity_SetModel(entity this, string name, bool _anim); +REPLICATE_INIT(int, cvar_cl_gunalign); +REPLICATE_INIT(bool, cvar_cl_weapon_switch_reload); +REPLICATE_INIT(bool, cvar_cl_weapon_switch_fallback_to_impulse); +REPLICATE_INIT(int, cvar_cl_weaponimpulsemode); + +REPLICATE_INIT(string, cvar_cl_weaponpriority); +REPLICATE_INIT(string, cvar_cl_weaponpriorities[10]); + #ifdef CSQC -bool cvar_cl_accuracy_data_share; -REPLICATE(cvar_cl_accuracy_data_share, bool, "cl_accuracy_data_share"); -bool cvar_cl_accuracy_data_receive; -REPLICATE(cvar_cl_accuracy_data_receive, bool, "cl_accuracy_data_receive"); +REPLICATE_INIT(bool, cvar_cl_accuracy_data_share); +REPLICATE_INIT(bool, cvar_cl_accuracy_data_receive); #endif #ifdef SVQC void wframe_send(entity actor, entity weaponentity, int wepframe, float attackrate, bool restartanim); -#endif -#ifdef SVQC void W_MuzzleFlash(Weapon thiswep, entity actor, .entity weaponentity, vector shotorg, vector shotdir); + +string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(entity this, string wo); +string W_FixWeaponOrder_AllowIncomplete(entity this, string order); #endif + #endif diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh index 83f3f4a0f..ec6e14eb6 100644 --- a/qcsrc/common/weapons/weapon.qh +++ b/qcsrc/common/weapons/weapon.qh @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include #ifdef SVQC @@ -45,7 +45,7 @@ CLASS(Weapon, Object) /** control what happens when this weapon is spawned */ METHOD(Weapon, m_spawnfunc_hookreplace, Weapon(Weapon this, entity e)) { return this; } /** M: ammotype : main ammo type */ - ATTRIB(Weapon, ammo_type, int, RES_NONE); + ATTRIB(Weapon, ammo_type, Resource, RES_NONE); /** M: impulse : weapon impulse */ ATTRIB(Weapon, impulse, int, -1); /** M: flags : WEPSPAWNFLAG_... combined */ @@ -223,15 +223,16 @@ string W_FixWeaponOrder_AllowIncomplete(entity this, string order); string W_FixWeaponOrder_ForceComplete(string order); WepSet W_RandomWeapons(entity e, WepSet remaining, int n); -string GetAmmoPicture(int ammotype); +string GetAmmoPicture(Resource ammotype); -string GetAmmoName(int ammotype); +string GetAmmoName(Resource ammotype); -entity GetAmmoItem(int ammotype); +entity GetAmmoItem(Resource ammotype); #ifdef CSQC -int GetAmmoTypeFromNum(int i); -int GetAmmoStat(int ammotype); +Resource GetAmmoTypeFromNum(int i); + +int GetAmmoStat(Resource ammotype); #endif string W_Sound(string w_snd); diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc index 7c2ab081c..73198a7a4 100644 --- a/qcsrc/common/weapons/weapon/arc.qc +++ b/qcsrc/common/weapons/weapon/arc.qc @@ -938,7 +938,14 @@ void Draw_ArcBeam(entity this) // into a weapon system for client code. // find where we are aiming - vector myviewangle = ((autocvar_chase_active) ? warpzone_save_view_angles : view_angles); + vector myviewangle = view_angles; + if (autocvar_chase_active) + { + if (autocvar_cl_lockview) + myviewangle = eX * csqcplayer.v_angle.x + eY * csqcplayer.angles.y; + else + myviewangle = warpzone_save_view_angles; + } vector forward, right, up; MAKE_VECTORS(myviewangle, forward, right, up); entity wepent = viewmodels[this.beam_slot]; diff --git a/qcsrc/common/weapons/weapon/arc.qh b/qcsrc/common/weapons/weapon/arc.qh index 6db349889..15a2cb772 100644 --- a/qcsrc/common/weapons/weapon/arc.qh +++ b/qcsrc/common/weapons/weapon/arc.qh @@ -2,7 +2,7 @@ CLASS(Arc, Weapon) /* spawnfunc */ ATTRIB(Arc, m_canonical_spawnfunc, string, "weapon_arc"); -/* ammotype */ ATTRIB(Arc, ammo_type, int, RES_CELLS); +/* ammotype */ ATTRIB(Arc, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(Arc, impulse, int, 3); /* flags */ ATTRIB(Arc, spawnflags, int, WEP_TYPE_HITSCAN); /* rating */ ATTRIB(Arc, bot_pickupbasevalue, float, 8000); diff --git a/qcsrc/common/weapons/weapon/blaster.qh b/qcsrc/common/weapons/weapon/blaster.qh index ed966cf2f..d768abfaf 100644 --- a/qcsrc/common/weapons/weapon/blaster.qh +++ b/qcsrc/common/weapons/weapon/blaster.qh @@ -2,7 +2,7 @@ CLASS(Blaster, Weapon) /* spawnfunc */ ATTRIB(Blaster, m_canonical_spawnfunc, string, "weapon_blaster"); -/* ammotype */ //ATTRIB(Blaster, ammo_type, int, RES_NONE); +/* ammotype */ //ATTRIB(Blaster, ammo_type, Resource, RES_NONE); /* impulse */ ATTRIB(Blaster, impulse, int, 1); /* flags */ ATTRIB(Blaster, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Blaster, bot_pickupbasevalue, float, 0); diff --git a/qcsrc/common/weapons/weapon/crylink.qh b/qcsrc/common/weapons/weapon/crylink.qh index 501b87822..2329c364e 100644 --- a/qcsrc/common/weapons/weapon/crylink.qh +++ b/qcsrc/common/weapons/weapon/crylink.qh @@ -2,7 +2,7 @@ CLASS(Crylink, Weapon) /* spawnfunc */ ATTRIB(Crylink, m_canonical_spawnfunc, string, "weapon_crylink"); -/* ammotype */ ATTRIB(Crylink, ammo_type, int, RES_CELLS); +/* ammotype */ ATTRIB(Crylink, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(Crylink, impulse, int, 6); /* flags */ ATTRIB(Crylink, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_CANCLIMB); /* rating */ ATTRIB(Crylink, bot_pickupbasevalue, float, 6000); diff --git a/qcsrc/common/weapons/weapon/devastator.qh b/qcsrc/common/weapons/weapon/devastator.qh index 11481c6f9..70c72f52c 100644 --- a/qcsrc/common/weapons/weapon/devastator.qh +++ b/qcsrc/common/weapons/weapon/devastator.qh @@ -2,7 +2,7 @@ CLASS(Devastator, Weapon) /* spawnfunc */ ATTRIB(Devastator, m_canonical_spawnfunc, string, "weapon_devastator"); -/* ammotype */ ATTRIB(Devastator, ammo_type, int, RES_ROCKETS); +/* ammotype */ ATTRIB(Devastator, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(Devastator, impulse, int, 9); /* flags */ ATTRIB(Devastator, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Devastator, bot_pickupbasevalue, float, 8000); diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh index 6417243b2..e4263403b 100644 --- a/qcsrc/common/weapons/weapon/electro.qh +++ b/qcsrc/common/weapons/weapon/electro.qh @@ -2,7 +2,7 @@ CLASS(Electro, Weapon) /* spawnfunc */ ATTRIB(Electro, m_canonical_spawnfunc, string, "weapon_electro"); -/* ammotype */ ATTRIB(Electro, ammo_type, int, RES_CELLS); +/* ammotype */ ATTRIB(Electro, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(Electro, impulse, int, 5); /* flags */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Electro, bot_pickupbasevalue, float, 5000); diff --git a/qcsrc/common/weapons/weapon/fireball.qh b/qcsrc/common/weapons/weapon/fireball.qh index dc59a109c..c3dd73a2e 100644 --- a/qcsrc/common/weapons/weapon/fireball.qh +++ b/qcsrc/common/weapons/weapon/fireball.qh @@ -2,7 +2,7 @@ CLASS(Fireball, Weapon) /* spawnfunc */ ATTRIB(Fireball, m_canonical_spawnfunc, string, "weapon_fireball"); -/* ammotype */ //ATTRIB(Fireball, ammo_type, int, RES_NONE); +/* ammotype */ //ATTRIB(Fireball, ammo_type, Resource, RES_NONE); /* impulse */ ATTRIB(Fireball, impulse, int, 9); /* flags */ ATTRIB(Fireball, spawnflags, int, WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH | WEP_FLAG_NODUAL); /* rating */ ATTRIB(Fireball, bot_pickupbasevalue, float, 5000); diff --git a/qcsrc/common/weapons/weapon/hagar.qh b/qcsrc/common/weapons/weapon/hagar.qh index d9df8485f..5a43d84ef 100644 --- a/qcsrc/common/weapons/weapon/hagar.qh +++ b/qcsrc/common/weapons/weapon/hagar.qh @@ -2,7 +2,7 @@ CLASS(Hagar, Weapon) /* spawnfunc */ ATTRIB(Hagar, m_canonical_spawnfunc, string, "weapon_hagar"); -/* ammotype */ ATTRIB(Hagar, ammo_type, int, RES_ROCKETS); +/* ammotype */ ATTRIB(Hagar, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(Hagar, impulse, int, 8); /* flags */ ATTRIB(Hagar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Hagar, bot_pickupbasevalue, float, 6000); diff --git a/qcsrc/common/weapons/weapon/hlac.qh b/qcsrc/common/weapons/weapon/hlac.qh index 5ff0e2b30..ec07fa35a 100644 --- a/qcsrc/common/weapons/weapon/hlac.qh +++ b/qcsrc/common/weapons/weapon/hlac.qh @@ -2,7 +2,7 @@ CLASS(HLAC, Weapon) /* spawnfunc */ ATTRIB(HLAC, m_canonical_spawnfunc, string, "weapon_hlac"); -/* ammotype */ ATTRIB(HLAC, ammo_type, int, RES_CELLS); +/* ammotype */ ATTRIB(HLAC, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(HLAC, impulse, int, 6); /* flags */ ATTRIB(HLAC, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(HLAC, bot_pickupbasevalue, float, 4000); diff --git a/qcsrc/common/weapons/weapon/hook.qh b/qcsrc/common/weapons/weapon/hook.qh index 385fab4d6..25b1be507 100644 --- a/qcsrc/common/weapons/weapon/hook.qh +++ b/qcsrc/common/weapons/weapon/hook.qh @@ -2,7 +2,7 @@ CLASS(Hook, Weapon) /* spawnfunc */ ATTRIB(Hook, m_canonical_spawnfunc, string, "weapon_hook"); -/* ammotype */ ATTRIB(Hook, ammo_type, int, RES_FUEL); +/* ammotype */ ATTRIB(Hook, ammo_type, Resource, RES_FUEL); /* impulse */ ATTRIB(Hook, impulse, int, 0); /* flags */ ATTRIB(Hook, spawnflags, int, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Hook, bot_pickupbasevalue, float, 0); diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh index acf1668d7..9a2adf46c 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qh +++ b/qcsrc/common/weapons/weapon/machinegun.qh @@ -2,7 +2,7 @@ CLASS(MachineGun, Weapon) /* spawnfunc */ ATTRIB(MachineGun, m_canonical_spawnfunc, string, "weapon_machinegun"); -/* ammotype */ ATTRIB(MachineGun, ammo_type, int, RES_BULLETS); +/* ammotype */ ATTRIB(MachineGun, ammo_type, Resource, RES_BULLETS); /* impulse */ ATTRIB(MachineGun, impulse, int, 3); /* flags */ ATTRIB(MachineGun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_BLEED); /* rating */ ATTRIB(MachineGun, bot_pickupbasevalue, float, 7000); diff --git a/qcsrc/common/weapons/weapon/minelayer.qh b/qcsrc/common/weapons/weapon/minelayer.qh index b34ef9dd4..a574510f5 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qh +++ b/qcsrc/common/weapons/weapon/minelayer.qh @@ -2,7 +2,7 @@ CLASS(MineLayer, Weapon) /* spawnfunc */ ATTRIB(MineLayer, m_canonical_spawnfunc, string, "weapon_minelayer"); -/* ammotype */ ATTRIB(MineLayer, ammo_type, int, RES_ROCKETS); +/* ammotype */ ATTRIB(MineLayer, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(MineLayer, impulse, int, 4); /* flags */ ATTRIB(MineLayer, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(MineLayer, bot_pickupbasevalue, float, 7000); diff --git a/qcsrc/common/weapons/weapon/mortar.qh b/qcsrc/common/weapons/weapon/mortar.qh index 97ee20791..118e5c5f0 100644 --- a/qcsrc/common/weapons/weapon/mortar.qh +++ b/qcsrc/common/weapons/weapon/mortar.qh @@ -2,7 +2,7 @@ CLASS(Mortar, Weapon) /* spawnfunc */ ATTRIB(Mortar, m_canonical_spawnfunc, string, "weapon_mortar"); -/* ammotype */ ATTRIB(Mortar, ammo_type, int, RES_ROCKETS); +/* ammotype */ ATTRIB(Mortar, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(Mortar, impulse, int, 4); /* flags */ ATTRIB(Mortar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Mortar, bot_pickupbasevalue, float, 7000); diff --git a/qcsrc/common/weapons/weapon/porto.qh b/qcsrc/common/weapons/weapon/porto.qh index 6c1a6e7f2..757386b5c 100644 --- a/qcsrc/common/weapons/weapon/porto.qh +++ b/qcsrc/common/weapons/weapon/porto.qh @@ -2,7 +2,7 @@ CLASS(PortoLaunch, Weapon) /* spawnfunc */ ATTRIB(PortoLaunch, m_canonical_spawnfunc, string, "weapon_porto"); -/* ammotype */ ATTRIB(PortoLaunch, ammo_type, int, RES_NONE); +/* ammotype */ ATTRIB(PortoLaunch, ammo_type, Resource, RES_NONE); /* impulse */ ATTRIB(PortoLaunch, impulse, int, 0); /* flags */ ATTRIB(PortoLaunch, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_SUPERWEAPON | WEP_FLAG_NODUAL | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(PortoLaunch, bot_pickupbasevalue, float, 0); diff --git a/qcsrc/common/weapons/weapon/rifle.qh b/qcsrc/common/weapons/weapon/rifle.qh index 7a2348af7..e5a2cde2b 100644 --- a/qcsrc/common/weapons/weapon/rifle.qh +++ b/qcsrc/common/weapons/weapon/rifle.qh @@ -2,7 +2,7 @@ CLASS(Rifle, Weapon) /* spawnfunc */ ATTRIB(Rifle, m_canonical_spawnfunc, string, "weapon_rifle"); -/* ammotype */ ATTRIB(Rifle, ammo_type, int, RES_BULLETS); +/* ammotype */ ATTRIB(Rifle, ammo_type, Resource, RES_BULLETS); /* impulse */ ATTRIB(Rifle, impulse, int, 7); /* flags */ ATTRIB(Rifle, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS); /* rating */ ATTRIB(Rifle, bot_pickupbasevalue, float, 7000); diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc index c782b4eaf..cdf7d6a2e 100644 --- a/qcsrc/common/weapons/weapon/seeker.qc +++ b/qcsrc/common/weapons/weapon/seeker.qc @@ -86,23 +86,23 @@ void W_Seeker_Missile_Think(entity this) { if(dist <= WEP_CVAR(seeker, missile_proxy_maxrange)) { - if(this.autoswitch == 0) + if(this.cvar_cl_autoswitch == 0) { - this.autoswitch = time + WEP_CVAR(seeker, missile_proxy_delay); + this.cvar_cl_autoswitch = time + WEP_CVAR(seeker, missile_proxy_delay); } else { - if(this.autoswitch <= time) + if(this.cvar_cl_autoswitch <= time) { W_Seeker_Missile_Explode(this, NULL); - this.autoswitch = 0; + this.cvar_cl_autoswitch = 0; } } } else { - if(this.autoswitch != 0) - this.autoswitch = 0; + if(this.cvar_cl_autoswitch != 0) + this.cvar_cl_autoswitch = 0; } } /////////////// diff --git a/qcsrc/common/weapons/weapon/seeker.qh b/qcsrc/common/weapons/weapon/seeker.qh index 3e79ce252..d3024a436 100644 --- a/qcsrc/common/weapons/weapon/seeker.qh +++ b/qcsrc/common/weapons/weapon/seeker.qh @@ -2,7 +2,7 @@ CLASS(Seeker, Weapon) /* spawnfunc */ ATTRIB(Seeker, m_canonical_spawnfunc, string, "weapon_seeker"); -/* ammotype */ ATTRIB(Seeker, ammo_type, int, RES_ROCKETS); +/* ammotype */ ATTRIB(Seeker, ammo_type, Resource, RES_ROCKETS); /* impulse */ ATTRIB(Seeker, impulse, int, 8); /* flags */ ATTRIB(Seeker, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Seeker, bot_pickupbasevalue, float, 5000); diff --git a/qcsrc/common/weapons/weapon/shockwave.qh b/qcsrc/common/weapons/weapon/shockwave.qh index 8b1cd48ef..9fa484b6a 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qh +++ b/qcsrc/common/weapons/weapon/shockwave.qh @@ -2,7 +2,7 @@ CLASS(Shockwave, Weapon) /* spawnfunc */ ATTRIB(Shockwave, m_canonical_spawnfunc, string, "weapon_shockwave"); -/* ammotype */ //ATTRIB(Shockwave, ammo_type, int, RES_NONE); +/* ammotype */ //ATTRIB(Shockwave, ammo_type, Resource, RES_NONE); /* impulse */ ATTRIB(Shockwave, impulse, int, 2); /* flags */ ATTRIB(Shockwave, spawnflags, int, WEP_FLAG_HIDDEN | WEP_TYPE_HITSCAN | WEP_FLAG_CANCLIMB | WEP_TYPE_MELEE_SEC); /* rating */ ATTRIB(Shockwave, bot_pickupbasevalue, float, 3000); diff --git a/qcsrc/common/weapons/weapon/shotgun.qh b/qcsrc/common/weapons/weapon/shotgun.qh index d99a371f3..5b200ed58 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qh +++ b/qcsrc/common/weapons/weapon/shotgun.qh @@ -2,7 +2,7 @@ CLASS(Shotgun, Weapon) /* spawnfunc */ ATTRIB(Shotgun, m_canonical_spawnfunc, string, "weapon_shotgun"); -/* ammotype */ ATTRIB(Shotgun, ammo_type, int, RES_SHELLS); +/* ammotype */ ATTRIB(Shotgun, ammo_type, Resource, RES_SHELLS); /* impulse */ ATTRIB(Shotgun, impulse, int, 2); /* flags */ ATTRIB(Shotgun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_TYPE_MELEE_SEC | WEP_FLAG_BLEED); /* rating */ ATTRIB(Shotgun, bot_pickupbasevalue, float, 6000); diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc index 687ada154..43e5ca24e 100644 --- a/qcsrc/common/weapons/weapon/tuba.qc +++ b/qcsrc/common/weapons/weapon/tuba.qc @@ -306,7 +306,12 @@ void W_Tuba_NoteOn(entity actor, .entity weaponentity, float hittype) { // FIXME gettaginfo(actor.(weaponentity), 0) doesn't return the real origin of the weapon vector org = gettaginfo(actor.(weaponentity), 0); - Send_Effect(EFFECT_SMOKE_RING, org + v_up * 45 + v_right * 10 + v_forward * 14, v_up * 100, 1); + if(actor.(weaponentity).tuba_instrument == 1) + Send_Effect(EFFECT_SMOKE_RING, org + v_up * 25 + v_right * 10 + v_forward * 14, v_up * 100, 1); + else if(actor.(weaponentity).tuba_instrument == 2) + Send_Effect(EFFECT_SMOKE_RING, org + v_up * 50 + v_right * 10 + v_forward * 45, v_up * 100, 1); + else + Send_Effect(EFFECT_SMOKE_RING, org + v_up * 40 + v_right * 10 + v_forward * 14, v_up * 100, 1); actor.(weaponentity).tuba_smoketime = time + 0.25; } } diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index 380fc300a..3f1c19673 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -151,7 +151,15 @@ void W_Vaporizer_Attack(Weapon thiswep, entity actor, .entity weaponentity) W_DecreaseAmmo(thiswep, actor, ((autocvar_g_instagib) ? 1 : WEP_CVAR_PRI(vaporizer, ammo)), weaponentity); } -void W_RocketMinsta_Laser_Explode (entity this, entity directhitentity) +void W_RocketMinsta_Laser_Damage(entity this, entity directhitentity) +{ + int laser_count = max(1, this.rm_laser_count); + float laser_force = autocvar_g_rm_laser_force / laser_count; + float laser_damage = autocvar_g_rm_laser_damage / laser_count; + RadiusDamage(this, this.realowner, laser_damage, laser_damage, autocvar_g_rm_laser_radius, NULL, NULL, laser_force, this.projectiledeathtype, this.weaponentity_fld, directhitentity); +} + +void W_RocketMinsta_Laser_Explode(entity this, entity directhitentity) { if(directhitentity.takedamage == DAMAGE_AIM) if(IS_PLAYER(directhitentity)) @@ -163,7 +171,7 @@ void W_RocketMinsta_Laser_Explode (entity this, entity directhitentity) this.event_damage = func_null; this.takedamage = DAMAGE_NO; - RadiusDamage (this, this.realowner, this.rm_damage, this.rm_edmg, autocvar_g_rm_laser_radius, NULL, NULL, this.rm_force, this.projectiledeathtype, this.weaponentity_fld, directhitentity); + W_RocketMinsta_Laser_Damage(this, directhitentity); delete(this); } @@ -176,114 +184,66 @@ void W_RocketMinsta_Laser_Touch(entity this, entity toucher) { PROJECTILE_TOUCH(this, toucher); //W_RocketMinsta_Laser_Explode (); - RadiusDamage(this, this.realowner, this.rm_damage, this.rm_edmg, autocvar_g_rm_laser_radius, NULL, NULL, this.rm_force, this.projectiledeathtype, this.weaponentity_fld, toucher); + W_RocketMinsta_Laser_Damage(this, toucher); delete(this); } -void W_RocketMinsta_Attack2(entity actor, .entity weaponentity) +// mode 0 fires many projectiles +// mode 1 fires 1 projectile +void W_RocketMinsta_Attack(entity actor, .entity weaponentity, int mode) { makevectors(actor.v_angle); entity proj; - float counter = 0; - float total = autocvar_g_rm_laser_count; - float spread = autocvar_g_rm_laser_spread; - float rndspread = autocvar_g_rm_laser_spread_random; - - W_SetupShot_ProjectileSize (actor, weaponentity, '0 0 -3', '0 0 -3', false, 2, SND_CRYLINK_FIRE, CH_WEAPON_A, autocvar_g_rm_laser_damage, WEP_ELECTRO.m_id); + int laser_count = max(1, autocvar_g_rm_laser_count); + int total = (mode == 0) ? laser_count : 1; + Sound snd = (mode == 0) ? SND_CRYLINK_FIRE : SND_ELECTRO_FIRE2; + W_SetupShot_ProjectileSize(actor, weaponentity, '0 0 -3', '0 0 -3', false, 2, snd, CH_WEAPON_A, autocvar_g_rm_laser_damage, WEP_ELECTRO.m_id); // uses electro effects W_MuzzleFlash(WEP_ELECTRO, actor, weaponentity, w_shotorg, w_shotdir); - while(counter < total) + for (int counter = 0; counter < total; counter++) { - proj = new(plasma_prim); - proj.owner = proj.realowner = actor; - proj.bot_dodge = true; - proj.bot_dodgerating = autocvar_g_rm_laser_damage; - proj.use = W_RocketMinsta_Laser_Explode_use; - setthink(proj, adaptor_think2use_hittype_splash); - proj.nextthink = time + autocvar_g_rm_laser_lifetime; - PROJECTILE_MAKETRIGGER(proj); - proj.projectiledeathtype = WEP_ELECTRO.m_id; - proj.weaponentity_fld = weaponentity; - setorigin(proj, w_shotorg); - - proj.rm_force = autocvar_g_rm_laser_force / total; - proj.rm_damage = autocvar_g_rm_laser_damage / total; - proj.rm_edmg = proj.rm_damage; - - //W_SetupProjectileVelocity(proj, autocvar_g_rm_laser_speed, spread * (rndspread ? random() : 1) * autocvar_g_rm_laser_speed); - - set_movetype(proj, MOVETYPE_BOUNCEMISSILE); - //W_SETUPPROJECTILEVELOCITY(proj, g_balance_minstanex_laser); - proj.velocity = (w_shotdir + (((counter + 0.5) / total) * 2 - 1) * v_right * (spread * (rndspread ? random() : 1))) * cvar("g_rm_laser_speed"); - proj.velocity_z = proj.velocity_z + cvar("g_rm_laser_zspread") * (random() - 0.5); + proj = new(plasma_prim); + proj.owner = proj.realowner = actor; + proj.bot_dodge = true; + proj.bot_dodgerating = autocvar_g_rm_laser_damage; + proj.use = W_RocketMinsta_Laser_Explode_use; + setthink(proj, adaptor_think2use_hittype_splash); + proj.nextthink = time + autocvar_g_rm_laser_lifetime; + PROJECTILE_MAKETRIGGER(proj); + proj.projectiledeathtype = WEP_ELECTRO.m_id; + proj.weaponentity_fld = weaponentity; + setorigin(proj, w_shotorg); + + proj.rm_laser_count = total; + + //W_SetupProjectileVelocity(proj, autocvar_g_rm_laser_speed, spread * (rndspread ? random() : 1) * autocvar_g_rm_laser_speed); + + set_movetype(proj, MOVETYPE_BOUNCEMISSILE); + if (mode == 0) + { + float spread = autocvar_g_rm_laser_spread * (autocvar_g_rm_laser_spread_random ? random() : 1); + //W_SETUPPROJECTILEVELOCITY(proj, g_balance_minstanex_laser); + proj.velocity = (w_shotdir + (((counter + 0.5) / total) * 2 - 1) * v_right * spread) * cvar("g_rm_laser_speed"); + proj.velocity.z += cvar("g_rm_laser_zspread") * (random() - 0.5); + } + else + proj.velocity = w_shotdir * autocvar_g_rm_laser_speed; proj.velocity = W_CalculateProjectileVelocity(actor, actor.velocity, proj.velocity, true); - proj.angles = vectoangles(proj.velocity); - settouch(proj, W_RocketMinsta_Laser_Touch); - setsize(proj, '0 0 -3', '0 0 -3'); - proj.flags = FL_PROJECTILE; - IL_PUSH(g_projectiles, proj); - IL_PUSH(g_bot_dodge, proj); - proj.missile_flags = MIF_SPLASH; - - CSQCProjectile(proj, true, PROJECTILE_ROCKETMINSTA_LASER, true); - - MUTATOR_CALLHOOK(EditProjectile, actor, proj); - counter++; - } -} - -void W_RocketMinsta_Attack3 (entity actor, .entity weaponentity) -{ - makevectors(actor.v_angle); + proj.angles = vectoangles(proj.velocity); + settouch(proj, W_RocketMinsta_Laser_Touch); + setsize(proj, '0 0 -3', '0 0 -3'); + proj.flags = FL_PROJECTILE; + IL_PUSH(g_projectiles, proj); + IL_PUSH(g_bot_dodge, proj); + proj.missile_flags = MIF_SPLASH; - entity proj; - float counter = 0; - float total = 1; - - W_SetupShot_ProjectileSize (actor, weaponentity, '0 0 -3', '0 0 -3', false, 2, SND_ELECTRO_FIRE2, CH_WEAPON_A, autocvar_g_rm_laser_damage, WEP_ELECTRO.m_id); - - // uses electro effects - W_MuzzleFlash(WEP_ELECTRO, actor, weaponentity, w_shotorg, w_shotdir); + CSQCProjectile(proj, true, PROJECTILE_ROCKETMINSTA_LASER, true); - while(counter < total) - { - proj = new(plasma_prim); - proj.owner = proj.realowner = actor; - proj.bot_dodge = true; - proj.bot_dodgerating = autocvar_g_rm_laser_damage; - proj.use = W_RocketMinsta_Laser_Explode_use; - setthink(proj, adaptor_think2use_hittype_splash); - proj.nextthink = time + autocvar_g_rm_laser_lifetime; - PROJECTILE_MAKETRIGGER(proj); - proj.projectiledeathtype = WEP_ELECTRO.m_id; - proj.weaponentity_fld = weaponentity; - setorigin(proj, w_shotorg); - - proj.rm_force = autocvar_g_rm_laser_force / total; - proj.rm_damage = autocvar_g_rm_laser_damage / total; - proj.rm_edmg = proj.rm_damage; - - //W_SetupProjectileVelocity(proj, autocvar_g_rm_laser_speed, spread * (rndspread ? random() : 1) * autocvar_g_rm_laser_speed); - - set_movetype(proj, MOVETYPE_BOUNCEMISSILE); - proj.velocity = w_shotdir * autocvar_g_rm_laser_speed; - proj.velocity = W_CalculateProjectileVelocity(actor, actor.velocity, proj.velocity, true); - proj.angles = vectoangles(proj.velocity); - settouch(proj, W_RocketMinsta_Laser_Touch); - setsize(proj, '0 0 -3', '0 0 -3'); - proj.flags = FL_PROJECTILE; - IL_PUSH(g_projectiles, proj); - IL_PUSH(g_bot_dodge, proj); - proj.missile_flags = MIF_SPLASH; - - CSQCProjectile(proj, true, PROJECTILE_ROCKETMINSTA_LASER, true); - - MUTATOR_CALLHOOK(EditProjectile, actor, proj); - counter++; - } + MUTATOR_CALLHOOK(EditProjectile, actor, proj); + } } METHOD(Vaporizer, wr_aim, void(entity thiswep, entity actor, .entity weaponentity)) @@ -322,13 +282,13 @@ METHOD(Vaporizer, wr_think, void(entity thiswep, entity actor, .entity weaponent actor.(weaponentity).jump_interval = time + autocvar_g_rm_laser_refire; actor.(weaponentity).jump_interval2 = time + autocvar_g_rm_laser_rapid_delay; impressive_hits = 0; - W_RocketMinsta_Attack2(actor, weaponentity); + W_RocketMinsta_Attack(actor, weaponentity, 0); } else if(rapid && actor.(weaponentity).jump_interval2 <= time && actor.(weaponentity).held_down) { actor.(weaponentity).jump_interval2 = time + autocvar_g_rm_laser_rapid_refire; impressive_hits = 0; - W_RocketMinsta_Attack3(actor, weaponentity); + W_RocketMinsta_Attack(actor, weaponentity, 1); //weapon_thinkf(actor, WFRAME_FIRE2, autocvar_g_rm_laser_rapid_animtime, w_ready); } } diff --git a/qcsrc/common/weapons/weapon/vaporizer.qh b/qcsrc/common/weapons/weapon/vaporizer.qh index 00dbf78ec..277557e9c 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qh +++ b/qcsrc/common/weapons/weapon/vaporizer.qh @@ -2,7 +2,7 @@ CLASS(Vaporizer, Weapon) /* spawnfunc */ ATTRIB(Vaporizer, m_canonical_spawnfunc, string, "weapon_vaporizer"); -/* ammotype */ ATTRIB(Vaporizer, ammo_type, int, RES_CELLS); +/* ammotype */ ATTRIB(Vaporizer, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(Vaporizer, impulse, int, 7); /* flags */ ATTRIB(Vaporizer, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN | WEP_FLAG_NODUAL); /* rating */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, 10000); @@ -63,7 +63,5 @@ SPAWNFUNC_WEAPON(weapon_minstanex, WEP_VAPORIZER) .float jump_interval; .float jump_interval2; .bool held_down; -.float rm_force; -.float rm_damage; -.float rm_edmg; +.int rm_laser_count; #endif diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index 516d1d1f2..c57268425 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -142,6 +142,9 @@ void W_Vortex_Attack(Weapon thiswep, entity actor, .entity weaponentity, float i FireRailgunBullet(actor, weaponentity, w_shotorg, w_shotorg + w_shotdir * max_shot_distance, mydmg, false, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, dtype); if(yoda && flying) { + if(charge == 1) // play additional sound if we hit in the air with maximum damage + sound(actor, CH_INFO, SND_MIDAIR, VOL_BASE, ATTN_NONE); + Give_Medal(actor, YODA); } diff --git a/qcsrc/common/weapons/weapon/vortex.qh b/qcsrc/common/weapons/weapon/vortex.qh index 040374f4c..66151b4c0 100644 --- a/qcsrc/common/weapons/weapon/vortex.qh +++ b/qcsrc/common/weapons/weapon/vortex.qh @@ -2,7 +2,7 @@ CLASS(Vortex, Weapon) /* spawnfunc */ ATTRIB(Vortex, m_canonical_spawnfunc, string, "weapon_vortex"); -/* ammotype */ ATTRIB(Vortex, ammo_type, int, RES_CELLS); +/* ammotype */ ATTRIB(Vortex, ammo_type, Resource, RES_CELLS); /* impulse */ ATTRIB(Vortex, impulse, int, 7); /* flags */ ATTRIB(Vortex, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN); /* rating */ ATTRIB(Vortex, bot_pickupbasevalue, float, 8000); @@ -18,7 +18,7 @@ CLASS(Vortex, Weapon) /* reticle */ ATTRIB(Vortex, w_reticle, string, "gfx/reticle_nex"); /* wepimg */ ATTRIB(Vortex, model2, string, "weaponnex"); /* refname */ ATTRIB(Vortex, netname, string, "vortex"); -/* wepname */ ATTRIB(Vortex, m_name, string, _("Vortex")); +/* wepname */ ATTRIB(Vortex, m_name, string, _("Nex")); #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ diff --git a/qcsrc/lib/counting.qh b/qcsrc/lib/counting.qh index c084b5efe..303ee6988 100644 --- a/qcsrc/lib/counting.qh +++ b/qcsrc/lib/counting.qh @@ -117,10 +117,10 @@ string count_fill(float interval, string zeroth, string first, string second, st } ERASEABLE -string process_time(float outputtype, float seconds) +string process_time(float outputtype, int seconds) { - float tmp_hours = 0, tmp_minutes = 0, tmp_seconds = 0; - float tmp_years = 0, tmp_weeks = 0, tmp_days = 0; + int tmp_hours = 0, tmp_minutes = 0, tmp_seconds = 0; + int tmp_years = 0, tmp_weeks = 0, tmp_days = 0; tmp_seconds = floor(seconds); @@ -159,44 +159,17 @@ string process_time(float outputtype, float seconds) case 2: { string output = ""; - - output = count_seconds(tmp_seconds); - - if (tmp_minutes) - { - output = strcat( - count_minutes(tmp_minutes), - ((output != "") ? strcat(", ", output) : "")); - } - - if (tmp_hours) - { - output = strcat( - count_hours(tmp_hours), - ((output != "") ? strcat(", ", output) : "")); - } - - if (tmp_days) - { - output = strcat( - count_days(tmp_days), - ((output != "") ? strcat(", ", output) : "")); - } - - if (tmp_weeks) - { - output = strcat( - count_weeks(tmp_weeks), - ((output != "") ? strcat(", ", output) : "")); - } - - if (tmp_years) - { - output = strcat( - count_years(tmp_years), - ((output != "") ? strcat(", ", output) : "")); - } - + #define APPEND_TIME(unit) \ + if (tmp_##unit) output = strcat(output, ((output != "") ? ", " : ""), count_##unit(tmp_##unit)) + APPEND_TIME(years); + APPEND_TIME(weeks); + APPEND_TIME(days); + APPEND_TIME(hours); + APPEND_TIME(minutes); + APPEND_TIME(seconds); + #undef APPEND_TIME + if (output == "") + return count_seconds(0); return output; } case 3: diff --git a/qcsrc/lib/replicate.qh b/qcsrc/lib/replicate.qh index 64d893a10..a7a8d10df 100644 --- a/qcsrc/lib/replicate.qh +++ b/qcsrc/lib/replicate.qh @@ -1,21 +1,54 @@ #pragma once +#ifdef SVQC +// copies a string to a tempstring (so one can strunzone it) +string strcat1(string s) = #115; // FRIK_FILE +#endif + +#if defined(CSQC) +const int REPLICATEVARS_SEND_ALL = -1; // sync all cvars with the server (init) +const int REPLICATEVARS_CHECK = 0; // check if any cvar has changed and sync it with the server +const int REPLICATEVARS_DESTROY = 1; // destroy data associated with cvars (shutdown) +#define REPLICATE_INIT(type, name) type name +#elif defined(SVQC) +#define REPLICATE_INIT(type, name) .type name +#endif + #ifdef GAMEQC /** - * Replicate a client cvar into a server field + * \def REPLICATE(fld, type, cvar) + * Replicates a client cvar into a server field * * @param fld The field to replicate into * @param type The field type - * @param cvar The cvar name + * @param cvarname + * @param fixup_func((entity this, string original_value)) optional parameter */ #define REPLICATE(...) EVAL_REPLICATE(OVERLOAD(REPLICATE, __VA_ARGS__)) #define EVAL_REPLICATE(...) __VA_ARGS__ #if defined(SVQC) ACCUMULATE void ReplicateVars(entity this, entity store, string thisname, int i) {} + ACCUMULATE void ReplicateVars_ApplyChange(entity this, entity store, string thisname, int i) {} + /** + * \def REPLICATE_APPLYCHANGE(cvarname, ApplyChange_code) + * Allows setting code that will be executed on cvar value changes + * + * @param cvarname + * @param ApplyChange_code code meant to be run on cvar value changes + */ + #define REPLICATE_APPLYCHANGE(var, ApplyChange_code) \ + void ReplicateVars_ApplyChange(entity this, entity store, string thisname, int i) \ + { if (thisname == var) { ApplyChange_code } } #elif defined(CSQC) - ACCUMULATE void ReplicateVars(int mode) {} + noref float ReplicateVars_time; + ACCUMULATE void ReplicateVars(int mode) + { + if (time < ReplicateVars_time) + return; + ReplicateVars_time = time + 0.8 + random() * 0.4; // check cvars periodically + } #endif #define REPLICATE_3(fld, type, var) REPLICATE_4(fld, type, var, ) @@ -27,7 +60,7 @@ { strfree(field); }, \ { \ /* also initialize to the default value of func when requesting cvars */ \ - string s = func(field); \ + string s = func(this, strcat1(field)); \ if (s != field) \ { \ strcpy(field, s); \ @@ -59,51 +92,30 @@ store.fld = field; \ } #elif defined(CSQC) - noref float ReplicateVars_time; - #define ReplicateVars_NOT_SENDING() (time > ReplicateVars_time) - #define ReplicateVars_DELAY(t) ReplicateVars_time = time + t - #define ReplicateVars_DELAY_1FRAME() ReplicateVars_time = time #define REPLICATE_string(fld, var, func) REPLICATE_7(fld, float, var, func, (fld != cvar_string(var)), { strcpy(fld, cvar_string(var)); }, { strfree(fld); }) #define REPLICATE_float(fld, var, func) REPLICATE_7(fld, float, var, func, (fld != cvar(var)), { fld = cvar(var); }, ) #define REPLICATE_bool(fld, var, func) REPLICATE_7(fld, bool, var, func, (fld != cvar(var)), { fld = cvar(var); }, ) #define REPLICATE_int(fld, var, func) REPLICATE_7(fld, int, var, func, (fld != cvar(var)), { fld = cvar(var); }, ) - void ReplicateVars_Destroy() { ReplicateVars(1); } - void ReplicateVars_Send_All() { ReplicateVars(-1); } - void ReplicateVars_Check() - { - // if a cvar has changed send it and check cvars again next frame - ReplicateVars(0); - if (ReplicateVars_NOT_SENDING()) // if no cvar has changed - ReplicateVars_DELAY(0.8 + random() * 0.4); // check cvars after a while - } void ReplicateVars_Send(string cvarname) { localcmd(strcat("cl_cmd sendcvar ", cvarname, "\n")); } #define REPLICATE_7(fld, type, var, func, check, update, destroy) \ void ReplicateVars(int mode) \ { \ - if (mode == 1) { destroy } \ - else if (mode == -1) { ReplicateVars_Send(var); update } \ - else if (ReplicateVars_NOT_SENDING() && check) \ + if (mode == REPLICATEVARS_DESTROY) { destroy } \ + else if (mode == REPLICATEVARS_SEND_ALL || check) \ { \ ReplicateVars_Send(var); \ - ReplicateVars_DELAY_1FRAME(); \ update \ - return; \ } \ } #define REPLICATE_SIMPLE(field, cvarname) MACRO_BEGIN \ - if (ReplicateVars_NOT_SENDING()) \ + float thecvar = cvar(cvarname); \ + if(field != thecvar) \ { \ - float thecvar = cvar(cvarname); \ - if(field != thecvar) \ - { \ - ReplicateVars_Send(cvarname); \ - ReplicateVars_DELAY_1FRAME(); \ - field = thecvar; \ - return; \ - } \ + ReplicateVars_Send(cvarname); \ + field = thecvar; \ } \ MACRO_END #endif diff --git a/qcsrc/lib/string.qh b/qcsrc/lib/string.qh index c99497bc7..79ba56ebe 100644 --- a/qcsrc/lib/string.qh +++ b/qcsrc/lib/string.qh @@ -117,14 +117,46 @@ string strftime_s() return strcat(ftos(hundreds_of_seconds), seconds_str); } +/// \param[in] seconds number of seconds, can be negative too +/// \return time as "m:ss" string (floored) ERASEABLE -string seconds_tostring(float sec) +string seconds_tostring(float seconds) { - float minutes = floor(sec / 60); - sec -= minutes * 60; - return sprintf("%d:%02d", minutes, sec); + bool negative = false; + if (seconds < 0) + { + negative = true; + seconds = -seconds; + if (floor(seconds) != seconds) + seconds += 1; // make floor work in the other direction + } + int minutes = floor(seconds / 60); + seconds -= minutes * 60; + if (negative) + return sprintf("-%d:%02d", minutes, seconds); + return sprintf("%d:%02d", minutes, seconds); +} + +/// \param[in] tm integer clocked time in tenths or hundredths, CANNOT be negative +/// \param[in] hundredths if true append hundredths too, otherwise only tenths +/// \return clocked time as "m:ss.t" or "m:ss.th" string (rounded) +ERASEABLE +string clockedtime_tostring(int tm, bool hundredths) +{ + if (tm < 0) + return strcat("0:00:0", hundredths ? "0" : ""); + int acc = hundredths ? 6000 : 600; + int seconds = floor(tm + 0.5); + int minutes = floor(seconds / acc); + seconds -= minutes * acc; + // NOTE: the start digit of s is a placeholder and won't be displayed + string s = ftos(acc * 10 + seconds); + return strcat(ftos(minutes), ":", substring(s, 1, 2), ".", substring(s, 3, hundredths ? 2 : 1)); } +#define mmsst(tm) clockedtime_tostring(tm, false) +#define mmssth(tm) clockedtime_tostring(tm, true) + ERASEABLE string format_time(float seconds) { @@ -139,26 +171,6 @@ string format_time(float seconds) else return sprintf(_("%02d:%02d:%02d"), hours, minutes, seconds); } -ERASEABLE -string mmsss(float tenths) -{ - tenths = floor(tenths + 0.5); - float minutes = floor(tenths / 600); - tenths -= minutes * 600; - string s = ftos(1000 + tenths); - return strcat(ftos(minutes), ":", substring(s, 1, 2), ".", substring(s, 3, 1)); -} - -ERASEABLE -string mmssss(float hundredths) -{ - hundredths = floor(hundredths + 0.5); - float minutes = floor(hundredths / 6000); - hundredths -= minutes * 6000; - string s = ftos(10000 + hundredths); - return strcat(ftos(minutes), ":", substring(s, 1, 2), ".", substring(s, 3, 2)); -} - int ColorTranslateMode; ERASEABLE diff --git a/qcsrc/lib/urllib.qh b/qcsrc/lib/urllib.qh index 8918ca0a2..639b5db73 100644 --- a/qcsrc/lib/urllib.qh +++ b/qcsrc/lib/urllib.qh @@ -7,6 +7,7 @@ const int URI_GET_IPBAN_END = 16; const int URI_GET_CURL = 17; const int URI_GET_CURL_END = 32; const int URI_GET_UPDATENOTIFICATION = 33; +const int URI_GET_TOS = 34; const int URI_GET_URLLIB = 128; const int URI_GET_URLLIB_END = 191; diff --git a/qcsrc/menu/xonotic/_mod.inc b/qcsrc/menu/xonotic/_mod.inc index 0f9a960c9..1c09f3586 100644 --- a/qcsrc/menu/xonotic/_mod.inc +++ b/qcsrc/menu/xonotic/_mod.inc @@ -49,6 +49,8 @@ #include

#include #include +#include +#include #include #include #include @@ -82,6 +84,7 @@ #include #include #include +#include #include #include #include @@ -114,6 +117,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/menu/xonotic/_mod.qh b/qcsrc/menu/xonotic/_mod.qh index 2bb4ccead..7c3ab9059 100644 --- a/qcsrc/menu/xonotic/_mod.qh +++ b/qcsrc/menu/xonotic/_mod.qh @@ -49,6 +49,8 @@ #include #include #include +#include +#include #include #include #include @@ -82,6 +84,7 @@ #include #include #include +#include #include #include #include @@ -114,6 +117,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/menu/xonotic/credits.qc b/qcsrc/menu/xonotic/credits.qc index 423974e44..4ec6c0826 100644 --- a/qcsrc/menu/xonotic/credits.qc +++ b/qcsrc/menu/xonotic/credits.qc @@ -24,6 +24,9 @@ PERSON(packer) \ PERSON(Severin "sev" Meyer) \ PERSON(SpiKe) \ + PERSON(Thomas "illwieckz" Debesse) \ + PERSON(Victor "LegendGuard" Jaume) \ + PERSON(z411) \ NL() \ NL() \ FUNCTION(_("Website")) \ @@ -96,6 +99,8 @@ PERSON(Rudolf "divVerent" Polzer) \ PERSON(Samual "Ares" Lenks) \ PERSON(TimePath) \ + PERSON(Victor "LegendGuard" Jaume) \ + PERSON(z411) \ PERSON(Zac "Mario" Jardine) \ NL() \ FUNCTION(_("Marketing / PR")) \ @@ -228,7 +233,7 @@ PERSON(Victor "LegendGuard" Jaume) \ NL() \ FUNCTION(_("Kazakh")) \ - PERSON("Артем "bystrov.arterm" Быстров") \ + PERSON(Артем "bystrov.arterm" Быстров) \ NL() \ FUNCTION(_("Korean")) \ PERSON(Jisoo "s6e9x" Lim) \ @@ -401,23 +406,54 @@ PERSON(... and a goat) \ /**/ -int credits_get() + +int CREDITS_TYPE_TITLE = 2; +int CREDITS_TYPE_FUNCTION = 1; +int CREDITS_TYPE_PERSON = 0; +int CREDITS_TYPE_NL = -1; +void credits_add_line(int fh, int n, int type, string line) { - int n = buf_create(); - #define CREDITS_TITLE(t) bufstr_add(n, strcat("**", t), 0); - #define CREDITS_FUNCTION(f) bufstr_add(n, strcat("*", f), 0); - #define CREDITS_PERSON(p) bufstr_add(n, p, 0); + if (type == CREDITS_TYPE_TITLE) + line = strcat("**", line); + else if (type == CREDITS_TYPE_FUNCTION) + line = strcat("*", line); + + if (fh >= 0) + fputs(fh, strcat(line, "\n")); + if (n >= 0) + bufstr_add(n, line, 0); +} + +void credits_build(int fh, int n) +{ + #define CREDITS_TITLE(t) credits_add_line(fh, n, CREDITS_TYPE_TITLE, t); + #define CREDITS_FUNCTION(f) credits_add_line(fh, n, CREDITS_TYPE_FUNCTION, f); + #define CREDITS_PERSON(p) credits_add_line(fh, n, CREDITS_TYPE_PERSON, p); #define _CREDITS_PERSON(p) CREDITS_PERSON(#p) - #define CREDITS_NL() bufstr_add(n, "", 0); - CREDITS(CREDITS_TITLE, CREDITS_FUNCTION, _CREDITS_PERSON, CREDITS_PERSON, CREDITS_NL) + #define CREDITS_NL() credits_add_line(fh, n, CREDITS_TYPE_NL, ""); + CREDITS(CREDITS_TITLE, CREDITS_FUNCTION, _CREDITS_PERSON, CREDITS_PERSON, CREDITS_NL) #undef CREDITS_TITLE #undef CREDITS_FUNCTION #undef CREDITS_PERSON #undef _CREDITS_PERSON #undef CREDITS_NL +} + +int credits_get() +{ + int n = buf_create(); + credits_build(-1, n); return n; } +void credits_export() +{ + int fh = fopen("credits.txt", FILE_WRITE); + if(fh < 0) + return; + credits_build(fh, -1); +} + #undef CREDITS entity makeXonoticCreditsList() @@ -430,8 +466,13 @@ entity makeXonoticCreditsList() void XonoticCreditsList_configureXonoticCreditsList(entity me) { me.configureXonoticListBox(me); - me.bufferIndex = credits_get(); + me.bufferIndex = credits_get(); me.nItems = buf_getsize(me.bufferIndex); + if (cvar("_menu_credits_export")) // set by the menu_credits_export alias + { + credits_export(); + cvar_set("_menu_credits_export", "0"); + } } void XonoticCreditsList_destroy(entity me) { diff --git a/qcsrc/menu/xonotic/dialog_firstrun.qc b/qcsrc/menu/xonotic/dialog_firstrun.qc index 6dc1cfcc0..c45256c52 100644 --- a/qcsrc/menu/xonotic/dialog_firstrun.qc +++ b/qcsrc/menu/xonotic/dialog_firstrun.qc @@ -8,6 +8,11 @@ #include "charmap.qh" #include "commandbutton.qh" +bool XonoticFirstRunDialog_shouldShow() +{ + return cvar_string("_cl_name") == cvar_defstring("_cl_name"); +} + float CheckFirstRunButton(entity me) { if(cvar_string("_cl_name") != cvar_defstring("_cl_name")) diff --git a/qcsrc/menu/xonotic/dialog_firstrun.qh b/qcsrc/menu/xonotic/dialog_firstrun.qh index 51a56bb6a..8952f009e 100644 --- a/qcsrc/menu/xonotic/dialog_firstrun.qh +++ b/qcsrc/menu/xonotic/dialog_firstrun.qh @@ -3,6 +3,7 @@ #include "rootdialog.qh" CLASS(XonoticFirstRunDialog, XonoticRootDialog) METHOD(XonoticFirstRunDialog, fill, void(entity)); + METHOD(XonoticFirstRunDialog, shouldShow, bool()); ATTRIB(XonoticFirstRunDialog, title, string, _("Welcome")); ATTRIB(XonoticFirstRunDialog, color, vector, SKINCOLOR_DIALOG_FIRSTRUN); ATTRIB(XonoticFirstRunDialog, intendedWidth, float, 0.7); diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc index 84c6d862d..bea708279 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc @@ -1,5 +1,6 @@ #include "dialog_hudpanel_timer.qh" +#include "textslider.qh" #include "checkbox.qh" #include "textlabel.qh" @@ -17,4 +18,12 @@ void XonoticHUDTimerDialog_fill(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 3.8, e = makeXonoticCheckBox(0, "hud_panel_timer_increment", _("Show elapsed time"))); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Secondary timer:"))); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_timer_secondary")); + e.addValue(e, _("Disable"), "0"); + e.addValue(e, _("Enable"), "1"); + e.addValue(e, _("Swapped"), "2"); + e.configureXonoticTextSliderValues(e); } diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc index cf542f39c..7ff09655a 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc @@ -1,11 +1,15 @@ #include "dialog_multiplayer_join_serverinfo.qh" #include +#include "tabcontroller.qh" #include "serverlist.qh" #include "playerlist.qh" #include "inputbox.qh" #include "textlabel.qh" #include "button.qh" +#include "dialog_multiplayer_join_serverinfotab.qh" +#include "dialog_multiplayer_join_termsofservice.qh" + void XonoticServerInfoDialog_loadServerInfo(entity me, float i) { @@ -36,10 +40,10 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i) // Now, fill in the strings // ========================== me.currentServerName = strzone(gethostcachestring(SLIST_FIELD_NAME, i)); - me.nameLabel.setText(me.nameLabel, me.currentServerName); + me.infoTab.nameLabel.setText(me.infoTab.nameLabel, me.currentServerName); me.currentServerCName = strzone(gethostcachestring(SLIST_FIELD_CNAME, i)); - me.cnameLabel.setText(me.cnameLabel, me.currentServerCName); + me.infoTab.cnameLabel.setText(me.infoTab.cnameLabel, me.currentServerCName); pure_available = false; pure_violations = -1; @@ -56,6 +60,7 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i) freeslots = -1; sflags = -1; modname = ""; + bool ToSSpecified = false; for(int j = 2; j < m; ++j) { if(argv(j) == "") @@ -68,11 +73,36 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i) pure_violations = stof(v); } else if(k == "S") + { freeslots = stof(v); + } else if(k == "F") + { sflags = stof(v); + } else if(k == "M") + { modname = v; + } + else if(k == "T") + { + ToSSpecified = true; + string downloadurl = v; + if (downloadurl == "INVALID") + { + me.ToSTab.textBox.setText(me.ToSTab.textBox, _("No Terms of Service specified")); + } + else + { + downloadurl = strreplace("|", ":", downloadurl); + me.ToSTab.loadToS(me.ToSTab, downloadurl); + } + } + } + + if (!ToSSpecified) + { + me.ToSTab.textBox.setText(me.ToSTab.textBox, _("No Terms of Service specified")); } #ifdef COMPAT_NO_MOD_IS_XONOTIC @@ -88,39 +118,39 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i) if(j) { typestr = MapInfo_Type_ToText(j); } // only set it if we actually found it me.currentServerType = strzone(typestr); - me.typeLabel.setText(me.typeLabel, me.currentServerType); + me.infoTab.typeLabel.setText(me.infoTab.typeLabel, me.currentServerType); me.currentServerMap = strzone(gethostcachestring(SLIST_FIELD_MAP, i)); - me.mapLabel.setText(me.mapLabel, me.currentServerMap); + me.infoTab.mapLabel.setText(me.infoTab.mapLabel, me.currentServerMap); me.currentServerPlayers = strzone(gethostcachestring(SLIST_FIELD_PLAYERS, i)); - me.rawPlayerList.setPlayerList(me.rawPlayerList, me.currentServerPlayers); + me.infoTab.rawPlayerList.setPlayerList(me.infoTab.rawPlayerList, me.currentServerPlayers); numh = gethostcachenumber(SLIST_FIELD_NUMHUMANS, i); maxp = gethostcachenumber(SLIST_FIELD_MAXPLAYERS, i); numb = gethostcachenumber(SLIST_FIELD_NUMBOTS, i); me.currentServerNumPlayers = strzone(sprintf("%d/%d", numh, maxp)); - me.numPlayersLabel.setText(me.numPlayersLabel, me.currentServerNumPlayers); + me.infoTab.numPlayersLabel.setText(me.infoTab.numPlayersLabel, me.currentServerNumPlayers); s = ftos(numb); me.currentServerNumBots = strzone(s); - me.numBotsLabel.setText(me.numBotsLabel, me.currentServerNumBots); + me.infoTab.numBotsLabel.setText(me.infoTab.numBotsLabel, me.currentServerNumBots); if(freeslots < 0) { freeslots = maxp - numh - numb; } s = ftos(freeslots); me.currentServerNumFreeSlots = strzone(s); - me.numFreeSlotsLabel.setText(me.numFreeSlotsLabel, me.currentServerNumFreeSlots); + me.infoTab.numFreeSlotsLabel.setText(me.infoTab.numFreeSlotsLabel, me.currentServerNumFreeSlots); me.currentServerMod = ((modname == "Xonotic") ? ZCTX(_("MOD^Default")) : modname); me.currentServerMod = strzone(me.currentServerMod); - me.modLabel.setText(me.modLabel, me.currentServerMod); + me.infoTab.modLabel.setText(me.infoTab.modLabel, me.currentServerMod); me.currentServerVersion = strzone(versionstr); - me.versionLabel.setText(me.versionLabel, me.currentServerVersion); + me.infoTab.versionLabel.setText(me.infoTab.versionLabel, me.currentServerVersion); me.currentServerPure = ((!pure_available) ? _("N/A") : (pure_violations == 0) ? _("Official") : sprintf(_("%d modified"), pure_violations)); me.currentServerPure = strzone(me.currentServerPure); - me.pureLabel.setText(me.pureLabel, me.currentServerPure); + me.infoTab.pureLabel.setText(me.infoTab.pureLabel, me.currentServerPure); s = crypto_getencryptlevel(me.currentServerCName); if(s == "") @@ -157,101 +187,34 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i) me.currentServerEncrypt = _("Required (will encrypt)"); break; } - me.encryptLabel.setText(me.encryptLabel, me.currentServerEncrypt); - setZonedTooltip(me.encryptLabel, _("Use the `crypto_aeslevel` cvar to change your preferences"), string_null); + me.infoTab.encryptLabel.setText(me.infoTab.encryptLabel, me.currentServerEncrypt); + setZonedTooltip(me.infoTab.encryptLabel, _("Use the `crypto_aeslevel` cvar to change your preferences"), string_null); s = crypto_getidfp(me.currentServerCName); if (!s) { s = _("N/A"); } me.currentServerID = strzone(s); - me.idLabel.setText(me.idLabel, me.currentServerID); + me.infoTab.idLabel.setText(me.infoTab.idLabel, me.currentServerID); s = crypto_getkeyfp(me.currentServerCName); if (!s) { s = _("N/A"); } me.currentServerKey = strzone(s); - me.keyLabel.setText(me.keyLabel, me.currentServerKey); + me.infoTab.keyLabel.setText(me.infoTab.keyLabel, me.currentServerKey); + + me.currentServerStatsStatus = ((sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS)) ? ((sflags & SERVERFLAG_PLAYERSTATS_CUSTOM) ? _("custom stats server") : _("stats enabled")) : _("stats disabled")); + me.currentServerStatsStatus = strzone(me.currentServerStatsStatus); + me.infoTab.statsLabel.setText(me.infoTab.statsLabel, me.currentServerStatsStatus); } void XonoticServerInfoDialog_fill(entity me) { - entity e; + entity mc, e; + mc = makeXonoticTabController(me.rows - 2); me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Hostname:"))); - me.TD(me, 1, 4.6, e = makeXonoticTextLabel(0.5, "")); - e.colorL = SKINCOLOR_SERVERINFO_NAME; - e.allowCut = 1; - me.nameLabel = e; - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Address:"))); - me.TD(me, 1, 4.6, e = makeXonoticTextLabel(0.5, "")); - e.colorL = SKINCOLOR_SERVERINFO_IP; - e.allowCut = 1; - me.cnameLabel = e; + me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Status"), me.infoTab = makeXonoticServerInfoTab())); + me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Terms of Service"), me.ToSTab = makeXonoticServerToSTab())); me.TR(me); - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Gametype:"))); - me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.typeLabel = e; - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Map:"))); - me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.mapLabel = e; - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Mod:"))); - me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.modLabel = e; - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Version:"))); - me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.versionLabel = e; - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Settings:"))); - me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.pureLabel = e; - - me.TR(me); - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Players:"))); - me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.numPlayersLabel = e; - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Bots:"))); - me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.numBotsLabel = e; - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Free slots:"))); - me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.numFreeSlotsLabel = e; - - me.gotoRC(me, me.rows - 5, 0); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Encryption:"))); - me.TD(me, 1, 5.4, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.encryptLabel = e; - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("ID:"))); - me.TD(me, 1, 5.4, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.keyLabel = e; - me.TR(me); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Key:"))); - me.TD(me, 1, 5.4, e = makeXonoticTextLabel(0, "")); - e.allowCut = 1; - me.idLabel = e; - - me.gotoRC(me, 2, 2.2); me.setFirstColumn(me, me.currentColumn); - me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Players:"))); - me.TR(me); - me.TD(me, me.rows - 8, 4, e = makeXonoticPlayerList()); - me.rawPlayerList = e; + me.TD(me, me.rows - 2, me.columns, mc); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns/2, e = makeXonoticButton(_("Close"), '0 0 0')); @@ -270,3 +233,4 @@ void Join_Click(entity btn, entity me) { localcmd("connect ", me.currentServerCName, "\n"); } + diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh index 68f5ab8ca..30a5453dd 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh @@ -2,44 +2,33 @@ #include "dialog.qh" CLASS(XonoticServerInfoDialog, XonoticDialog) - METHOD(XonoticServerInfoDialog, fill, void(entity)); METHOD(XonoticServerInfoDialog, loadServerInfo, void(entity, float)); - ATTRIB(XonoticServerInfoDialog, title, string, _("Server Information")); - ATTRIB(XonoticServerInfoDialog, color, vector, SKINCOLOR_DIALOG_SERVERINFO); - ATTRIB(XonoticServerInfoDialog, intendedWidth, float, 0.8); - ATTRIB(XonoticServerInfoDialog, rows, float, 18); - ATTRIB(XonoticServerInfoDialog, columns, float, 6.2); + METHOD(XonoticServerInfoDialog, fill, void(entity)); + ATTRIB(XonoticServerInfoDialog, title, string, _("Server Info")); + ATTRIB(XonoticServerInfoDialog, color, vector, SKINCOLOR_DIALOG_MULTIPLAYER); + ATTRIB(XonoticServerInfoDialog, intendedWidth, float, 0.96); + ATTRIB(XonoticServerInfoDialog, rows, float, 19); + ATTRIB(XonoticServerInfoDialog, columns, float, 2); + ATTRIB(XonoticServerInfoDialog, infoTab, entity); + ATTRIB(XonoticServerInfoDialog, ToSTab, entity); - ATTRIB(XonoticServerInfoDialog, currentServerName, string); - ATTRIB(XonoticServerInfoDialog, currentServerCName, string); - ATTRIB(XonoticServerInfoDialog, currentServerType, string); - ATTRIB(XonoticServerInfoDialog, currentServerMap, string); - ATTRIB(XonoticServerInfoDialog, currentServerPlayers, string); - ATTRIB(XonoticServerInfoDialog, currentServerNumPlayers, string); - ATTRIB(XonoticServerInfoDialog, currentServerNumBots, string); - ATTRIB(XonoticServerInfoDialog, currentServerNumFreeSlots, string); - ATTRIB(XonoticServerInfoDialog, currentServerMod, string); - ATTRIB(XonoticServerInfoDialog, currentServerVersion, string); - ATTRIB(XonoticServerInfoDialog, currentServerKey, string); - ATTRIB(XonoticServerInfoDialog, currentServerID, string); - ATTRIB(XonoticServerInfoDialog, currentServerEncrypt, string); - ATTRIB(XonoticServerInfoDialog, currentServerPure, string); + ATTRIB(XonoticServerInfoTab, currentServerName, string); + ATTRIB(XonoticServerInfoTab, currentServerCName, string); + ATTRIB(XonoticServerInfoTab, currentServerType, string); + ATTRIB(XonoticServerInfoTab, currentServerMap, string); + ATTRIB(XonoticServerInfoTab, currentServerPlayers, string); + ATTRIB(XonoticServerInfoTab, currentServerNumPlayers, string); + ATTRIB(XonoticServerInfoTab, currentServerNumBots, string); + ATTRIB(XonoticServerInfoTab, currentServerNumFreeSlots, string); + ATTRIB(XonoticServerInfoTab, currentServerMod, string); + ATTRIB(XonoticServerInfoTab, currentServerVersion, string); + ATTRIB(XonoticServerInfoTab, currentServerKey, string); + ATTRIB(XonoticServerInfoTab, currentServerID, string); + ATTRIB(XonoticServerInfoTab, currentServerEncrypt, string); + ATTRIB(XonoticServerInfoTab, currentServerPure, string); + ATTRIB(XonoticServerInfoTab, currentServerStatsStatus, string); - ATTRIB(XonoticServerInfoDialog, nameLabel, entity); - ATTRIB(XonoticServerInfoDialog, cnameLabel, entity); - ATTRIB(XonoticServerInfoDialog, typeLabel, entity); - ATTRIB(XonoticServerInfoDialog, mapLabel, entity); - ATTRIB(XonoticServerInfoDialog, rawPlayerList, entity); - ATTRIB(XonoticServerInfoDialog, numPlayersLabel, entity); - ATTRIB(XonoticServerInfoDialog, numBotsLabel, entity); - ATTRIB(XonoticServerInfoDialog, numFreeSlotsLabel, entity); - ATTRIB(XonoticServerInfoDialog, modLabel, entity); - ATTRIB(XonoticServerInfoDialog, versionLabel, entity); - ATTRIB(XonoticServerInfoDialog, keyLabel, entity); - ATTRIB(XonoticServerInfoDialog, idLabel, entity); - ATTRIB(XonoticServerInfoDialog, encryptLabel, entity); - ATTRIB(XonoticServerInfoDialog, canConnectLabel, entity); - ATTRIB(XonoticServerInfoDialog, pureLabel, entity); ENDCLASS(XonoticServerInfoDialog) void Join_Click(entity btn, entity me); + diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc new file mode 100644 index 000000000..5b2dc05ab --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc @@ -0,0 +1,107 @@ +#include "dialog_multiplayer_join_serverinfo.qh" +#include "dialog_multiplayer_join_serverinfotab.qh" +#include + +#include "serverlist.qh" +#include "playerlist.qh" +#include "inputbox.qh" +#include "textlabel.qh" +#include "button.qh" + + +entity makeXonoticServerInfoTab() +{ + entity me; + me = NEW(XonoticServerInfoTab); + me.configureDialog(me); + return me; +} + +void XonoticServerInfoTab_fill(entity me) +{ + entity e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Hostname:"))); + me.TD(me, 1, 4.6, e = makeXonoticTextLabel(0.5, "")); + e.colorL = SKINCOLOR_SERVERINFO_NAME; + e.allowCut = 1; + me.nameLabel = e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Address:"))); + me.TD(me, 1, 4.6, e = makeXonoticTextLabel(0.5, "")); + e.colorL = SKINCOLOR_SERVERINFO_IP; + e.allowCut = 1; + me.cnameLabel = e; + + me.TR(me); + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Gametype:"))); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.typeLabel = e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Map:"))); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.mapLabel = e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Mod:"))); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.modLabel = e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Version:"))); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.versionLabel = e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Settings:"))); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.pureLabel = e; + + me.TR(me); + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Players:"))); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.numPlayersLabel = e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Bots:"))); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.numBotsLabel = e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Free slots:"))); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.numFreeSlotsLabel = e; + + me.gotoRC(me, me.rows - 5, 0); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Encryption:"))); + me.TD(me, 1, 5.4, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.encryptLabel = e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("ID:"))); + me.TD(me, 1, 5.4, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.keyLabel = e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Key:"))); + me.TD(me, 1, 5.4, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.idLabel = e; + me.TR(me); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Stats:"))); + me.TD(me, 1, 5.4, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.statsLabel = e; + + me.gotoRC(me, 2, 2.2); me.setFirstColumn(me, me.currentColumn); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Players:"))); + me.TR(me); + me.TD(me, me.rows - 8, 4, e = makeXonoticPlayerList()); + me.rawPlayerList = e; +} + diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh new file mode 100644 index 000000000..ed3515f99 --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh @@ -0,0 +1,30 @@ +#pragma once + +#include "tab.qh" +CLASS(XonoticServerInfoTab, XonoticTab) + METHOD(XonoticServerInfoTab, fill, void(entity)); + ATTRIB(XonoticServerInfoTab, title, string, _("Server Information")); + ATTRIB(XonoticServerInfoTab, color, vector, SKINCOLOR_DIALOG_SERVERINFO); + ATTRIB(XonoticServerInfoTab, intendedWidth, float, 0.8); + ATTRIB(XonoticServerInfoTab, rows, float, 17); + ATTRIB(XonoticServerInfoTab, columns, float, 6.2); + + ATTRIB(XonoticServerInfoTab, nameLabel, entity); + ATTRIB(XonoticServerInfoTab, cnameLabel, entity); + ATTRIB(XonoticServerInfoTab, typeLabel, entity); + ATTRIB(XonoticServerInfoTab, mapLabel, entity); + ATTRIB(XonoticServerInfoTab, rawPlayerList, entity); + ATTRIB(XonoticServerInfoTab, numPlayersLabel, entity); + ATTRIB(XonoticServerInfoTab, numBotsLabel, entity); + ATTRIB(XonoticServerInfoTab, numFreeSlotsLabel, entity); + ATTRIB(XonoticServerInfoTab, modLabel, entity); + ATTRIB(XonoticServerInfoTab, versionLabel, entity); + ATTRIB(XonoticServerInfoTab, keyLabel, entity); + ATTRIB(XonoticServerInfoTab, idLabel, entity); + ATTRIB(XonoticServerInfoTab, encryptLabel, entity); + ATTRIB(XonoticServerInfoTab, canConnectLabel, entity); + ATTRIB(XonoticServerInfoTab, pureLabel, entity); + ATTRIB(XonoticServerInfoTab, statsLabel, entity); +ENDCLASS(XonoticServerInfoTab) +entity makeXonoticServerInfoTab(); + diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qc new file mode 100644 index 000000000..81d089785 --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qc @@ -0,0 +1,62 @@ +#include "dialog_multiplayer_join_termsofservice.qh" + +#include "textbox.qh" +#include + + +entity makeXonoticServerToSTab() +{ + entity me; + me = NEW(XonoticServerToSTab); + me.configureDialog(me); + return me; +} + +void XonoticServerToSTab_loadToS(entity me, string downloadurl) +{ + url_single_fopen(downloadurl, FILE_READ, AdditionalServerInfo_OnGet, me); +} + +void XonoticServerToSTab_fill(entity me) +{ + entity e; + me.TR(me); + me.TD(me, me.rows, me.columns, e = makeXonoticTextBox()); + me.textBox = e; +} + +void AdditionalServerInfo_OnGet(entity fh, entity me, int status) +{ + switch (status) { + case URL_READY_CLOSED: + { + break; + } + case URL_READY_ERROR: + { + me.text = strzone("Error reading ToS"); + me.textBox.setText(me.textBox, me.text); + break; + } + case URL_READY_CANREAD: + { + strfree(me.text); + string temp = ""; + for (string s; (s = url_fgets(fh)); ) + { + if (temp != "") + temp = strcat(temp, "\n", s); + else + temp = s; + } + url_fclose(fh); + me.text = strzone(temp); + me.textBox.setText(me.textBox, me.text); + break; + } + default: + { + break; + } + } +} diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh b/qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh new file mode 100644 index 000000000..ebc2d867e --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh @@ -0,0 +1,18 @@ +#pragma once + +#include "tab.qh" +CLASS(XonoticServerToSTab, XonoticTab) + METHOD(XonoticServerToSTab, fill, void(entity)); + METHOD(XonoticServerToSTab, loadToS, void(entity, string)); + ATTRIB(XonoticServerToSTab, title, string, _("Terms of Service")); + ATTRIB(XonoticServerToSTab, color, vector, SKINCOLOR_DIALOG_SERVERINFO); + ATTRIB(XonoticServerToSTab, intendedWidth, float, 0.8); + ATTRIB(XonoticServerToSTab, rows, float, 17); + ATTRIB(XonoticServerToSTab, columns, float, 6.2); + + ATTRIB(XonoticServerToSTab, text, string); + ATTRIB(XonoticServerToSTab, textBox, entity); +ENDCLASS(XonoticServerToSTab) +entity makeXonoticServerToSTab(); + +void AdditionalServerInfo_OnGet(entity fh, entity pass, int status); diff --git a/qcsrc/menu/xonotic/dialog_termsofservice.qc b/qcsrc/menu/xonotic/dialog_termsofservice.qc new file mode 100644 index 000000000..0fec38a89 --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_termsofservice.qc @@ -0,0 +1,101 @@ +#include "dialog_termsofservice.qh" + +#include "../menu.qh" +#include "mainwindow.qh" +#include "dialog_firstrun.qh" +#include "textbox.qh" +#include "textlabel.qh" +#include "button.qh" +#include "util.qh" + +void Close_Clicked(entity btn, entity me) +{ + LOG_INFOF("Accepted ToS version %d", _Nex_ExtResponseSystem_NewToS); + cvar_set("_termsofservice_accepted", ftos(_Nex_ExtResponseSystem_NewToS)); + localcmd("saveconfig\n"); + if (main.firstRunDialog.shouldShow()) + main.firstDraw = true; + Dialog_Close(btn, me); +} + +void DontAccept_Clicked(entity btn, entity me) +{ + localcmd("quit\n"); +} + +void XonoticToSDialog_loadXonoticToS(entity me) +{ + url_single_fopen(termsofservice_url, FILE_READ, XonoticToS_OnGet, me); +} + +void XonoticToS_OnGet(entity fh, entity me, int status) +{ + switch (status) { + case URL_READY_CLOSED: + { + break; + } + case URL_READY_ERROR: + { + me.text = strzone("Error reading ToS"); + me.textBox.setText(me.textBox, me.text); + break; + } + case URL_READY_CANREAD: + { + strfree(me.text); + string temp = ""; + for (string s; (s = url_fgets(fh)); ) + { + if (temp != "") + temp = strcat(temp, "\n", s); + else + temp = s; + } + url_fclose(fh); + me.text = strzone(temp); + me.textBox.setText(me.textBox, me.text); + break; + } + default: + { + break; + } + } +} + +bool XonoticToSDialog_shouldShow() +{ + return (_Nex_ExtResponseSystem_NewToS && _Nex_ExtResponseSystem_NewToS > autocvar__termsofservice_accepted); +} + +void XonoticToSDialog_fill(entity me) +{ + entity e; + string subtitle; + + if (autocvar__termsofservice_accepted > 0) + subtitle = _("Terms of Service have been updated. Please read them before continuing:"); + else + subtitle = _("Welcome to Xonotic! Please read the following Terms of Service:"); + + me.TR(me); + me.TD(me, 1, 5, e = makeXonoticTextLabel(0, subtitle)); + e.allowWrap = 1; + + me.TR(me); + me.TR(me); + me.TD(me, me.rows - 4, me.columns, me.textBox = makeXonoticTextBox()); + + me.TR(me); + me.gotoRC(me, me.rows - 1, 0); + + me.TD(me, 1, me.columns/2, e = makeXonoticButton(_("Accept"), '0 1 0')); + e.onClick = Close_Clicked; + e.onClickEntity = me; + + me.TD(me, 1, me.columns/2, e = makeXonoticButton(_("Don't accept (quit the game)"), '1 0 0')); + e.onClick = DontAccept_Clicked; + e.onClickEntity = me; +} + diff --git a/qcsrc/menu/xonotic/dialog_termsofservice.qh b/qcsrc/menu/xonotic/dialog_termsofservice.qh new file mode 100644 index 000000000..9231f3063 --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_termsofservice.qh @@ -0,0 +1,24 @@ +#pragma once + +int autocvar__termsofservice_accepted; +const string termsofservice_url = "http://update.xonotic.org/tos.txt"; + +#include "rootdialog.qh" +CLASS(XonoticToSDialog, XonoticRootDialog) + METHOD(XonoticToSDialog, shouldShow, bool()); + METHOD(XonoticToSDialog, fill, void(entity)); + METHOD(XonoticToSDialog, loadXonoticToS, void(entity)); + ATTRIB(XonoticToSDialog, title, string, _("Terms of Service")); + ATTRIB(XonoticToSDialog, color, vector, SKINCOLOR_DIALOG_FIRSTRUN); + ATTRIB(XonoticToSDialog, intendedWidth, float, 0.8); + ATTRIB(XonoticToSDialog, rows, float, 16); + ATTRIB(XonoticToSDialog, columns, float, 6.2); + ATTRIB(XonoticToSDialog, name, string, "TermsOfService"); + + ATTRIB(XonoticToSDialog, text, string); + ATTRIB(XonoticToSDialog, textBox, entity); + + ATTRIB(XonoticToSDialog, closable, float, 0); +ENDCLASS(XonoticToSDialog) + +void XonoticToS_OnGet(entity fh, entity me, int status); diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc index 89a61fb0d..f5d2aca98 100644 --- a/qcsrc/menu/xonotic/mainwindow.qc +++ b/qcsrc/menu/xonotic/mainwindow.qc @@ -4,6 +4,7 @@ #include "nexposee.qh" #include "inputbox.qh" +#include "dialog_termsofservice.qh" #include "dialog_firstrun.qh" #include "dialog_hudsetup_exit.qh" #include "dialog_hudpanel_notification.qh" @@ -58,10 +59,16 @@ void MainWindow_draw(entity me) { SUPER(MainWindow).draw(me); - if(me.dialogToShow) - { - DialogOpenButton_Click_withCoords(NULL, me.dialogToShow, '0 0 0', eX * conwidth + eY * conheight); - me.dialogToShow = NULL; + if (me.firstDraw) { + if (me.ToSDialog.shouldShow()) + { + me.ToSDialog.loadXonoticToS(me.ToSDialog); + DialogOpenButton_Click_withCoords(NULL, me.ToSDialog, '0 0 0', eX * conwidth + eY * conheight); + } + else if(me.firstRunDialog.shouldShow()) + DialogOpenButton_Click_withCoords(NULL, me.firstRunDialog, '0 0 0', eX * conwidth + eY * conheight); + + me.firstDraw = false; } //------------------------------------- @@ -104,6 +111,11 @@ void MainWindow_configureMainWindow(entity me) { entity n, i; + // terms of service dialog + me.ToSDialog = i = NEW(XonoticToSDialog); + i.configureDialog(i); + me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); + // dialog run upon startup me.firstRunDialog = i = NEW(XonoticFirstRunDialog); i.configureDialog(i); @@ -281,7 +293,7 @@ void MainWindow_configureMainWindow(entity me) // main dialogs/windows me.mainNexposee = n = NEW(XonoticNexposee); - + /* if(checkextension("DP_GECKO_SUPPORT")) { @@ -291,7 +303,7 @@ void MainWindow_configureMainWindow(entity me) n.setNexposee(n, i, '0.1 0.1 0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y); } */ - + i = NEW(XonoticSingleplayerDialog); i.configureDialog(i); n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); @@ -332,7 +344,4 @@ void MainWindow_configureMainWindow(entity me) me.initializeDialog(me, n); me.disconnectDialogVisibility = 1; - - if(cvar_string("_cl_name") == cvar_defstring("_cl_name")) - me.dialogToShow = me.firstRunDialog; } diff --git a/qcsrc/menu/xonotic/mainwindow.qh b/qcsrc/menu/xonotic/mainwindow.qh index 1e8afa4a3..82e126a9f 100644 --- a/qcsrc/menu/xonotic/mainwindow.qh +++ b/qcsrc/menu/xonotic/mainwindow.qh @@ -5,6 +5,7 @@ CLASS(MainWindow, ModalController) METHOD(MainWindow, configureMainWindow, void(entity)); METHOD(MainWindow, draw, void(entity)); + ATTRIB(MainWindow, ToSDialog, entity); ATTRIB(MainWindow, firstRunDialog, entity); ATTRIB(MainWindow, advancedDialog, entity); ATTRIB(MainWindow, mutatorsDialog, entity); @@ -20,7 +21,7 @@ CLASS(MainWindow, ModalController) ATTRIB(MainWindow, languageWarningDialog, entity); ATTRIB(MainWindow, mainNexposee, entity); ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND); - ATTRIB(MainWindow, dialogToShow, entity); + ATTRIB(MainWindow, firstDraw, bool, true); ATTRIB(MainWindow, demostartconfirmDialog, entity); ATTRIB(MainWindow, demotimeconfirmDialog, entity); ATTRIB(MainWindow, resetDialog, entity); diff --git a/qcsrc/menu/xonotic/playerlist.qc b/qcsrc/menu/xonotic/playerlist.qc index e90eef23d..1edc5b840 100644 --- a/qcsrc/menu/xonotic/playerlist.qc +++ b/qcsrc/menu/xonotic/playerlist.qc @@ -2,11 +2,11 @@ .float realUpperMargin2; -const float PLAYERPARM_SCORE = 0; -const float PLAYERPARM_PING = 1; -const float PLAYERPARM_TEAM = 2; -const float PLAYERPARM_NAME = 3; -const float PLAYERPARM_COUNT = 4; +const int PLAYERPARM_SCORE = 0; +const int PLAYERPARM_PING = 1; +const int PLAYERPARM_TEAM = 2; +const int PLAYERPARM_NAME = 3; +const int PLAYERPARM_COUNT = 4; entity makeXonoticPlayerList() { @@ -33,7 +33,7 @@ void XonoticPlayerList_setPlayerList(entity me, string plist) s = bufstr_get(buf, i * PLAYERPARM_COUNT + PLAYERPARM_NAME); n = tokenize_console(s); - if(n == 4) + if(n == PLAYERPARM_COUNT) { bufstr_set(buf, i * PLAYERPARM_COUNT + PLAYERPARM_SCORE, argv(0)); // -666 bufstr_set(buf, i * PLAYERPARM_COUNT + PLAYERPARM_PING, argv(1)); // 100 diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc index e20a13a8e..7d5d21e30 100644 --- a/qcsrc/menu/xonotic/serverlist.qc +++ b/qcsrc/menu/xonotic/serverlist.qc @@ -1036,7 +1036,12 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is // Stats if(sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS)) - draw_Picture(iconPos, "icon_stats1", iconSize, '1 1 1', 1); + { + if (sflags & SERVERFLAG_PLAYERSTATS_CUSTOM) + draw_Picture(iconPos, "icon_mod_", iconSize, '1 1 1', 1); // TODO: custom stats server icon + else + draw_Picture(iconPos, "icon_stats1", iconSize, '1 1 1', 1); + } if(isFocused && me.mouseOverIcons && !me.tooltip) { @@ -1048,7 +1053,7 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is if(pure_available) t = strcat(t, sprintf(" (%s)", (pure) ? _("official settings") : _("modified settings"))); t = strcat(t, ", "); - t = strcat(t, ((sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS)) ? _("stats enabled") : _("stats disabled"))); + t = strcat(t, ((sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS)) ? ((sflags & SERVERFLAG_PLAYERSTATS_CUSTOM) ? _("custom stats server") : _("stats enabled")) : _("stats disabled"))); setZonedTooltip(me, t, string_null); } // -------------- diff --git a/qcsrc/menu/xonotic/textbox.qc b/qcsrc/menu/xonotic/textbox.qc new file mode 100644 index 000000000..1027d0c9e --- /dev/null +++ b/qcsrc/menu/xonotic/textbox.qc @@ -0,0 +1,90 @@ +#include "textbox.qh" +#include "../item/label.qh" + +entity makeXonoticTextBox() +{ + entity me; + me = NEW(XonoticTextBox); + me.configureXonoticListBox(me); + return me; +} + +void XonoticTextBox_destroy(entity me) +{ + if (me.stringList >= 0) + { + buf_del(me.stringList); + me.stringList = -1; + } +} + +void XonoticTextBox_setText(entity me, string text) +{ + if (me.stringList >= 0) + { + buf_del(me.stringList); + me.stringList = -1; + } + + int buf; + int line = 0; + + string t; + + buf = buf_create(); + for (int i = 0, n = tokenizebyseparator(text, "\n"); i < n; ++i) + { + t = substring(argv(i), 0, -1); + getWrappedLine_remaining = t; + while (getWrappedLine_remaining) + { + t = getWrappedLine(1, me.realFontSize, draw_TextWidth_WithColors); + bufstr_set(buf, line, t); + line++; + } + } + + me.stringList = buf; + me.nItems = line+1; +} + +string XonoticTextBox_getTextBoxLine(entity me, int i) +{ + if (me.stringList >= 0) + { + return bufstr_get(me.stringList, i); + } + return string_null; +} + +// mostly copied from playerlist +// FIXME: is this really needed +void XonoticTextBox_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) +{ + me.itemAbsSize = '0 0 0'; + SUPER(XonoticTextBox).resizeNotify(me, relOrigin, relSize, absOrigin, absSize); + + me.itemAbsSize.y = absSize.y * me.itemHeight; + me.itemAbsSize.x = absSize.x * (1 - me.controlWidth); + me.realFontSize.y = me.fontSize / me.itemAbsSize.y; + me.realFontSize.x = me.fontSize / me.itemAbsSize.x; + string temp = string_null; + for (int i = 0; i < me.nItems; ++i) + { + if (!temp) + { + temp = me.getTextBoxLine(me, i); + } + else + { + temp = strcat(temp, "\n", me.getTextBoxLine(me, i)); + } + } + me.setText(me, temp); +} + +void XonoticTextBox_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused) +{ + string s = me.getTextBoxLine(me, i); + draw_Text(vec2(0, 0), s, me.realFontSize, me.colorL, me.alpha, true); +} diff --git a/qcsrc/menu/xonotic/textbox.qh b/qcsrc/menu/xonotic/textbox.qh new file mode 100644 index 000000000..b27481671 --- /dev/null +++ b/qcsrc/menu/xonotic/textbox.qh @@ -0,0 +1,23 @@ +#pragma once + +#include "listbox.qh" + +// slightly hacky multiline textbox with scrollbar +CLASS(XonoticTextBox, XonoticListBox) + METHOD(XonoticTextBox, destroy, void(entity)); + ATTRIB(XonoticTextBox, rowsPerItem, float, 1); + METHOD(XonoticTextBox, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticTextBox, drawListBoxItem, void(entity, int, vector, bool, bool)); + ATTRIB(XonoticTextBox, allowFocusSound, float, 0); + ATTRIB(XonoticTextBox, alpha, float, SKINALPHA_TEXT); + ATTRIB(XonoticTextBox, fontSize, float, SKINFONTSIZE_NORMAL); + ATTRIB(XonoticTextBox, realFontSize, vector, '0 0 0'); + ATTRIB(XonoticTextBox, itemAbsSize, vector, '0 0 0'); + METHOD(XonoticTextBox, setText, void(entity, string)); + METHOD(XonoticTextBox, getTextBoxLine, string(entity, int)); + ATTRIB(XonoticTextBox, nItems, int, 0); + ATTRIB(XonoticTextBox, stringList, int, -1); + ATTRIB(XonoticTextBox, selectionDoesntMatter, bool, true); +ENDCLASS(XonoticTextBox) +entity makeXonoticTextBox(); + diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index e77049d20..b697a6891 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -352,6 +352,7 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data) string s; string un_version = ""; + string un_tosversion = ""; string un_download = ""; string un_url = ""; string un_bannedservers = ""; @@ -372,6 +373,11 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data) un_version = s; break; } + case "T": + { + un_tosversion = s; + break; + } case "C": { un_compatexpire = s; @@ -432,6 +438,11 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data) } } + if(un_tosversion != "") + { + _Nex_ExtResponseSystem_NewToS = stof(un_tosversion); + } + if(un_bannedservers != "") { _Nex_ExtResponseSystem_BannedServers = strzone(un_bannedservers); @@ -582,6 +593,7 @@ void preMenuDraw() draw_CenterText(mid - 1 * line, l1, fs, '1 0 0', 1, 0); draw_CenterText(mid - 0 * line, l2, fs, '0 0 1', 1, 0); } + if (!campaign_name_previous) campaign_name_previous = strzone(strcat(campaign_name, "x")); // force unequal if(campaign_name == campaign_name_previous) @@ -683,7 +695,6 @@ float updateCompression() GAMETYPE(MAPINFO_TYPE_ASSAULT) \ /* GAMETYPE(MAPINFO_TYPE_DUEL) */ \ /* GAMETYPE(MAPINFO_TYPE_INVASION) */ \ - /**/ // hidden gametypes come last so indexing always works correctly #define HIDDEN_GAMETYPES \ diff --git a/qcsrc/menu/xonotic/util.qh b/qcsrc/menu/xonotic/util.qh index f5bd636d8..9e90c7776 100644 --- a/qcsrc/menu/xonotic/util.qh +++ b/qcsrc/menu/xonotic/util.qh @@ -47,5 +47,6 @@ string _Nex_ExtResponseSystem_PromotedServers; float _Nex_ExtResponseSystem_PromotedServersNeedsRefresh; string _Nex_ExtResponseSystem_RecommendedServers; float _Nex_ExtResponseSystem_RecommendedServersNeedsRefresh; +float _Nex_ExtResponseSystem_NewToS; void CheckSendCvars(entity me, string cvarnamestring); diff --git a/qcsrc/server/_mod.inc b/qcsrc/server/_mod.inc index 34ca1e2c8..c82e892f7 100644 --- a/qcsrc/server/_mod.inc +++ b/qcsrc/server/_mod.inc @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/qcsrc/server/_mod.qh b/qcsrc/server/_mod.qh index c99753826..52574efec 100644 --- a/qcsrc/server/_mod.qh +++ b/qcsrc/server/_mod.qh @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/qcsrc/server/bot/api.qh b/qcsrc/server/bot/api.qh index 0759d4636..65ab46bad 100644 --- a/qcsrc/server/bot/api.qh +++ b/qcsrc/server/bot/api.qh @@ -70,7 +70,7 @@ void bot_clientconnect(entity this); void bot_clientdisconnect(entity this); void bot_cmdhelp(string scmd); void bot_endgame(); -bool bot_fixcount(); +bool bot_fixcount(bool multiple_per_frame); void bot_list_commands(); void bot_queuecommand(entity bot, string cmdstring); void bot_relinkplayerlist(); diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc index 59ff81df9..79f939196 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -536,11 +536,8 @@ void bot_removenewest() void autoskill(float factor) { - float bestbot; - float bestplayer; - - bestbot = -1; - bestplayer = -1; + int bestbot = -1; + int bestplayer = -1; FOREACH_CLIENT(IS_PLAYER(it), { if(IS_REAL_CLIENT(it)) bestplayer = max(bestplayer, it.totalfrags - it.totalfrags_lastcheck); @@ -548,37 +545,37 @@ void autoskill(float factor) bestbot = max(bestbot, it.totalfrags - it.totalfrags_lastcheck); }); - LOG_DEBUG("autoskill: best player got ", ftos(bestplayer), ", "); - LOG_DEBUG("best bot got ", ftos(bestbot), "; "); + string msg = strcat("autoskill: best player got ", ftos(bestplayer), ", ""best bot got ", ftos(bestbot), "; "); if(bestbot < 0 || bestplayer < 0) { - LOG_DEBUG("not doing anything"); + msg = strcat(msg, "not doing anything"); // don't return, let it reset all counters below } else if(bestbot <= bestplayer * factor - 2) { if(autocvar_skill < 17) { - LOG_DEBUG("2 frags difference, increasing skill"); + msg = strcat(msg, "2 frags difference, increasing skill"); cvar_set("skill", ftos(autocvar_skill + 1)); - bprint("^2SKILL UP!^7 Now at level ", ftos(autocvar_skill), "\n"); + bprint("^2BOT SKILL UP!^7 Now at level ", ftos(autocvar_skill), "\n"); } } else if(bestbot >= bestplayer * factor + 2) { if(autocvar_skill > 0) { - LOG_DEBUG("2 frags difference, decreasing skill"); + msg = strcat(msg, "2 frags difference, decreasing skill"); cvar_set("skill", ftos(autocvar_skill - 1)); - bprint("^1SKILL DOWN!^7 Now at level ", ftos(autocvar_skill), "\n"); + bprint("^1BOT SKILL DOWN!^7 Now at level ", ftos(autocvar_skill), "\n"); } } else { - LOG_DEBUG("not doing anything"); + msg = strcat(msg, "not doing anything"); return; // don't reset counters, wait for them to accumulate } + LOG_DEBUG(msg); FOREACH_CLIENT(IS_PLAYER(it), { it.totalfrags_lastcheck = it.totalfrags; }); } @@ -591,7 +588,7 @@ void bot_calculate_stepheightvec() jumpheight_time = autocvar_sv_jumpvelocity / autocvar_sv_gravity; } -bool bot_fixcount() +bool bot_fixcount(bool multiple_per_frame) { int activerealplayers = 0; int realplayers = 0; @@ -639,13 +636,17 @@ bool bot_fixcount() // only add one bot per frame to avoid utter chaos if(time > botframe_nextthink) { - if (currentbots < bots) + while (currentbots < bots) { if (bot_spawn() == NULL) { bprint("Can not add bot, server full.\n"); return false; } + if (!multiple_per_frame) + { + break; + } } while (currentbots > bots && bots >= 0) bot_removenewest(); @@ -716,7 +717,7 @@ void bot_serverframe() if(time > botframe_nextthink) { - if(!bot_fixcount()) + if(!bot_fixcount(false)) botframe_nextthink = time + 10; } diff --git a/qcsrc/server/bot/default/bot.qh b/qcsrc/server/bot/default/bot.qh index 618a766b8..74f7e0fa9 100644 --- a/qcsrc/server/bot/default/bot.qh +++ b/qcsrc/server/bot/default/bot.qh @@ -90,7 +90,7 @@ int _content_type; */ entity bot_spawn(); -bool bot_fixcount(); +bool bot_fixcount(bool multiple_per_frame); void bot_think(entity this); void bot_setnameandstuff(entity this); diff --git a/qcsrc/server/bot/default/havocbot/roles.qc b/qcsrc/server/bot/default/havocbot/roles.qc index 87f7bc0d0..52aff186a 100644 --- a/qcsrc/server/bot/default/havocbot/roles.qc +++ b/qcsrc/server/bot/default/havocbot/roles.qc @@ -1,5 +1,6 @@ #include "roles.qh" +#include #include #include #include @@ -11,7 +12,6 @@ #include #include #include -#include void havocbot_goalrating_waypoints(entity this, float ratingscale, vector org, float sradius) { diff --git a/qcsrc/server/bot/null/bot_null.qc b/qcsrc/server/bot/null/bot_null.qc index a7f8e99f1..a27e00c42 100644 --- a/qcsrc/server/bot/null/bot_null.qc +++ b/qcsrc/server/bot/null/bot_null.qc @@ -6,7 +6,7 @@ void bot_clientconnect(entity this) { } void bot_clientdisconnect(entity this) { } void bot_cmdhelp(string scmd) { } void bot_endgame() { } -bool bot_fixcount() { return true; } +bool bot_fixcount(bool multiple_per_frame) { return true; } void bot_list_commands() { } void bot_queuecommand(entity bot, string cmdstring) { } void bot_relinkplayerlist() { } diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 6091c5344..9ec7cc69a 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -26,7 +27,6 @@ #include #include #include -#include #include #ifdef NOCHEATS diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 8d0e04d98..2b9f798d6 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -65,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -245,9 +245,10 @@ void setplayermodel(entity e, string modelname) } /** putting a client as observer in the server */ -void PutObserverInServer(entity this, bool is_forced) +void PutObserverInServer(entity this, bool is_forced, bool use_spawnpoint) { bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver, this, is_forced); + bool recount_ready = false; PlayerState_detach(this); if (IS_PLAYER(this)) @@ -262,17 +263,24 @@ void PutObserverInServer(entity this, bool is_forced) if(IS_REAL_CLIENT(this)) { if (vote_called) { VoteCount(false); } - ReadyCount(); + this.ready = false; + recount_ready = true; } entcs_update_players(this); } - entity spot = SelectSpawnPoint(this, true); - if (!spot) LOG_FATAL("No spawnpoints for observers?!?"); - this.angles = vec2(spot.angles); + if (use_spawnpoint) + { + entity spot = SelectSpawnPoint(this, true); + if (!spot) LOG_FATAL("No spawnpoints for observers?!?"); + this.angles = vec2(spot.angles); + // offset it so that the spectator spawns higher off the ground, looks better this way + setorigin(this, spot.origin + STAT(PL_VIEW_OFS, this)); + } + else // change origin to restore previous view origin + setorigin(this, this.origin + STAT(PL_VIEW_OFS, this) - STAT(PL_CROUCH_VIEW_OFS, this)); this.fixangle = true; - // offset it so that the spectator spawns higher off the ground, looks better this way - setorigin(this, spot.origin + STAT(PL_VIEW_OFS, this)); + if (IS_REAL_CLIENT(this)) { msg_entity = this; @@ -305,13 +313,16 @@ void PutObserverInServer(entity this, bool is_forced) if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE); + TRANSMUTE(Observer, this); + + if(recount_ready) ReadyCount(); + WaypointSprite_PlayerDead(this); + accuracy_resend(this); if (CS(this).killcount != FRAGS_SPECTATOR && !game_stopped && CHAT_NOSPECTATORS()) Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_CHAT_NOSPECTATORS); - accuracy_resend(this); - CS(this).spectatortime = time; if(this.bot_attack) IL_REMOVE(g_bot_targets, this); @@ -320,7 +331,6 @@ void PutObserverInServer(entity this, bool is_forced) IL_REMOVE(g_monster_targets, this); this.monster_attack = false; STAT(HUD, this) = HUD_NORMAL; - TRANSMUTE(Observer, this); this.iscreature = false; this.teleportable = TELEPORT_SIMPLE; if(this.damagedbycontents) @@ -361,6 +371,7 @@ void PutObserverInServer(entity this, bool is_forced) this.revival_time = 0; this.draggable = drag_undraggable; + player_powerups_remove_all(this); this.items = 0; STAT(WEAPONS, this) = '0 0 0'; this.drawonlytoclient = this; @@ -407,6 +418,10 @@ void PutObserverInServer(entity this, bool is_forced) if (CS(this).just_joined) CS(this).just_joined = false; + + // for RJZ + if (autocvar_rjz_count_shards) + send_TotalShards(this); } int player_getspecies(entity this) @@ -825,6 +840,7 @@ void PutClientInServer(entity this) if (game_stopped) TRANSMUTE(Observer, this); + bool use_spawnpoint = (!this.enemy); // check this.enemy here since SetSpectatee will clear it SetSpectatee(this, NULL); // reset player keys @@ -834,7 +850,7 @@ void PutClientInServer(entity this) MUTATOR_CALLHOOK(PutClientInServer, this); if (IS_OBSERVER(this)) { - PutObserverInServer(this, false); + PutObserverInServer(this, false, use_spawnpoint); } else if (IS_PLAYER(this)) { PutPlayerInServer(this); } @@ -884,6 +900,9 @@ void ClientInit_misc(entity this) // z411 send full hostname WriteString(channel, (autocvar_hostname_full != "" ? autocvar_hostname_full : autocvar_hostname)); WriteString(channel, autocvar_sv_motd_permanent); + + // z411 send client countdown type + WriteByte(channel, autocvar_sv_timer_countdown); } void ClientInit_CheckUpdate(entity this) @@ -957,7 +976,6 @@ void DecodeLevelParms(entity this) void FixClientCvars(entity e) { // send prediction settings to the client - stuffcmd(e, "\nin_bindmap 0 0\n"); if(autocvar_g_antilag == 3) // client side hitscan stuffcmd(e, "cl_cmd settemp cl_prydoncursor_notrace 0\n"); if(autocvar_sv_gentle) @@ -1068,7 +1086,6 @@ string getwelcomemessage(entity this) //string versionmessage = GetClientVersionMessage(this); //string s = strcat(versionmessage, "^8\n^9", (autocvar_hostname_full ? autocvar_hostname_full : autocvar_hostname)); - //string s = strcat(versionmessage, "^8\n^8\nserver is ^9", autocvar_hostname, "^8\n"); string s = (autocvar_hostname_full != "" ? autocvar_hostname_full : autocvar_hostname); s = strcat(s, "^8\n^7", gamemode_name); @@ -1096,6 +1113,9 @@ string getwelcomemessage(entity this) if (motd != "") { s = strcat(s, "\n\n^7", strreplace("\\n", "\n", motd)); } + + // It's been a work, I want some credit for a while. Might remove later. + s = strcat(s, "\n\nUsing BaI mod by z411 - bienvenidoainternet.org"); return s; } @@ -1132,8 +1152,12 @@ void ClientConnect(entity this) else CS(this).allowed_timeouts = autocvar_sv_timeout_number; - if (autocvar_sv_eventlog) + if (autocvar_sv_eventlog) { GameLogEcho(strcat(":join:", ftos(this.playerid), ":", ftos(etof(this)), ":", ((IS_REAL_CLIENT(this)) ? GameLog_ProcessIP(this.netaddress) : "bot"), ":", playername(this.netname, this.team, false))); + + /* z411 for RJZ */ + if(autocvar_rjz_ranks) GameLogEcho(strcat(":idfp:", ftos(etof(this)), ":", this.crypto_idfp)); + } CS(this).just_joined = true; // stop spamming the eventlog with additional lines when the client connects @@ -1466,15 +1490,17 @@ void play_countdown(entity this, float finished, Sound samp) sound (this, CH_INFO, samp, VOL_BASE, ATTEN_NORM); } +// it removes special powerups not handled by StatusEffects void player_powerups_remove_all(entity this) { - if (this.items & IT_SUPERWEAPON) + if (this.items & (IT_SUPERWEAPON | IT_UNLIMITED_AMMO | IT_UNLIMITED_SUPERWEAPONS)) { // don't play the poweroff sound when the game restarts or the player disconnects if (time > game_starttime + 1 && IS_CLIENT(this)) sound(this, CH_INFO, SND_POWEROFF, VOL_BASE, ATTEN_NORM); - stopsound(this, CH_TRIGGER_SINGLE); // get rid of the pickup sound - this.items -= (this.items & IT_SUPERWEAPON); + if (this.items & (IT_UNLIMITED_AMMO | IT_UNLIMITED_SUPERWEAPONS)) + stopsound(this, CH_TRIGGER_SINGLE); // get rid of the pickup sound + this.items -= (this.items & (IT_SUPERWEAPON | IT_UNLIMITED_AMMO | IT_UNLIMITED_SUPERWEAPONS)); } } @@ -1578,7 +1604,7 @@ float CalcRot(float current, float stable, float rotfactor, float rotframetime) return max(stable, current + (stable - current) * rotfactor * rotframetime); } -void RotRegen(entity this, int res, float limit_mod, +void RotRegen(entity this, Resource res, float limit_mod, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime) { @@ -1822,7 +1848,7 @@ bool SpectateSet(entity this) accuracy_resend(this); if(!SpectateUpdate(this)) - PutObserverInServer(this, false); + PutObserverInServer(this, false, true); return true; } @@ -1864,18 +1890,18 @@ void SetSpectatee(entity this, entity spectatee) old_spectatee.(weaponentity).arc_beam.SendFlags |= ARC_SF_SETTINGS; } } - if(this.enemy) + if(spectatee) { for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) { .entity weaponentity = weaponentities[slot]; - if(this.enemy.(weaponentity).arc_beam) - this.enemy.(weaponentity).arc_beam.SendFlags |= ARC_SF_SETTINGS; + if(spectatee.(weaponentity).arc_beam) + spectatee.(weaponentity).arc_beam.SendFlags |= ARC_SF_SETTINGS; } } - if (this.enemy) - SetSpectatee_status(this, etof(this.enemy)); + if (spectatee) + SetSpectatee_status(this, etof(spectatee)); // needed to update spectator list if(old_spectatee) { ClientData_Touch(old_spectatee); } @@ -2331,7 +2357,7 @@ void ObserverOrSpectatorThink(entity this) TRANSMUTE(Observer, this); PutClientInServer(this); } else if(!SpectateUpdate(this) && !SpectateNext(this)) { - PutObserverInServer(this, false); + PutObserverInServer(this, false, true); this.would_spectate = true; } } @@ -2357,7 +2383,7 @@ void ObserverOrSpectatorThink(entity this) } } if(is_spec && !SpectateUpdate(this)) - PutObserverInServer(this, false); + PutObserverInServer(this, false, true); } if (is_spec) this.flags |= FL_CLIENT | FL_NOTARGET; @@ -2541,12 +2567,9 @@ void PlayerPreThink (entity this) this.last_vehiclecheck = time + 1; } - if(!CS_CVAR(this).cvar_cl_newusekeysupported) // FIXME remove this - it was a stupid idea to begin with, we can JUST use the button - { - if(PHYS_INPUT_BUTTON_USE(this) && !CS(this).usekeypressed) - PlayerUseKey(this); - CS(this).usekeypressed = PHYS_INPUT_BUTTON_USE(this); - } + if(PHYS_INPUT_BUTTON_USE(this) && !CS(this).usekeypressed) + PlayerUseKey(this); + CS(this).usekeypressed = PHYS_INPUT_BUTTON_USE(this); if (IS_REAL_CLIENT(this)) PrintWelcomeMessage(this); @@ -2731,7 +2754,7 @@ void PlayerPostThink (entity this) if (IS_PLAYER(this) && autocvar_sv_maxidle_playertospectator > 0) { Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_MOVETOSPEC_IDLING, this.netname, maxidle_time); - PutObserverInServer(this, true); + PutObserverInServer(this, true, true); } else { diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh index bd366cfd9..2ee5aa3ca 100644 --- a/qcsrc/server/client.qh +++ b/qcsrc/server/client.qh @@ -2,6 +2,7 @@ #include "utils.qh" #include +//#include #include #include @@ -63,9 +64,14 @@ string autocvar_g_teamnames_blue; string autocvar_g_teamnames_yellow; string autocvar_g_teamnames_pink; +void send_TeamNames(int channel, entity to); + // Medals float autocvar_g_medals_excellent_time = 2; +// Timer +int autocvar_sv_timer_countdown = 1; // 0 = disabled, 1 = enabled, 2 = spect only + // WEAPONTODO .string weaponorder_byimpulse; @@ -102,6 +108,7 @@ CLASS(Client, Object) ATTRIB(Client, team, int, this.team); ATTRIB(Client, clientcolors, int, this.clientcolors); ATTRIB(Client, countrycode, int, this.countrycode); + ATTRIB(Client, rank, string, this.rank); /** Client IP */ ATTRIB(Client, netaddress, string, this.netaddress); ATTRIB(Client, playermodel, string, this.playermodel); @@ -224,12 +231,11 @@ CLASS(Client, Object) ATTRIB(Client, cvar_cl_clippedspectating, bool, this.cvar_cl_clippedspectating); ATTRIB(Client, cvar_cl_autoscreenshot, int, this.cvar_cl_autoscreenshot); ATTRIB(Client, cvar_cl_jetpack_jump, bool, this.cvar_cl_jetpack_jump); - ATTRIB(Client, cvar_cl_newusekeysupported, bool, this.cvar_cl_newusekeysupported); ATTRIB(Client, cvar_cl_noantilag, bool, this.cvar_cl_noantilag); ATTRIB(Client, cvar_cl_movement_track_canjump, bool, this.cvar_cl_movement_track_canjump); ATTRIB(Client, cvar_cl_weaponimpulsemode, int, this.cvar_cl_weaponimpulsemode); ATTRIB(Client, cvar_g_xonoticversion, string, this.cvar_g_xonoticversion); - ATTRIB(Client, autoswitch, bool, this.autoswitch); + ATTRIB(Client, cvar_cl_autoswitch, bool, this.cvar_cl_autoswitch); ATTRIB(Client, cvar_cl_casings, bool, this.cvar_cl_casings); ATTRIB(Client, cvar_r_drawviewmodel, bool, this.cvar_r_drawviewmodel); ATTRIB(Client, cvar_cl_dodging_timeout, float, this.cvar_cl_dodging_timeout); @@ -330,6 +336,7 @@ bool independent_players; .float lastkill; .int countrycode; .int killcount; +.string rank; // RJZ //flood fields .float nickspamtime; // time of last nick change @@ -391,7 +398,8 @@ STATIC_INIT(g_initforplayer) { g_initforplayer = IL_NEW(); } void play_countdown(entity this, float finished, Sound samp); void player_powerups_remove_all(entity this); -void RotRegen(entity this, float current, float limit_mod, +// NOTE: current type is Resource (avoiding circular includes!) +void RotRegen(entity this, entity current, float limit_mod, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime); @@ -399,7 +407,7 @@ bool Spectate(entity this, entity pl); void ClientInit_Spawn(); -void PutObserverInServer(entity this, bool is_forced); +void PutObserverInServer(entity this, bool is_forced, bool use_spawnpoint); void SetSpectatee(entity this, entity spectatee); void SetSpectatee_status(entity this, int spectatee_num); diff --git a/qcsrc/server/clientkill.qc b/qcsrc/server/clientkill.qc index 474f15af1..296a95bfe 100644 --- a/qcsrc/server/clientkill.qc +++ b/qcsrc/server/clientkill.qc @@ -25,7 +25,7 @@ void ClientKill_Now_TeamChange(entity this) { if (blockSpectators) Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime); - PutObserverInServer(this, false); + PutObserverInServer(this, false, true); } else { diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 17e237114..0c1dcc798 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -73,8 +73,8 @@ void ClientCommand_autoswitch(entity caller, int request, int argc) { if (argv(1) != "") { - CS_CVAR(caller).autoswitch = InterpretBoolean(argv(1)); - sprint(caller, strcat("^1autoswitch is currently turned ", (CS_CVAR(caller).autoswitch ? "on" : "off"), ".\n")); + CS_CVAR(caller).cvar_cl_autoswitch = InterpretBoolean(argv(1)); + sprint(caller, strcat("^1autoswitch is currently turned ", (CS_CVAR(caller).cvar_cl_autoswitch ? "on" : "off"), ".\n")); return; } } @@ -372,7 +372,7 @@ void ClientCommand_ready(entity caller, int request) { case CMD_REQUEST_COMMAND: { - if (IS_CLIENT(caller) && caller.last_ready < time - 3) // anti-spam + if (IS_CLIENT(caller) && caller.last_ready < time - 3) { if (warmup_stage || g_race_qualifying == 2) { @@ -382,15 +382,17 @@ void ClientCommand_ready(entity caller, int request) { caller.ready = false; if (IS_PLAYER(caller) || INGAME_JOINED(caller)) - bprint(playername(caller.netname, caller.team, false), "^2 is ^1NOT^2 ready\n"); + bprint("\{1}", playername(caller.netname, caller.team, false), "^2 is ^1NOT^2 ready\n"); } else { caller.ready = true; if (IS_PLAYER(caller) || INGAME_JOINED(caller)) - bprint(playername(caller.netname, caller.team, false), "^2 is ready\n"); + bprint("\{1}", playername(caller.netname, caller.team, false), "^2 is ready\n"); } + caller.last_ready = time; + // cannot reset the game while a timeout is active! if (!timeout_status) ReadyCount(); } diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index b96d966c8..59f92bcbe 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -688,6 +689,7 @@ void CommonCommand_timein(int request, entity caller) timeout_status = TIMEOUT_INACTIVE; timeout_time = 0; timeout_handler.nextthink = time; // timeout_handler has to take care of it immediately + Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_TIMEOUT); bprint(strcat("^7The timeout was aborted by ", GetCallerName(caller), " !\n")); return; } diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh index 5fd66bdbb..5fbf0dc69 100644 --- a/qcsrc/server/command/common.qh +++ b/qcsrc/server/command/common.qh @@ -58,7 +58,6 @@ float sys_frametime; // gets initialised in worldspawn, saves the value from float orig_slowmo; // contains the value of autocvar_slowmo so that, after timeout finished, it isn't set to slowmo 1 necessarily float timeout_time; // contains the time in seconds that the active timeout has left float timeout_leadtime; // contains the number of seconds left of the leadtime (before the timeout starts) -float timeout_status; // (values: 0, 1, 2) contains whether a timeout is not active (0), was called but still at leadtime (1) or is active (2) .float allowed_timeouts; // contains the number of allowed timeouts for each player .vector lastV_angle; // used when pausing the game in order to force the player to keep his old view angle fixed diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc index 3beabbc41..3f82484ab 100644 --- a/qcsrc/server/command/getreplies.qc +++ b/qcsrc/server/command/getreplies.qc @@ -304,6 +304,7 @@ string getmonsterlist() ============= GetCvars ============= +Superseded by REPLICATE Called with: 0: sends the request >0: receives a cvar from name=argv(f) value=argv(f+1) @@ -373,12 +374,6 @@ void GetCvars_handleFloatOnce(entity this, entity store, string thisname, float stuffcmd(this, strcat("cl_cmd sendcvar ", name, "\n")); } } -string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(entity this, string wo) -{ - string o = W_FixWeaponOrder_ForceComplete(wo); - strcpy(CS_CVAR(this).weaponorder_byimpulse, W_FixWeaponOrder_BuildImpulseList(o)); - return o; -} /** * @param f -1: cleanup, 0: request, 1: receive @@ -400,36 +395,6 @@ void GetCvars(entity this, entity store, int f) Notification_GetCvars(this, store); ReplicateVars(this, store, s, f); - - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList); - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[0], "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[1], "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[2], "cl_weaponpriority2", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[3], "cl_weaponpriority3", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[4], "cl_weaponpriority4", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[5], "cl_weaponpriority5", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[6], "cl_weaponpriority6", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[7], "cl_weaponpriority7", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[8], "cl_weaponpriority8", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[9], "cl_weaponpriority9", W_FixWeaponOrder_AllowIncomplete); - - GetCvars_handleFloat(this, store, s, f, cvar_cl_allow_uidtracking, "cl_allow_uidtracking"); - - // fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early) if (f > 0) - { - if (s == "cl_weaponpriority") - { - for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) - { - .entity weaponentity = weaponentities[slot]; - if (this.(weaponentity) && (this.(weaponentity).m_weapon != WEP_Null || slot == 0)) - this.(weaponentity).m_switchweapon = w_getbestweapon(this, weaponentity); - } - } - if (s == "cl_allow_uidtracking") - PlayerStats_GameReport_AddPlayer(this); - //if (s == "cl_gunalign") - //W_ResetGunAlign(this, store.cvar_cl_gunalign); - } + ReplicateVars_ApplyChange(this, store, s, f); } diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index d2a143bad..95979c304 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -246,7 +246,7 @@ void GameCommand_allspec(int request, int argc) string reason = argv(1); int n = 0; FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it), { - PutObserverInServer(it, true); + PutObserverInServer(it, true, true); ++n; }); if (n) bprint(strcat("Successfully forced all (", ftos(n), ") players to spectate", (reason ? strcat(" for reason: '", reason, "'") : ""), ".\n")); @@ -388,9 +388,9 @@ void GameCommand_bot_cmd(int request, int argc, string command) cvar_settemp("minplayers", "0"); cvar_settemp("minplayers_per_team", "0"); cvar_settemp("bot_number", "0"); - bot_fixcount(); + bot_fixcount(false); // Kill all bots. cvar_settemp("bot_number", argv(2)); - if (!bot_fixcount()) LOG_INFO("Sorry, could not set requested bot count"); + if (!bot_fixcount(true)) LOG_INFO("Sorry, could not set requested bot count"); return; } else if (argv(1) == "load" && argc == 3) @@ -421,9 +421,9 @@ void GameCommand_bot_cmd(int request, int argc, string command) cvar_settemp("minplayers", "0"); cvar_settemp("minplayers_per_team", "0"); cvar_settemp("bot_number", "0"); - bot_fixcount(); + bot_fixcount(false); // Kill all bots. cvar_settemp("bot_number", argv(3)); - if (!bot_fixcount()) LOG_INFO("Sorry, could not set requested bot count"); + if (!bot_fixcount(true)) LOG_INFO("Sorry, could not set requested bot count"); } else { @@ -978,6 +978,46 @@ void GameCommand_gotomap(int request, int argc) } } +void GameCommand_ircmsg(int request, int argc, string command) +{ + /* IRCSay from the SMB Modpack */ + switch (request) + { + case CMD_REQUEST_COMMAND: + { + string msgstr = substring(command, strlen(argv(0))+1, strlen(command)); + + if(msgstr == "") + return; + + string prefix; + if(substring(msgstr, 0, 3) == "^4*") // actions + prefix = "\{3}"; + else + prefix = "\{1}"; + + msgstr = strcat(prefix, strreplace("\n", " ", msgstr), "\n"); // newlines only are good for centerprint + + FOREACH_CLIENTSLOT(true, + { + if(!intermission_running) + if((autocvar_g_chat_nospectators == 1) || (autocvar_g_chat_nospectators == 2 && !(warmup_stage || game_stopped))) + if(IS_PLAYER(it)) + continue; + if(IS_REAL_CLIENT(it)) + sprint(it, msgstr); + }); + } + + default: + case CMD_REQUEST_USAGE: + { + LOG_HELP("Usage:^3 sv_cmd ircmsg message"); + return; + } + } +} + void GameCommand_lockteams(int request) { switch (request) @@ -1066,6 +1106,39 @@ void GameCommand_setflag(int request, int argc) } } +void GameCommand_setrank(int request, int argc) +{ + switch (request) + { + case CMD_REQUEST_COMMAND: + { + entity client; + float accepted; + + client = GetFilteredEntity(argv(1)); + accepted = VerifyClientEntity(client, false, false); + + if (accepted <= 0) + { + LOG_INFO("^1ERROR^7: Couldn't set player rank"); + LOG_HELP("Usage:^3 sv_cmd setrank #client_id rank"); + return; + } + + client.rank = strzone(argv(2)); + LOG_INFO("^2SUCCESS^7: Player rank set!"); + return; + } + default: + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); + case CMD_REQUEST_USAGE: + { + LOG_HELP("Usage:^3 sv_cmd setrank #client_id #rank"); + return; + } + } +} + void GameCommand_moveplayer(int request, int argc) { switch (request) @@ -1104,7 +1177,7 @@ void GameCommand_moveplayer(int request, int argc) string pl_name = playername(client.netname, client.team, false); if (!IS_SPEC(client) && !IS_OBSERVER(client)) { - PutObserverInServer(client, true); + PutObserverInServer(client, true, true); successful = strcat(successful, (successful ? ", " : ""), pl_name); } @@ -1313,7 +1386,7 @@ void GameCommand_setbots(int request, int argc) cvar_settemp("minplayers", "0"); cvar_settemp("minplayers_per_team", "0"); cvar_settemp("bot_number", argv(1)); - bot_fixcount(); + bot_fixcount(true); return; } } @@ -1739,9 +1812,6 @@ void GameCommand_(int request) // ================================== // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;) -SERVER_COMMAND(setflag, "Set client flag") { GameCommand_setflag(request, arguments); } -SERVER_COMMAND(teamname, "Set team name") { GameCommand_teamname(request, arguments); } - SERVER_COMMAND(adminmsg, "Send an admin message to a client directly") { GameCommand_adminmsg(request, arguments); } SERVER_COMMAND(allready, "Ends warmup and starts the match") { GameCommand_allready(request); } SERVER_COMMAND(allspec, "Force all players to spectate") { GameCommand_allspec(request, arguments); } @@ -1759,6 +1829,7 @@ SERVER_COMMAND(extendmatchtime, "Increase the timelimit value incrementally") { SERVER_COMMAND(gametype, "Simple command to change the active gametype") { GameCommand_gametype(request, arguments); } SERVER_COMMAND(gettaginfo, "Get specific information about a weapon model") { GameCommand_gettaginfo(request, arguments); } SERVER_COMMAND(gotomap, "Simple command to switch to another map") { GameCommand_gotomap(request, arguments); } +SERVER_COMMAND(ircmsg, "Chat message to be sent by IRC bots") { GameCommand_ircmsg(request, arguments, command); } SERVER_COMMAND(lockteams, "Disable the ability for players to switch or enter teams") { GameCommand_lockteams(request); } SERVER_COMMAND(make_mapinfo, "Automatically rebuild mapinfo files") { GameCommand_make_mapinfo(request); } SERVER_COMMAND(moveplayer, "Change the team/status of a player") { GameCommand_moveplayer(request, arguments); } @@ -1768,8 +1839,11 @@ SERVER_COMMAND(radarmap, "Generate a radar image of the map") { GameCommand_rada SERVER_COMMAND(reducematchtime, "Decrease the timelimit value incrementally") { GameCommand_reducematchtime(request); } SERVER_COMMAND(resetmatch, "Soft restart the game without changing teams; goes back to warmup if enabled") { GameCommand_resetmatch(request); } SERVER_COMMAND(setbots, "Adjust how many bots are in the match") { GameCommand_setbots(request, arguments); } +SERVER_COMMAND(setflag, "Set client flag") { GameCommand_setflag(request, arguments); } +SERVER_COMMAND(setrank, "Set client rank") { GameCommand_setrank(request, arguments); } SERVER_COMMAND(shuffleteams, "Randomly move players to different teams") { GameCommand_shuffleteams(request); } SERVER_COMMAND(stuffto, "Send a command to be executed on a client") { GameCommand_stuffto(request, arguments); } +SERVER_COMMAND(teamname, "Set team name") { GameCommand_teamname(request, arguments); } SERVER_COMMAND(trace, "Various debugging tools with tracing") { GameCommand_trace(request, arguments); } SERVER_COMMAND(unlockteams, "Enable the ability for players to switch or enter teams") { GameCommand_unlockteams(request); } SERVER_COMMAND(warp, "Choose different level in campaign") { GameCommand_warp(request, arguments); } diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index da9a9472f..2a0369747 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -348,10 +348,20 @@ void reset_map(bool dorespawn, bool is_fake_round_start) return; if (!is_fake_round_start) + { + Score_ClearAll(); PlayerStats_GameReport_Reset_All(); + } + if (round_handler_IsActive()) round_handler_Reset(game_starttime); } + + // for RJZ + if (autocvar_rjz_count_shards) { + total_shards = 0; + send_TotalShardsAll(); + } if (shuffleteams_on_reset_map) { @@ -419,8 +429,6 @@ void reset_map(bool dorespawn, bool is_fake_round_start) void ReadyRestart_think(entity this) { reset_map(true, false); - Score_ClearAll(); - Inventory_ClearAll(); delete(this); } @@ -437,7 +445,7 @@ void ReadyRestart_force(bool is_fake_round_start) // clear overtime, we have to decrease timelimit to its original value again. if (checkrules_overtimesadded > 0 && g_race_qualifying != 2) cvar_set("timelimit", ftos(autocvar_timelimit - (checkrules_overtimesadded * autocvar_timelimit_overtime))); - checkrules_suddendeathend = checkrules_overtimesadded = checkrules_suddendeathwarning = 0; + checkrules_suddendeathend = checkrules_overtimesadded = checkrules_suddendeathwarning = overtimes = 0; if(warmup_stage) game_starttime = time; // Warmup: No countdown in warmup @@ -480,7 +488,10 @@ void ReadyRestart_force(bool is_fake_round_start) FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it), { CS(it).allowed_timeouts = autocvar_sv_timeout_number; }); } - if (!sv_ready_restart_after_countdown || warmup_stage) reset_map(true, is_fake_round_start); + round_handler_Activate(!warmup_stage); + if (!sv_ready_restart_after_countdown || warmup_stage) + reset_map(true, is_fake_round_start); + if (autocvar_sv_eventlog) GameLogEcho(":restart"); } @@ -489,10 +500,6 @@ void ReadyRestart(bool forceWarmupEnd) if (MUTATOR_CALLHOOK(ReadyRestart_Deny) || intermission_running || race_completing) localcmd("restart\n"); else localcmd("\nsv_hook_readyrestart\n"); - // Reset ALL scores, but only do that at the beginning of the countdown if sv_ready_restart_after_countdown is off! - // Otherwise scores could be manipulated during the countdown. - if (!sv_ready_restart_after_countdown) Score_ClearAll(); - if(forceWarmupEnd) warmup_stage = 0; // forcefully end warmup and go to match stage else @@ -790,11 +797,24 @@ int VoteCommand_parse(entity caller, string vote_command, string vote_list, floa break; } + case "gg": + case "shuffleteams": + case "endmatch": + { + // add a delay so that vote result can be seen and announcer can be heard + // if the vote is accepted + vote_parsed_command = strcat("defer 2 ", vote_command); + vote_parsed_display = strzone(strcat("^1", vote_command)); + + break; + } + + case "reset": case "restart": // re-direct all match restarting to resetmatch vote_command = "resetmatch"; // fall-through case "resetmatch": { - vote_parsed_command = vote_command; + vote_parsed_command = strcat("defer 2 ", vote_command); vote_parsed_display = strzone(strcat("^1", vote_command)); break; @@ -807,7 +827,7 @@ int VoteCommand_parse(entity caller, string vote_command, string vote_list, floa return -1; } - vote_parsed_command = vote_command; + vote_parsed_command = strcat("defer 2 ", vote_command); vote_parsed_display = strzone(strcat("^1", vote_command)); break; } diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh index 355f241ef..b3079a207 100644 --- a/qcsrc/server/command/vote.qh +++ b/qcsrc/server/command/vote.qh @@ -71,7 +71,7 @@ const float RESTART_COUNTDOWN = 10; entity nagger; float readycount; // amount of players who are ready .float ready; // flag for if a player is ready -.float last_ready; // z411 time of the last readyup for anti-spam +.float last_ready; // last ready time for anti-spam .int team_saved; // team number to restore upon map reset .void(entity this) reset; // if set, an entity is reset using this .void(entity this) reset2; // if set, an entity is reset using this (after calling ALL the reset functions for other entities) diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc index ac2409cc0..911ab0f81 100644 --- a/qcsrc/server/compat/quake3.qc +++ b/qcsrc/server/compat/quake3.qc @@ -9,13 +9,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include /*********************** diff --git a/qcsrc/server/damage.qc b/qcsrc/server/damage.qc index 09232261a..a2f2b722a 100644 --- a/qcsrc/server/damage.qc +++ b/qcsrc/server/damage.qc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc index 3fa3dc6c6..be66fe968 100644 --- a/qcsrc/server/impulse.qc +++ b/qcsrc/server/impulse.qc @@ -381,87 +381,16 @@ void ImpulseCommands(entity this) if (timeout_status == TIMEOUT_ACTIVE) return; // don't allow any impulses while the game is paused - // allow only weapon change impulses when not in round time if (round_handler_IsActive() && !round_handler_IsRoundStarted()) { + // impulses forbidden while waiting for the start of a round #define X(id) case IMP_##id.impulse: switch (imp) { - X(weapon_group_0) - X(weapon_group_1) - X(weapon_group_2) - X(weapon_group_3) - X(weapon_group_4) - X(weapon_group_5) - X(weapon_group_6) - X(weapon_group_7) - X(weapon_group_8) - X(weapon_group_9) - X(weapon_next_byid) - X(weapon_prev_byid) - X(weapon_next_bygroup) - X(weapon_prev_bygroup) - X(weapon_next_bypriority) - X(weapon_prev_bypriority) - X(weapon_last) - X(weapon_best) + X(weapon_drop) X(weapon_reload) - X(weapon_priority_0_prev) - X(weapon_priority_1_prev) - X(weapon_priority_2_prev) - X(weapon_priority_3_prev) - X(weapon_priority_4_prev) - X(weapon_priority_5_prev) - X(weapon_priority_6_prev) - X(weapon_priority_7_prev) - X(weapon_priority_8_prev) - X(weapon_priority_9_prev) - X(weapon_priority_0_next) - X(weapon_priority_1_next) - X(weapon_priority_2_next) - X(weapon_priority_3_next) - X(weapon_priority_4_next) - X(weapon_priority_5_next) - X(weapon_priority_6_next) - X(weapon_priority_7_next) - X(weapon_priority_8_next) - X(weapon_priority_9_next) - X(weapon_priority_0_best) - X(weapon_priority_1_best) - X(weapon_priority_2_best) - X(weapon_priority_3_best) - X(weapon_priority_4_best) - X(weapon_priority_5_best) - X(weapon_priority_6_best) - X(weapon_priority_7_best) - X(weapon_priority_8_best) - X(weapon_priority_9_best) - X(weapon_byid_0) - X(weapon_byid_1) - X(weapon_byid_2) - X(weapon_byid_3) - X(weapon_byid_4) - X(weapon_byid_5) - X(weapon_byid_6) - X(weapon_byid_7) - X(weapon_byid_8) - X(weapon_byid_9) - X(weapon_byid_10) - X(weapon_byid_11) - X(weapon_byid_12) - X(weapon_byid_13) - X(weapon_byid_14) - X(weapon_byid_15) - X(weapon_byid_16) - X(weapon_byid_17) - X(weapon_byid_18) - X(weapon_byid_19) - X(weapon_byid_20) - X(weapon_byid_21) - X(weapon_byid_22) - X(weapon_byid_23) - break; - default: return; + X(use) + return; } #undef X } diff --git a/qcsrc/server/intermission.qc b/qcsrc/server/intermission.qc index 81850d8df..98d2ef25b 100644 --- a/qcsrc/server/intermission.qc +++ b/qcsrc/server/intermission.qc @@ -399,7 +399,7 @@ string GotoMap(string m) if(!MapInfo_CheckMap(m)) return "The map you suggested does not support the current game mode."; cvar_set("nextmap", m); - cvar_set("timelimit", "-1"); + cvar_set("_endmatch", "1"); if(mapvote_initialized || alreadychangedlevel) { if(DoNextMapOverride(0)) diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc index a889e6b92..3635c7f1d 100644 --- a/qcsrc/server/ipban.qc +++ b/qcsrc/server/ipban.qc @@ -6,6 +6,7 @@ #include #include #include +#include /* * Protocol of online ban list: diff --git a/qcsrc/server/ipban.qh b/qcsrc/server/ipban.qh index 330d8b7df..0e9dff87a 100644 --- a/qcsrc/server/ipban.qh +++ b/qcsrc/server/ipban.qh @@ -7,6 +7,7 @@ float Ban_MaybeEnforceBanOnce(entity client); float BanCommand(string command); float Ban_Insert(string ip, float bantime, string reason, float dosync); +void Ban_KickClient(entity client, string reason); void Ban_KickBanClient(entity client, float bantime, float masksize, string reason); void Ban_View(); float Ban_Delete(float i); diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc index 27e5a20ea..faec01a4c 100644 --- a/qcsrc/server/items/items.qc +++ b/qcsrc/server/items/items.qc @@ -11,7 +11,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -458,7 +460,7 @@ void GiveRandomWeapons(entity receiver, int num_weapons, string weapon_names, } } -bool Item_GiveAmmoTo(entity item, entity player, int res_type, float ammomax) +bool Item_GiveAmmoTo(entity item, entity player, Resource res_type, float ammomax) { float amount = GetResource(item, res_type); if (amount == 0) @@ -503,7 +505,7 @@ bool Item_GiveTo(entity item, entity player) // if the player is using their best weapon before items are given, they // probably want to switch to an even better weapon after items are given - if(CS_CVAR(player).autoswitch) + if(CS_CVAR(player).cvar_cl_autoswitch) { for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) { @@ -527,6 +529,13 @@ bool Item_GiveTo(entity item, entity player) pickedup |= Item_GiveAmmoTo(item, player, RES_CELLS, g_pickup_cells_max); pickedup |= Item_GiveAmmoTo(item, player, RES_PLASMA, g_pickup_plasma_max); pickedup |= Item_GiveAmmoTo(item, player, RES_FUEL, g_pickup_fuel_max); + + // for RJZ + if (autocvar_rjz_count_shards && !warmup_stage && item.itemdef == ITEM_ArmorSmall) { + total_shards++; + send_TotalShardsAll(); + } + if (item.itemdef.instanceOfWeaponPickup) { WepSet w, wp; @@ -1462,12 +1471,12 @@ void GiveSound(entity e, float v0, float v1, float t, Sound snd_incr, Sound snd_ if(v1 <= v0 - t) { if(snd_decr != NULL) - sound (e, CH_TRIGGER, snd_decr, VOL_BASE, ATTEN_NORM); + sound(e, CH_TRIGGER, snd_decr, VOL_BASE, ATTEN_NORM); } else if(v0 >= v0 + t) { if(snd_incr != NULL) - sound (e, CH_TRIGGER, snd_incr, VOL_BASE, ATTEN_NORM); + sound(e, ((snd_incr == SND_POWERUP) ? CH_TRIGGER_SINGLE : CH_TRIGGER), snd_incr, VOL_BASE, ATTEN_NORM); } } @@ -1478,7 +1487,7 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa else if(v0 > v1) e.(regenfield) = max(e.(regenfield), time + regentime); } -bool GiveResourceValue(entity e, int res_type, int op, int val) +bool GiveResourceValue(entity e, Resource res_type, int op, int val) { int v0 = GetResource(e, res_type); float new_val = 0; @@ -1540,7 +1549,7 @@ float GiveItems(entity e, float beginarg, float endarg) int _switchweapon = 0; - if(CS_CVAR(e).autoswitch) + if(CS_CVAR(e).cvar_cl_autoswitch) { for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) { diff --git a/qcsrc/server/items/items.qh b/qcsrc/server/items/items.qh index dc3898323..dff9ccda2 100644 --- a/qcsrc/server/items/items.qh +++ b/qcsrc/server/items/items.qh @@ -1,5 +1,6 @@ #pragma once +#include #include float autocvar_g_balance_superweapons_time; @@ -64,7 +65,7 @@ void Item_ScheduleInitialRespawn(entity e); /// \return No return. void GiveRandomWeapons(entity receiver, int num_weapons, string weapon_names, entity ammo_entity); -bool Item_GiveAmmoTo(entity item, entity player, int res_type, float ammomax); +bool Item_GiveAmmoTo(entity item, entity player, Resource res_type, float ammomax); bool Item_GiveTo(entity item, entity player); diff --git a/qcsrc/server/main.qh b/qcsrc/server/main.qh index e189601a7..172e0a9e5 100644 --- a/qcsrc/server/main.qh +++ b/qcsrc/server/main.qh @@ -28,9 +28,6 @@ void remove_safely(entity e); void remove_unsafely(entity e); -// copies a string to a tempstring (so one can strunzone it) -string strcat1(string s) = #115; // FRIK_FILE - #ifdef PROFILING float client_cefc_accumulator; float client_cefc_accumulatortime; diff --git a/qcsrc/server/mutators/_mod.inc b/qcsrc/server/mutators/_mod.inc index 5e6816b99..7b7cdf33d 100644 --- a/qcsrc/server/mutators/_mod.inc +++ b/qcsrc/server/mutators/_mod.inc @@ -1,3 +1,3 @@ // generated file; do not modify #include -#include \ No newline at end of file +#include diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh index 90a923034..a9c95a9c4 100644 --- a/qcsrc/server/mutators/events.qh +++ b/qcsrc/server/mutators/events.qh @@ -317,8 +317,17 @@ MUTATOR_HOOKABLE(PlayerPreThink, EV_PlayerPreThink); /**/ MUTATOR_HOOKABLE(GetPressedKeys, EV_GetPressedKeys); -/** is meant to call GetCvars_handle*(get_cvars_s, get_cvars_f, cvarfield, "cvarname") for cvars this mutator needs from the client */ -// NOTE: requesting cvar values (get_cvars_f 0) is deprecated +/** + * is meant to call GetCvars_handle* for cvars this mutator needs from the client, e.g.: + MUTATOR_HOOKFUNCTION(mymutator, GetCvars) + { + GetCvars_handleFloat(this, store, s, f, cvar_mycvar, "mycvar"); + return false; + } + * Usually you can just use REPLICATE instead of this hook, e.g.: + REPLICATE(cvar_mycvar, int, "mycvar"); + * NOTE: requesting cvar values (get_cvars_f 0) is deprecated + */ #define EV_GetCvars(i, o) \ /**/ i(float, get_cvars_f) \ /**/ i(string, get_cvars_s) \ @@ -709,7 +718,7 @@ MUTATOR_HOOKABLE(ItemTouched, EV_ItemTouched); resource limit. */ #define EV_GetResourceLimit(i, o) \ /** checked entity */ i(entity, MUTATOR_ARGV_0_entity) \ - /** resource type */ i(int, MUTATOR_ARGV_1_int) \ + /** resource type */ i(entity, MUTATOR_ARGV_1_entity) \ /** limit */ i(float, MUTATOR_ARGV_2_float) \ /**/ o(float, MUTATOR_ARGV_2_float) \ /**/ @@ -719,8 +728,8 @@ MUTATOR_HOOKABLE(GetResourceLimit, EV_GetResourceLimit); constants for resource types. Return true to forbid the change. */ #define EV_SetResource(i, o) \ /** checked entity */ i(entity, MUTATOR_ARGV_0_entity) \ - /** resource type */ i(int, MUTATOR_ARGV_1_int) \ - /**/ o(int, MUTATOR_ARGV_1_int) \ + /** resource type */ i(entity, MUTATOR_ARGV_1_entity) \ + /**/ o(entity, MUTATOR_ARGV_1_entity) \ /** amount */ i(float, MUTATOR_ARGV_2_float) \ /**/ o(float, MUTATOR_ARGV_2_float) \ /**/ @@ -731,7 +740,7 @@ constants for resource types. Amount wasted is the amount of resource that is above resource limit so it was not given. */ #define EV_ResourceAmountChanged(i, o) \ /** checked entity */ i(entity, MUTATOR_ARGV_0_entity) \ - /** resource type */ i(int, MUTATOR_ARGV_1_int) \ + /** resource type */ i(entity, MUTATOR_ARGV_1_entity) \ /** amount */ i(float, MUTATOR_ARGV_2_float) \ /**/ MUTATOR_HOOKABLE(ResourceAmountChanged, EV_ResourceAmountChanged); @@ -741,7 +750,7 @@ limit. See RES_* constants for resource types. Amount wasted is the amount of resource that is above resource limit so it was not given. */ #define EV_ResourceWasted(i, o) \ /** checked entity */ i(entity, MUTATOR_ARGV_0_entity) \ - /** resource type */ i(int, MUTATOR_ARGV_1_int) \ + /** resource type */ i(entity, MUTATOR_ARGV_1_entity) \ /** amount wasted */ i(float, MUTATOR_ARGV_2_float) \ /**/ MUTATOR_HOOKABLE(ResourceWasted, EV_ResourceWasted); @@ -751,8 +760,8 @@ for resource types. Return true to forbid giving. NOTE: This hook is also called by GiveResourceWithLimit */ #define EV_GiveResource(i, o) \ /** receiver */ i(entity, MUTATOR_ARGV_0_entity) \ - /** resource type */ i(int, MUTATOR_ARGV_1_int) \ - /**/ o(int, MUTATOR_ARGV_1_int) \ + /** resource type */ i(entity, MUTATOR_ARGV_1_entity) \ + /**/ o(entity, MUTATOR_ARGV_1_entity) \ /** amount */ i(float, MUTATOR_ARGV_2_float) \ /**/ o(float, MUTATOR_ARGV_2_float) \ /**/ @@ -762,8 +771,8 @@ MUTATOR_HOOKABLE(GiveResource, EV_GiveResource); RES_* constants for resource types. Return true to forbid giving. */ #define EV_GiveResourceWithLimit(i, o) \ /** receiver */ i(entity, MUTATOR_ARGV_0_entity) \ - /** resource type */ i(int, MUTATOR_ARGV_1_int) \ - /**/ o(int, MUTATOR_ARGV_1_int) \ + /** resource type */ i(entity, MUTATOR_ARGV_1_entity) \ + /**/ o(entity, MUTATOR_ARGV_1_entity) \ /** amount */ i(float, MUTATOR_ARGV_2_float) \ /**/ o(float, MUTATOR_ARGV_2_float) \ /** limit */ i(float, MUTATOR_ARGV_3_float) \ @@ -776,8 +785,8 @@ for resource types. Return true to forbid giving. NOTE: This hook is also called by TakeResourceWithLimit */ #define EV_TakeResource(i, o) \ /** receiver */ i(entity, MUTATOR_ARGV_0_entity) \ - /** resource type */ i(int, MUTATOR_ARGV_1_int) \ - /**/ o(int, MUTATOR_ARGV_1_int) \ + /** resource type */ i(entity, MUTATOR_ARGV_1_entity) \ + /**/ o(entity, MUTATOR_ARGV_1_entity) \ /** amount */ i(float, MUTATOR_ARGV_2_float) \ /**/ o(float, MUTATOR_ARGV_2_float) \ /**/ @@ -787,8 +796,8 @@ MUTATOR_HOOKABLE(TakeResource, EV_TakeResource); RES_* constants for resource types. Return true to forbid giving. */ #define EV_TakeResourceWithLimit(i, o) \ /** receiver */ i(entity, MUTATOR_ARGV_0_entity) \ - /** resource type */ i(int, MUTATOR_ARGV_1_int) \ - /**/ o(int, MUTATOR_ARGV_1_int) \ + /** resource type */ i(entity, MUTATOR_ARGV_1_entity) \ + /**/ o(entity, MUTATOR_ARGV_1_entity) \ /** amount */ i(float, MUTATOR_ARGV_2_float) \ /**/ o(float, MUTATOR_ARGV_2_float) \ /** limit */ i(float, MUTATOR_ARGV_3_float) \ diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 5ccb607e9..dda32ac2a 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc index b30242813..dd289a49a 100644 --- a/qcsrc/server/round_handler.qc +++ b/qcsrc/server/round_handler.qc @@ -4,12 +4,14 @@ #include #include #include +#include #include void round_handler_Think(entity this) { + if (!this.isactive) return; if (game_timeout) { this.nextthink = time + 1; return; } - + if (intermission_running) { round_handler_Reset(0); @@ -53,6 +55,7 @@ void round_handler_Think(entity this) else { round_handler_Reset(0); + round_starttime = -1; // can't start } this.nextthink = time + 1; // canRoundStart every second } @@ -78,6 +81,7 @@ void round_handler_Init(float the_delay, float the_count, float the_round_timeli this.count = fabs(floor(the_count)); this.cnt = this.count + 1; this.round_timelimit = (the_round_timelimit > 0) ? the_round_timelimit : 0; + round_limit = the_round_timelimit; } // NOTE: this is only needed because if round_handler spawns at time 1 @@ -97,14 +101,12 @@ void round_handler_Spawn(bool() canRoundStart_func, bool() canRoundEnd_func, voi return; } entity this = round_handler = new_pure(round_handler); - this.canRoundStart = canRoundStart_func; this.canRoundEnd = canRoundEnd_func; this.roundStart = roundStart_func; this.wait = false; round_handler_Init(5, 5, 180); - } void round_handler_Activate(bool active) { @@ -115,6 +117,8 @@ void round_handler_Activate(bool active) { if(active) { setthink(this, round_handler_FirstThink); this.nextthink = time; + } else { + round_starttime = -1; } } } @@ -126,7 +130,8 @@ void round_handler_Reset(float next_think) if (this.count) if (this.cnt < this.count + 1) this.cnt = this.count + 1; this.nextthink = next_think; - round_starttime = (next_think) ? (next_think + this.count) : -1; + if (next_think) + round_starttime = next_think + this.count; } void round_handler_Remove() diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index 60be86077..6c82292d4 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -452,6 +452,7 @@ void WinningConditionHelper(entity this) s = strcat(s, ":P", ftos(cvar_purechanges_count)); s = strcat(s, ":S", ftos(nJoinAllowed(this, NULL))); s = strcat(s, ":F", ftos(serverflags)); + s = strcat(s, ":T", sv_termsofservice_url_escaped); s = strcat(s, ":M", modname); s = strcat(s, "::", GetPlayerScoreString(NULL, (fullstatus ? 1 : 2))); diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc index 800550617..901613c85 100644 --- a/qcsrc/server/weapons/accuracy.qc +++ b/qcsrc/server/weapons/accuracy.qc @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -177,3 +178,6 @@ bool accuracy_canbegooddamage(entity attacker) { return !warmup_stage && IS_CLIENT(attacker); } + +REPLICATE(cvar_cl_accuracy_data_share, bool, "cl_accuracy_data_share"); +REPLICATE(cvar_cl_accuracy_data_receive, bool, "cl_accuracy_data_receive"); diff --git a/qcsrc/server/weapons/accuracy.qh b/qcsrc/server/weapons/accuracy.qh index 285da0727..cf698d98c 100644 --- a/qcsrc/server/weapons/accuracy.qh +++ b/qcsrc/server/weapons/accuracy.qh @@ -20,10 +20,8 @@ float autocvar_sv_accuracy_data_share = 1; -.bool cvar_cl_accuracy_data_share; -REPLICATE(cvar_cl_accuracy_data_share, bool, "cl_accuracy_data_share"); -.bool cvar_cl_accuracy_data_receive; -REPLICATE(cvar_cl_accuracy_data_receive, bool, "cl_accuracy_data_receive"); +REPLICATE_INIT(bool, cvar_cl_accuracy_data_share); +REPLICATE_INIT(bool, cvar_cl_accuracy_data_receive); .entity accuracy; .entity roundaccuracy; diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc index ca331bb3c..0368f7f5f 100644 --- a/qcsrc/server/weapons/selection.qc +++ b/qcsrc/server/weapons/selection.qc @@ -346,3 +346,13 @@ void W_LastWeapon(entity this, .entity weaponentity) else W_SwitchToOtherWeapon(this, weaponentity); } + +// fix switchweapon (needed when spectating is disabled, as PutClientInServer comes too early) +REPLICATE_APPLYCHANGE("cl_weaponpriority", + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + if (this.(weaponentity) && (this.(weaponentity).m_weapon != WEP_Null || slot == 0)) + this.(weaponentity).m_switchweapon = w_getbestweapon(this, weaponentity); + } +); diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 810cc2638..30a2869f3 100644 --- a/qcsrc/server/weapons/spawning.qc +++ b/qcsrc/server/weapons/spawning.qc @@ -1,10 +1,10 @@ #include "spawning.qh" +#include #include #include #include #include -#include #include #include @@ -108,6 +108,7 @@ void weapon_defaultspawnfunc(entity this, Weapon wpn) this.superweapons_finished = autocvar_g_balance_superweapons_time; // if we don't already have ammo, give us some ammo + // TODO: registry handles if ((wpn.ammo_type != RES_NONE) && !GetResource(this, wpn.ammo_type)) { int ammo = 0; diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 66b62c6e2..719b59935 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -13,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -40,7 +40,7 @@ void thrown_wep_think(entity this) float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector velo, .entity weaponentity) { Weapon info = REGISTRY_GET(Weapons, wpn); - int ammotype = info.ammo_type; + Resource ammotype = info.ammo_type; entity wep = spawn(); Item_SetLoot(wep, true); diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index 2618b9f23..6070177a9 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index be8c447d0..11833e50b 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -6,8 +6,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -21,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/qcsrc/server/weapons/weaponsystem.qh b/qcsrc/server/weapons/weaponsystem.qh index 5291f98dd..c0e0c221f 100644 --- a/qcsrc/server/weapons/weaponsystem.qh +++ b/qcsrc/server/weapons/weaponsystem.qh @@ -75,3 +75,5 @@ bool weapon_prepareattack_check(Weapon thiswep, entity actor, .entity weaponenti void weapon_prepareattack_do(entity actor, .entity weaponentity, float secondary, float attacktime); void weapon_thinkf(entity actor, .entity weaponentity, WFRAME fr, float t, void(Weapon thiswep, entity actor, .entity weaponentity, int fire) func); + +//REPLICATE_APPLYCHANGE("cl_gunalign", { W_ResetGunAlign(this, store.cvar_cl_gunalign); }); diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc index ed1a67cfc..30b17bf01 100644 --- a/qcsrc/server/world.qc +++ b/qcsrc/server/world.qc @@ -101,6 +101,27 @@ void PingPLReport_Spawn() const float SPAWNFLAG_NO_WAYPOINTS_FOR_ITEMS = 1; +void send_TotalShards(entity to) { + // for RJZ + // Send total number of picked up shards + if(!autocvar_rjz_count_shards) return; + if(!IS_REAL_CLIENT(to)) return; + + msg_entity = to; + WriteHeader(MSG_ONE, TE_CSQC_TOTALSHARDS); + WriteInt24_t(MSG_ONE, total_shards); +} + +void send_TotalShardsAll() { + // for RJZ + // Send total number of picked up shards + if(!autocvar_rjz_count_shards) return; + + FOREACH_CLIENT(IS_REAL_CLIENT(it) && (IS_SPEC(it) || IS_OBSERVER(it)), { + send_TotalShards(it); + }); +} + void SetDefaultAlpha() { if (!MUTATOR_CALLHOOK(SetDefaultAlpha)) @@ -301,8 +322,6 @@ void cvar_changes_init() BADCVAR("g_tdm"); BADCVAR("g_tdm_on_dm_maps"); BADCVAR("g_tdm_teams"); - BADCVAR("g_mmm"); - BADCVAR("g_mmm_not_dm_maps"); BADCVAR("g_vip"); BADCVAR("leadlimit"); BADCVAR("nextmap"); @@ -312,7 +331,6 @@ void cvar_changes_init() BADCVAR("g_mapinfo_ignore_warnings"); BADCVAR("g_maplist_ignore_sizes"); BADCVAR("g_maplist_sizes_count_bots"); - //LegendGuard adds BADCVAR(g_*) for MMM 20-02-2021 // long BADCVAR("hostname"); @@ -701,6 +719,15 @@ spawnfunc(worldspawn) { server_is_dedicated = boolean(stof(cvar_defstring("is_dedicated"))); + if (autocvar_sv_termsofservice_url && autocvar_sv_termsofservice_url != "") + { + strcpy(sv_termsofservice_url_escaped, strreplace(":", "|", autocvar_sv_termsofservice_url)); + } + else + { + strcpy(sv_termsofservice_url_escaped, "INVALID"); + } + bool wantrestart = false; { if (!server_is_dedicated) @@ -1025,11 +1052,17 @@ spawnfunc(worldspawn) WinningConditionHelper(this); // set worldstatus - world_initialized = 1; - __spawnfunc_spawn_all(); - if(!warmup_stage) round_handler_Activate(true); + + // for RJZ + if (autocvar_rjz_count_shards && warmup_stage) { + total_shards = -2; + send_TotalShardsAll(); + } + + world_initialized = 1; + __spawnfunc_spawn_all(); } spawnfunc(light) @@ -1281,6 +1314,7 @@ only called if a time or frag limit has expired */ void NextLevel() { + cvar_set("_endmatch", "0"); game_stopped = true; intermission_running = true; // game over @@ -1386,9 +1420,14 @@ float InitiateSuddenDeath() if(!checkrules_suddendeathend) { if(autocvar_g_campaign) + { checkrules_suddendeathend = time; // no suddendeath in campaign + } else + { checkrules_suddendeathend = time + 60 * autocvar_timelimit_suddendeath; + overtimes = -1; + } if(g_race && !g_race_qualifying) race_StartCompleting(); } @@ -1399,6 +1438,7 @@ float InitiateSuddenDeath() void InitiateOvertime() // ONLY call this if InitiateSuddenDeath returned true { ++checkrules_overtimesadded; + overtimes = checkrules_overtimesadded; //add one more overtime by simply extending the timelimit cvar_set("timelimit", ftos(autocvar_timelimit + autocvar_timelimit_overtime)); Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_OVERTIME_TIME, autocvar_timelimit_overtime * 60); @@ -1705,17 +1745,16 @@ void CheckRules_World() leadlimit = 0; // no leadlimit for now } - if(timelimit > 0) - { - timelimit += game_starttime; - } - else if (timelimit < 0) + if (autocvar__endmatch || timelimit < 0) { // endmatch NextLevel(); return; } + if(timelimit > 0) + timelimit += game_starttime; + float wantovertime; wantovertime = 0; @@ -2536,6 +2575,8 @@ void Shutdown() WeaponStats_Shutdown(); MapInfo_Shutdown(); + + strfree(sv_termsofservice_url_escaped); } else if(world_initialized == 0) { diff --git a/qcsrc/server/world.qh b/qcsrc/server/world.qh index 1af336a3f..4400d486e 100644 --- a/qcsrc/server/world.qh +++ b/qcsrc/server/world.qh @@ -3,6 +3,7 @@ #include bool autocvar__sv_init; +bool autocvar__endmatch; bool autocvar_g_use_ammunition; bool autocvar_g_jetpack; bool autocvar_g_warmup_allguns; @@ -32,10 +33,13 @@ bool autocvar_sv_jingle_end; string autocvar_sv_jingle_end_list; float autocvar_sv_jingle_end_volume; +float fragsleft; +int fragsleft_last; + float checkrules_equality; float checkrules_suddendeathwarning; float checkrules_suddendeathend; -//float checkrules_overtimesadded; //how many overtimes have been already added +int checkrules_overtimesadded; //how many overtimes have been already added // flag set on worldspawn so that the code knows if it is dedicated or not bool server_is_dedicated; @@ -50,10 +54,12 @@ string modname; string gamemode_name; -int fragsleft; -int fragsleft_last; string record_type; +string autocvar_sv_termsofservice_url; +// only escape the terms of service url on map change +string sv_termsofservice_url_escaped; + string clientstuff; string matchid; @@ -159,5 +165,12 @@ void readlevelcvars(); .vector dropped_origin; void droptofloor(entity this); +/* z411 for RJZ */ +bool autocvar_rjz_count_shards = false; +bool autocvar_rjz_ranks = false; +int total_shards = 0; +void send_TotalShards(entity to); +void send_TotalShardsAll(); + IntrusiveList g_moveables; STATIC_INIT(g_moveables) { g_moveables = IL_NEW(); } diff --git a/sound/misc/blind.ogg b/sound/misc/blind.ogg deleted file mode 100644 index 54ddd7c118636f6821f16eee4c34e63d4382d03e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399646 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 v>sWKdx3R|| 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 l>eC+wDmxsu{Y=c7$gB^_TfJ_