From: LegendaryGuard Date: Thu, 10 Mar 2022 22:16:52 +0000 (+0100) Subject: Merge branch 'master' into 'LegendaryGuard/cyber' and cleanup resources X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=437292b7330b2467d4b955a2674ca4200884c81f;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into 'LegendaryGuard/cyber' and cleanup resources --- 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 31cf048fd..000000000 Binary files a/gfx/hud/default/nade_ammo.tga and /dev/null differ diff --git a/gfx/hud/default/nade_dark.tga b/gfx/hud/default/nade_dark.tga deleted file mode 100644 index 112ddcb86..000000000 Binary files a/gfx/hud/default/nade_dark.tga and /dev/null differ diff --git a/gfx/hud/default/nade_emerald.tga b/gfx/hud/default/nade_emerald.tga deleted file mode 100644 index 86c3d99e7..000000000 Binary files a/gfx/hud/default/nade_emerald.tga and /dev/null differ diff --git a/gfx/hud/luma/nade_ammo.tga b/gfx/hud/luma/nade_ammo.tga deleted file mode 100644 index 3f0a8f0f6..000000000 Binary files a/gfx/hud/luma/nade_ammo.tga and /dev/null differ diff --git a/gfx/hud/luma/nade_dark.tga b/gfx/hud/luma/nade_dark.tga deleted file mode 100644 index fb33b341b..000000000 Binary files a/gfx/hud/luma/nade_dark.tga and /dev/null differ diff --git a/gfx/hud/luma/nade_emerald.tga b/gfx/hud/luma/nade_emerald.tga deleted file mode 100644 index 7588761b9..000000000 Binary files a/gfx/hud/luma/nade_emerald.tga and /dev/null differ diff --git a/gfx/menu/luma/gametype_mmm.tga b/gfx/menu/luma/gametype_mmm.tga deleted file mode 100644 index 481c62132..000000000 Binary files a/gfx/menu/luma/gametype_mmm.tga and /dev/null differ diff --git a/gfx/menu/luminos/gametype_mmm.tga b/gfx/menu/luminos/gametype_mmm.tga deleted file mode 100644 index 8bacd80fd..000000000 Binary files a/gfx/menu/luminos/gametype_mmm.tga and /dev/null differ diff --git a/gfx/menu/wickedx/gametype_mmm.tga b/gfx/menu/wickedx/gametype_mmm.tga deleted file mode 100644 index 8bacd80fd..000000000 Binary files a/gfx/menu/wickedx/gametype_mmm.tga and /dev/null differ diff --git a/gfx/menu/xaw/gametype_mmm.tga b/gfx/menu/xaw/gametype_mmm.tga deleted file mode 100644 index 938b529ef..000000000 Binary files a/gfx/menu/xaw/gametype_mmm.tga and /dev/null differ 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/resources.qh b/qcsrc/client/resources.qh deleted file mode 100644 index 4b0eaa8e7..000000000 --- a/qcsrc/client/resources.qh +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once - -/// \file -/// \brief Header file that describes the resource system. -/// \copyright GNU GPLv2 or any later version. - -#include - -// ============================ Public API ==================================== - -/// \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); - -/// \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); - -/// \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); - -/// \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); - -/// \brief Takes an entity some resource but not less than a limit. -/// \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. -/// \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; 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/common/resources/cl_resources.qh b/qcsrc/common/resources/cl_resources.qh new file mode 100644 index 000000000..f03c1dc3d --- /dev/null +++ b/qcsrc/common/resources/cl_resources.qh @@ -0,0 +1,44 @@ +#pragma once + +/// \file +/// \brief Header file that describes the resource system. +/// \copyright GNU GPLv2 or any later version. + +#include + +// ============================ Public API ==================================== + +/// \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, 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, 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, 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, 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. +/// \param[in] res_type Type of the resource (a RES_* constant). +/// \param[in] amount Amount of resource to take. +/// \param[in] limit Limit of resources to take. +/// \return No return. +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/common/resources/sv_resources.qc b/qcsrc/common/resources/sv_resources.qc new file mode 100644 index 000000000..9984e9111 --- /dev/null +++ b/qcsrc/common/resources/sv_resources.qc @@ -0,0 +1,234 @@ +#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, 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: + { + limit = autocvar_g_balance_health_limit; + break; + } + case RES_ARMOR: + { + limit = autocvar_g_balance_armor_limit; + break; + } + case RES_SHELLS: + { + limit = g_pickup_shells_max; + break; + } + case RES_BULLETS: + { + limit = g_pickup_nails_max; + break; + } + case RES_ROCKETS: + { + limit = g_pickup_rockets_max; + break; + } + case RES_CELLS: + { + limit = g_pickup_cells_max; + break; + } + case RES_PLASMA: + { + limit = g_pickup_plasma_max; + break; + } + case RES_FUEL: + { + limit = autocvar_g_balance_fuel_limit; + break; + } + default: + { + error("GetResourceLimit: Invalid resource type."); + return 0; + } + } + MUTATOR_CALLHOOK(GetResourceLimit, e, res_type, limit); + limit = M_ARGV(2, float); + if (limit > RES_AMOUNT_HARD_LIMIT) + { + limit = RES_AMOUNT_HARD_LIMIT; + } + return limit; +} + +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) +{ + bool forbid = MUTATOR_CALLHOOK(SetResource, e, res_type, amount); + if (forbid) + { + return; + } + 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; + if (amount > max_amount && max_amount != RES_LIMIT_NONE) + { + amount_wasted = amount - max_amount; + amount = max_amount; + } + bool changed = SetResourceExplicit(e, res_type, amount); + if (changed) + { + MUTATOR_CALLHOOK(ResourceAmountChanged, e, res_type, amount); + } + if (amount_wasted == 0) + { + return; + } + MUTATOR_CALLHOOK(ResourceWasted, e, res_type, amount_wasted); +} + +void GiveResource(entity receiver, Resource res_type, float amount) +{ + if (amount <= 0) + { + return; + } + bool forbid = MUTATOR_CALLHOOK(GiveResource, receiver, res_type, amount); + if (forbid) + { + return; + } + 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: + { + receiver.pauserothealth_finished = + max(receiver.pauserothealth_finished, time + + autocvar_g_balance_pause_health_rot); + return; + } + case RES_ARMOR: + { + receiver.pauserotarmor_finished = + max(receiver.pauserotarmor_finished, time + + autocvar_g_balance_pause_armor_rot); + return; + } + case RES_FUEL: + { + receiver.pauserotfuel_finished = max(receiver.pauserotfuel_finished, + time + autocvar_g_balance_pause_fuel_rot); + return; + } + } +} + +void GiveResourceWithLimit(entity receiver, Resource res_type, float amount, float limit) +{ + if (amount <= 0) + { + return; + } + bool forbid = MUTATOR_CALLHOOK(GiveResourceWithLimit, receiver, res_type, amount, limit); + if (forbid) + { + return; + } + res_type = M_ARGV(1, entity); + amount = M_ARGV(2, float); + limit = M_ARGV(3, float); + if (amount <= 0) + { + return; + } + float current_amount = GetResource(receiver, res_type); + if (current_amount + amount > limit && limit != RES_LIMIT_NONE) + { + amount = limit - current_amount; + } + GiveResource(receiver, res_type, amount); +} + +void TakeResource(entity receiver, Resource res_type, float amount) +{ + if (amount <= 0) + { + return; + } + bool forbid = MUTATOR_CALLHOOK(TakeResource, receiver, res_type, amount); + if (forbid) + { + return; + } + res_type = M_ARGV(1, entity); + amount = M_ARGV(2, float); + 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; + } + bool forbid = MUTATOR_CALLHOOK(TakeResourceWithLimit, receiver, res_type, amount, limit); + if (forbid) + { + return; + } + res_type = M_ARGV(1, entity); + amount = M_ARGV(2, float); + limit = M_ARGV(3, float); + 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/common/resources/sv_resources.qh b/qcsrc/common/resources/sv_resources.qh new file mode 100644 index 000000000..738501433 --- /dev/null +++ b/qcsrc/common/resources/sv_resources.qh @@ -0,0 +1,95 @@ +#pragma once + +/// \file +/// \brief Header file that describes the resource system. +/// \author Lyberta +/// \copyright GNU GPLv2 or any later version. + +#include + +// TODO: split resources into their own files, registry based +float autocvar_g_balance_health_limit; +int autocvar_g_balance_armor_limit; +float autocvar_g_balance_fuel_limit; +float autocvar_g_balance_armor_regen; +float autocvar_g_balance_armor_regenlinear; +int autocvar_g_balance_armor_regenstable; +float autocvar_g_balance_armor_rot; +float autocvar_g_balance_armor_rotlinear; +int autocvar_g_balance_armor_rotstable; +float autocvar_g_balance_fuel_regen; +float autocvar_g_balance_fuel_regenlinear; +int autocvar_g_balance_fuel_regenstable; +float autocvar_g_balance_fuel_rot; +float autocvar_g_balance_fuel_rotlinear; +int autocvar_g_balance_fuel_rotstable; +float autocvar_g_balance_health_regen; +float autocvar_g_balance_health_regenlinear; +float autocvar_g_balance_health_regenstable; +float autocvar_g_balance_health_rot; +float autocvar_g_balance_health_rotlinear; +float autocvar_g_balance_health_rotstable; +float autocvar_g_balance_pause_armor_rot; +float autocvar_g_balance_pause_fuel_regen; +float autocvar_g_balance_pause_fuel_rot; +float autocvar_g_balance_pause_health_regen; +float autocvar_g_balance_pause_health_rot; + +// ============================ Public API ==================================== + +/// \brief Returns the maximum amount of the given resource. +/// \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, 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, 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, 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. +/// \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, 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, 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. +/// \param[in] res_type Type of the resource (a RES_* constant). +/// \param[in] amount Amount of resource to give. +/// \param[in] limit Limit of resources to give. +/// \return No return. +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, 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. +/// \param[in] res_type Type of the resource (a RES_* constant). +/// \param[in] amount Amount of resource to take. +/// \param[in] limit Limit of resources to take. +/// \return No return. +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/resources.qc b/qcsrc/server/resources.qc deleted file mode 100644 index e0b8995f1..000000000 --- a/qcsrc/server/resources.qc +++ /dev/null @@ -1,265 +0,0 @@ -#include "resources.qh" - -/// \file -/// \brief Source file that contains implementation of the resource system. -/// \author Lyberta -/// \copyright GNU GPLv2 or any later version. - -#include -#include - -float GetResourceLimit(entity e, int res_type) -{ - if(!IS_PLAYER(e)) - return RES_LIMIT_NONE; // no limits on non-players - - float limit; - switch (res_type) - { - case RES_HEALTH: - { - limit = autocvar_g_balance_health_limit; - break; - } - case RES_ARMOR: - { - limit = autocvar_g_balance_armor_limit; - break; - } - case RES_SHELLS: - { - limit = g_pickup_shells_max; - break; - } - case RES_BULLETS: - { - limit = g_pickup_nails_max; - break; - } - case RES_ROCKETS: - { - limit = g_pickup_rockets_max; - break; - } - case RES_CELLS: - { - limit = g_pickup_cells_max; - break; - } - case RES_PLASMA: - { - limit = g_pickup_plasma_max; - break; - } - case RES_FUEL: - { - limit = autocvar_g_balance_fuel_limit; - break; - } - default: - { - error("GetResourceLimit: Invalid resource type."); - return 0; - } - } - MUTATOR_CALLHOOK(GetResourceLimit, e, res_type, limit); - limit = M_ARGV(2, float); - if (limit > RES_AMOUNT_HARD_LIMIT) - { - limit = RES_AMOUNT_HARD_LIMIT; - } - return limit; -} - -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) -{ - bool forbid = MUTATOR_CALLHOOK(SetResource, e, res_type, amount); - if (forbid) - { - return; - } - res_type = M_ARGV(1, int); - 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; - if (amount > max_amount && max_amount != RES_LIMIT_NONE) - { - amount_wasted = amount - max_amount; - amount = max_amount; - } - bool changed = SetResourceExplicit(e, res_type, amount); - if (changed) - { - MUTATOR_CALLHOOK(ResourceAmountChanged, e, res_type, amount); - } - if (amount_wasted == 0) - { - return; - } - MUTATOR_CALLHOOK(ResourceWasted, e, res_type, amount_wasted); -} - -void GiveResource(entity receiver, int res_type, float amount) -{ - if (amount <= 0) - { - return; - } - bool forbid = MUTATOR_CALLHOOK(GiveResource, receiver, res_type, amount); - if (forbid) - { - return; - } - res_type = M_ARGV(1, int); - amount = M_ARGV(2, float); - if (amount <= 0) - { - return; - } - SetResource(receiver, res_type, GetResource(receiver, res_type) + amount); - switch (res_type) - { - case RES_HEALTH: - { - receiver.pauserothealth_finished = - max(receiver.pauserothealth_finished, time + - autocvar_g_balance_pause_health_rot); - return; - } - case RES_ARMOR: - { - receiver.pauserotarmor_finished = - max(receiver.pauserotarmor_finished, time + - autocvar_g_balance_pause_armor_rot); - return; - } - case RES_FUEL: - { - receiver.pauserotfuel_finished = max(receiver.pauserotfuel_finished, - time + autocvar_g_balance_pause_fuel_rot); - return; - } - } -} - -void GiveResourceWithLimit(entity receiver, int res_type, float amount, float limit) -{ - if (amount <= 0) - { - return; - } - bool forbid = MUTATOR_CALLHOOK(GiveResourceWithLimit, receiver, res_type, amount, limit); - if (forbid) - { - return; - } - res_type = M_ARGV(1, int); - amount = M_ARGV(2, float); - limit = M_ARGV(3, float); - if (amount <= 0) - { - return; - } - float current_amount = GetResource(receiver, res_type); - if (current_amount + amount > limit && limit != RES_LIMIT_NONE) - { - amount = limit - current_amount; - } - GiveResource(receiver, res_type, amount); -} - -void TakeResource(entity receiver, int res_type, float amount) -{ - if (amount <= 0) - { - return; - } - bool forbid = MUTATOR_CALLHOOK(TakeResource, receiver, res_type, amount); - if (forbid) - { - return; - } - res_type = M_ARGV(1, int); - amount = M_ARGV(2, float); - 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; - } - bool forbid = MUTATOR_CALLHOOK(TakeResourceWithLimit, receiver, res_type, amount, limit); - if (forbid) - { - return; - } - res_type = M_ARGV(1, int); - amount = M_ARGV(2, float); - limit = M_ARGV(3, float); - 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/server/resources.qh b/qcsrc/server/resources.qh deleted file mode 100644 index 05cb602c3..000000000 --- a/qcsrc/server/resources.qh +++ /dev/null @@ -1,107 +0,0 @@ -#pragma once - -/// \file -/// \brief Header file that describes the resource system. -/// \author Lyberta -/// \copyright GNU GPLv2 or any later version. - -#include - -// TODO: split resources into their own files, registry based -float autocvar_g_balance_health_limit; -int autocvar_g_balance_armor_limit; -float autocvar_g_balance_fuel_limit; -float autocvar_g_balance_armor_regen; -float autocvar_g_balance_armor_regenlinear; -int autocvar_g_balance_armor_regenstable; -float autocvar_g_balance_armor_rot; -float autocvar_g_balance_armor_rotlinear; -int autocvar_g_balance_armor_rotstable; -float autocvar_g_balance_fuel_regen; -float autocvar_g_balance_fuel_regenlinear; -int autocvar_g_balance_fuel_regenstable; -float autocvar_g_balance_fuel_rot; -float autocvar_g_balance_fuel_rotlinear; -int autocvar_g_balance_fuel_rotstable; -float autocvar_g_balance_health_regen; -float autocvar_g_balance_health_regenlinear; -float autocvar_g_balance_health_regenstable; -float autocvar_g_balance_health_rot; -float autocvar_g_balance_health_rotlinear; -float autocvar_g_balance_health_rotstable; -float autocvar_g_balance_pause_armor_rot; -float autocvar_g_balance_pause_fuel_regen; -float autocvar_g_balance_pause_fuel_rot; -float autocvar_g_balance_pause_health_regen; -float autocvar_g_balance_pause_health_rot; - -// ============================ Public API ==================================== - -/// \brief Returns the maximum amount of the given resource. -/// \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); - -/// \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); - -/// \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); - -/// \brief Sets the current amount of resource the given entity will have -/// but limited to the max amount allowed for the resource type. -/// \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); - -/// \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); - -/// \brief Gives an entity some resource but not more than a limit. -/// \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. -/// \param[in] limit Limit of resources to give. -/// \return No return. -void GiveResourceWithLimit(entity receiver, int 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); - -/// \brief Takes an entity some resource but not less than a limit. -/// \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. -/// \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); 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 54ddd7c11..000000000 Binary files a/sound/misc/blind.ogg and /dev/null differ diff --git a/sound/misc/goomba.ogg b/sound/misc/goomba.ogg deleted file mode 100644 index 1a499a8f1..000000000 Binary files a/sound/misc/goomba.ogg and /dev/null differ diff --git a/xonotic-client.cfg b/xonotic-client.cfg index 8ade6794e..09602a543 100644 --- a/xonotic-client.cfg +++ b/xonotic-client.cfg @@ -487,6 +487,9 @@ set menu_showboxes 0 "show item bounding boxes (debug)" set menu_cvarlist_onlymodified 0 "show only modified cvars in the cvar list" set menu_force_on_disconnection 1 "force to show the menu this number of seconds after you get disconnected (0 to disable)" +set _menu_credits_export 0 "set to 1 and restart the menu to export credits to credits.txt (menu will automatically reset to 0)" +alias menu_credits_export "_menu_credits_export 1; menu_restart" + r_textbrightness 0.2 r_textcontrast 0.8 r_textshadow 0 @@ -842,6 +845,9 @@ seta cl_allow_uid2name -1 "-1 = ask if the player wants to disable/enable this f seta cl_allow_uidtracking 1 "-1 = ask if the player wants to disable/enable this feature, 0 = disable, 1 = enable uid tracking (allows associating your data with your player ID)" seta cl_allow_uidranking 1 "0 = disable, 1 = enable uid ranking (allows statistics like elo to rank you in leaderboards)" +// terms of service +seta _termsofservice_accepted 0 + // polygonoffset for submodel SUCKS SUCKS SUCKS (only a hack for quake1, we don't need that) r_polygonoffset_submodel_offset 0 r_polygonoffset_submodel_factor 0 diff --git a/xonotic-server.cfg b/xonotic-server.cfg index 0f374902a..0be38b303 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -344,6 +344,7 @@ sv_curl_defaulturl "http://www.xonotic.org/contentdownload/getmap.php?file=" set sv_curl_serverpackages_auto 1 "automatically add packs with *.serverpackage files to sv_curl_serverpackages" set sv_motd "" "additional information to show on the welcome screen that greets joining players" +set sv_termsofservice_url "" "URL from which Server specific Terms of Service should be downloaded" set g_waypoints_for_items 0 "make waypoints out of items, values: 0 = never, 1 = unless the mapper prevents it by worldspawn.spawnflags & 1, 2 = always"