From f6cab16b6576c7472df54958bc4d9c9ba872a04c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 22 May 2010 14:59:23 +0200 Subject: [PATCH] Don't capitalize words in the middle of sentences Affects output of commands add, anti, build, edit, order, reset, set, setresource, setsector, show, version. --- info/Technology.t | 2 +- src/lib/commands/add.c | 2 +- src/lib/commands/anti.c | 2 +- src/lib/commands/buil.c | 2 +- src/lib/commands/edit.c | 10 +++++----- src/lib/commands/orde.c | 4 ++-- src/lib/commands/rese.c | 2 +- src/lib/commands/set.c | 2 +- src/lib/commands/setres.c | 2 +- src/lib/commands/setsect.c | 2 +- src/lib/commands/vers.c | 2 +- src/lib/subs/show.c | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/info/Technology.t b/info/Technology.t index 8411bb76..20e0be88 100644 --- a/info/Technology.t +++ b/info/Technology.t @@ -22,7 +22,7 @@ produced in your various tech centres in a line like this: (2) Calculate tech delta from technological breakthroughs In the output of the "version" command, you will see a line like this: - Tech Buildup is limited to logarithmic growth (base 2.00) after 3.00. + Tech buildup is limited to logarithmic growth (base 2.00) after 3.00. In this example, the "tech log base" is 2.00 and the "easy tech" is 3.00. To find out what your tech delta for an update will be, subtract diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c index 9d2455dc..e58d2829 100644 --- a/src/lib/commands/add.c +++ b/src/lib/commands/add.c @@ -82,7 +82,7 @@ add(void) return RET_FAIL; } natp = getnatp(coun); - p = getstarg(player->argp[2], "Country Name? ", buf); + p = getstarg(player->argp[2], "Country name? ", buf); if (!p) return RET_SYN; if (!check_nat_name(p)) diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c index 247ac3f3..d17a7e79 100644 --- a/src/lib/commands/anti.c +++ b/src/lib/commands/anti.c @@ -143,7 +143,7 @@ anti(void) putsect(§); pr(" Partisans take over the sector. You blew it.\n"); wu(0, sect.sct_oldown, - "Sector %s regained from Partisan activity.\n", + "Sector %s regained from partisan activity.\n", xyas(nstr.x, nstr.y, sect.sct_oldown)); } } else { diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c index c7d61017..726466e4 100644 --- a/src/lib/commands/buil.c +++ b/src/lib/commands/buil.c @@ -390,7 +390,7 @@ build_land(struct sctstr *sp, struct lchrstr *lp, short *vec, int tlev) lcm = roundavg(lp->l_lcm * eff); if (sp->sct_type != SCT_HEADQ) { - pr("Land Units must be built in headquarters.\n"); + pr("Land units must be built in headquarters.\n"); return 0; } if (sp->sct_effic < 60 && !player->god) { diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c index 89ce9b4c..319372a7 100644 --- a/src/lib/commands/edit.c +++ b/src/lib/commands/edit.c @@ -86,7 +86,7 @@ edit(void) char ewhat; what = getstarg(player->argp[1], - "Edit What (country, land, ship, plane, nuke, unit)? ", + "Edit what (country, land, ship, plane, nuke, unit)? ", buf); if (!what) return RET_SYN; @@ -589,7 +589,7 @@ doland(char op, int arg, char *p, struct sctstr *sect) case 'D': if (!sarg_xy(p, &newx, &newy)) return RET_SYN; - pr("Distribution Location for sector %s changed from %s to %s\n", + pr("Distribution location for sector %s changed from %s to %s\n", xyas(sect->sct_x, sect->sct_y, player->cnum), xyas(sect->sct_dist_x, sect->sct_dist_y, player->cnum), xyas(newx, newy, player->cnum)); @@ -610,7 +610,7 @@ doland(char op, int arg, char *p, struct sctstr *sect) des = sct_typematch(p); if (des < 0) return RET_SYN; - pr("New Designation for sector %s changed from %c to %c\n", + pr("New designation for sector %s changed from %c to %c\n", xyas(sect->sct_x, sect->sct_y, player->cnum), dchr[sect->sct_newtype].d_mnem, dchr[des].d_mnem); sect->sct_newtype = des; @@ -676,10 +676,10 @@ docountry(char op, int arg, char *p, struct natstr *np) break; case 'm': benefit(nat, np->nat_reserve < arg); - pr("Military Reserves changed from %ld to %d\n", + pr("Military reserves changed from %ld to %d\n", np->nat_reserve, arg); wu(player->cnum, nat, - "Military Reserves changed from %ld to %d by divine intervention.\n", + "Military reserves changed from %ld to %d by divine intervention.\n", np->nat_reserve, arg); np->nat_reserve = arg; break; diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c index 5151a474..58dc2d4a 100644 --- a/src/lib/commands/orde.c +++ b/src/lib/commands/orde.c @@ -186,7 +186,7 @@ orde(void) sub = sub - 1;; if (ship.shp_autonav & AN_AUTONAV) { - dest = getstarg(player->argp[4], "Start or End? ", buf); + dest = getstarg(player->argp[4], "Start or end? ", buf); if (!dest) return RET_FAIL; switch (*dest) { @@ -211,7 +211,7 @@ orde(void) } ship.shp_tstart[sub] = i1->i_uid; ship.shp_lstart[sub] = level; - pr("Order Set \n"); + pr("Order set\n"); break; case 's': case 'S': diff --git a/src/lib/commands/rese.c b/src/lib/commands/rese.c index 1a7e9925..c65d92d7 100644 --- a/src/lib/commands/rese.c +++ b/src/lib/commands/rese.c @@ -134,7 +134,7 @@ rese(void) (void)time(&now); comm.com_markettime = now; if (!putcomm(number_set, &comm)) { - pr("Problems with the commodities file, Call the Deity\n"); + pr("Problems with the commodities file, call the Deity\n"); return RET_OK; } return RET_OK; diff --git a/src/lib/commands/set.c b/src/lib/commands/set.c index b5994937..a557cf44 100644 --- a/src/lib/commands/set.c +++ b/src/lib/commands/set.c @@ -90,7 +90,7 @@ set(void) return RET_FAIL; } trade.trd_type = type; - sprintf(prompt, "%s #%d; Price? ", + sprintf(prompt, "%s #%d; price? ", trade_nameof(&trade, &item), ni.cur); if (!(p = getstarg(player->argp[3], prompt, buf))) return RET_FAIL; diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c index 15304505..736c4c4b 100644 --- a/src/lib/commands/setres.c +++ b/src/lib/commands/setres.c @@ -51,7 +51,7 @@ setres(void) char buf[1024]; what = getstarg(player->argp[1], - "Set What (iron, gold, oil, uranium, fertility)? ", + "Set what (iron, gold, oil, uranium, fertility)? ", buf); if (!what) return RET_SYN; diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c index 62e85913..c34381b0 100644 --- a/src/lib/commands/setsect.c +++ b/src/lib/commands/setsect.c @@ -55,7 +55,7 @@ setsector(void) char char0, char1; what = getstarg(player->argp[1], - "Give What (iron, gold, oil, uranium, fertility, owner, eff., mob., work, avail., oldown, mines)? ", + "Give what (iron, gold, oil, uranium, fertility, owner, eff., mob., work, avail., oldown, mines)? ", buf); if (!what) return RET_SYN; diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c index fb2ea611..bdb9124e 100644 --- a/src/lib/commands/vers.c +++ b/src/lib/commands/vers.c @@ -119,7 +119,7 @@ vers(void) pr("Nation levels (tech etc.) decline 1%% every %d time units.\n", (int)(level_age_rate)); - pr("Tech Buildup is "); + pr("Tech buildup is "); if (tech_log_base <= 1.0) { pr("not limited\n"); } diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c index da55cfcb..99703eae 100644 --- a/src/lib/subs/show.c +++ b/src/lib/subs/show.c @@ -148,7 +148,7 @@ show_tower(int tlev) { if (tlev < buil_tower_bt) return; - pr("Bridge Towers require %g tech, %d hcm, 0 workers,\n", + pr("Bridge towers require %g tech, %d hcm, 0 workers,\n", buil_tower_bt, buil_tower_bh); pr("%d available workforce, and cost $%g\n", (SCT_BLD_WORK(0, buil_tower_bh) * SCT_MINEFF + 99) / 100,