From 2c109bd7c1464700766547d1d408dcd8db82bc60 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 14 Dec 2023 05:09:32 +0200
Subject: [PATCH 21/21] Add second alt sound tag support for buildings

See RM #65

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 client/audio.c                       | 17 +++---
 client/audio.h                       |  3 +-
 client/clinet.c                      |  2 +-
 client/control.c                     |  3 +-
 client/gui-qt/chatline.cpp           |  2 +-
 client/packhand.c                    | 12 +++--
 common/improvement.h                 |  1 +
 common/networking/packets.def        |  1 +
 data/alien/buildings.ruleset         | 30 +++++++++++
 data/civ1/buildings.ruleset          | 46 ++++++++++++++++
 data/civ2/buildings.ruleset          | 67 +++++++++++++++++++++++
 data/civ2civ3/buildings.ruleset      | 72 +++++++++++++++++++++++++
 data/classic/buildings.ruleset       | 67 +++++++++++++++++++++++
 data/goldkeep/buildings.ruleset      | 69 ++++++++++++++++++++++++
 data/granularity/buildings.ruleset   |  3 ++
 data/multiplayer/buildings.ruleset   | 67 +++++++++++++++++++++++
 data/sandbox/buildings.ruleset       | 79 ++++++++++++++++++++++++++++
 data/stub/buildings.ruleset          |  1 +
 data/webperimental/buildings.ruleset | 67 +++++++++++++++++++++++
 server/ruleset/ruleload.c            |  4 ++
 tools/ruledit/edit_impr.cpp          | 21 ++++++++
 tools/ruledit/edit_impr.h            |  2 +
 tools/ruleutil/rulesave.c            |  3 ++
 23 files changed, 625 insertions(+), 14 deletions(-)

diff --git a/client/audio.c b/client/audio.c
index 47236b6bc1..d70b940a08 100644
--- a/client/audio.c
+++ b/client/audio.c
@@ -525,19 +525,24 @@ static int audio_play_music_tag(const char *tag, bool repeat,
 /**********************************************************************//**
   Play an audio sample as suggested by sound tags
 **************************************************************************/
-void audio_play_sound(const char *const tag, const char *const alt_tag)
+void audio_play_sound(const char *const tag, const char *const alt_tag,
+                      const char *const alt_tag2)
 {
   const char *pretty_alt_tag = alt_tag ? alt_tag : "(null)";
+  const char *pretty_alt2_tag = alt_tag2 ? alt_tag2 : "(null)";
 
   if (gui_options.sound_enable_effects) {
     fc_assert_ret(tag != NULL);
 
-    log_debug("audio_play_sound('%s', '%s')", tag, pretty_alt_tag);
+    log_debug("audio_play_sound('%s', '%s', '%s')",
+              tag, pretty_alt_tag, pretty_alt2_tag);
 
-    /* try playing primary tag first, if not go to alternative tag */
+    /* Try playing primary tag first, if not go to alternative tags */
     if (!audio_play_sound_tag(tag, FALSE)
-        && !audio_play_sound_tag(alt_tag, FALSE)) {
-      log_verbose( "Neither of tags %s or %s found", tag, pretty_alt_tag);
+        && !audio_play_sound_tag(alt_tag, FALSE)
+        && !audio_play_sound_tag(alt_tag2, FALSE)) {
+      log_verbose( "None of tags %s, %s, or %s found",
+                   tag, pretty_alt_tag, pretty_alt2_tag);
     }
   }
 }
@@ -655,7 +660,7 @@ void audio_shutdown(bool play_quit_tag)
   audio_stop();
 
   if (play_quit_tag) {
-    audio_play_sound("e_client_quit", NULL);
+    audio_play_sound("e_client_quit", NULL, NULL);
   }
 
   if (plugins[selected_plugin].initialized) {
diff --git a/client/audio.h b/client/audio.h
index 813897cbd2..0852f5d314 100644
--- a/client/audio.h
+++ b/client/audio.h
@@ -64,7 +64,8 @@ void audio_restart(const char *soundset_name, const char *musicset_name);
 void audio_pause(void);
 void audio_resume(void);
 
-void audio_play_sound(const char *const tag, const char *const alt_tag);
+void audio_play_sound(const char *const tag, const char *const alt_tag,
+                      const char *const alt_tag2);
 void audio_play_music(const char *const tag, char *const alt_tag,
                       enum music_usage usage);
 void audio_play_track(const char *const tag, char *const alt_tag);
diff --git a/client/clinet.c b/client/clinet.c
index ef4c3293b4..c728c79a5e 100644
--- a/client/clinet.c
+++ b/client/clinet.c
@@ -323,7 +323,7 @@ void disconnect_from_server(bool leaving_sound)
   output_window_append(ftc_client, _("Disconnected from server."));
 
   if (leaving_sound) {
-    audio_play_sound("e_leave_game", NULL);
+    audio_play_sound("e_leave_game", NULL, NULL);
   }
 
   if (gui_options.save_options_on_exit) {
diff --git a/client/control.c b/client/control.c
index b22c8f66b7..58f66a59b1 100644
--- a/client/control.c
+++ b/client/control.c
@@ -2784,7 +2784,8 @@ void do_move_unit(struct unit *punit, struct unit *target_unit)
       && punit->activity != ACTIVITY_SENTRY
       && !unit_transported(punit)) {
     audio_play_sound(unit_type_get(punit)->sound_move,
-                     unit_type_get(punit)->sound_move_alt);
+                     unit_type_get(punit)->sound_move_alt,
+                     NULL);
   }
 
   if (unit_owner(punit) == client.conn.playing
diff --git a/client/gui-qt/chatline.cpp b/client/gui-qt/chatline.cpp
index 58a43bef9e..55f1c3bdeb 100644
--- a/client/gui-qt/chatline.cpp
+++ b/client/gui-qt/chatline.cpp
@@ -773,7 +773,7 @@ void qtg_real_output_window_append(const char *astring,
   if (str.contains(wakeup) && client_state() < C_S_RUNNING
       && !wakeup.isEmpty()) {
     qapp->alert(gui()->central_wdg);
-    audio_play_sound("e_player_wake", nullptr);
+    audio_play_sound("e_player_wake", nullptr, nullptr);
   }
 
   chat_listener::update_word_list();
diff --git a/client/packhand.c b/client/packhand.c
index 2f09e1104a..98099ecddd 100644
--- a/client/packhand.c
+++ b/client/packhand.c
@@ -597,9 +597,11 @@ void handle_unit_combat_info(const struct packet_unit_combat_info *packet)
       int hp0 = packet->attacker_hp, hp1 = packet->defender_hp;
 
       audio_play_sound(unit_type_get(punit0)->sound_fight,
-                       unit_type_get(punit0)->sound_fight_alt);
+                       unit_type_get(punit0)->sound_fight_alt,
+                       NULL);
       audio_play_sound(unit_type_get(punit1)->sound_fight,
-                       unit_type_get(punit1)->sound_fight_alt);
+                       unit_type_get(punit1)->sound_fight_alt,
+                       NULL);
 
       if (gui_options.smooth_combat_step_msec > 0) {
         decrease_unit_hp_smooth(punit0, hp0, punit1, hp1);
@@ -883,7 +885,8 @@ void handle_city_info(const struct packet_city_info *packet)
 
     if (have && !city_is_new
         && pcity->built[improvement_index(pimprove)].turn <= I_NEVER) {
-      audio_play_sound(pimprove->soundtag, pimprove->soundtag_alt);
+      audio_play_sound(pimprove->soundtag, pimprove->soundtag_alt,
+                       pimprove->soundtag_alt2);
     }
     need_economy_dialog_update |=
         update_improvement_from_packet(pcity, pimprove, have);
@@ -1516,7 +1519,7 @@ void play_sound_for_event(enum event_type type)
   const char *sound_tag = get_event_tag(type);
 
   if (sound_tag) {
-    audio_play_sound(sound_tag, NULL);
+    audio_play_sound(sound_tag, NULL, NULL);
   }
 }
 
@@ -3914,6 +3917,7 @@ void handle_ruleset_building(const struct packet_ruleset_building *p)
   PACKET_STRVEC_EXTRACT(b->helptext, p->helptext);
   sz_strlcpy(b->soundtag, p->soundtag);
   sz_strlcpy(b->soundtag_alt, p->soundtag_alt);
+  sz_strlcpy(b->soundtag_alt2, p->soundtag_alt2);
 
 #ifdef FREECIV_DEBUG
   if (p->id == improvement_count() - 1) {
diff --git a/common/improvement.h b/common/improvement.h
index 849d5f2381..c9df48df8c 100644
--- a/common/improvement.h
+++ b/common/improvement.h
@@ -65,6 +65,7 @@ struct impr_type {
   struct strvec *helptext;
   char soundtag[MAX_LEN_NAME];
   char soundtag_alt[MAX_LEN_NAME];
+  char soundtag_alt2[MAX_LEN_NAME];
 
   /* Cache */
   bool allows_units;
diff --git a/common/networking/packets.def b/common/networking/packets.def
index 542cc0603d..ff1478e7df 100644
--- a/common/networking/packets.def
+++ b/common/networking/packets.def
@@ -1675,6 +1675,7 @@ PACKET_RULESET_BUILDING = 150; sc, lsend
   BV_IMPR_FLAGS flags;
   STRING soundtag[MAX_LEN_NAME];
   STRING soundtag_alt[MAX_LEN_NAME];
+  STRING soundtag_alt2[MAX_LEN_NAME];
   STRVEC helptext[MAX_LEN_PACKET];
 end
 
diff --git a/data/alien/buildings.ruleset b/data/alien/buildings.ruleset
index 275899dd53..7d7ccf57f8 100644
--- a/data/alien/buildings.ruleset
+++ b/data/alien/buildings.ruleset
@@ -94,6 +94,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_airport"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Allows one unit airlift from and to city, increased to three once \
@@ -117,6 +118,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_library"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science production of a city by 75%.")
@@ -138,6 +140,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_super_highways"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Basic Infrastructure to the city. This improvement has no maintenance, and \
@@ -165,6 +168,7 @@ upkeep          = 1
 sabotage        = 15
 sound           = "b_sam_battery"
 sound_alt       = "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Revolt cannot be incited in a city with bunker.\
@@ -189,6 +193,7 @@ upkeep          = 1
 sabotage        = 80
 sound           = "b_mfg_plant"
 sound_alt       = "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 City center tile produces three extra shields.\
@@ -212,6 +217,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_marketplace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the tax output in a city by 75%.\
@@ -235,6 +241,7 @@ upkeep          = 1
 sabotage        = 50
 sound           = "b_factory"
 sound_alt       = "b_generic"
+sound_alt2      = "-"
 helptext        = _("\
 Factory produces spare parts for two units removing their production upkeep.\
 ")
@@ -258,6 +265,7 @@ upkeep          = 1
 sabotage        = 30
 sound           = "b_sewer_system"
 sound_alt       = "b_generic"
+sound_alt2      = "-"
 helptext        = _("\
 Filter System gets 1 extra food and 1 extra production from each oceanic tile.\
 ")
@@ -281,6 +289,7 @@ upkeep          = 1
 sabotage        = 30
 sound           = "b_city_walls"
 sound_alt       = "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext        = _("\
 Force Walls doubles city defense against all kind of attacks. \
@@ -303,6 +312,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Headquarters building marks city as your capital. City with \
@@ -326,6 +336,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Damaged units which stay in city without moving, heal 50% of their hitpoints \
@@ -349,6 +360,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "w_isaac_newtons_college"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Improved information gathering. Only 2 other factions needs to know \
@@ -372,6 +384,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_colosseum"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Makes 3 unhappy citizens content.\
@@ -395,6 +408,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_barracks_i"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 All new units are built as Elite ones.\
@@ -418,6 +432,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_mass_transit"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 City workers can travel further from city center to work and \
@@ -444,6 +459,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_coastal_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City with Radar Tower sees much further than one without.")
 
@@ -465,6 +481,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_nuclear_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Radiation Resistor increases maximum city size by 3.\
 ")
@@ -487,6 +504,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_university"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science production of a city by 100%.")
@@ -509,6 +527,7 @@ upkeep          = 1
 sabotage        = 100
 sound           = "b_police_station"
 sound_alt       = "b_generic"
+sound_alt2      = "-"
 helptext        = _("\
 Secret Police is good at leading army.\n\n\
 Makes martial law possible. Each military unit in city makes one unhappy \
@@ -532,6 +551,7 @@ upkeep          = 2
 sabotage        = 100
 sound           = "b_stock_exchange"
 sound_alt       = "b_generic"
+sound_alt2      = "-"
 helptext        = _("\
 Radiation is weaker miles high. Top levels of really tall buildings can safely house \
 more people.\n\nCities can grow 5 sizes bigger.")
@@ -554,6 +574,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_temple"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Makes two unhappy citizens content.\
@@ -601,6 +622,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_component"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Components can be differentiated into Propulsion and Fuel\
  Components.  Each pair of them reduces your spaceship's travel\
@@ -625,6 +647,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_module"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Modules are the most expensive parts of spaceships.  There\
  are three different types of Space Module:\
@@ -658,6 +681,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_structural"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Structurals form the base of your spaceship.  All other\
  spaceship parts need to be connected to Structurals in order to\
@@ -681,6 +705,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_colossus"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Monument to celebrate our true home planet, Earth.\n\n\
 Each square around the city where this wonder is built that is already \
@@ -705,6 +730,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_king_richards_crusade"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Real deep mining.\n\n\
 Each square around the city where this wonder is built that is already \
@@ -729,6 +755,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_eiffel_tower"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 All player's antigravity units will regenerate 50% of their hitpoints each \
@@ -754,6 +781,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_asmiths_trading_co"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each oceanic city center generates 3 points more trade and production.\
 ")
@@ -776,6 +804,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_womens_suffrage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 All player's native alien units will regenerate 50% of their hitpoints each \
@@ -800,6 +829,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_wall"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Provides additional protection against radiation making it possible for \
 all cities player owns to grow 2 sizes bigger, unless growth is blocked by \
diff --git a/data/civ1/buildings.ruleset b/data/civ1/buildings.ruleset
index b9da88fc8c..7e4c7240d1 100644
--- a/data/civ1/buildings.ruleset
+++ b/data/civ1/buildings.ruleset
@@ -92,6 +92,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 10.\
 "), _("\
@@ -118,6 +119,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_bank"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with the Marketplace improvement, a Bank increases the\
@@ -143,6 +145,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_i"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -173,6 +176,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_barracks_ii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -202,6 +206,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_barracks_iii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -231,6 +236,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_cathedral"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Cathedral makes 4 unhappy citizens content in a city, making it\
  easier to maintain order in that city; however, it does not affect\
@@ -256,6 +262,7 @@ upkeep		= 2
 sabotage	= 50
 sound		= "b_city_walls"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City Walls make it easier to defend a city.  They triple the defense\
  strength of units within the city. They are ineffective against\
@@ -285,6 +292,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_colosseum"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Entertains the citizens of a city, making 3 unhappy citizens content. \
  However, it does not affect citizens made unhappy by military activity.\
@@ -308,6 +316,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_courthouse"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces the corruption in a city by 50%. Has no effect in your capital\
@@ -332,6 +341,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_factory"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production in a city by 50%.  This increase may\
@@ -356,6 +366,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_granary"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The amount of stored food will be set to half full whenever a city\
  with a Granary shrinks or grows. This helps a city to grow faster\
@@ -393,6 +404,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_hydro_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces the amount of pollution generated by production in a city\
@@ -427,6 +439,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_library"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 50%.\
@@ -450,6 +463,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_marketplace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
@@ -473,6 +487,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_mass_transit"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Neutralizes the pollution generated by the population. \
  The population simply has no effect on the pollution generated in\
@@ -498,6 +513,7 @@ upkeep		= 6
 sabotage	= 100
 sound		= "b_mfg_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Factory, a Manufacturing Plant increases the shield\
@@ -523,6 +539,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_nuclear_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces the amount of pollution generated by production in a city\
@@ -558,6 +575,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes a city the capital and the center of your government.\
  Corruption in other cities is related to how far away from the\
@@ -599,6 +617,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_power_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production of a Factory or Mfg. Plant in a\
@@ -629,6 +648,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_recycling_center"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Building a Recycling Center reduces the amount of pollution\
@@ -653,6 +673,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_sdi_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Protects a city and its environs (up to 2 tiles away) from attacks\
  by other nations' Nuclear units. A Nuclear unit not owned by you or a\
@@ -678,6 +699,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_component"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Components can be differentiated into Propulsion and Fuel\
  Components.  Each pair of them reduces your spaceship's travel\
@@ -705,6 +727,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_module"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Modules are the most expensive parts of spaceships.  There\
  are three different types of Space Module:\
@@ -741,6 +764,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_structural"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Structurals form the base of your spaceship.  All other\
  spaceship parts need to be connected to Structurals in order to\
@@ -768,6 +792,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_temple"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content.  The Mysticism advance doubles\
  this effect, as does the Oracle wonder.  With both Mysticism and the Oracle,\
@@ -797,6 +822,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_university"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a University increases the science\
@@ -846,6 +872,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_colossus"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city where this wonder is built that is already\
  generating some trade produces one extra trade resource.\
@@ -870,6 +897,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_copernicus_observatory"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 50% in the city where it is built.\
@@ -893,6 +921,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_cure_for_cancer"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 This stunning technological achievement makes one unhappy\
  citizen content in each of your cities (including citizens unhappy\
@@ -917,6 +946,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_darwins_voyage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Charles Darwin's voyage sparked the discovery of the evolution\
  of the species, which inspired greater confidence in science.\
@@ -942,6 +972,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_library"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The civilization which builds the Great Library gets every advance\
  that at least two other teams have achieved.\
@@ -966,6 +997,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_wall"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as a City Wall in all your cities.\
 ")
