Author: jtn
Date: Mon Nov 30 22:14:50 2015
New Revision: 30817

URL: http://svn.gna.org/viewcvs/freeciv?rev=30817&view=rev
Log:
Standardise on "nation set" rather than "nationset" in text.

Reported by Marko Lindqvist (cazfi@gna).

See gna patch #6639.

Modified:
    branches/S2_6/client/gui-sdl/dialogs.c
    branches/S2_6/client/gui-sdl2/dialogs.c
    branches/S2_6/server/commands.c
    branches/S2_6/server/edithand.c
    branches/S2_6/server/settings.c
    branches/S2_6/server/srv_main.c
    branches/S2_6/server/stdinhand.c

Modified: branches/S2_6/client/gui-sdl/dialogs.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/dialogs.c?rev=30817&r1=30816&r2=30817&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/dialogs.c      (original)
+++ branches/S2_6/client/gui-sdl/dialogs.c      Mon Nov 30 22:14:50 2015
@@ -3316,7 +3316,7 @@
     SDL_String16 *natset_str;
     struct option *poption;
 
-    natset_str = create_str16_from_char(_("Nationset"), adj_font(12));
+    natset_str = create_str16_from_char(_("Nation set"), adj_font(12));
     change_ptsize16(natset_str, adj_font(24));
     nationsets = create_iconlabel(NULL, pWindow->dst, natset_str, 0);
     add_to_gui_list(ID_LABEL, nationsets);

Modified: branches/S2_6/client/gui-sdl2/dialogs.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/dialogs.c?rev=30817&r1=30816&r2=30817&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/dialogs.c     (original)
+++ branches/S2_6/client/gui-sdl2/dialogs.c     Mon Nov 30 22:14:50 2015
@@ -3293,7 +3293,7 @@
     utf8_str *natset_str;
     struct option *poption;
 
-    natset_str = create_utf8_from_char(_("Nationset"), adj_font(12));
+    natset_str = create_utf8_from_char(_("Nation set"), adj_font(12));
     change_ptsize_utf8(natset_str, adj_font(24));
     nationsets = create_iconlabel(NULL, pWindow->dst, natset_str, 0);
     add_to_gui_list(ID_LABEL, nationsets);

Modified: branches/S2_6/server/commands.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/commands.c?rev=30817&r1=30816&r2=30817&view=diff
==============================================================================
--- branches/S2_6/server/commands.c     (original)
+++ branches/S2_6/server/commands.c     Mon Nov 30 22:14:50 2015
@@ -103,7 +103,7 @@
       " - the list of defined map images,\n"
       " - the list of the players in the game,\n"
       " - the available scenarios,\n"
-      " - the available nationsets in this ruleset,\n"
+      " - the available nation sets in this ruleset,\n"
       " - the teams of players or\n"
       " - the running votes.\n"
       "The argument may be abbreviated, and defaults to 'players' if "

Modified: branches/S2_6/server/edithand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/edithand.c?rev=30817&r1=30816&r2=30817&view=diff
==============================================================================
--- branches/S2_6/server/edithand.c     (original)
+++ branches/S2_6/server/edithand.c     Mon Nov 30 22:14:50 2015
@@ -1211,7 +1211,7 @@
       notify_conn(pc->self, NULL, E_BAD_COMMAND, ftc_editor,
                   _("Cannot change nation for player %d (%s) "
                     "to nation %d (%s) because that nation is "
-                    "not in the current nationset."),
+                    "not in the current nation set."),
                   player_number(pplayer), player_name(pplayer),
                   packet->nation, nation_plural_translation(pnation));
     } else if (pplayer->ai_common.barbarian_type

Modified: branches/S2_6/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/settings.c?rev=30817&r1=30816&r2=30817&view=diff
==============================================================================
--- branches/S2_6/server/settings.c     (original)
+++ branches/S2_6/server/settings.c     Mon Nov 30 22:14:50 2015
@@ -623,7 +623,7 @@
    * (However, new connections will start out detached.) */
   if (normal_player_count() > server.playable_nations) {
     notify_conn(NULL, NULL, E_SETTING, ftc_server, "%s",
-                _("Warning: not enough nations in this nationset "
+                _("Warning: not enough nations in this nation set "
                   "for all current players."));
   }
 

Modified: branches/S2_6/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=30817&r1=30816&r2=30817&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c     (original)
+++ branches/S2_6/server/srv_main.c     Mon Nov 30 22:14:50 2015
@@ -2150,7 +2150,7 @@
   if (limit > server.playable_nations) {
     limit = server.playable_nations;
     if (nation_set_count() > 1) {
-      limitreason = _("not enough playable nations in this nationset "
+      limitreason = _("not enough playable nations in this nation set "
                       "(see 'nationset' setting)");
     } else {
       limitreason = _("not enough playable nations");

Modified: branches/S2_6/server/stdinhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/stdinhand.c?rev=30817&r1=30816&r2=30817&view=diff
==============================================================================
--- branches/S2_6/server/stdinhand.c    (original)
+++ branches/S2_6/server/stdinhand.c    Mon Nov 30 22:14:50 2015
@@ -809,7 +809,7 @@
     if (!nation_is_in_current_set(pnation)) {
       fc_snprintf(buf, buflen,
                   _("Can't create player, requested nation %s not in "
-                    "current nationset."),
+                    "current nation set."),
                   nation_plural_translation(pnation));
       return C_FAIL;
     }
@@ -985,7 +985,7 @@
       if (nation_set_count() > 1) {
         fc_snprintf(buf, buflen,
                     _("Can't add more players, not enough playable nations "
-                      "in current nationset (see 'nationset' setting)."));
+                      "in current nation set (see 'nationset' setting)."));
       } else {
         fc_snprintf(buf, buflen,
                     _("Can't add more players, not enough playable nations."));
@@ -5643,7 +5643,7 @@
     } else if (normal_player_count() > server.playable_nations) {
       if (nation_set_count() > 1) {
         start_cmd_reply(caller, notify,
-                        _("Not enough nations in the current nationset "
+                        _("Not enough nations in the current nation set "
                           "for all players; game will not start. "
                           "(See 'nationset' setting.)"));
       } else {


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to