From: terencehill Date: Tue, 2 Jun 2020 09:59:05 +0000 (+0200) Subject: Improve and add context to some translatable messages X-Git-Tag: xonotic-v0.8.5~963 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e1cbcc2a39c8770900d5d8d592c1e582120d71b1 Improve and add context to some translatable messages --- diff --git a/qcsrc/menu/xonotic/dialog_disconnect.qh b/qcsrc/menu/xonotic/dialog_disconnect.qh index a61dd77552..5e397cd1c5 100644 --- a/qcsrc/menu/xonotic/dialog_disconnect.qh +++ b/qcsrc/menu/xonotic/dialog_disconnect.qh @@ -4,7 +4,7 @@ CLASS(XonoticDisconnectDialog, XonoticDialog) METHOD(XonoticDisconnectDialog, fill, void(entity)); ATTRIB(XonoticDisconnectDialog, title, string, _("Disconnect")); - ATTRIB(XonoticDisconnectDialog, tooltip, string, _("Disconnect server")); + ATTRIB(XonoticDisconnectDialog, tooltip, string, _("Disconnect from the server you are connected to")); ATTRIB(XonoticDisconnectDialog, color, vector, SKINCOLOR_DIALOG_QUIT); ATTRIB(XonoticDisconnectDialog, intendedWidth, float, 0.5); ATTRIB(XonoticDisconnectDialog, rows, float, 3); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc index 7ef5172965..1244ee86b2 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc @@ -165,7 +165,7 @@ void XonoticMutatorsDialog_fill(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.8, e = makeXonoticCheckBox_T(0, "g_touchexplode", _("Touch explode"), - _("An explosion occurs when two players collide"))); + _("An explosion occurs when two players collide"))); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.8, e = makeXonoticCheckBox_T(0, "g_cloaked", _("Cloaked"), @@ -173,7 +173,7 @@ void XonoticMutatorsDialog_fill(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.8, e = makeXonoticCheckBox_T(0, "g_buffs", _("Buffs"), - _("Enable buff pickups (random bonuses like Medic, Invisible, etc.) on the maps that support it"))); + _("Enable buff pickups (random bonuses like Medic, Invisible, etc.) on the maps that support it"))); e.cvarOffValue = "-1"; // TODO: make this a radio button? me.TR(me); me.TDempty(me, 0.2); @@ -217,17 +217,17 @@ void XonoticMutatorsDialog_fill(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.8, e = makeXonoticCheckBox_T(0, "g_invincible_projectiles", _("Invincible Projectiles"), - _("Projectiles can't be destroyed. However, Electro combos still work"))); + _("Projectiles can't be destroyed. However, you can still explode Electro orbs with the Electro primary fire"))); setDependent(e, "g_instagib", 0, 0); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.8, e = makeXonoticCheckBox_T(0, "g_new_toys", _("New Toys"), - _("Some weapon spawns will be randomly replaced with new weapons: Heavy Laser Assault Cannon, Mine Layer, Rifle, T.A.G. Seeker"))); + _("Some weapon spawns will be randomly replaced with new weapons: Heavy Laser Assault Cannon, Mine Layer, Rifle, T.A.G. Seeker"))); setDependentWeird(e, checkCompatibility_newtoys); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.8, e = makeXonoticCheckBox_T(0, "g_rocket_flying", _("Rocket Flying"), - _("Devastator rockets can be detonated instantly (otherwise, there's a short delay). This allows players to fire and detonate a Devastator rocket while in the air for a strong mid-air boost even while moving fast"))); + _("Devastator rockets can be detonated instantly (otherwise, there's a short delay). This allows players to fire and detonate a Devastator rocket while in the air for a strong mid-air boost even while moving fast"))); setDependent(e, "g_instagib", 0, 0); me.TR(me); me.TDempty(me, 0.2); diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc index 9841f66ff3..4d62d459e2 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.qc +++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc @@ -126,7 +126,7 @@ void XonoticEffectsSettingsTab_fill(entity me) } me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 1, e = makeXonoticCheckBoxEx_T(1, 0, "r_sky", _("Show skyboxes"), _("Disable skyboxes for performance and visibility"))); + me.TD(me, 1, 1, e = makeXonoticCheckBoxEx_T(1, 0, "r_sky", _("Show sky"), _("Disable sky for performance and visibility"))); if(cvar("developer") > 0) { me.TD(me, 1, 1, e = makeXonoticCheckBoxEx_T(3, 0, "r_showsurfaces", _("Show surfaces"), diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc index 65797e2bff..caf69f34af 100644 --- a/qcsrc/menu/xonotic/serverlist.qc +++ b/qcsrc/menu/xonotic/serverlist.qc @@ -253,12 +253,12 @@ void ServerList_Update_favoriteButton(entity btn, entity me) entity e = me.favoriteButton; if(IsFavorite(me.ipAddressBox.text)) { - e.setText(e, _("Remove favorite")); + e.setText(e, _("SERVER^Remove favorite")); setZonedTooltip(e, _("Remove the currently highlighted server from bookmarks"), string_null); } else { - e.setText(e, _("Favorite")); + e.setText(e, _("SERVER^Favorite")); setZonedTooltip(e, _("Bookmark the currently highlighted server so that it's faster to find in the future"), string_null); } } diff --git a/qcsrc/menu/xonotic/statslist.qc b/qcsrc/menu/xonotic/statslist.qc index 7d19516cf0..d1edd5948e 100644 --- a/qcsrc/menu/xonotic/statslist.qc +++ b/qcsrc/menu/xonotic/statslist.qc @@ -41,6 +41,8 @@ string XonoticStatsList_convertDate(string input) default: return input; // failed, why? } + // without no-c-format this string looks messed up in Transifex since only %d is a valid c placeholder + /* xgettext:no-c-format */ string date = ZCTX(_("DATE^%m %d, %Y")); date = strreplace("%Y", substring(input, 0, 4), date); date = strreplace("%d", ftos(stof(substring(input, 8, 2))), date); // ftos-stof removes leading 0 diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 9632397f50..af2846c8cd 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -1323,7 +1323,7 @@ void UpdateChatBubble(entity this) void respawn(entity this) { - int damagedbycontents_prev = this.damagedbycontents; + bool damagedbycontents_prev = this.damagedbycontents; if(this.alpha >= 0) { if(autocvar_g_respawn_ghosts)