@@ -991,6 +1023,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hanging_gardens"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one content citizen happy in every city. In the unlikely event\
  where there are no content citizens to get the effect of Hanging\
@@ -1016,6 +1049,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hoover_dam"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as if you had a Hydro Plant in every city\
  on the same continent where the wonder is built. \
@@ -1042,6 +1076,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_isaac_newtons_college"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in the city where it is built.\
@@ -1065,6 +1100,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_js_bachs_cathedral"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two unhappy citizens content in every city of yours\
  on the same continent where the wonder is built (including citizens\
@@ -1090,6 +1126,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_lighthouse"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 1 additional movement point.\
 ")
@@ -1112,6 +1149,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_magellans_expedition"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all sea units 1 additional movement point.\
 ")
@@ -1134,6 +1172,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ;helptext is set in client/helpdata.c:helptext_wonder()
 ;helptext	=
 
@@ -1156,6 +1195,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_michelangelos_chapel"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Double effects of Cathedrals, in all cities.\
 ")
@@ -1179,6 +1219,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the effect of a Temple in every city.\
  Does not affect citizens made unhappy by military activity.\
@@ -1203,6 +1244,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_pyramids"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows you to choose any government, including those that have not yet\
  been researched by your civilization, and without the transition\
@@ -1227,6 +1269,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_seti_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production in each city by 50%.\
@@ -1252,6 +1295,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_shakespeares_theatre"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes all angry and unhappy citizens content in the city where it\
  is located, including citizens unhappy about military activity.\
@@ -1275,6 +1319,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_united_nations"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows you to choose any government, including those that have not yet\
  been researched by your civilization, and without the transition\
@@ -1304,6 +1349,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_womens_suffrage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 In all cities, the unhappiness effect of every unit is reduced by 1.\
  This means that in a Republic, units do not cause unhappiness, and in\
diff --git a/data/civ2/buildings.ruleset b/data/civ2/buildings.ruleset
index 528ba368b5..4105b36a99 100644
--- a/data/civ2/buildings.ruleset
+++ b/data/civ2/buildings.ruleset
@@ -94,6 +94,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_airport"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to produce veteran air units (including helicopters and\
  missiles).\
@@ -124,6 +125,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8.  A Sewer System is also\
  required for a city to grow larger than size 12.\
@@ -148,6 +150,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_bank"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with the Marketplace improvement, a Bank increases the\
@@ -173,6 +176,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_i"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -203,6 +207,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_ii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -232,6 +237,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_iii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -261,6 +267,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_cathedral"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Cathedral makes 3 unhappy citizens content in a city, making it\
  easier to maintain order in that city; however, it does not affect\
@@ -290,6 +297,7 @@ upkeep		= 0
 sabotage	= 50
 sound		= "b_city_walls"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City Walls make it easier to defend a city.  They triple the defense\
  strength of units within the city against land and helicopter\
@@ -317,6 +325,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_coastal_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Increases the defense strength of units within a city by a factor\
  of 2 when defending against bombardments from enemy ships.\
@@ -340,6 +349,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_colosseum"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Entertains the citizens of a city, making 3 unhappy citizens content. \
  (Four after the discovery of Electronics.)  However, it does not\
@@ -364,6 +374,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_courthouse"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces the corruption and waste in a city by 50%, and makes the\
@@ -392,6 +403,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_factory"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production in a city by 50%.  This increase may\
@@ -416,6 +428,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_granary"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The amount of stored food will be set to half full whenever a city\
  with a Granary shrinks or grows. This helps a city to grow faster\
@@ -445,6 +458,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_harbour"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives one extra food resource on all Oceanic tiles. The city needs\
  to be coastal to build this improvement.\
@@ -470,6 +484,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_hydro_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces the amount of pollution generated by production in a city\
@@ -504,6 +519,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_library"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 50%.\
@@ -527,6 +543,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_marketplace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
@@ -550,6 +567,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_mass_transit"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Neutralizes the pollution generated by the population. \
  The population simply has no effect on the pollution generated in\
@@ -575,6 +593,7 @@ upkeep		= 6
 sabotage	= 100
 sound		= "b_mfg_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Factory, a Manufacturing Plant increases the shield\
@@ -601,6 +620,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_nuclear_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces the amount of pollution generated by production in a city\
@@ -636,6 +656,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_offshore_platform"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Adds 1 extra shield resource on all Oceanic tiles worked by a city.  The\
  city needs to be coastal to build this improvement.\
@@ -660,6 +681,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes a city the capital and the center of your government.\
  Corruption and waste in other cities is related to how far away\
