(svn r3495) Rename the string handles for cargo names with a quantity and abbreviated cargo names to something sensible, i.e. STR_QUANTITY_$NAME and STR_ABBREV_$NAME

1 files changed, 64 insertions, 64 deletions

diff --git a/lang/catalan.txt b/lang/catalan.txt
index a48ad09bc..0f7125c7b 100644
--- a/lang/catalan.txt
+++ b/lang/catalan.txt
@@ -82,70 +82,70 @@ STR_004A_TOFFEE                                                 :Caramel
 STR_004B_BATTERY                                                :Pila
 STR_004C_PLASTIC                                                :Plàstic
 STR_004D_FIZZY_DRINK                                            :Beguda Gasosa
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} passatger
-STR_0050_TON_OF_COAL                                            :{COMMA} tona de carbó
-STR_0051_BAG_OF_MAIL                                            :{COMMA} saca de correu
-STR_0052_OF_OIL                                                 :{VOLUME} de petroli
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} cap de bestiar
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} palet de mercaderies
-STR_0055_TON_OF_GRAIN                                           :{COMMA} tona de gra
-STR_0056_TON_OF_WOOD                                            :{COMMA} tona de fusta
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tona de mineral de ferro
-STR_0058_TON_OF_STEEL                                           :{COMMA} tona d'acer
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} saca de valors
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tona de mineral de coure
-STR_005B_TON_OF_MAIZE                                           :{COMMA} tona de blat de moro
-STR_005C_TON_OF_FRUIT                                           :{COMMA} tona de fruita
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} bossa de diamants
-STR_005E_TON_OF_FOOD                                            :{COMMA} tona de queviures
-STR_005F_TON_OF_PAPER                                           :{COMMA} tona de paper
-STR_0060_BAG_OF_GOLD                                            :{COMMA} sac d'or
-STR_0061_OF_WATER                                               :{VOLUME} d'aigua
-STR_0062_TON_OF_WHEAT                                           :{COMMA} tona de blat
-STR_0063_OF_RUBBER                                              :{VOLUME} de cautxú
-STR_0064_TON_OF_SUGAR                                           :{COMMA} tona de sucre
-STR_0065_TOY                                                    :{COMMA} joguina
-STR_0066_BAG_OF_CANDY                                           :{COMMA} bossa de dolços
-STR_0067_OF_COLA                                                :{VOLUME} de refrescs
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tona de cotó de sucre
-STR_0069_BUBBLE                                                 :{COMMA} bombolla
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} tona de caramel
-STR_006B_BATTERY                                                :{COMMA} pila
-STR_006C_OF_PLASTIC                                             :{VOLUME} de plàstic
-STR_006D_FIZZY_DRINK                                            :{COMMA} beguda gasosa
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CB
-STR_0091_ML                                                     :{TINYFONT}CR
-STR_0092_OL                                                     :{TINYFONT}PT
-STR_0093_LV                                                     :{TINYFONT}BE
-STR_0094_GD                                                     :{TINYFONT}ME
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}FU
-STR_0097_OR                                                     :{TINYFONT}FE
-STR_0098_ST                                                     :{TINYFONT}AC
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}BM
-STR_009C_FT                                                     :{TINYFONT}FR
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}QV
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}OR
-STR_00A1_WR                                                     :{TINYFONT}AI
-STR_00A2_WH                                                     :{TINYFONT}BL
-STR_00A3_RB                                                     :{TINYFONT}CX
-STR_00A4_SG                                                     :{TINYFONT}SU
-STR_00A5_TY                                                     :{TINYFONT}JO
-STR_00A6_SW                                                     :{TINYFONT}XU
-STR_00A7_CL                                                     :{TINYFONT}RF
-STR_00A8_CF                                                     :{TINYFONT}CS
-STR_00A9_BU                                                     :{TINYFONT}BM
-STR_00AA_TF                                                     :{TINYFONT}CA
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}BG
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passatger
+STR_QUANTITY_COAL                                               :{COMMA} tona de carbó
+STR_QUANTITY_MAIL                                               :{COMMA} saca de correu
+STR_QUANTITY_OIL                                                :{VOLUME} de petroli
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} cap de bestiar
+STR_QUANTITY_GOODS                                              :{COMMA} palet de mercaderies
+STR_QUANTITY_GRAIN                                              :{COMMA} tona de gra
+STR_QUANTITY_WOOD                                               :{COMMA} tona de fusta
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tona de mineral de ferro
+STR_QUANTITY_STEEL                                              :{COMMA} tona d'acer
+STR_QUANTITY_VALUABLES                                          :{COMMA} saca de valors
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tona de mineral de coure
+STR_QUANTITY_MAIZE                                              :{COMMA} tona de blat de moro
+STR_QUANTITY_FRUIT                                              :{COMMA} tona de fruita
+STR_QUANTITY_DIAMONDS                                           :{COMMA} bossa de diamants
+STR_QUANTITY_FOOD                                               :{COMMA} tona de queviures
+STR_QUANTITY_PAPER                                              :{COMMA} tona de paper
+STR_QUANTITY_GOLD                                               :{COMMA} sac d'or
+STR_QUANTITY_WATER                                              :{VOLUME} d'aigua
+STR_QUANTITY_WHEAT                                              :{COMMA} tona de blat
+STR_QUANTITY_RUBBER                                             :{VOLUME} de cautxú
+STR_QUANTITY_SUGAR                                              :{COMMA} tona de sucre
+STR_QUANTITY_TOYS                                               :{COMMA} joguina
+STR_QUANTITY_SWEETS                                             :{COMMA} bossa de dolços
+STR_QUANTITY_COLA                                               :{VOLUME} de refrescs
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tona de cotó de sucre
+STR_QUANTITY_BUBBLES                                            :{COMMA} bombolla
+STR_QUANTITY_TOFFEE                                             :{COMMA} tona de caramel
+STR_QUANTITY_BATTERIES                                          :{COMMA} pila
+STR_QUANTITY_PLASTIC                                            :{VOLUME} de plàstic
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} beguda gasosa
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CB
+STR_ABBREV_MAIL                                                 :{TINYFONT}CR
+STR_ABBREV_OIL                                                  :{TINYFONT}PT
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}BE
+STR_ABBREV_GOODS                                                :{TINYFONT}ME
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}FU
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}FE
+STR_ABBREV_STEEL                                                :{TINYFONT}AC
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}BM
+STR_ABBREV_FRUIT                                                :{TINYFONT}FR
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}QV
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}OR
+STR_ABBREV_WATER                                                :{TINYFONT}AI
+STR_ABBREV_WHEAT                                                :{TINYFONT}BL
+STR_ABBREV_RUBBER                                               :{TINYFONT}CX
+STR_ABBREV_SUGAR                                                :{TINYFONT}SU
+STR_ABBREV_TOYS                                                 :{TINYFONT}JO
+STR_ABBREV_SWEETS                                               :{TINYFONT}XU
+STR_ABBREV_COLA                                                 :{TINYFONT}RF
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CS
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BM
+STR_ABBREV_TOFFEE                                               :{TINYFONT}CA
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}BG
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}