Changeset 1150

Timestamp:

11/16/07 10:06:45 (11 months ago)

Author:

shawnw

Message:

#7435: Strings for translation

Files:

• 1.8.3/branches/devel/src/atr_tab.c (modified) (1 diff)
• 1.8.3/branches/devel/src/command.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/conf.c (modified) (1 diff)
• 1.8.3/branches/devel/src/cque.c (modified) (1 diff)
• 1.8.3/branches/devel/src/create.c (modified) (1 diff)
• 1.8.3/branches/devel/src/extchat.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/function.c (modified) (1 diff)
• 1.8.3/branches/devel/src/look.c (modified) (9 diffs)
• 1.8.3/branches/devel/src/parse.c (modified) (1 diff)
• 1.8.3/branches/devel/src/set.c (modified) (3 diffs)
• 1.8.3/branches/devel/src/speech.c (modified) (6 diffs)
• 1.8.3/branches/devel/src/strutil.c (modified) (1 diff)
• 1.8.3/branches/devel/src/wiz.c (modified) (7 diffs)

1.8.3/branches/devel/src/atr_tab.c

@@ -366 +366 @@
-{
-  char *b = list_attribs();
-"Attribs: %s"
+T("Attribs: %s")
-}
-

1.8.3/branches/devel/src/command.c

@@ -1669 +1669 @@
-{
-  char *b = list_commands();
-"Commands: %s"
+T("Commands: %s")
-}
-
@@ -1943 +1943 @@
-  if (Wizard(player) || has_power_by_name(player, "HOOK", NOTYPE)) {
-    if (GoodObject(cmd->hooks.before.obj))
-"@hook/before: #%d/%s"
+T("@hook/before: #%d/%s")
-                    cmd->hooks.before.obj, cmd->hooks.before.attrname);
-    if (GoodObject(cmd->hooks.after.obj))
-"@hook/after: #%d/%s"
+T("@hook/after: #%d/%s")
-                    cmd->hooks.after.attrname);
-    if (GoodObject(cmd->hooks.ignore.obj))
-"@hook/ignore: #%d/%s"
+T("@hook/ignore: #%d/%s")
-                    cmd->hooks.ignore.obj, cmd->hooks.ignore.attrname);
-    if (GoodObject(cmd->hooks.override.obj))
-"@hook/override: #%d/%s"
+T("@hook/override: #%d/%s")
-                    cmd->hooks.override.obj, cmd->hooks.override.attrname);
-  }

1.8.3/branches/devel/src/conf.c

@@ -537 +537 @@
-  {NULL, NULL, 0}
-};
+
+#if 0
+/* Just to mark these strings for translation */
+PENNCONFGROUP dummy[] = {
+  {"attribs", T("Options affecting attributes"), 0},
+  {"chat", T("Chat system options"), 0},
+  {"cmds", T("Options affecting command behavior"), 0},
+  {"compile", T("Compile-time options"), 0},
+  {"cosmetic", T("Cosmetic options"), 0},
+  {"costs", T("Costs"), 0},
+  {"db", T("Database options"), 0},
+  {"dump", T("Options affecting dumps and other periodic processes"), 0},
+  {"files", T("Files used by the MUSH"), CGP_GOD},
+  {"flags", T("Default flags for new objects"), 0},
+  {"funcs", T("Options affecting function behavior"), 0},
+  {"limits", T("Limits and other constants"), 0},
+  {"log", T("Logging options"), 0},
+  {"messages", T("Message files sent by the MUSH"), CGP_GOD},
+  {"net", T("Networking and connection-related options"), 0},
+  {"tiny", T("TinyMUSH compatibility options"), 0},
+  {NULL, NULL, 0}
+};
+#endif
-
-/** Returns a pointer to a newly allocated PENNCONF object.

1.8.3/branches/devel/src/cque.c

@@ -1018 +1018 @@
-      notify(player, T("------------  Queue Done  ------------"));
-    notify_format(player,
-
+
+
-                  pq, tpq, dpq, oq, toq, doq, wq, twq, sq, tsq);
-  }

1.8.3/branches/devel/src/create.c

@@ -473 +473 @@
-
-    /* and we're done */
-"Created: Object %s."
+T("Created: Object %s.")
-    current_state.things++;
-    local_data_create(thing);

1.8.3/branches/devel/src/extchat.c