@@ -702,6 +724,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_police_station"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces the unhappiness caused by aggressively deployed military\
  units owned by the city by 2 under Democracy and 1 under Republic\
@@ -728,6 +751,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_port_facility"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to build veteran sea units.  Also, damaged sea units\
  which stay in town for one full turn without moving are completely\
@@ -753,6 +777,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_power_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production of a Factory or Mfg. Plant in a\
@@ -783,6 +808,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_recycling_center"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Building a Recycling Center reduces the amount of pollution\
@@ -808,6 +834,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_research_lab"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a Research Lab increases the science\
@@ -834,6 +861,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sam_battery"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the defense of all units inside the city when attacked by\
  aircraft (not including helicopters or missiles).\
@@ -857,6 +885,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_sdi_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Protects a city and its environs (up to 2 tiles away) from attacks\
  by other nations' Nuclear units. A Nuclear unit not owned by you or a\
@@ -886,6 +915,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sewer_system"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 12.  An Aqueduct is first\
  required for a city to grow larger than size 8.\
@@ -910,6 +940,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_solar_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Eliminates all pollution generated by production in a city. It also\
@@ -940,6 +971,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_component"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Components can be differentiated into Propulsion and Fuel\
  Components.  Each pair of them reduces your spaceship's travel\
@@ -967,6 +999,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_module"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Modules are the most expensive parts of spaceships.  There\
  are three different types of Space Module:\
@@ -1003,6 +1036,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_structural"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Structurals form the base of your spaceship.  All other\
  spaceship parts need to be connected to Structurals in order to\
@@ -1031,6 +1065,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_stock_exchange"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Bank, a Stock Exchange boosts tax and luxury\
@@ -1057,6 +1092,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_super_highways"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases trade resources by 50% on all tiles with roads or\
@@ -1081,6 +1117,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_supermarket"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the food resources by 50% on each farmland tile which\
@@ -1106,6 +1143,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_temple"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content.  The Mysticism advance doubles\
  this effect, as does Oracle wonder.  With both Mysticism and the Oracle,\
@@ -1132,6 +1170,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_university"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a University increases the science\
@@ -1156,6 +1195,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_apollo_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The entire map becomes permanently visible to the player who owns it\
  -- the player always has up-to-date knowledge of all terrain and\
@@ -1182,6 +1222,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_asmiths_trading_co"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City improvements which would normally have an upkeep of 1 are free\
  of upkeep, for all cities.\
@@ -1206,6 +1247,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_colossus"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city where this wonder is built that is already\
  generating some trade produces one extra trade resource.\
@@ -1229,6 +1271,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_copernicus_observatory"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 50% in the city where it is built.\
@@ -1252,6 +1295,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_cure_for_cancer"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 This stunning technological achievement makes one unhappy\
  citizen content in each of your cities (including citizens unhappy\
@@ -1276,6 +1320,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_darwins_voyage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Charles Darwin's voyage sparked the discovery of the evolution\
  of the species, which inspired greater confidence in science.\
@@ -1300,6 +1345,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_eiffel_tower"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Your reputation and goodwill among other nations is recovered four times\
@@ -1325,6 +1371,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_library"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The civilization which builds the Great Library gets every advance\
  that at least two other teams have achieved.\
@@ -1349,6 +1396,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_wall"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as a City Wall in all your cities.\
 ")
@@ -1374,6 +1422,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hanging_gardens"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one content citizen happy in every city. Makes two extra\
  content citizens happy in the city containing the Hanging Gardens\
@@ -1401,6 +1450,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hoover_dam"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as if you had a Hydro Plant in every city.  (This reduces\
  pollution and increases the effects of Factories and Mfg. Plants.)\
@@ -1424,6 +1474,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_isaac_newtons_college"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in the city where it is built.\
@@ -1447,6 +1498,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_js_bachs_cathedral"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two unhappy citizens content in every city (including citizens\
  unhappy about military activity).\
@@ -1471,6 +1523,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_king_richards_crusade"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Adds one extra shield resource on every tile around the city\
  where it is built.\
@@ -1495,6 +1548,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_leonardos_workshop"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Upgrades one obsolete unit per game turn.\
 ")
@@ -1518,6 +1572,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_lighthouse"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 1 additional movement point. Makes all your\
  new military sea units veterans (for all cities).\
@@ -1541,6 +1596,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_magellans_expedition"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all sea units 2 additional movement points.\
 ")
@@ -1563,6 +1619,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ;helptext is set in client/helpdata.c:helptext_wonder()
 ;helptext	=
 
@@ -1585,6 +1642,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_marco_polos_embassy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The player who owns it gets an embassy with all players.\
 ")
@@ -1607,6 +1665,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_michelangelos_chapel"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as having a Cathedral in each of your cities.  This makes 3\
  unhappy citizens content in each city; however, it does not affect\
@@ -1636,6 +1695,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the effect of a Temple in every city.\
  Does not affect citizens made unhappy by military activity.\
@@ -1659,6 +1719,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_pyramids"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as having a Granary in every city.\
 ")
@@ -1681,6 +1742,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_seti_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production in each city with a Library by 50%. \
@@ -1706,6 +1768,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_shakespeares_theatre"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes all angry and unhappy citizens content in the city where it\
  is located, including citizens unhappy about military activity.\
@@ -1729,6 +1792,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_statue_of_liberty"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows you to choose any government, including those that have not yet\
  been researched by your civilization, and without the transition\
@@ -1754,6 +1818,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_sun_tzus_war_academy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 All your new military land units become veterans (for all cities). \
@@ -1779,6 +1844,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_united_nations"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All your units regain two extra hitpoints per turn.\
 ")
