(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/french.txt b/lang/french.txt
index 60eaabfa9..ce375880e 100644
--- a/lang/french.txt
+++ b/lang/french.txt
@@ -83,70 +83,70 @@ STR_004A_TOFFEE                                                 :Caramel
 STR_004B_BATTERY                                                :Batterie
 STR_004C_PLASTIC                                                :Plastique
 STR_004D_FIZZY_DRINK                                            :Boisson Gazeuse
-STR_004E                                                        :
-STR_004F_PASSENGER                                              :{COMMA} passager{P "" s}
-STR_0050_TON_OF_COAL                                            :{COMMA} tonne{P "" s} de charbon
-STR_0051_BAG_OF_MAIL                                            :{COMMA} sac{P "" s} posta{P l ux}
-STR_0052_OF_OIL                                                 :{VOLUME} de pétrole
-STR_0053_ITEM_OF_LIVESTOCK                                      :{COMMA} tête{P "" s} de bétail
-STR_0054_CRATE_OF_GOODS                                         :{COMMA} caisse{P "" s} de biens
-STR_0055_TON_OF_GRAIN                                           :{COMMA} tonne{P "" s} de grains
-STR_0056_TON_OF_WOOD                                            :{COMMA} tonne{P "" s} de bois
-STR_0057_TON_OF_IRON_ORE                                        :{COMMA} tonne{P "" s} de fer
-STR_0058_TON_OF_STEEL                                           :{COMMA} tonne{P "" s} d'acier
-STR_0059_BAG_OF_VALUABLES                                       :{COMMA} sac{P "" s} d'objets de valeur
-STR_005A_TON_OF_COPPER_ORE                                      :{COMMA} tonne{P "" s} de cuivre
-STR_005B_TON_OF_MAIZE                                           :{COMMA} tonne{P "" s} de maïs
-STR_005C_TON_OF_FRUIT                                           :{COMMA} tonne{P "" s} de fruits
-STR_005D_BAG_OF_DIAMONDS                                        :{COMMA} sac{P "" s} de diamants
-STR_005E_TON_OF_FOOD                                            :{COMMA} tonne{P "" s} de nourriture
-STR_005F_TON_OF_PAPER                                           :{COMMA} tonne{P "" s} de papier
-STR_0060_BAG_OF_GOLD                                            :{COMMA} sac{P "" s} d'or
-STR_0061_OF_WATER                                               :{VOLUME} d'eau
-STR_0062_TON_OF_WHEAT                                           :{COMMA} tonne{P "" s} de blé
-STR_0063_OF_RUBBER                                              :{VOLUME} de caoutchouc
-STR_0064_TON_OF_SUGAR                                           :{COMMA} tonne{P "" s} de sucre
-STR_0065_TOY                                                    :{COMMA} jouet{P "" s}
-STR_0066_BAG_OF_CANDY                                           :{COMMA} sac{P "" s} de jouets
-STR_0067_OF_COLA                                                :{VOLUME} de cola
-STR_0068_TON_OF_COTTON_CANDY                                    :{COMMA} tonne{P "" s} de barbe à papa
-STR_0069_BUBBLE                                                 :{COMMA} bulle{P "" s}
-STR_006A_TON_OF_TOFFEE                                          :{COMMA} tonne{P "" s} de caramel
-STR_006B_BATTERY                                                :{COMMA} batterie{P "" s}
-STR_006C_OF_PLASTIC                                             :{VOLUME} de plastique
-STR_006D_FIZZY_DRINK                                            :{COMMA} boisson{P "" s} gazeuse{P "" s}
-STR_008E                                                        :
-STR_008F_PS                                                     :{TINYFONT}PS
-STR_0090_CL                                                     :{TINYFONT}CL
-STR_0091_ML                                                     :{TINYFONT}ML
-STR_0092_OL                                                     :{TINYFONT}OL
-STR_0093_LV                                                     :{TINYFONT}LV
-STR_0094_GD                                                     :{TINYFONT}GD
-STR_0095_GR                                                     :{TINYFONT}GR
-STR_0096_WD                                                     :{TINYFONT}WD
-STR_0097_OR                                                     :{TINYFONT}OR
-STR_0098_ST                                                     :{TINYFONT}ST
-STR_0099_VL                                                     :{TINYFONT}VL
-STR_009A_CO                                                     :{TINYFONT}CO
-STR_009B_MZ                                                     :{TINYFONT}MZ
-STR_009C_FT                                                     :{TINYFONT}FT
-STR_009D_DM                                                     :{TINYFONT}DM
-STR_009E_FD                                                     :{TINYFONT}FD
-STR_009F_PR                                                     :{TINYFONT}PR
-STR_00A0_GD                                                     :{TINYFONT}GD
-STR_00A1_WR                                                     :{TINYFONT}WR
-STR_00A2_WH                                                     :{TINYFONT}WH
-STR_00A3_RB                                                     :{TINYFONT}RB
-STR_00A4_SG                                                     :{TINYFONT}SG
-STR_00A5_TY                                                     :{TINYFONT}TY
-STR_00A6_SW                                                     :{TINYFONT}SW
-STR_00A7_CL                                                     :{TINYFONT}CL
-STR_00A8_CF                                                     :{TINYFONT}CF
-STR_00A9_BU                                                     :{TINYFONT}BU
-STR_00AA_TF                                                     :{TINYFONT}TF
-STR_00AB_BA                                                     :{TINYFONT}BA
-STR_00AC_PL                                                     :{TINYFONT}PL
-STR_00AD_FZ                                                     :{TINYFONT}FZ
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passager{P "" s}
+STR_QUANTITY_COAL                                               :{COMMA} tonne{P "" s} de charbon
+STR_QUANTITY_MAIL                                               :{COMMA} sac{P "" s} posta{P l ux}
+STR_QUANTITY_OIL                                                :{VOLUME} de pétrole
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} tête{P "" s} de bétail
+STR_QUANTITY_GOODS                                              :{COMMA} caisse{P "" s} de biens
+STR_QUANTITY_GRAIN                                              :{COMMA} tonne{P "" s} de grains
+STR_QUANTITY_WOOD                                               :{COMMA} tonne{P "" s} de bois
+STR_QUANTITY_IRON_ORE                                           :{COMMA} tonne{P "" s} de fer
+STR_QUANTITY_STEEL                                              :{COMMA} tonne{P "" s} d'acier
+STR_QUANTITY_VALUABLES                                          :{COMMA} sac{P "" s} d'objets de valeur
+STR_QUANTITY_COPPER_ORE                                         :{COMMA} tonne{P "" s} de cuivre
+STR_QUANTITY_MAIZE                                              :{COMMA} tonne{P "" s} de maïs
+STR_QUANTITY_FRUIT                                              :{COMMA} tonne{P "" s} de fruits
+STR_QUANTITY_DIAMONDS                                           :{COMMA} sac{P "" s} de diamants
+STR_QUANTITY_FOOD                                               :{COMMA} tonne{P "" s} de nourriture
+STR_QUANTITY_PAPER                                              :{COMMA} tonne{P "" s} de papier
+STR_QUANTITY_GOLD                                               :{COMMA} sac{P "" s} d'or
+STR_QUANTITY_WATER                                              :{VOLUME} d'eau
+STR_QUANTITY_WHEAT                                              :{COMMA} tonne{P "" s} de blé
+STR_QUANTITY_RUBBER                                             :{VOLUME} de caoutchouc
+STR_QUANTITY_SUGAR                                              :{COMMA} tonne{P "" s} de sucre
+STR_QUANTITY_TOYS                                               :{COMMA} jouet{P "" s}
+STR_QUANTITY_SWEETS                                             :{COMMA} sac{P "" s} de jouets
+STR_QUANTITY_COLA                                               :{VOLUME} de cola
+STR_QUANTITY_CANDYFLOSS                                         :{COMMA} tonne{P "" s} de barbe à papa
+STR_QUANTITY_BUBBLES                                            :{COMMA} bulle{P "" s}
+STR_QUANTITY_TOFFEE                                             :{COMMA} tonne{P "" s} de caramel
+STR_QUANTITY_BATTERIES                                          :{COMMA} batterie{P "" s}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} de plastique
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} boisson{P "" s} gazeuse{P "" s}
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Carte - {STRING}