@@ -2078 +2078 @@
-    notify_noenter(player, open_tag("SAMP"));
-  notify_format(player, "%-30s %-5s %8s %-16s %-8s %-3s",
-
+
+
-  for (c = channels; c; c = c->next) {
-    strcpy(cleanname, remove_markup(ChanName(c), NULL));
@@ -2127 +2128 @@
-                    ChanCreator(c) == player ? '*' : '-',
-                    /* User status */
-"Gag" : "On") : "Off"
+T("Gag") : T("On")) : T("Off")
-                    (u && Chanuser_Quiet(u)) ? 'Q' : ' ',
-                    (u && Chanuser_Hide(u)) ? 'H' : ' ',

1.8.3/branches/devel/src/function.c

@@ -801 +801 @@
-  /* lists all built-in functions. */
-  char *b = list_functions(NULL);
-"Functions: %s"
+T("Functions: %s")
-}
-

1.8.3/branches/devel/src/look.c

@@ -722 +722 @@
-    look_simple(player, thing);
-    if (!(Opaque(thing)))
-"Carrying:"
+T("Carrying:")
-    break;
-  default:
@@ -1186 +1186 @@
-        if (Hearer(here) || Listener(here)) {
-          if (Connected(here))
-"%s [speech]. (connected)"
+T("%s [speech]. (connected)")
-          else
-"%s [speech]."
+T("%s [speech].")
-        }
-        if (Commer(here))
-"%s [commands]."
+T("%s [commands].")
-      }
-    }
@@ -1202 +1202 @@
-        if (Audible(here)) {
-          strcpy(tbuf1, Name(here));
-for (p = tbuf1; *p && (*p != ';'); p++) 
+p = seek_char(tbuf1, ';')
-          *p = '\0';
-"%s [broadcasting]."
+T("%s [broadcasting].")
-        }
-      }
@@ -1226 +1226 @@
-        if (Hearer(here) || Listener(here)) {
-          if (Connected(here))
-"%s [speech]. (connected)"
+T("%s [speech]. (connected)")
-          else
-"%s [speech]."
+T("%s [speech].")
-        }
-        if (Commer(here))
-"%s [commands]."
+T("%s [commands].")
-      }
-    }
@@ -1349 +1349 @@
-          if (Location(counter) == place) {
-            notify_format(player,
-"%s(#%d) [from: %s(#%d)]"
+T("%s(#%d) [from: %s(#%d)]")
-                          counter, Name(Source(counter)), Source(counter));
-            exc++;
@@ -1358 +1358 @@
-        if (rd) {
-          if (Location(counter) == place) {
-
+
+
-            rc++;
-          }
@@ -1366 +1367 @@
-        if (td) {
-          if (Home(counter) == place) {
-"%s(#%d) [home]"
+T("%s(#%d) [home]")
-            tc++;
-          }
@@ -1374 +1375 @@
-        if (pd) {
-          if (Home(counter) == place) {
-"%s(#%d) [home]"
+T("%s(#%d) [home]")
-            pc++;
-          }
@@ -1389 +1390 @@
-    notify(player, T("----------  Entrances Done  ----------"));
-    notify_format(player,
-
+
+
-                  rc, exc, tc, pc);
-    return;

1.8.3/branches/devel/src/parse.c

@@ -1317 +1317 @@
-          }
-          if ((nfargs < fp->minargs) || (nfargs > abs(fp->maxargs))) {
-
-
-
+
-            if (fp->minargs == abs(fp->maxargs)) {
-              safe_integer(fp->minargs, buff, bp);
-            } else if ((fp->minargs + 1) == abs(fp->maxargs)) {
-              safe_integer(fp->minargs, buff, bp);
-" OR "
+T(" OR ")
-              safe_integer(abs(fp->maxargs), buff, bp);
-            } else if (fp->maxargs == INT_MAX) {
-"AT LEAST "
+T("AT LEAST ")
-              safe_integer(fp->minargs, buff, bp);
-            } else {
-"BETWEEN "
+T("BETWEEN ")
-              safe_integer(fp->minargs, buff, bp);
-" AND "
+T(" AND ")
-              safe_integer(abs(fp->maxargs), buff, bp);
-            }
-" ARGUMENTS BUT GOT "
+T(" ARGUMENTS BUT GOT ")
-            safe_integer(nfargs, buff, bp);
-          } else {

1.8.3/branches/devel/src/set.c

@@ -732 +732 @@
-  if (copies) {
-    notify_format(player, T("Attribute %s (%d copies)"),
-"moved" : "copied"
+T("moved") : T("copied")
-    if (move)
-      do_set_atr(oldobj, AL_NAME(a), NULL, player, 1);
-  } else {
-    notify_format(player, T("Unable to %s attribute."),
-"move" : "copy"
+T("move") : T("copy")
-  }
-  return;
@@ -887 +887 @@
-        !AreQuiet(player, thing)) {
-      if (!ansi_long_flag && ShowAnsi(player))
-"%s - Set: %s"
+T("%s - Set: %s")
-      else
-"%s - Set: %s"
+T("%s - Set: %s")
-    }
-  } else {
@@ -1019 +1019 @@
-      return;
-    } else
-"Used."
+T("Used.")
-  }
-}

1.8.3/branches/devel/src/speech.c

@@ -347 +347 @@
-
-  if (!gcount) {
-(Malloc_t) 
+
-    return;
-  }
@@ -357 +357 @@
-  /* Set up list of good names */
-  tp = tbuf;
-" to "
+T(" to ")
-  for (who = 0; who < gcount; who++) {
-    if (noisy && (get_random_long(0, 100) < WHISPER_LOUDNESS))
@@ -372 +372 @@
-  } else {
-    notify_format(player, T("You whisper, \"%s\"%s."), arg2, tbuf);
-"%s whispers%s: %s"
+T("%s whispers%s: %s")
-                gcount > 1 ? tbuf : "", arg2);
-  }
@@ -385 +385 @@
-    if (!GoodObject(first))
-      return;
-"%s whispers%s."
+T("%s whispers%s.")
-    DOLIST(first, first) {
-      overheard = 1;
@@ -398 +398 @@
-    }
-  }
-(Malloc_t) 
+
-}
-
@@ -674 +674 @@
-    flag_broadcast(mask, 0,
-                   "%s %s %s, \"%s\"", prefix, Name(player),
-"shouts" : "says"
+T("shouts") : T("says")
-}
-