@@ -1809,6 +1875,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_womens_suffrage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as a Police Station in every city. (That is, for each city, it\
  reduces the unhappiness caused by aggressively deployed military\
diff --git a/data/civ2civ3/buildings.ruleset b/data/civ2civ3/buildings.ruleset
index f403ef31f5..ee3d860d94 100644
--- a/data/civ2civ3/buildings.ruleset
+++ b/data/civ2civ3/buildings.ruleset
@@ -94,6 +94,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_airport"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to produce veteran air units (including helicopters and\
  missiles).\
@@ -127,6 +128,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8. (A Sewer System is required \
 for a city to grow larger than size 16.)\
@@ -164,6 +166,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8. (A Sewer System is required \
 for a city to grow larger than size 16.)\
@@ -202,6 +205,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8. (A Sewer System is required \
 for a city to grow larger than size 16.)\
@@ -240,6 +244,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_bank"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by an additional 50%. \
@@ -266,6 +271,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_i"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -297,6 +303,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_ii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -326,6 +333,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_iii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -356,6 +364,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_cathedral"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Cathedral makes 3 unhappy citizens content in a city, making it \
 easier to maintain order in that city; however, it does not affect \
@@ -383,6 +392,7 @@ upkeep		= 0
 sabotage	= 50
 sound		= "b_city_walls"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 City Walls make it easier to defend a city. They add a +100% bonus to the \
@@ -412,6 +422,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_coastal_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Gives a +100% bonus to the intrinsic defense strength of units within \
@@ -439,6 +450,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_colosseum"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Entertains the citizens of a city, making 3 unhappy citizens content. \
  (Four after the discovery of Electricity.)  However, it does not\
@@ -463,6 +475,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_courthouse"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Halves all kinds of waste in a city (corruption, production waste, and \
 food waste). In your capital, corruption and production waste is \
@@ -493,6 +506,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_factory"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production in a city by 25%, or 50% with an \
@@ -521,6 +535,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_granary"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 When any small city grows or shrinks, 10 food points are saved; this \
 helps cities to grow faster and more easily withstand famine. With a \
@@ -555,6 +570,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_harbour"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives one extra food resource on all Ocean or Deep Ocean tiles (but \
 not Lakes). The city needs to be coastal (next to one of these tiles) \
@@ -581,6 +597,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_hydro_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Any kind of electrical plant increases the shield production \
@@ -623,6 +640,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_library"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 50%, or by 100% once the \
@@ -647,6 +665,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_marketplace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
@@ -670,6 +689,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_mass_transit"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces the pollution generated by the population in a city; this \
 building counteracts the additional pollution associated with any \
@@ -695,6 +715,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_mfg_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production in a city by an additional 25%, or \
@@ -732,6 +753,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_nuclear_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Any kind of electrical plant increases the shield production \
@@ -775,6 +797,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_offshore_platform"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Every Ocean or Lake tile worked by the city yields one extra shield resource, \
 as well as any Deep Ocean tile containing an oil platform. The city needs \
@@ -802,6 +825,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes a city the capital and the center of your government. \
 Waste in other cities (corruption, production waste, and food waste) \
@@ -849,6 +873,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes a city the ecclesiastical capital, that acts as a second center \
 of government.\
@@ -887,6 +912,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_police_station"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Police Station neutralizes any unhappiness caused by one military \
 unit in its city. It also makes up to 2 more unhappy citizens content \
@@ -912,6 +938,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_port_facility"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to build veteran sea units.  Also, damaged sea units\
  which stay in town for one full turn without moving are completely\
@@ -939,6 +966,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_power_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Any kind of electrical plant increases the shield production \
@@ -972,6 +1000,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_recycling_center"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Building a Recycling Center reduces the amount of pollution \
@@ -999,6 +1028,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_research_lab"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by an additional 50%, or \
@@ -1030,6 +1060,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sam_battery"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the intrinsic defense strength of units within a city \
 when defending against aircraft (including helicopters).\
@@ -1053,6 +1084,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_sdi_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Protects a city and its environs (up to 2 tiles away) from attacks \
 by other nations' Nuclear units. A Nuclear unit not owned by you or a \
@@ -1081,6 +1113,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sewer_system"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with an Aqueduct, allows a city to grow larger than size 16, \
@@ -1106,6 +1139,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_solar_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Any kind of electrical plant increases the shield production \
@@ -1149,6 +1183,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_component"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Components can be differentiated into Propulsion and Fuel\
  Components.  Each pair of them reduces your spaceship's travel\
@@ -1180,6 +1215,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_module"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Modules are the most expensive parts of spaceships.  There\
  are three different types of Space Module:\
@@ -1220,6 +1256,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_structural"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Structurals form the base of your spaceship.  All other\
  spaceship parts need to be connected to Structurals in order to\
@@ -1248,6 +1285,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_stock_exchange"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by an additional 50%, \
@@ -1274,6 +1312,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_super_highways"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city with roads and without farmland, that\
  is already generating some trade, produces one extra trade resource.\
@@ -1307,6 +1346,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_supermarket"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the food resources by 50% on each farmland tile which\
@@ -1332,6 +1372,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_temple"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content. The Mysticism advance doubles \
 this effect (except under a Communist government). With both Mysticism \
@@ -1358,6 +1399,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_university"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by an additional 50%, or \
@@ -1388,6 +1430,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_apollo_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The entire map becomes permanently visible to the player who owns it \
 -- the player always has up-to-date knowledge of all terrain and \
@@ -1420,6 +1463,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_asmiths_trading_co"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 In every city with a Stock Exchange, city improvements which would \
 normally have an upkeep of 1 become free of upkeep. (Communist \
@@ -1449,6 +1493,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_colossus"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city where this wonder is built that is already\
  generating some trade produces one extra trade resource.\
@@ -1473,6 +1518,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_copernicus_observatory"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile worked by the city where this wonder is built produces \
 one extra research point.\
@@ -1496,6 +1542,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_cure_for_cancer"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 This stunning technological achievement makes one content citizen \
@@ -1523,6 +1570,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_darwins_voyage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Charles Darwin's voyage sparked the discovery of the evolution \
 of the species, which inspired greater confidence in science. \
@@ -1550,6 +1598,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_eiffel_tower"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 AI nations are more inclined to be friendly and forgiving toward the \
 owner of this wonder (until the Apollo Program is completed). It also \
@@ -1576,6 +1625,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_library"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives an immediate technology advance to the player that builds it, \
 and thereafter 4 extra research points every turn to its city.\
@@ -1603,6 +1653,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_wall"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the defense of all your cities by adding a +50% bonus to \
@@ -1630,6 +1681,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hanging_gardens"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content in every city of the player that \
 owns it (not including citizens unhappy about aggression). This wonder \
@@ -1657,6 +1709,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hoover_dam"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Acts as a Hydro Plant in the city where it is built, and reduces \
@@ -1683,6 +1736,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_isaac_newtons_college"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives an immediate technology advance to the player that builds it, \
 and thereafter 6 extra research points every turn to its city.\
@@ -1709,6 +1763,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_js_bachs_cathedral"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one content citizen happy in every city of the player that owns \
 it (2 extra luxury points per city).\
@@ -1733,6 +1788,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_king_richards_crusade"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces the unhappiness caused by aggressively deployed military \
 units owned by the city by 1 -- in other words, it neutralizes the \
@@ -1761,6 +1817,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_leonardos_workshop"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Upgrades one obsolete unit per game turn.\
 ")
@@ -1785,6 +1842,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_lighthouse"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 1 additional movement point (except Triremes \
 while moving on rivers). Makes all your new sea units veterans (for all \
@@ -1811,6 +1869,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_magellans_expedition"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 1 additional movement point. The chance\
  of a sea unit getting the next veteran level after a battle\
@@ -1835,6 +1894,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ;helptext is set in client/helpdata.c:helptext_wonder()
 ;helptext	=
 
@@ -1857,6 +1917,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_marco_polos_embassy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The player who owns it gets an embassy with all players.\
 "), _("\
@@ -1883,6 +1944,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_michelangelos_chapel"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the base effect of Cathedrals. This makes 3 additional unhappy \
 citizens content in each city with a Cathedral; however, it does \
@@ -1908,6 +1970,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 With this wonder, City Walls and Courthouses each make one unhappy \
 citizen content in their city, unless that citizen is unhappy about \
@@ -1933,6 +1996,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces by 1 the unhappiness caused by one aggressively deployed \
 military unit per city -- in other words, in each city it neutralizes \
@@ -1961,6 +2025,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes 2 additional unhappy citizens content in every city with \
 a Temple. Does not affect citizens made unhappy by aggression.\
@@ -1985,6 +2050,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_pyramids"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city where this wonder is built that is already \
 generating some shield output produces one extra shield resource. \
@@ -2012,6 +2078,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_seti_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives an immediate technology advance to the player that builds it, \
 and thereafter all cities on the map are continuously visible to its \
@@ -2040,6 +2107,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_shakespeares_theatre"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives 1 additional luxury to every city, and 6 luxuries to the city \
 where it is located.\
@@ -2066,6 +2134,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_statue_of_liberty"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows you to choose any government, including those that have not yet \
 been researched by your civilization, and without the transition \
@@ -2093,6 +2162,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_sun_tzus_war_academy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All your new military land units start with an additional veteran level \
 (this is cumulative with any Barracks building in a city; with both, units \
@@ -2117,6 +2187,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_united_nations"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Creates a world senate that prevents unprovoked declaration of war by \
 any nuclear-capable nation (that is, any nation with knowledge of \
@@ -2148,6 +2219,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_womens_suffrage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Neutralizes the unhappiness caused by one aggressively \
 deployed military unit per city. Under Democracy, it additionally \
diff --git a/data/classic/buildings.ruleset b/data/classic/buildings.ruleset
index effe10a5ec..471ebdd07f 100644
--- a/data/classic/buildings.ruleset
+++ b/data/classic/buildings.ruleset
@@ -94,6 +94,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_airport"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to produce veteran air units (including helicopters and\
  missiles).\
@@ -124,6 +125,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8.  A Sewer System is also\
  required for a city to grow larger than size 12.\
@@ -150,6 +152,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_bank"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with the Marketplace improvement, a Bank increases the\
@@ -176,6 +179,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_i"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -207,6 +211,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_ii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -236,6 +241,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_iii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -266,6 +272,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_cathedral"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Cathedral makes 3 unhappy citizens content in a city, making it\
  easier to maintain order in that city; however, it does not affect\
@@ -295,6 +302,7 @@ upkeep		= 0
 sabotage	= 50
 sound		= "b_city_walls"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City Walls make it easier to defend a city.  They triple the defense\
  strength of units within the city against land and helicopter\
@@ -322,6 +330,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_coastal_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Increases the defense strength of units within a city by a factor\
  of 2 when defending against bombardments from enemy ships.\
@@ -345,6 +354,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_colosseum"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Entertains the citizens of a city, making 3 unhappy citizens content. \
  (Four after the discovery of Electricity.)  However, it does not\
@@ -371,6 +381,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_courthouse"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces the corruption in a city by 50%, and makes the revolt cost\
@@ -399,6 +410,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_factory"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production in a city by 50%.  This increase may\
@@ -423,6 +435,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_granary"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The amount of stored food will be set to half full whenever a city\
  with a Granary shrinks or grows. This helps a city to grow faster\
@@ -452,6 +465,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_harbour"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives one extra food resource on all Oceanic tiles. The city needs\
  to be coastal to build this improvement.\
@@ -477,6 +491,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_hydro_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -514,6 +529,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_library"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 100%.\
@@ -537,6 +553,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_marketplace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
@@ -560,6 +577,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_mass_transit"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Neutralizes the pollution generated by the population. \
  The population simply has no effect on the pollution generated in\
@@ -585,6 +603,7 @@ upkeep		= 6
 sabotage	= 100
 sound		= "b_mfg_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Factory, a Manufacturing Plant increases the shield\
@@ -614,6 +633,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_nuclear_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -657,6 +677,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_offshore_platform"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Adds 1 extra shield resource on all Oceanic tiles worked by a city.  The\
  city needs to be coastal to build this improvement.\
@@ -681,6 +702,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes a city the capital and the center of your government.\
  Corruption in other cities is related to how far away from the\
@@ -727,6 +749,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_police_station"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces the unhappiness caused by aggressively deployed military\
  units owned by the city by 2 under Democracy and 1 under Republic\
@@ -756,6 +779,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_port_facility"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to build veteran sea units.  Also, damaged sea units\
  which stay in town for one full turn without moving are completely\
@@ -781,6 +805,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_power_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -816,6 +841,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_recycling_center"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Building a Recycling Center reduces the amount of pollution\
@@ -841,6 +867,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_research_lab"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a Research Lab increases the science\
@@ -867,6 +894,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sam_battery"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the defense of all units inside the city when attacked by\
  aircraft (not including helicopters or missiles).\
@@ -890,6 +918,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_sdi_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Protects a city and its environs (up to 2 tiles away) from attacks\
  by other nations' Nuclear units. A Nuclear unit not owned by you or a\
@@ -919,6 +948,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sewer_system"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 12.  An Aqueduct is first\
  required for a city to grow larger than size 8.\
@@ -945,6 +975,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_solar_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -981,6 +1012,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_component"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Components can be differentiated into Propulsion and Fuel\
  Components.  Each pair of them reduces your spaceship's travel\
@@ -1009,6 +1041,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_module"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Modules are the most expensive parts of spaceships.  There\
  are three different types of Space Module:\
@@ -1046,6 +1079,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_structural"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Structurals form the base of your spaceship.  All other\
  spaceship parts need to be connected to Structurals in order to\
@@ -1074,6 +1108,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_stock_exchange"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Bank, a Stock Exchange boosts tax and luxury\
@@ -1100,6 +1135,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_super_highways"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases trade resources by 50% on all tiles with roads or\
@@ -1126,6 +1162,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_supermarket"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the food resources by 50% on each farmland tile which\
@@ -1151,6 +1188,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_temple"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content.  The Mysticism advance doubles\
  this effect.  With both Mysticism and the Oracle, 4 citizens are\
@@ -1177,6 +1215,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_university"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a University increases the science\
@@ -1201,6 +1240,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_apollo_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The entire map becomes permanently visible to the player who owns it\
  -- the player always has up-to-date knowledge of all terrain and\
@@ -1227,6 +1267,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_asmiths_trading_co"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City improvements which would normally have an upkeep of 1 are free\
  of upkeep, for all your cities.\
@@ -1251,6 +1292,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_colossus"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city where this wonder is built that is already\
  generating some trade produces one extra trade resource.\
@@ -1274,6 +1316,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_copernicus_observatory"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in the city where it is built.\
@@ -1297,6 +1340,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_cure_for_cancer"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 This stunning technological achievement makes one unhappy\
  citizen content in each of your cities (including citizens unhappy\
@@ -1324,6 +1368,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_darwins_voyage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Charles Darwin's voyage sparked the discovery of the evolution\
  of the species, which inspired greater confidence in science.\
@@ -1348,6 +1393,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_eiffel_tower"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Your reputation and goodwill among other nations is recovered twice\
@@ -1373,6 +1419,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_library"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The civilization which builds the Great Library gets every advance\
  that at least two other teams have achieved.\
@@ -1397,6 +1444,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_wall"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as a City Wall in all your cities.\
 ")
@@ -1423,6 +1471,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hanging_gardens"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one content citizen happy in every city. Makes two extra\
  content citizens happy in the city containing the Hanging Gardens\
@@ -1451,6 +1500,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hoover_dam"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as if you had a Hydro Plant in every city.  (This reduces\
  pollution and increases the effects of Factories and Mfg. Plants.)\
@@ -1474,6 +1524,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_isaac_newtons_college"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in every city you control that\
@@ -1498,6 +1549,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_js_bachs_cathedral"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two unhappy citizens content in every city (including citizens\
  unhappy about military activity).\
@@ -1522,6 +1574,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_king_richards_crusade"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Adds one extra shield resource on every tile around the city\
  where it is built.\
@@ -1546,6 +1599,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_leonardos_workshop"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Upgrades one obsolete unit per game turn.\
 ")
@@ -1570,6 +1624,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_lighthouse"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 1 additional movement point. Makes all your\
  new military sea units veterans (for all your cities).\
@@ -1594,6 +1649,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_magellans_expedition"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 2 additional movement points.\
 ")
@@ -1616,6 +1672,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ;helptext is set in client/helpdata.c:helptext_wonder()
 ;helptext	=
 
@@ -1638,6 +1695,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_marco_polos_embassy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The player who owns it gets an embassy with all players.\
 ")
@@ -1660,6 +1718,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_michelangelos_chapel"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as having a Cathedral in each of your cities.  This makes 3\
  unhappy citizens content in each city; however, it does not affect\
@@ -1689,6 +1748,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two additional unhappy citizens content in every city with\
  a Temple.  Does not affect citizens made unhappy by military\
@@ -1713,6 +1773,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_pyramids"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 The amount of stored food lost when one of your cities grows or shrinks\
@@ -1738,6 +1799,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_seti_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production in each city with a Research Lab by 100%.\
@@ -1762,6 +1824,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_shakespeares_theatre"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes all angry and unhappy citizens content in the city where it\
  is located, including citizens unhappy about military activity.\
@@ -1785,6 +1848,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_statue_of_liberty"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows you to choose any government, including those that have not yet\
  been researched by your civilization, and without the transition\
@@ -1810,6 +1874,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_sun_tzus_war_academy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All your new military land units start with an additional veteran level\
  (this is cumulative with any Barracks building in a city; with both, units\
@@ -1835,6 +1900,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_united_nations"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All your units regain two extra hitpoints per turn.\
 ")
@@ -1857,6 +1923,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_womens_suffrage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as a Police Station in every city. (That is, for each city, it\
  reduces the unhappiness caused by aggressively deployed military\
diff --git a/data/goldkeep/buildings.ruleset b/data/goldkeep/buildings.ruleset
index 33983f5cb6..625478a220 100644
--- a/data/goldkeep/buildings.ruleset
+++ b/data/goldkeep/buildings.ruleset
@@ -96,6 +96,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_airport"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to produce veteran air units (including helicopters and\
  missiles).\
@@ -126,6 +127,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8 and reduces the chance of plague\
  within the city. After Industrialization is researched this effect of\
@@ -155,6 +157,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_bank"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with the Marketplace improvement, a Bank increases the\
@@ -181,6 +184,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_i"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -212,6 +216,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_ii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -241,6 +246,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_iii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -271,6 +277,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_cathedral"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Cathedral makes 3 unhappy citizens content in a city, making it\
  easier to maintain order in that city; however, it does not affect\
@@ -300,6 +307,7 @@ upkeep		= 0
 sabotage	= 50
 sound		= "b_city_walls"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City Walls make it easier to defend a city.  They triple the defense\
  strength of units within the city against land and helicopter\
@@ -327,6 +335,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_coastal_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Increases the defense strength of units within a city by a factor\
  of 2 when defending against bombardments from enemy ships.\
@@ -350,6 +359,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_colosseum"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Entertains the citizens of a city, making 3 unhappy citizens content. \
  (Four after the discovery of Electricity.)  However, it does not\
@@ -377,6 +387,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_courthouse"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces the corruption in a city by 50%, and makes the revolt cost\
@@ -405,6 +416,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_factory"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production in a city by 50%.  This increase may\
@@ -429,6 +441,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_granary"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The amount of stored food will be set to half full whenever a city\
  with a Granary shrinks or grows. This helps a city to grow faster\
@@ -458,6 +471,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_harbour"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives one extra food resource on all Oceanic tiles. The city needs\
  to be coastal to build this improvement.\
@@ -481,6 +495,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "-"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Hospital is used to treat the ill, and sometimes for medical research.\
  A city with a Hospital is less likely to suffer from plagues.\
@@ -506,6 +521,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_hydro_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -543,6 +559,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "-"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 In a Genetic Laboratory medicaments can be researched. The possibility\
@@ -570,6 +587,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_library"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 100%.\
@@ -594,6 +612,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_marketplace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
@@ -617,6 +636,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_mass_transit"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Neutralizes the pollution generated by the population. \
  The population simply has no effect on the pollution generated in\
@@ -645,6 +665,7 @@ upkeep		= 6
 sabotage	= 100
 sound		= "b_mfg_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Factory, a Manufacturing Plant increases the shield\
@@ -674,6 +695,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_nuclear_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -714,6 +736,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_offshore_platform"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Adds 1 extra shield resource on all Oceanic tiles worked by a city.  The\
  city needs to be coastal to build this improvement.\
@@ -738,6 +761,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes a city the capital and the center of your government.\
  Corruption in other cities is related to how far away from the\
@@ -785,6 +809,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_police_station"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces the unhappiness caused by aggressively deployed military\
  units owned by the city by 2 under Democracy and 1 under Republic\
@@ -814,6 +839,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_port_facility"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to build veteran sea units.  Also, damaged sea units\
  which stay in town for one full turn without moving are completely\
@@ -839,6 +865,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_power_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -874,6 +901,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_recycling_center"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Building a Recycling Center reduces the amount of pollution\
@@ -899,6 +927,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_research_lab"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a Research Lab increases the science\
@@ -925,6 +954,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sam_battery"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the defense of all units inside the city when attacked by\
  aircraft (not including helicopters or missiles).\
@@ -948,6 +978,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_sdi_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Protects a city and its environs (up to 2 tiles away) from attacks\
  by other nations' Nuclear units. A Nuclear unit not owned by you or a\
@@ -977,6 +1008,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sewer_system"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 12. Pre-requirement is an Aqueduct\
  for a city to grow larger than size 8. The Sewer System further reduces\
@@ -1003,6 +1035,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_solar_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -1039,6 +1072,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_component"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Components can be differentiated into Propulsion and Fuel\
  Components.  Each pair of them reduces your spaceship's travel\
@@ -1067,6 +1101,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_module"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Modules are the most expensive parts of spaceships.  There\
  are three different types of Space Module:\
@@ -1104,6 +1139,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_structural"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Structurals form the base of your spaceship.  All other\
  spaceship parts need to be connected to Structurals in order to\
@@ -1132,6 +1168,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_stock_exchange"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Bank, a Stock Exchange boosts tax and luxury\
@@ -1158,6 +1195,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_super_highways"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases trade resources by 50% on all tiles with roads or\
@@ -1187,6 +1225,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_supermarket"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the food resources by 50% on each farmland tile which\
@@ -1212,6 +1251,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_temple"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content.  The Mysticism advance doubles\
  this effect.  With both Mysticism and the Oracle, 4 citizens are\
@@ -1240,6 +1280,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_university"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a University increases the science\
@@ -1265,6 +1306,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_apollo_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The entire map becomes permanently visible to the player who owns it\
  -- the player always has up-to-date knowledge of all terrain and\
@@ -1291,6 +1333,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_asmiths_trading_co"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City improvements which would normally have an upkeep of 1 are free\
  of upkeep, for all your cities.\
@@ -1315,6 +1358,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_colossus"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city where this wonder is built that is already\
  generating some trade produces one extra trade resource.\
@@ -1338,6 +1382,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_copernicus_observatory"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in the city where it is built.\
@@ -1361,6 +1406,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_cure_for_cancer"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 This stunning technological achievement makes one unhappy\
  citizen content in each of your cities (including citizens unhappy\
@@ -1388,6 +1434,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_darwins_voyage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Charles Darwin's voyage sparked the discovery of the evolution\
  of the species, which inspired greater confidence in science.\
@@ -1412,6 +1459,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_eiffel_tower"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Your reputation and goodwill among other nations is recovered twice\
@@ -1437,6 +1485,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_library"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The civilization which builds the Great Library gets every advance\
  that at least two other teams have achieved.\
@@ -1461,6 +1510,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_wall"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as a City Wall in all your cities.\
 ")
@@ -1487,6 +1537,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hanging_gardens"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one content citizen happy in every city. Makes two extra\
  content citizens happy in the city containing the Hanging Gardens\
@@ -1515,6 +1566,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hoover_dam"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as if you had a Hydro Plant in every city.  (This reduces\
  pollution and increases the effects of Factories and Mfg. Plants.)\
@@ -1538,6 +1590,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_isaac_newtons_college"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in every city you control that\
@@ -1562,6 +1615,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_js_bachs_cathedral"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two unhappy citizens content in every city (including citizens\
  unhappy about military activity).\
@@ -1586,6 +1640,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_king_richards_crusade"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Adds one extra shield resource on every tile around the city\
  where it is built.\
@@ -1610,6 +1665,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_leonardos_workshop"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Upgrades one obsolete unit per game turn.\
 ")
@@ -1634,6 +1690,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_lighthouse"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 1 additional movement point. Makes all your\
  new military sea units veterans (for all your cities).\
@@ -1658,6 +1715,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_magellans_expedition"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 2 additional movement points.\
 ")
@@ -1680,6 +1738,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ;helptext is set in client/helpdata.c:helptext_wonder()
 ;helptext	=
 
@@ -1702,6 +1761,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_marco_polos_embassy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The player who owns it gets an embassy with all players with whom one has ever\
  had contact with.\
@@ -1725,6 +1785,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_michelangelos_chapel"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as having a Cathedral in each of your cities.  This makes 3\
  unhappy citizens content in each city; however, it does not affect\
@@ -1754,6 +1815,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two additional unhappy citizens content in every city with\
  a Temple.  Does not affect citizens made unhappy by military\
@@ -1778,6 +1840,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_pyramids"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 The amount of stored food lost when one of your cities grows or shrinks\
@@ -1803,6 +1866,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_seti_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production in each city with a Research Lab by 100%.\
@@ -1827,6 +1891,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_shakespeares_theatre"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes all angry and unhappy citizens content in the city where it\
  is located, including citizens unhappy about military activity.\
@@ -1850,6 +1915,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_statue_of_liberty"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows you to choose any government, including those that have not yet\
  been researched by your civilization, and without the transition\
@@ -1875,6 +1941,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_sun_tzus_war_academy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All your new military land units start with an additional veteran level\
  (this is cumulative with any Barracks building in a city; with both, units\
@@ -1900,6 +1967,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_united_nations"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All your units regain two extra hitpoints per turn.\
 ")
@@ -1922,6 +1990,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_womens_suffrage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as a Police Station in every city. (That is, for each city, it\
  reduces the unhappiness caused by aggressively deployed military\
diff --git a/data/granularity/buildings.ruleset b/data/granularity/buildings.ruleset
index 49ab269851..d1ef91467b 100644
--- a/data/granularity/buildings.ruleset
+++ b/data/granularity/buildings.ruleset
@@ -94,6 +94,7 @@ upkeep		= 0
 sabotage	= 50
 sound		= "b_city_walls"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City Walls make it easier to defend a city. They triple the defense\
  strength of units within the city against land units.\
@@ -117,6 +118,7 @@ upkeep		= 80
 sabotage	= 100
 sound		= "b_sacred_grove"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content.\
  Does not affect citizens made unhappy by military activity.\
@@ -140,6 +142,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City with your throne is your capital city.\
 ")
diff --git a/data/multiplayer/buildings.ruleset b/data/multiplayer/buildings.ruleset
index 3936fd35c6..05cfdfa715 100644
--- a/data/multiplayer/buildings.ruleset
+++ b/data/multiplayer/buildings.ruleset
@@ -93,6 +93,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_airport"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to produce veteran air units (including helicopters and\
  missiles).\
@@ -127,6 +128,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_colosseum"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Entertains the citizens of a city, making 3 unhappy citizens content. \
  (Four after the discovery of Electricity.)  However, it does not\
@@ -151,6 +153,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8.  A Sewer System is also\
  required for a city to grow larger than size 12.\
@@ -177,6 +180,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_bank"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with the Marketplace improvement, a Bank increases the\
@@ -203,6 +207,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_i"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -234,6 +239,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_ii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -263,6 +269,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_iii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -293,6 +300,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_cathedral"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Cathedral makes 3 unhappy citizens content in a city, making it\
  easier to maintain order in that city; however, it does not affect\
@@ -322,6 +330,7 @@ upkeep		= 0
 sabotage	= 50
 sound		= "b_city_walls"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City Walls make it easier to defend a city.  They triple the defense\
  strength of units within the city against land and helicopter\
@@ -349,6 +358,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_coastal_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Increases the defense strength of units within a city by a factor\
  of 2 when defending against bombardments from enemy ships.\
@@ -372,6 +382,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_courthouse"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces the corruption and waste in a city by 50%, and makes the\
@@ -400,6 +411,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_factory"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production in a city by 50%.  This increase may\
@@ -424,6 +436,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_granary"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The amount of stored food will be set to half full whenever a city\
  with a Granary shrinks or grows. This helps a city to grow faster\
@@ -450,6 +463,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_harbour"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives one extra food resource on all Oceanic tiles. The city needs\
  to be coastal to build this improvement.\
@@ -475,6 +489,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_hydro_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -509,6 +524,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_library"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 100%.\
@@ -532,6 +548,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_marketplace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
@@ -555,6 +572,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_mass_transit"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Neutralizes the pollution generated by the population. \
  The population simply has no effect on the pollution generated in\
@@ -580,6 +598,7 @@ upkeep		= 6
 sabotage	= 100
 sound		= "b_mfg_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Factory, a Manufacturing Plant increases the shield\
@@ -606,6 +625,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_nuclear_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -641,6 +661,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_offshore_platform"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Adds 1 extra shield resource on all Oceanic tiles worked by a city.  The\
  city needs to be coastal to build this improvement.\
@@ -665,6 +686,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes a city the capital and the center of your government.\
  Corruption and waste in other cities is related to how far away\
@@ -712,6 +734,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_police_station"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces the unhappiness caused by aggressively deployed military\
  units owned by the city by 4 under Democracy and 2 under Republic\
@@ -738,6 +761,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_port_facility"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to build veteran sea units.  Also, damaged sea units\
  which stay in town for one full turn without moving are completely\
@@ -763,6 +787,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_power_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -795,6 +820,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_recycling_center"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Building a Recycling Center reduces the amount of pollution\
@@ -820,6 +846,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_research_lab"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a Research Lab increases the science\
@@ -846,6 +873,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sam_battery"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the defense of all units inside the city when attacked by\
  aircraft (not including helicopters or missiles).\
@@ -869,6 +897,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_sdi_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Protects a city and its environs (up to 2 tiles away) from attacks\
  by other nations' Nuclear units. A Nuclear unit not owned by you or a\
@@ -896,6 +925,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sewer_system"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 12.  An Aqueduct is first\
  required for a city to grow larger than size 8.\
@@ -922,6 +952,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_solar_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -958,6 +989,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_component"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Components can be differentiated into Propulsion and Fuel\
  Components.  Each pair of them reduces your spaceship's travel\
@@ -986,6 +1018,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_module"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Modules are the most expensive parts of spaceships.  There\
  are three different types of Space Module:\
@@ -1023,6 +1056,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_structural"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Structurals form the base of your spaceship.  All other\
  spaceship parts need to be connected to Structurals in order to\
@@ -1051,6 +1085,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_stock_exchange"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Bank, a Stock Exchange boosts tax and luxury\
@@ -1077,6 +1112,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_super_highways"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases trade resources by 50% on all tiles with roads or\
@@ -1101,6 +1137,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_supermarket"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the food resources by 100% on each farmland tile which\
@@ -1126,6 +1163,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_temple"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content.  The Mysticism advance doubles\
  this effect.  With both Mysticism and the Oracle, 4 citizens are\
@@ -1152,6 +1190,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_university"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a University increases the science\
@@ -1177,6 +1216,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_apollo_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows you to start building spaceship parts in cities\
  with factories (assuming you have researched the necessary\
@@ -1202,6 +1242,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_asmiths_trading_co"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City improvements which would normally have an upkeep of 1 are free\
  of upkeep, for all your cities on the same continent.\
@@ -1227,6 +1268,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_colossus"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city where this wonder is built that is already\
  generating some trade produces one extra trade resource.\
@@ -1251,6 +1293,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_copernicus_observatory"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in the city where it is built.\
@@ -1274,6 +1317,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_cure_for_cancer"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 This stunning technological achievement makes two content citizens\
  happy in all cities of all players who have researched Genetic\
@@ -1302,6 +1346,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_darwins_voyage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives immediate technology advance the first time it is\
  built by each player.\
@@ -1326,6 +1371,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_eiffel_tower"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Each city on the same continent may support one unit free of\
@@ -1351,6 +1397,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_library"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces corruption by 50% in all cities on the same continent.\
@@ -1376,6 +1423,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_wall"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as a City Wall in all your cities on the same continent.\
 ")
@@ -1400,6 +1448,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hanging_gardens"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two content citizens happy in every city on the same continent.\
  In the unlikely event where there are no content citizens to get the\
@@ -1428,6 +1477,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hoover_dam"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as if you had a Hydro Plant in every city on the same\
  continent. (This reduces pollution and increases the effects\
@@ -1453,6 +1503,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_isaac_newtons_college"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in every city on the same\
@@ -1478,6 +1529,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_js_bachs_cathedral"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two unhappy citizens content in every city on the same continent\
  (including citizens unhappy about military activity).\
@@ -1503,6 +1555,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_king_richards_crusade"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Adds one extra shield resource on every tile around the city\
  where it is built.\
@@ -1528,6 +1581,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_leonardos_workshop"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Upgrades two obsolete units per game turn.\
 ")
@@ -1553,6 +1607,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_lighthouse"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 1 additional movement point.\
 ")
@@ -1577,6 +1632,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_magellans_expedition"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All your new sea units built in cities on the same continent start with\
  an additional veteran level (this is cumulative with any Port Facility\
@@ -1601,6 +1657,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ;helptext is set in client/helpdata.c:helptext_wonder()
 ;helptext	=
 
@@ -1623,6 +1680,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_marco_polos_embassy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases trade output by 40% in all cities on the same\
@@ -1648,6 +1706,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_michelangelos_chapel"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as having a Cathedral in each of your cities on the same\
  continent. This makes 3 unhappy citizens content in each city;\
@@ -1678,6 +1737,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two of your unhappy citizens content in every city\
  with a Temple on the same continent. Does not affect citizens made\
@@ -1703,6 +1763,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_pyramids"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 The city where this wonder is built will experience\
@@ -1728,6 +1789,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_internet"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production in each city on the\
@@ -1754,6 +1816,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_shakespeares_theatre"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes all angry and unhappy citizens content in the city where it\
  is located, including citizens unhappy about military activity.\
@@ -1778,6 +1841,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_statue_of_liberty"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows you to choose any government, including those that have not yet\
  been researched by your civilization, and without the transition\
@@ -1804,6 +1868,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_sun_tzus_war_academy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All your new military land units produced in cities on the same continent\
  start with an additional veteran level (this is cumulative with any\
@@ -1828,6 +1893,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_united_nations"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Creates a world senate that may prevent declarations of\
  war in some circumstances. If any player's city is in revolt\
@@ -1853,6 +1919,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_womens_suffrage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as a Police Station in every city on the same continent.\
  (That is, for each city, it reduces the unhappiness caused by\
diff --git a/data/sandbox/buildings.ruleset b/data/sandbox/buildings.ruleset
index 9840d82c87..66c91f1b63 100644
--- a/data/sandbox/buildings.ruleset
+++ b/data/sandbox/buildings.ruleset
@@ -94,6 +94,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_airport"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to produce veteran air units (including helicopters and\
  missiles).\
@@ -130,6 +131,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8. (A Sewer System is required \
 for a city to grow larger than size 16.)\
@@ -167,6 +169,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8. (A Sewer System is required \
 for a city to grow larger than size 16.)\
@@ -205,6 +208,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8. (A Sewer System is required \
 for a city to grow larger than size 16.)\
@@ -243,6 +247,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_bank"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by an additional 50%. \
@@ -269,6 +274,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_i"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -300,6 +306,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_ii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -329,6 +336,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_iii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -359,6 +367,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_cathedral"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Cathedral makes 3 unhappy citizens content in a city, making it \
 easier to maintain order in that city; however, it does not affect \
@@ -386,6 +395,7 @@ upkeep		= 0
 sabotage	= 50
 sound		= "b_city_walls"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 City Walls make it easier to defend a city. They add a +100% bonus to the \
@@ -415,6 +425,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_coastal_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Gives a +100% bonus to the intrinsic defense strength of units within \
@@ -442,6 +453,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_colosseum"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Entertains the citizens of a city, making 3 unhappy citizens content. \
  (Four after the discovery of Electricity.)  However, it does not\
@@ -466,6 +478,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_courthouse"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Halves all kinds of waste in a city (corruption, production waste, and \
 food waste). In your capital, corruption and production waste is \
@@ -496,6 +509,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_factory"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production in a city by 25%, or 50% with an \
@@ -524,6 +538,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_granary"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 When any small city grows or shrinks, 10 food points are saved; this \
 helps cities to grow faster and more easily withstand famine. With a \
@@ -558,6 +573,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_harbour"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives one extra food resource on all Ocean or Deep Ocean tiles (but \
 not Lakes). The city needs to be coastal (next to one of these tiles) \
@@ -584,6 +600,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_hydro_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Any kind of electrical plant increases the shield production \
@@ -626,6 +643,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_library"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 50%.\
@@ -649,6 +667,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_marketplace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
@@ -672,6 +691,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_mass_transit"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces the pollution generated by the population in a city; this \
 building counteracts the additional pollution associated with any \
@@ -697,6 +717,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_mfg_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production in a city by an additional 25%, or \
@@ -734,6 +755,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_nuclear_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Any kind of electrical plant increases the shield production \
@@ -777,6 +799,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_offshore_platform"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Every Ocean or Lake tile worked by the city yields one extra shield resource, \
 as well as any Deep Ocean tile containing an oil platform. The city needs \
@@ -804,6 +827,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes a city the capital and the center of your government. \
 Waste in other cities (corruption, production waste, and food waste) \
@@ -851,6 +875,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes a city the ecclesiastical capital, that acts as a second center \
 of government.\
@@ -892,6 +917,7 @@ upkeep          = 0
 sabotage        = 0
 sound           = "b_mystery_school"
 sound_alt       = "b_temple"
+sound_alt2      = "-"
 helptext        = _("\
 Initiates of The School of Amêzârâk knows how to operate an \
 Ancient Transport Hub.\
@@ -917,6 +943,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_police_station"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Police Station neutralizes any unhappiness caused by one military \
 unit in its city. It also makes up to 2 more unhappy citizens content \
@@ -942,6 +969,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_port_facility"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to build veteran sea units.  Also, damaged sea units\
  which stay in town for one full turn without moving are completely\
@@ -969,6 +997,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_power_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Any kind of electrical plant increases the shield production \
@@ -1002,6 +1031,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_recycling_center"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Building a Recycling Center reduces the amount of pollution \
@@ -1029,6 +1059,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_research_lab"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by an additional 50%, or \
@@ -1060,6 +1091,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sam_battery"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the intrinsic defense strength of units within a city \
 when defending against aircraft (including helicopters).\
@@ -1083,6 +1115,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_sdi_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Protects a city and its environs (up to 2 tiles away) from attacks \
 by other nations' Nuclear units. A Nuclear unit not owned by you or a \
@@ -1111,6 +1144,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sewer_system"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with an Aqueduct, allows a city to grow larger than size 16, \
@@ -1136,6 +1170,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_solar_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Any kind of electrical plant increases the shield production \
@@ -1179,6 +1214,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_component"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Components can be differentiated into Propulsion and Fuel\
  Components.  Each pair of them reduces your spaceship's travel\
@@ -1208,6 +1244,7 @@ upkeep          = 4
 sabotage        = 100
 sound           = "b_space_elevator_tether"
 sound_alt       = "b_generic"
+sound_alt2      = "-"
 helptext        = _("\
 Each tile around the city that is already generating some trade, produces \
 one extra trade resource.\
@@ -1246,6 +1283,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_module"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Modules are the most expensive parts of spaceships.  There\
  are three different types of Space Module:\
@@ -1286,6 +1324,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_structural"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Structurals form the base of your spaceship.  All other\
  spaceship parts need to be connected to Structurals in order to\
@@ -1314,6 +1353,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_stock_exchange"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by an additional 50%, \
@@ -1340,6 +1380,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_super_highways"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city with roads and without farmland, that\
  is already generating some trade, produces one extra trade resource.\
@@ -1373,6 +1414,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_supermarket"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the food resources by 50% on each farmland tile which\
@@ -1398,6 +1440,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_temple"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content. The Mysticism advance doubles \
 this effect (except under a Communist government). With both Mysticism \
@@ -1424,6 +1467,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_university"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by an additional 50%, or \
@@ -1459,6 +1503,7 @@ upkeep          = 0
 sabotage        = 0
 sound           = "w_altar"
 sound_alt       = "w_generic"
+sound_alt2      = "-"
 helptext        = _("\
 Makes it possible to receive sacrifices from your subjects.\
  A Sacrifice of Work makes the unit unhomed and therefore without material\
@@ -1483,6 +1528,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_apollo_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The entire map becomes permanently visible to the player who owns it \
 -- the player always has up-to-date knowledge of all terrain and \
@@ -1515,6 +1561,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_asmiths_trading_co"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 In every city with a Stock Exchange, city improvements which would \
 normally have an upkeep of 1 become free of upkeep. (Communist \
@@ -1544,6 +1591,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_chichen_itza"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 In a city with Chichen Itza, settlers can be built without\
  size of the city shrinking.\
@@ -1568,6 +1616,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_colossus"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city where this wonder is built that is already\
  generating some trade produces one extra trade resource.\
@@ -1592,6 +1641,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_copernicus_observatory"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile worked by the city where this wonder is built produces \
 one extra research point.\
@@ -1615,6 +1665,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_cure_for_cancer"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 This stunning technological achievement makes one content citizen \
@@ -1642,6 +1693,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_darwins_voyage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Charles Darwin's voyage sparked the discovery of the evolution \
 of the species, which inspired greater confidence in science. \
@@ -1669,6 +1721,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_eiffel_tower"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 AI nations are more inclined to be friendly and forgiving toward the \
 owner of this wonder (until the Apollo Program is completed). It also \
@@ -1700,6 +1753,7 @@ upkeep          = 0
 sabotage        = 0
 sound           = "w_georgia_guidestones"
 sound_alt       = "w_generic"
+sound_alt2      = "-"
 helptext        = _("\
 Allows releasing plague against any city as this helps maintain humanity \
 under 500,000,000.\
@@ -1724,6 +1778,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_library"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives an immediate technology advance to the player that builds it, \
 and thereafter 4 extra research points every turn to its city.\
@@ -1753,6 +1808,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_wall"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the defense of all your cities by adding a +50% bonus to \
@@ -1780,6 +1836,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hanging_gardens"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content in every city of the player that \
 owns it (not including citizens unhappy about aggression). This wonder \
@@ -1807,6 +1864,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hoover_dam"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Acts as a Hydro Plant in the city where it is built, and reduces \
@@ -1833,6 +1891,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_isaac_newtons_college"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives an immediate technology advance to the player that builds it, \
 and thereafter 6 extra research points every turn to its city.\
@@ -1859,6 +1918,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_js_bachs_cathedral"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one content citizen happy in every city of the player that owns \
 it (2 extra luxury points per city).\
@@ -1883,6 +1943,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_king_richards_crusade"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces the unhappiness caused by aggressively deployed military \
 units owned by the city by 1 -- in other words, it neutralizes the \
@@ -1911,6 +1972,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_leonardos_workshop"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Upgrades one obsolete unit per game turn.\
 ")
@@ -1935,6 +1997,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_lighthouse"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 1 additional movement point (except Triremes \
 while moving on rivers). Makes all your new sea units veterans (for all \
@@ -1961,6 +2024,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_magellans_expedition"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 1 additional movement point. The chance\
  of a sea unit getting the next veteran level after a battle\
@@ -1985,6 +2049,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ;helptext is set in client/helpdata.c:helptext_wonder()
 ;helptext	=
 
@@ -2007,6 +2072,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_marco_polos_embassy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The player who owns it gets an embassy with all players.\
 "), _("\
@@ -2033,6 +2099,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_michelangelos_chapel"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the base effect of Cathedrals. This makes 3 additional unhappy \
 citizens content in each city with a Cathedral; however, it does \
@@ -2058,6 +2125,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 With this wonder, City Walls and Courthouses each make one unhappy \
 citizen content in their city, unless that citizen is unhappy about \
@@ -2083,6 +2151,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces by 1 the unhappiness caused by one aggressively deployed \
 military unit per city -- in other words, in each city it neutralizes \
@@ -2111,6 +2180,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes 2 additional unhappy citizens content in every city with \
 a Temple. Does not affect citizens made unhappy by aggression.\
@@ -2135,6 +2205,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_pyramids"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city where this wonder is built that is already \
 generating some shield output produces one extra shield resource. \
@@ -2162,6 +2233,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_seti_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives an immediate technology advance to the player that builds it, \
 and thereafter all cities on the map are continuously visible to its \
@@ -2190,6 +2262,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_shakespeares_theatre"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives 1 additional luxury to every city, and 6 luxuries to the city \
 where it is located.\
@@ -2221,6 +2294,7 @@ upkeep          = 0
 sabotage        = 0
 sound           = "w_space_elevator"
 sound_alt       = "w_generic"
+sound_alt2      = "-"
 helptext        = _("\
 Each tile around the city that is already generating some trade, produces \
 one extra trade resource.\
@@ -2255,6 +2329,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_statue_of_liberty"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows you to choose any government, including those that have not yet \
 been researched by your civilization, and without the transition \
@@ -2282,6 +2357,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_sun_tzus_war_academy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All your new military land units start with an additional veteran level \
 (this is cumulative with any Barracks building in a city; with both, units \
@@ -2323,6 +2399,7 @@ upkeep          = 0
 sabotage        = 0
 sound           = "w_treuga_dei"
 sound_alt       = "w_generic"
+sound_alt2      = "-"
 helptext        = _("\
 Historical note: The real Treuga Dei was far less extreme. \
 Fighting was allowed around 80 days each year. \
@@ -2351,6 +2428,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_united_nations"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Creates a world senate that prevents unprovoked declaration of war by \
 any nuclear-capable nation (that is, any nation with knowledge of \
@@ -2382,6 +2460,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_womens_suffrage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Neutralizes the unhappiness caused by one aggressively \
 deployed military unit per city. Under Democracy, it additionally \
diff --git a/data/stub/buildings.ruleset b/data/stub/buildings.ruleset
index 15d1cef5d0..20203377a6 100644
--- a/data/stub/buildings.ruleset
+++ b/data/stub/buildings.ruleset
@@ -84,6 +84,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_generic"
 sound_alt	= "b_barracks"
+sound_alt2      = "-"
 helptext	= _("\
 This is the only building you can build.\
 ")
diff --git a/data/webperimental/buildings.ruleset b/data/webperimental/buildings.ruleset
index 87a0150d2c..10e505955a 100644
--- a/data/webperimental/buildings.ruleset
+++ b/data/webperimental/buildings.ruleset
@@ -94,6 +94,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_airport"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to produce veteran air units (including helicopters and\
  missiles).\
@@ -128,6 +129,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_aqueduct"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 8.  A Sewer System is also\
  required for a city to grow larger than size 12.\
@@ -154,6 +156,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_bank"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with the Marketplace improvement, a Bank increases the\
@@ -180,6 +183,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_i"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -212,6 +216,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_ii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -242,6 +247,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_barracks_iii"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 flags           = "Barracks"
 ; /* xgettext:no-c-format */
 helptext	= _("\
@@ -273,6 +279,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_cathedral"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 A Cathedral makes 3 unhappy citizens content in a city, making it\
  easier to maintain order in that city; however, it does not affect\
@@ -302,6 +309,7 @@ upkeep		= 0
 sabotage	= 50
 sound		= "b_city_walls"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City Walls make it easier to defend a city.  They triple the defense\
  strength of units within the city against land and helicopter\
@@ -329,6 +337,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_coastal_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Increases the defense strength of units within a city by a factor\
  of 2 when defending against bombardments from enemy ships.\
@@ -352,6 +361,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_colosseum"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Entertains the citizens of a city, making 3 unhappy citizens content. \
  (Four after the discovery of Electricity.)  However, it does not\
@@ -378,6 +388,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_courthouse"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Reduces the corruption in a city by 50%, and makes the revolt cost\
@@ -406,6 +417,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_factory"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the shield production in a city by 50%.  This increase may\
@@ -430,6 +442,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_granary"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The amount of stored food will be set to half full whenever a city\
  with a Granary shrinks or grows. This helps a city to grow faster\
@@ -459,6 +472,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_harbour"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives one extra food resource on all Oceanic tiles. The city needs\
  to be coastal to build this improvement.\
@@ -484,6 +498,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_hydro_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -521,6 +536,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_library"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the science output in a city by 100%.\
@@ -544,6 +560,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_marketplace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the luxury and tax output in a city by 50%.\
@@ -567,6 +584,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_mass_transit"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Neutralizes the pollution generated by the population. \
  The population simply has no effect on the pollution generated in\
@@ -592,6 +610,7 @@ upkeep		= 6
 sabotage	= 100
 sound		= "b_mfg_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Factory, a Manufacturing Plant increases the shield\
@@ -621,6 +640,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_nuclear_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -664,6 +684,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_offshore_platform"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Adds 1 extra shield resource on all Oceanic tiles worked by a city.  The\
  city needs to be coastal to build this improvement.\
@@ -688,6 +709,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "b_palace"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes a city the capital and the center of your government.\
  Corruption in other cities is related to how far away from the\
@@ -734,6 +756,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_police_station"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Reduces the unhappiness caused by aggressively deployed military\
  units owned by the city by 2 under Democracy and 1 under Republic\
@@ -763,6 +786,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_port_facility"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to build veteran sea units.  Also, damaged sea units\
  which stay in town for one full turn without moving are completely\
@@ -788,6 +812,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_power_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -823,6 +848,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_recycling_center"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Building a Recycling Center reduces the amount of pollution\
@@ -848,6 +874,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_research_lab"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a Research Lab increases the science\
@@ -874,6 +901,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sam_battery"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Doubles the defense of all units inside the city when attacked by\
  aircraft (not including helicopters or missiles).\
@@ -897,6 +925,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_sdi_defense"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Protects a city and its environs (up to 2 tiles away) from attacks\
  by other nations' Nuclear units. A Nuclear unit not owned by you or a\
@@ -926,6 +955,7 @@ upkeep		= 2
 sabotage	= 100
 sound		= "b_sewer_system"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows a city to grow larger than size 12.  An Aqueduct is first\
  required for a city to grow larger than size 8.\
@@ -952,6 +982,7 @@ upkeep		= 4
 sabotage	= 100
 sound		= "b_solar_plant"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the effect of Factory and Mfg. Plant on the shield\
@@ -988,6 +1019,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_component"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Components can be differentiated into Propulsion and Fuel\
  Components.  Each pair of them reduces your spaceship's travel\
@@ -1016,6 +1048,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_module"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Modules are the most expensive parts of spaceships.  There\
  are three different types of Space Module:\
@@ -1053,6 +1086,7 @@ upkeep		= 0
 sabotage	= 100
 sound		= "b_space_structural"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Space Structurals form the base of your spaceship.  All other\
  spaceship parts need to be connected to Structurals in order to\
@@ -1081,6 +1115,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_stock_exchange"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Bank, a Stock Exchange boosts tax and luxury\
@@ -1107,6 +1142,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_super_highways"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases trade resources by 50% on all tiles with roads or\
@@ -1133,6 +1169,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_supermarket"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Increases the food resources by 50% on each farmland tile which\
@@ -1158,6 +1195,7 @@ upkeep		= 1
 sabotage	= 100
 sound		= "b_temple"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one unhappy citizen content.  The Mysticism advance doubles\
  this effect.  With both Mysticism and the Oracle, 4 citizens are\
@@ -1184,6 +1222,7 @@ upkeep		= 3
 sabotage	= 100
 sound		= "b_university"
 sound_alt	= "b_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Together with a Library, a University increases the science\
@@ -1208,6 +1247,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_apollo_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The entire map becomes permanently visible to the player who owns it\
  -- the player always has up-to-date knowledge of all terrain and\
@@ -1234,6 +1274,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_asmiths_trading_co"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 City improvements which would normally have an upkeep of 1 are free\
  of upkeep, for all cities belonging to you and to your allies.\
@@ -1258,6 +1299,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_colossus"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Each tile around the city where this wonder is built that is already\
  generating some trade produces one extra trade resource.\
@@ -1281,6 +1323,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_copernicus_observatory"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in the city where it is built.\
@@ -1304,6 +1347,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_cure_for_cancer"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 This stunning technological achievement makes one unhappy\
  citizen content in each of your cities (including citizens unhappy\
@@ -1331,6 +1375,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_darwins_voyage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Charles Darwin's voyage sparked the discovery of the evolution\
  of the species, which inspired greater confidence in science.\
@@ -1355,6 +1400,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_eiffel_tower"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Your reputation and goodwill among other nations is recovered twice\
@@ -1380,6 +1426,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_library"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The civilization which builds the Great Library gets every advance\
  that at least two other teams have achieved.\
@@ -1404,6 +1451,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_great_wall"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as a City Wall in all your cities.\
 ")
@@ -1430,6 +1478,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hanging_gardens"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes one content citizen happy in every city. Makes two extra\
  content citizens happy in the city containing the Hanging Gardens\
@@ -1458,6 +1507,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_hoover_dam"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Works as if you had a Hydro Plant in every city.  (This reduces\
  pollution and increases the effects of Factories and Mfg. Plants.)\
@@ -1481,6 +1531,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_isaac_newtons_college"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production by 100% in every city you control that\
@@ -1505,6 +1556,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_js_bachs_cathedral"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two unhappy citizens content in every city belonging to you or to \
 your allies (including citizens unhappy about military activity).\
@@ -1529,6 +1581,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_king_richards_crusade"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Adds one extra shield resource on every tile around the city\
  where it is built.\
@@ -1553,6 +1606,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_leonardos_workshop"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Upgrades one obsolete unit per game turn.\
 ")
@@ -1577,6 +1631,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_lighthouse"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 1 additional movement point. Makes all your\
  new military sea units veterans (for all your cities).\
@@ -1601,6 +1656,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_magellans_expedition"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Gives all your sea units 2 additional movement points.\
 ")
@@ -1623,6 +1679,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_manhattan_project"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ;helptext is set in client/helpdata.c:helptext_wonder()
 ;helptext	=
 
@@ -1645,6 +1702,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_marco_polos_embassy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 The player who owns it gets an embassy with all players.\
 ")
@@ -1667,6 +1725,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_michelangelos_chapel"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as having a Cathedral in each of your cities.  This makes 3\
  unhappy citizens content in each city; however, it does not affect\
@@ -1696,6 +1755,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_oracle"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes two additional unhappy citizens content in every city with\
  a Temple.  Does not affect citizens made unhappy by military\
@@ -1720,6 +1780,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_pyramids"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 The amount of stored food lost when one of your cities grows or shrinks\
@@ -1745,6 +1806,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_seti_program"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 ; /* xgettext:no-c-format */
 helptext	= _("\
 Boosts science production in each city with a Research Lab by 100%.\
@@ -1769,6 +1831,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_shakespeares_theatre"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Makes all angry and unhappy citizens content in the city where it\
  is located, including citizens unhappy about military activity.\
@@ -1792,6 +1855,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_statue_of_liberty"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Allows you to choose any government, including those that have not yet\
  been researched by your civilization, and without the transition\
@@ -1817,6 +1881,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_sun_tzus_war_academy"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All new military land units belonging to you or to your allies start with \
 an additional veteran level\
@@ -1843,6 +1908,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_united_nations"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 All your units regain two extra hitpoints per turn.\
 ")
@@ -1865,6 +1931,7 @@ upkeep		= 0
 sabotage	= 0
 sound		= "w_womens_suffrage"
 sound_alt	= "w_generic"
+sound_alt2      = "-"
 helptext	= _("\
 Counts as a Police Station in every city. (That is, for each city, it\
  reduces the unhappiness caused by aggressively deployed military\
diff --git a/server/ruleset/ruleload.c b/server/ruleset/ruleload.c
index 7b111ee264..be1b573e71 100644
--- a/server/ruleset/ruleload.c
+++ b/server/ruleset/ruleload.c
@@ -2738,6 +2738,9 @@ static bool load_ruleset_buildings(struct section_file *file,
       sz_strlcpy(b->soundtag_alt,
                  secfile_lookup_str_default(file, "-",
                                             "%s.sound_alt", sec_name));
+      sz_strlcpy(b->soundtag_alt2,
+                 secfile_lookup_str_default(file, "-",
+                                            "%s.sound_alt2", sec_name));
       b->helptext = lookup_strvec(file, sec_name, "helptext");
     }
   }
@@ -8260,6 +8263,7 @@ static void send_ruleset_buildings(struct conn_list *dest)
     packet.flags = b->flags;
     sz_strlcpy(packet.soundtag, b->soundtag);
     sz_strlcpy(packet.soundtag_alt, b->soundtag_alt);
+    sz_strlcpy(packet.soundtag_alt2, b->soundtag_alt2);
     PACKET_STRVEC_COMPUTE(packet.helptext, b->helptext);
 
     lsend_packet_ruleset_building(dest, &packet);
diff --git a/tools/ruledit/edit_impr.cpp b/tools/ruledit/edit_impr.cpp
index c8b5decf2b..d57e693f14 100644
--- a/tools/ruledit/edit_impr.cpp
+++ b/tools/ruledit/edit_impr.cpp
@@ -132,6 +132,15 @@ edit_impr::edit_impr(ruledit_gui *ui_in, struct impr_type *impr_in) : QDialog()
   impr_layout->addWidget(label, row, 0);
   impr_layout->addWidget(sound_tag_alt, row++, 1);
 
+  label = new QLabel(QString::fromUtf8(R__("Second alt sound tag")));
+  label->setParent(this);
+
+  sound_tag_alt2 = new QLineEdit(this);
+  connect(sound_tag_alt2, SIGNAL(returnPressed()), this, SLOT(sound_tag_alt2_given()));
+
+  impr_layout->addWidget(label, row, 0);
+  impr_layout->addWidget(sound_tag_alt2, row++, 1);
+
   refresh();
 
   main_layout->addLayout(impr_layout);
@@ -150,6 +159,7 @@ void edit_impr::closeEvent(QCloseEvent *cevent)
   gfx_tag_alt2_given();
   sound_tag_given();
   sound_tag_alt_given();
+  sound_tag_alt2_given();
 
   impr->ruledit_dlg = nullptr;
 }
@@ -167,6 +177,7 @@ void edit_impr::refresh()
   gfx_tag_alt2->setText(impr->graphic_alt2);
   sound_tag->setText(impr->soundtag);
   sound_tag_alt->setText(impr->soundtag_alt);
+  sound_tag_alt2->setText(impr->soundtag_alt2);
 }
 
 /**********************************************************************//**
@@ -254,3 +265,13 @@ void edit_impr::sound_tag_alt_given()
 
   sz_strlcpy(impr->soundtag_alt, tag_bytes);
 }
+
+/**********************************************************************//**
+  User entered new second alternative sound tag.
+**************************************************************************/
+void edit_impr::sound_tag_alt2_given()
+{
+  QByteArray tag_bytes = sound_tag_alt2->text().toUtf8();
+
+  sz_strlcpy(impr->soundtag_alt2, tag_bytes);
+}
diff --git a/tools/ruledit/edit_impr.h b/tools/ruledit/edit_impr.h
index fee7dc5d1a..54a98e82bc 100644
--- a/tools/ruledit/edit_impr.h
+++ b/tools/ruledit/edit_impr.h
@@ -46,6 +46,7 @@ class edit_impr : public QDialog
     QLineEdit *gfx_tag_alt2;
     QLineEdit *sound_tag;
     QLineEdit *sound_tag_alt;
+    QLineEdit *sound_tag_alt2;
 
   protected:
     void closeEvent(QCloseEvent *cevent);
@@ -59,6 +60,7 @@ class edit_impr : public QDialog
     void gfx_tag_alt2_given();
     void sound_tag_given();
     void sound_tag_alt_given();
+    void sound_tag_alt2_given();
 };
 
 
diff --git a/tools/ruleutil/rulesave.c b/tools/ruleutil/rulesave.c
index 1a70334826..81fbb2230f 100644
--- a/tools/ruleutil/rulesave.c
+++ b/tools/ruleutil/rulesave.c
@@ -447,6 +447,9 @@ static bool save_buildings_ruleset(const char *filename, const char *name)
       if (strcmp(pb->soundtag_alt, "-")) {
         secfile_insert_str(sfile, pb->soundtag_alt, "%s.sound_alt", path);
       }
+      if (strcmp(pb->soundtag_alt2, "-")) {
+        secfile_insert_str(sfile, pb->soundtag_alt2, "%s.sound_alt2", path);
+      }
 
       save_reqs_vector(sfile, &(pb->reqs), path, "reqs");
       save_reqs_vector(sfile, &(pb->obsolete_by), path, "obsolete_by");
-- 
2.42.0

