From 7dcb23b4d8408e992829baa04741f2059e302c6d Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 13 Dec 2014 15:51:41 +1100 Subject: [PATCH] Fix some silly translated strings --- qcsrc/client/Main.qc | 6 +++--- qcsrc/client/hud.qc | 6 +++--- qcsrc/client/movetypes.qc | 4 ++-- qcsrc/client/scoreboard.qc | 2 +- qcsrc/client/target_music.qc | 4 ++-- qcsrc/common/command/generic.qc | 2 +- qcsrc/common/mapinfo.qc | 2 +- qcsrc/common/notifications.qh | 2 +- qcsrc/menu/item/label.c | 2 +- qcsrc/menu/item/slider.c | 2 +- qcsrc/menu/menu.qc | 2 +- qcsrc/menu/xonotic/campaign.c | 2 +- qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c | 6 +++--- qcsrc/menu/xonotic/slider_decibels.c | 6 +++--- qcsrc/menu/xonotic/slider_resolution.c | 4 ++-- qcsrc/menu/xonotic/util.qc | 6 +++--- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index cbc1247cc8..d1fe46d235 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -53,7 +53,7 @@ void CSQC_Init(void) check_unacceptable_compiler_bugs(); #ifdef WATERMARK - printf(_("^4CSQC Build information: ^1%s\n"), WATERMARK); + dprintf("^4CSQC Build information: ^1%s\n", WATERMARK); #endif float i; @@ -858,7 +858,7 @@ void CSQC_Ent_Update(float bIsNewEntity) default: //error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype)); - error(sprintf(_("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n"), self.enttype, num_for_edict(self), self.classname)); + error(sprintf("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n", self.enttype, num_for_edict(self), self.classname)); break; } @@ -1326,7 +1326,7 @@ string getcommandkey(string text, string command) return text; } else if (autocvar_hud_showbinds > 1) - return sprintf(_("%s (%s)"), text, keys); + return sprintf("%s (%s)", text, keys); else return keys; } diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 2ed9e6367f..9b44566d84 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -218,9 +218,9 @@ string MakeRaceString(float cp, float mytime, float histime, float lapdelta, str if(histime < 0) return strcat(col, cpname); else if(hisname == "") - return strcat(col, sprintf(_("%s (%s)"), cpname, timestr)); + return strcat(col, sprintf("%s (%s)", cpname, timestr)); else - return strcat(col, sprintf(_("%s (%s %s)"), cpname, timestr, strcat(hisname, col, lapstr))); + return strcat(col, sprintf("%s (%s %s)", cpname, timestr, strcat(hisname, col, lapstr))); } // Check if the given name already exist in race rankings? In that case, where? (otherwise return 0) @@ -4607,7 +4607,7 @@ void HUD_Main (void) } } if (warning) - print(_("Automatically fixed wrong/missing panel numbers in _hud_panelorder\n")); + dprint("Automatically fixed wrong/missing panel numbers in _hud_panelorder\n"); cvar_set("_hud_panelorder", s); if(hud_panelorder_prev) diff --git a/qcsrc/client/movetypes.qc b/qcsrc/client/movetypes.qc index b536797ce4..868f05e269 100644 --- a/qcsrc/client/movetypes.qc +++ b/qcsrc/client/movetypes.qc @@ -223,10 +223,10 @@ float _Movetype_UnstickEntity() // SV_UnstickEntity if(!_Movetype_TestEntityPosition('0 0 -1' * i)) goto success; if(!_Movetype_TestEntityPosition('0 0 1' * i)) goto success; } - dprintf(_("Can't unstick an entity (edict: %d, classname: %s, origin: %s)\n"), num_for_edict(self), self.classname, vtos(self.move_origin)); + dprintf("Can't unstick an entity (edict: %d, classname: %s, origin: %s)\n", num_for_edict(self), self.classname, vtos(self.move_origin)); return FALSE; :success - dprintf(_("Sucessfully unstuck an entity (edict: %d, classname: %s, origin: %s)\n"), num_for_edict(self), self.classname, vtos(self.move_origin)); + dprintf("Sucessfully unstuck an entity (edict: %d, classname: %s, origin: %s)\n", num_for_edict(self), self.classname, vtos(self.move_origin)); _Movetype_LinkEdict(TRUE); return TRUE; } diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index f6c8a30512..d1c7fb9f1e 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -1042,7 +1042,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) average_accuracy += weapon_stats; // store sum of all accuracies in average_accuracy string s; - s = sprintf(_("%d%%"), weapon_stats*100); + s = sprintf("%d%%", weapon_stats*100); float padding; padding = (weapon_width - stringwidth(s, FALSE, '1 0 0' * fontsize)) / 2; // center the accuracy value diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc index fa116dc731..1d90a664c3 100644 --- a/qcsrc/client/target_music.qc +++ b/qcsrc/client/target_music.qc @@ -91,7 +91,7 @@ void Net_TargetMusic() sound(e, CH_BGM_SINGLE, e.noise, 0, ATTEN_NONE); if(getsoundtime(e, CH_BGM_SINGLE) < 0) { - printf(_("Cannot initialize sound %s\n"), e.noise); + dprintf("Cannot initialize sound %s\n", e.noise); strunzone(e.noise); e.noise = string_null; } @@ -180,7 +180,7 @@ void Ent_ReadTriggerMusic() sound(self, CH_BGM_SINGLE, self.noise, 0, ATTEN_NONE); if(getsoundtime(self, CH_BGM_SINGLE) < 0) { - printf(_("Cannot initialize sound %s\n"), self.noise); + dprintf("Cannot initialize sound %s\n", self.noise); strunzone(self.noise); self.noise = string_null; } diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index 3f87609ee1..0710726de1 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -28,7 +28,7 @@ void Curl_URI_Get_Callback(float id, float status, string data) do_cvar = curl_uri_get_cvar[i]; if(status != 0) { - printf(_("error: status is %d\n"), status); + dprintf("error: status is %d\n", status); if(do_cvar) strunzone(do_cvar); return; diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 84df17516d..ba1fbeb6f4 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -1133,7 +1133,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo else if(MapInfo_isRedundant(MapInfo_Map_bspname, MapInfo_Map_title)) MapInfo_Map_titlestring = MapInfo_Map_title; else - MapInfo_Map_titlestring = sprintf(_("%s: %s"), MapInfo_Map_bspname, MapInfo_Map_title); + MapInfo_Map_titlestring = sprintf("%s: %s", MapInfo_Map_bspname, MapInfo_Map_title); MapInfo_Cache_Store(); if(MapInfo_Map_supportedGametypes != 0) diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 471e22cfd5..b721e63e34 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -684,7 +684,7 @@ void Send_Notification_WOCOVA( MSG_CENTER_NOTIF(1, CENTER_MINSTA_FINDAMMO_FIRST, 0, 0, "", CPID_MINSTA_FINDAMMO, "1 10", _("^BGGet some ammo or you'll be dead in ^F4^COUNT^BG!"), _("^BGGet some ammo! ^F4^COUNT^BG left!")) \ MSG_CENTER_NOTIF(1, CENTER_MINSTA_LIVES_REMAINING, 0, 1, "f1", NO_CPID, "0 0", _("^F2Extra lives remaining: ^K1%s"), "") \ MSG_CENTER_NOTIF(1, CENTER_MINSTA_SECONDARY, 0, 0, "", NO_CPID, "0 0", _("^BGSecondary fire inflicts no damage!"), "") \ - MSG_CENTER_NOTIF(1, CENTER_MOTD, 1, 0, "s1", CPID_MOTD, "-1 0", _("^BG%s"), "") \ + MSG_CENTER_NOTIF(1, CENTER_MOTD, 1, 0, "s1", CPID_MOTD, "-1 0", "^BG%s", "") \ MSG_CENTER_NOTIF(1, CENTER_NIX_COUNTDOWN, 0, 2, "item_wepname", CPID_NIX, "1 f2", _("^F2^COUNT^BG until weapon change...\nNext weapon: ^F1%s"), "") \ MSG_CENTER_NOTIF(1, CENTER_NIX_NEWWEAPON, 0, 1, "item_wepname", CPID_NIX, "0 0", _("^F2Active weapon: ^F1%s"), "") \ MSG_CENTER_NOTIF(1, CENTER_NADE, 0, 0, "", NO_CPID, "0 0", _("^BGPress ^F2DROPWEAPON^BG again to toss the grenade!"), "") \ diff --git a/qcsrc/menu/item/label.c b/qcsrc/menu/item/label.c index 0f6f966471..592c3a7ac5 100644 --- a/qcsrc/menu/item/label.c +++ b/qcsrc/menu/item/label.c @@ -79,7 +79,7 @@ void Label_recalcPositionWithText(entity me, string t) me.realOrigin_x = me.keepspaceLeft; if(!me.overrideCondenseFactor) me.condenseFactor = spaceAvail / spaceUsed; - dprintf(_("NOTE: label text %s too wide for label, condensed by factor %f\n"), t, me.condenseFactor); + dprintf("NOTE: label text %s too wide for label, condensed by factor %f\n", t, me.condenseFactor); } if(!me.overrideRealOrigin_y) diff --git a/qcsrc/menu/item/slider.c b/qcsrc/menu/item/slider.c index 8861357b77..b071a1af34 100644 --- a/qcsrc/menu/item/slider.c +++ b/qcsrc/menu/item/slider.c @@ -61,7 +61,7 @@ void Slider_setSliderValue(entity me, float val) } string Slider_toString(entity me) { - return sprintf(_("%d (%s)"), me.value, me.valueToText(me, me.value)); + return sprintf("%d (%s)", me.value, me.valueToText(me, me.value)); } void Slider_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index d7fd581a32..b17e91f867 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -56,7 +56,7 @@ void m_init() check_unacceptable_compiler_bugs(); #ifdef WATERMARK - printf(_("^4MQC Build information: ^1%s\n"), WATERMARK); + dprintf("^4MQC Build information: ^1%s\n", WATERMARK); #endif // list all game dirs (TEST) diff --git a/qcsrc/menu/xonotic/campaign.c b/qcsrc/menu/xonotic/campaign.c index 90b559b01c..454b4ad710 100644 --- a/qcsrc/menu/xonotic/campaign.c +++ b/qcsrc/menu/xonotic/campaign.c @@ -283,7 +283,7 @@ void XonoticCampaignList_drawListBoxItem(entity me, float i, vector absSize, flo if(i <= me.campaignIndex) s = campaign_shortdesc[i]; // fteqcc sucks else - s = _("???"); + s = "???"; s = draw_TextShortenToWidth(sprintf(_("Level %d: %s"), i+1, s), me.columnNameSize, 0, me.realFontSize); draw_Text(me.realUpperMargin1 * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, theColor, theAlpha, 0); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c index 5ecb77dd79..fa5e30682f 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c @@ -154,7 +154,7 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i) s = gethostcachestring(SLIST_FIELD_MOD, i); if(s != "data") - modname = sprintf(_("%s (%s)"), modname, s); + modname = sprintf("%s (%s)", modname, s); j = MapInfo_Type_FromString(typestr); // try and get the real name of the game type if(j) { typestr = MapInfo_Type_ToText(j); } // only set it if we actually found it @@ -171,7 +171,7 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i) 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.currentServerNumPlayers = strzone(sprintf("%d/%d", numh, maxp)); me.numPlayersLabel.setText(me.numPlayersLabel, me.currentServerNumPlayers); s = ftos(numb); @@ -190,7 +190,7 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i) me.currentServerVersion = strzone(versionstr); me.versionLabel.setText(me.versionLabel, me.currentServerVersion); - me.currentServerPure = ((pure < 0) ? "N/A" : (pure == 0) ? _("Official") : sprintf(_("%d modified"), pure)); + me.currentServerPure = ((pure < 0) ? _("N/A") : (pure == 0) ? _("Official") : sprintf(_("%d modified"), pure)); me.currentServerPure = strzone(me.currentServerPure); me.pureLabel.setText(me.pureLabel, me.currentServerPure); diff --git a/qcsrc/menu/xonotic/slider_decibels.c b/qcsrc/menu/xonotic/slider_decibels.c index 3f1c468272..bf847e3126 100644 --- a/qcsrc/menu/xonotic/slider_decibels.c +++ b/qcsrc/menu/xonotic/slider_decibels.c @@ -78,11 +78,11 @@ string XonoticDecibelsSlider_valueToText(entity me, float v) else if(v <= me.valueMin) return CTX(_("VOL^OFF")); else if(autocvar_menu_snd_sliderscale == 3) // fake percent scale - return sprintf(_("%d %%"), (v - me.valueMin) / (me.valueMax - me.valueMin) * 100); + return sprintf("%d %%", (v - me.valueMin) / (me.valueMax - me.valueMin) * 100); else if(autocvar_menu_snd_sliderscale == 2) // 0..10 scale - return sprintf(_("%.1f"), (v - me.valueMin) / (me.valueMax - me.valueMin) * 10); + return sprintf("%.1f", (v - me.valueMin) / (me.valueMax - me.valueMin) * 10); else if(autocvar_menu_snd_sliderscale == 1) // real percent scale - return sprintf(_("%.2f %%"), fromDecibelOfSquare(v, me.valueMin) * 100); + return sprintf("%.2f %%", fromDecibelOfSquare(v, me.valueMin) * 100); else // decibel scale return sprintf(_("%s dB"), ftos_decimals(toDecibelOfSquare(fromDecibelOfSquare(v, me.valueMin), 0), me.valueDigits)); } diff --git a/qcsrc/menu/xonotic/slider_resolution.c b/qcsrc/menu/xonotic/slider_resolution.c index 66f48f9e58..51f15aa32a 100644 --- a/qcsrc/menu/xonotic/slider_resolution.c +++ b/qcsrc/menu/xonotic/slider_resolution.c @@ -113,10 +113,10 @@ void XonoticResolutionSlider_addResolution(entity me, float w, float h, float pi bestdenom = denom; } } - me.insertValue(me, i, strzone(sprintf(_("%dx%d (%d:%d)"), w, h, bestnum, bestdenom)), strzone(strcat(ftos(w), " ", ftos(h), " ", ftos(pixelheight)))); + me.insertValue(me, i, strzone(sprintf("%dx%d (%d:%d)", w, h, bestnum, bestdenom)), strzone(strcat(ftos(w), " ", ftos(h), " ", ftos(pixelheight)))); } else - me.insertValue(me, i, strzone(sprintf(_("%dx%d"), w, h)), strzone(strcat(ftos(w), " ", ftos(h), " ", ftos(pixelheight)))); + me.insertValue(me, i, strzone(sprintf("%dx%d", w, h)), strzone(strcat(ftos(w), " ", ftos(h), " ", ftos(pixelheight)))); } float autocvar_menu_vid_allowdualscreenresolution; void XonoticResolutionSlider_configureXonoticResolutionSlider(entity me) diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index 8b78a0f0ae..7c46564f45 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -305,17 +305,17 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data) } if(status != 0) { - printf(_("error receiving update notification: status is %d\n"), status); + dprintf("error receiving update notification: status is %d\n", status); return; } if(substring(data, 0, 1) == "<") { - print(_("error: received HTML instead of an update notification\n")); + dprint("error: received HTML instead of an update notification\n"); return; } if(strstrofs(data, "\r", 0) != -1) { - print(_("error: received carriage returns from update notification server\n")); + dprint("error: received carriage returns from update notification server\n"); return; } -- 2.39.2