1.8.3/branches/devel/src/strutil.c

@@ -872 +872 @@
-{
-  char *p = (char *) s;
-
+
+
+
-    p++;
-  return p;

1.8.3/branches/devel/src/wiz.c

@@ -590 +590 @@
-
-  if ((victim = match_controlled(player, what)) == NOTHING) {
-"Sorry."
+T("Sorry.")
-    return;
-  }
@@ -1231 +1231 @@
-
-    if (nrooms) {
-"\nROOMS:"
+T("\nROOMS:")
-      for (n = 0; n < nrooms; n++) {
-        tbp = tbuf;
-
+
+
-        safe_str(object_header(player, Owner(rooms[n])), tbuf, &tbp);
-        safe_chr(']', tbuf, &tbp);
@@ -1245 +1246 @@
-      dbref from, to;
-
-"\nEXITS:"
+T("\nEXITS:")
-      for (n = 0; n < nexits; n++) {
-        tbp = tbuf;
@@ -1253 +1254 @@
-          from = Source(exits[n]);
-        to = Destination(exits[n]);
-
-
+
+
+
-                 tbuf, &tbp);
-" to "
-"NOWHERE"
+T(" to ")
+T("NOWHERE")
-                 tbuf, &tbp);
-        safe_chr(']', tbuf, &tbp);
@@ -1266 +1268 @@
-
-    if (nthings) {
-"\nTHINGS:"
+T("\nTHINGS:")
-      for (n = 0; n < nthings; n++) {
-        tbp = tbuf;
-"%s [owner: "
+T("%s [owner: ")
-                    object_header(player, things[n]));
-        safe_str(object_header(player, Owner(things[n])), tbuf, &tbp);
@@ -1280 +1282 @@
-    if (nplayers) {
-      int is_wizard = Search_All(player) || See_All(player);
-"\nPLAYERS:"
+T("\nPLAYERS:")
-      for (n = 0; n < nplayers; n++) {
-        tbp = tbuf;
@@ -1298 +1300 @@
-                  ("Totals: Rooms...%d  Exits...%d  Things...%d  Players...%d"),
-                  nrooms, nexits, nthings, nplayers);
-(Malloc_t) 
-(Malloc_t) 
-(Malloc_t) 
-(Malloc_t) 
+
+
+
+
-  }
-  if (results)