(svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent

1 files changed, 146 insertions, 146 deletions

diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index 29015672a..46ade23cd 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -95,72 +95,72 @@ STR_CARGO_SINGULAR_FIZZY_DRINK                                  :Газиран
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
 STR_QUANTITY_PASSENGERS                                         :{COMMA} патни{P к ци}
-STR_QUANTITY_COAL                                               :{WEIGHT} јаглен
+STR_QUANTITY_COAL                                               :{WEIGHT_LONG} јаглен
 STR_QUANTITY_MAIL                                               :{COMMA} торб{P а и} со пошта
-STR_QUANTITY_OIL                                                :{VOLUME} нафта
+STR_QUANTITY_OIL                                                :{VOLUME_LONG} нафта
 STR_QUANTITY_LIVESTOCK                                          :{COMMA} грл{P о а} добиток
 STR_QUANTITY_GOODS                                              :{COMMA} пакет{P "" и} роба
-STR_QUANTITY_GRAIN                                              :{WEIGHT} жито
-STR_QUANTITY_WOOD                                               :{WEIGHT} дрва
-STR_QUANTITY_IRON_ORE                                           :{WEIGHT} железна руда
-STR_QUANTITY_STEEL                                              :{WEIGHT} челик
+STR_QUANTITY_GRAIN                                              :{WEIGHT_LONG} жито
+STR_QUANTITY_WOOD                                               :{WEIGHT_LONG} дрва
+STR_QUANTITY_IRON_ORE                                           :{WEIGHT_LONG} железна руда
+STR_QUANTITY_STEEL                                              :{WEIGHT_LONG} челик
 STR_QUANTITY_VALUABLES                                          :{COMMA} торб{P а и} со скапоцености
-STR_QUANTITY_COPPER_ORE                                         :{WEIGHT} бакарна руда
-STR_QUANTITY_MAIZE                                              :{WEIGHT} пченка
-STR_QUANTITY_FRUIT                                              :{WEIGHT} овошје
+STR_QUANTITY_COPPER_ORE                                         :{WEIGHT_LONG} бакарна руда
+STR_QUANTITY_MAIZE                                              :{WEIGHT_LONG} пченка
+STR_QUANTITY_FRUIT                                              :{WEIGHT_LONG} овошје
 STR_QUANTITY_DIAMONDS                                           :{COMMA} торб{P а и} со дијаманти
-STR_QUANTITY_FOOD                                               :{WEIGHT} храна
-STR_QUANTITY_PAPER                                              :{WEIGHT} хартија
+STR_QUANTITY_FOOD                                               :{WEIGHT_LONG} храна
+STR_QUANTITY_PAPER                                              :{WEIGHT_LONG} хартија
 STR_QUANTITY_GOLD                                               :{COMMA} торб{P а и} злато
-STR_QUANTITY_WATER                                              :{VOLUME} вода
-STR_QUANTITY_WHEAT                                              :{WEIGHT} пченица
-STR_QUANTITY_RUBBER                                             :{VOLUME} гума
-STR_QUANTITY_SUGAR                                              :{WEIGHT} шеќер
+STR_QUANTITY_WATER                                              :{VOLUME_LONG} вода
+STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} пченица
+STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} гума
+STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} шеќер
 STR_QUANTITY_TOYS                                               :{COMMA} играчк{P а и}
 STR_QUANTITY_SWEETS                                             :{COMMA} торб{P а и} колачиња
-STR_QUANTITY_COLA                                               :{VOLUME} кола
-STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} суровина за колачиња
+STR_QUANTITY_COLA                                               :{VOLUME_LONG} кола
+STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} суровина за колачиња
 STR_QUANTITY_BUBBLES                                            :{COMMA} меурч{P е иња}
-STR_QUANTITY_TOFFEE                                             :{WEIGHT} карамели
+STR_QUANTITY_TOFFEE                                             :{WEIGHT_LONG} карамели
 STR_QUANTITY_BATTERIES                                          :{COMMA} батери{P ја и}
-STR_QUANTITY_PLASTIC                                            :{VOLUME} пластика
+STR_QUANTITY_PLASTIC                                            :{VOLUME_LONG} пластика
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} пенлив пијалок
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
-STR_ABBREV_PASSENGERS                                           :{TINYFONT}ПА
-STR_ABBREV_COAL                                                 :{TINYFONT}ЈА
-STR_ABBREV_MAIL                                                 :{TINYFONT}ПО
-STR_ABBREV_OIL                                                  :{TINYFONT}НА
-STR_ABBREV_LIVESTOCK                                            :{TINYFONT}ГД
-STR_ABBREV_GOODS                                                :{TINYFONT}СТ
-STR_ABBREV_GRAIN                                                :{TINYFONT}ЖИ
-STR_ABBREV_WOOD                                                 :{TINYFONT}ДР
-STR_ABBREV_IRON_ORE                                             :{TINYFONT}ЖР
-STR_ABBREV_STEEL                                                :{TINYFONT}ЧЕ
-STR_ABBREV_VALUABLES                                            :{TINYFONT}СЦ
-STR_ABBREV_COPPER_ORE                                           :{TINYFONT}БР
-STR_ABBREV_MAIZE                                                :{TINYFONT}ПЧ
-STR_ABBREV_FRUIT                                                :{TINYFONT}ОВ
-STR_ABBREV_DIAMONDS                                             :{TINYFONT}ДИ
-STR_ABBREV_FOOD                                                 :{TINYFONT}ХР
-STR_ABBREV_PAPER                                                :{TINYFONT}ХА
-STR_ABBREV_GOLD                                                 :{TINYFONT}ЗЛ
-STR_ABBREV_WATER                                                :{TINYFONT}ВО
-STR_ABBREV_WHEAT                                                :{TINYFONT}ПЦ
-STR_ABBREV_RUBBER                                               :{TINYFONT}ГУ
-STR_ABBREV_SUGAR                                                :{TINYFONT}ШЕ
-STR_ABBREV_TOYS                                                 :{TINYFONT}ИГ
-STR_ABBREV_SWEETS                                               :{TINYFONT}КЊ
-STR_ABBREV_COLA                                                 :{TINYFONT}КЛ
-STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}СК
-STR_ABBREV_BUBBLES                                              :{TINYFONT}МЕ
-STR_ABBREV_TOFFEE                                               :{TINYFONT}КА
-STR_ABBREV_BATTERIES                                            :{TINYFONT}БА
-STR_ABBREV_PLASTIC                                              :{TINYFONT}ПЛ
-STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}ПП
-STR_ABBREV_NONE                                                 :{TINYFONT}НТ
-STR_ABBREV_ALL                                                  :{TINYFONT}Се`
+STR_ABBREV_PASSENGERS                                           :{TINY_FONT}ПА
+STR_ABBREV_COAL                                                 :{TINY_FONT}ЈА
+STR_ABBREV_MAIL                                                 :{TINY_FONT}ПО
+STR_ABBREV_OIL                                                  :{TINY_FONT}НА
+STR_ABBREV_LIVESTOCK                                            :{TINY_FONT}ГД
+STR_ABBREV_GOODS                                                :{TINY_FONT}СТ
+STR_ABBREV_GRAIN                                                :{TINY_FONT}ЖИ
+STR_ABBREV_WOOD                                                 :{TINY_FONT}ДР
+STR_ABBREV_IRON_ORE                                             :{TINY_FONT}ЖР
+STR_ABBREV_STEEL                                                :{TINY_FONT}ЧЕ
+STR_ABBREV_VALUABLES                                            :{TINY_FONT}СЦ
+STR_ABBREV_COPPER_ORE                                           :{TINY_FONT}БР
+STR_ABBREV_MAIZE                                                :{TINY_FONT}ПЧ
+STR_ABBREV_FRUIT                                                :{TINY_FONT}ОВ
+STR_ABBREV_DIAMONDS                                             :{TINY_FONT}ДИ
+STR_ABBREV_FOOD                                                 :{TINY_FONT}ХР
+STR_ABBREV_PAPER                                                :{TINY_FONT}ХА
+STR_ABBREV_GOLD                                                 :{TINY_FONT}ЗЛ
+STR_ABBREV_WATER                                                :{TINY_FONT}ВО
+STR_ABBREV_WHEAT                                                :{TINY_FONT}ПЦ
+STR_ABBREV_RUBBER                                               :{TINY_FONT}ГУ
+STR_ABBREV_SUGAR                                                :{TINY_FONT}ШЕ
+STR_ABBREV_TOYS                                                 :{TINY_FONT}ИГ
+STR_ABBREV_SWEETS                                               :{TINY_FONT}КЊ
+STR_ABBREV_COLA                                                 :{TINY_FONT}КЛ
+STR_ABBREV_CANDYFLOSS                                           :{TINY_FONT}СК
+STR_ABBREV_BUBBLES                                              :{TINY_FONT}МЕ
+STR_ABBREV_TOFFEE                                               :{TINY_FONT}КА
+STR_ABBREV_BATTERIES                                            :{TINY_FONT}БА
+STR_ABBREV_PLASTIC                                              :{TINY_FONT}ПЛ
+STR_ABBREV_FIZZY_DRINKS                                         :{TINY_FONT}ПП
+STR_ABBREV_NONE                                                 :{TINY_FONT}НТ
+STR_ABBREV_ALL                                                  :{TINY_FONT}Се`
 
 # 'Mode' of transport for cargoes
 STR_BAGS                                                        :{COMMA} вреќи
@@ -412,10 +412,10 @@ STR_MONTH_ABBREV_DEC                                            :Дек
 ############ range for months ends
 
 # Graph window
-STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
-STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
-STR_GRAPH_Y_LABEL                                               :{TINYFONT}{STRING}
-STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
+STR_GRAPH_X_LABEL_MONTH                                         :{TINY_FONT}{STRING}{} {STRING}
+STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINY_FONT}{STRING}{} {STRING}{}{NUM}
+STR_GRAPH_Y_LABEL                                               :{TINY_FONT}{STRING}
+STR_GRAPH_Y_LABEL_NUMBER                                        :{TINY_FONT}{COMMA}
 
 
 
@@ -431,22 +431,22 @@ STR_PERFORMANCE_DETAIL_SELECT_COMPANY_TOOLTIP                   :{BLACK}Погл
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Џез Џубокс
-STR_MUSIC_PLAYLIST_ALL                                          :{TINYFONT}{BLACK}Сите
-STR_MUSIC_PLAYLIST_OLD_STYLE                                    :{TINYFONT}{BLACK}Стар Стил
-STR_MUSIC_PLAYLIST_NEW_STYLE                                    :{TINYFONT}{BLACK}Нов Стил
-STR_MUSIC_PLAYLIST_EZY_STREET                                   :{TINYFONT}{BLACK}Ezy Street
-STR_MUSIC_PLAYLIST_CUSTOM_1                                     :{TINYFONT}{BLACK}Свое 1
-STR_MUSIC_PLAYLIST_CUSTOM_2                                     :{TINYFONT}{BLACK}Свое 2
-STR_MUSIC_MUSIC_VOLUME                                          :{TINYFONT}{BLACK}Гласност на музка
-STR_MUSIC_EFFECTS_VOLUME                                        :{TINYFONT}{BLACK}Гласност на ефекти
-STR_MUSIC_TRACK_NONE                                            :{TINYFONT}{DKGREEN}--
-STR_MUSIC_TRACK_DIGIT                                           :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
-STR_MUSIC_TITLE_NONE                                            :{TINYFONT}{DKGREEN}------
-STR_MUSIC_TITLE_NAME                                            :{TINYFONT}{DKGREEN}"{STRING}"
-STR_MUSIC_TRACK                                                 :{TINYFONT}{BLACK}Песна
-STR_MUSIC_XTITLE                                                :{TINYFONT}{BLACK}Наслов
-STR_MUSIC_SHUFFLE                                               :{TINYFONT}{BLACK}Измешај
-STR_MUSIC_PROGRAM                                               :{TINYFONT}{BLACK}Програм
+STR_MUSIC_PLAYLIST_ALL                                          :{TINY_FONT}{BLACK}Сите
+STR_MUSIC_PLAYLIST_OLD_STYLE                                    :{TINY_FONT}{BLACK}Стар Стил
+STR_MUSIC_PLAYLIST_NEW_STYLE                                    :{TINY_FONT}{BLACK}Нов Стил
+STR_MUSIC_PLAYLIST_EZY_STREET                                   :{TINY_FONT}{BLACK}Ezy Street
+STR_MUSIC_PLAYLIST_CUSTOM_1                                     :{TINY_FONT}{BLACK}Свое 1
+STR_MUSIC_PLAYLIST_CUSTOM_2                                     :{TINY_FONT}{BLACK}Свое 2
+STR_MUSIC_MUSIC_VOLUME                                          :{TINY_FONT}{BLACK}Гласност на музка
+STR_MUSIC_EFFECTS_VOLUME                                        :{TINY_FONT}{BLACK}Гласност на ефекти
+STR_MUSIC_TRACK_NONE                                            :{TINY_FONT}{DKGREEN}--
+STR_MUSIC_TRACK_DIGIT                                           :{TINY_FONT}{DKGREEN}{ZEROFILL_NUM}
+STR_MUSIC_TITLE_NONE                                            :{TINY_FONT}{DKGREEN}------
+STR_MUSIC_TITLE_NAME                                            :{TINY_FONT}{DKGREEN}"{STRING}"
+STR_MUSIC_TRACK                                                 :{TINY_FONT}{BLACK}Песна
+STR_MUSIC_XTITLE                                                :{TINY_FONT}{BLACK}Наслов
+STR_MUSIC_SHUFFLE                                               :{TINY_FONT}{BLACK}Измешај
+STR_MUSIC_PROGRAM                                               :{TINY_FONT}{BLACK}Програм
 STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK                        :{BLACK}Прескокни на претходна избрана песна
 STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION               :{BLACK}Прескокни на следна избрана песна
 STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC                            :{BLACK}Запри ја музиката
@@ -463,16 +463,16 @@ STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Прик
 
 # Playlist window
 STR_PLAYLIST_MUSIC_PROGRAM_SELECTION                            :{WHITE}Избор на музички програм
-STR_PLAYLIST_TRACK_NAME                                         :{TINYFONT}{LTBLUE}{ZEROFILL_NUM} "{STRING}"
-STR_PLAYLIST_TRACK_INDEX                                        :{TINYFONT}{BLACK}Индекс на песната
-STR_PLAYLIST_PROGRAM                                            :{TINYFONT}{BLACK}Програм - '{STRING}'
-STR_PLAYLIST_CLEAR                                              :{TINYFONT}{BLACK}Исчисти
+STR_PLAYLIST_TRACK_NAME                                         :{TINY_FONT}{LTBLUE}{ZEROFILL_NUM} "{STRING}"
+STR_PLAYLIST_TRACK_INDEX                                        :{TINY_FONT}{BLACK}Индекс на песната
+STR_PLAYLIST_PROGRAM                                            :{TINY_FONT}{BLACK}Програм - '{STRING}'
+STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}Исчисти
 STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1              :{BLACK}Исчисти го тековниот програм (само Сопствен1 или Сопствен2)
 STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Кликни на песна за да ја додадеш во тековниот програм (само Сопствен1 или Сопствен2)
 
 # Highscore window
-STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIGFONT}{BLACK}Топ компании што постигнаа {NUM}{}({STRING} Ниво)
-STR_HIGHSCORE_POSITION                                          :{BIGFONT}{BLACK}{COMMA}.
+STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}Топ компании што постигнаа {NUM}{}({STRING} Ниво)
+STR_HIGHSCORE_POSITION                                          :{BIG_FONT}{BLACK}{COMMA}.
 STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN                     :Бизнисмен
 STR_HIGHSCORE_PERFORMANCE_TITLE_ENTREPRENEUR                    :Претпријатие
 STR_HIGHSCORE_PERFORMANCE_TITLE_INDUSTRIALIST                   :Индустриалист
@@ -480,8 +480,8 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST                      :Капитал�
 STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE                         :Магнат
 STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL                           :Могул
 STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY           :Тајкун на векот
-STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS                           :{BIGFONT}{BLACK}{COMPANY} постигна статус на '{STRING}'!
-STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS              :{BIGFONT}{WHITE}{PRESIDENTNAME} од {COMPANY} постигна статус на'{STRING}'!
+STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS                           :{BIG_FONT}{BLACK}{COMPANY} постигна статус на '{STRING}'!
+STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS              :{BIG_FONT}{WHITE}{PRESIDENT_NAME} од {COMPANY} постигна статус на'{STRING}'!
 
 # Smallmap window
 STR_SMALLMAP_CAPTION                                            :{WHITE}Мапа - {STRING}
@@ -499,34 +499,34 @@ STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Прик
 STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Прикажи ја вегетацијата на мапа
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Прикажи сопственици на земјата на мапа
 
-STR_SMALLMAP_LEGENDA_ROADS                                      :{TINYFONT}{BLACK}Патишта
-STR_SMALLMAP_LEGENDA_RAILROADS                                  :{TINYFONT}{BLACK}Пруги
-STR_SMALLMAP_LEGENDA_STATIONS_AIRPORTS_DOCKS                    :{TINYFONT}{BLACK}Станици/Аеродроми/Докови
-STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES                       :{TINYFONT}{BLACK}Згради/Индустрии
-STR_SMALLMAP_LEGENDA_VEHICLES                                   :{TINYFONT}{BLACK}Возила
-STR_SMALLMAP_LEGENDA_TRAINS                                     :{TINYFONT}{BLACK}Возови
-STR_SMALLMAP_LEGENDA_ROAD_VEHICLES                              :{TINYFONT}{BLACK}Патни Возила
-STR_SMALLMAP_LEGENDA_SHIPS                                      :{TINYFONT}{BLACK}Бродови
-STR_SMALLMAP_LEGENDA_AIRCRAFT                                   :{TINYFONT}{BLACK}Летала
-STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES                           :{TINYFONT}{BLACK}Транспортни Рути
-STR_SMALLMAP_LEGENDA_FOREST                                     :{TINYFONT}{BLACK}Шума
-STR_SMALLMAP_LEGENDA_RAILROAD_STATION                           :{TINYFONT}{BLACK}Железничка Станица
-STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY                          :{TINYFONT}{BLACK}Станица за Товарење
-STR_SMALLMAP_LEGENDA_BUS_STATION                                :{TINYFONT}{BLACK}Автобуска Станица
-STR_SMALLMAP_LEGENDA_AIRPORT_HELIPORT                           :{TINYFONT}{BLACK}Аеродром/Хелипорт
-STR_SMALLMAP_LEGENDA_DOCK                                       :{TINYFONT}{BLACK}Док
-STR_SMALLMAP_LEGENDA_ROUGH_LAND                                 :{TINYFONT}{BLACK}Груба Земја
-STR_SMALLMAP_LEGENDA_GRASS_LAND                                 :{TINYFONT}{BLACK}Земја со Трева
-STR_SMALLMAP_LEGENDA_BARE_LAND                                  :{TINYFONT}{BLACK}Гола Земја
-STR_SMALLMAP_LEGENDA_FIELDS                                     :{TINYFONT}{BLACK}Полиња
-STR_SMALLMAP_LEGENDA_TREES                                      :{TINYFONT}{BLACK}Дрва
-STR_SMALLMAP_LEGENDA_ROCKS                                      :{TINYFONT}{BLACK}Карпи
-STR_SMALLMAP_LEGENDA_WATER                                      :{TINYFONT}{BLACK}Вода
-STR_SMALLMAP_LEGENDA_NO_OWNER                                   :{TINYFONT}{BLACK}Нема Сопственик
-STR_SMALLMAP_LEGENDA_TOWNS                                      :{TINYFONT}{BLACK}Градови
-STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLACK}Индустрии
-STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Пустина
-STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Снег
+STR_SMALLMAP_LEGENDA_ROADS                                      :{TINY_FONT}{BLACK}Патишта
+STR_SMALLMAP_LEGENDA_RAILROADS                                  :{TINY_FONT}{BLACK}Пруги
+STR_SMALLMAP_LEGENDA_STATIONS_AIRPORTS_DOCKS                    :{TINY_FONT}{BLACK}Станици/Аеродроми/Докови
+STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES                       :{TINY_FONT}{BLACK}Згради/Индустрии
+STR_SMALLMAP_LEGENDA_VEHICLES                                   :{TINY_FONT}{BLACK}Возила
+STR_SMALLMAP_LEGENDA_TRAINS                                     :{TINY_FONT}{BLACK}Возови
+STR_SMALLMAP_LEGENDA_ROAD_VEHICLES                              :{TINY_FONT}{BLACK}Патни Возила
+STR_SMALLMAP_LEGENDA_SHIPS                                      :{TINY_FONT}{BLACK}Бродови
+STR_SMALLMAP_LEGENDA_AIRCRAFT                                   :{TINY_FONT}{BLACK}Летала
+STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES                           :{TINY_FONT}{BLACK}Транспортни Рути
+STR_SMALLMAP_LEGENDA_FOREST                                     :{TINY_FONT}{BLACK}Шума
+STR_SMALLMAP_LEGENDA_RAILROAD_STATION                           :{TINY_FONT}{BLACK}Железничка Станица
+STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY                          :{TINY_FONT}{BLACK}Станица за Товарење
+STR_SMALLMAP_LEGENDA_BUS_STATION                                :{TINY_FONT}{BLACK}Автобуска Станица
+STR_SMALLMAP_LEGENDA_AIRPORT_HELIPORT                           :{TINY_FONT}{BLACK}Аеродром/Хелипорт
+STR_SMALLMAP_LEGENDA_DOCK                                       :{TINY_FONT}{BLACK}Док
+STR_SMALLMAP_LEGENDA_ROUGH_LAND                                 :{TINY_FONT}{BLACK}Груба Земја
+STR_SMALLMAP_LEGENDA_GRASS_LAND                                 :{TINY_FONT}{BLACK}Земја со Трева
+STR_SMALLMAP_LEGENDA_BARE_LAND                                  :{TINY_FONT}{BLACK}Гола Земја
+STR_SMALLMAP_LEGENDA_FIELDS                                     :{TINY_FONT}{BLACK}Полиња
+STR_SMALLMAP_LEGENDA_TREES                                      :{TINY_FONT}{BLACK}Дрва
+STR_SMALLMAP_LEGENDA_ROCKS                                      :{TINY_FONT}{BLACK}Карпи
+STR_SMALLMAP_LEGENDA_WATER                                      :{TINY_FONT}{BLACK}Вода
+STR_SMALLMAP_LEGENDA_NO_OWNER                                   :{TINY_FONT}{BLACK}Нема Сопственик
+STR_SMALLMAP_LEGENDA_TOWNS                                      :{TINY_FONT}{BLACK}Градови
+STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINY_FONT}{BLACK}Индустрии
+STR_SMALLMAP_LEGENDA_DESERT                                     :{TINY_FONT}{BLACK}Пустина
+STR_SMALLMAP_LEGENDA_SNOW                                       :{TINY_FONT}{BLACK}Снег
 
 STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Вклучи/исклучи имиња на градови на мапа
 
@@ -550,17 +550,17 @@ STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}Про�
 STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Субвенции
 STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}Општи информации
 
-STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Градска прослава . . .{}Првиот авион пристигна на {STATION}!
+STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIG_FONT}{BLACK}Градска прослава . . .{}Првиот авион пристигна на {STATION}!
 
-STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Авионска несреќа!{}{COMMA} загинати во пожарот на {STATION}
+STR_NEWS_AIRCRAFT_CRASH                                         :{BIG_FONT}{BLACK}Авионска несреќа!{}{COMMA} загинати во пожарот на {STATION}
 
-STR_NEWS_DISASTER_ZEPPELIN                                      :{BIGFONT}{BLACK}Цепелинска несреќа на {STATION}!
-STR_NEWS_DISASTER_SMALL_UFO                                     :{BIGFONT}{BLACK}Возило уништено при судир со 'НЛО'!
-STR_NEWS_DISASTER_AIRPLANE_OIL_REFINERY                         :{BIGFONT}{BLACK}Експлозија на рафинерија во близина на {TOWN}!
-STR_NEWS_DISASTER_HELICOPTER_FACTORY                            :{BIGFONT}{BLACK}Фабрика уништена под сомнителни околности во близина на {TOWN}!
-STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK}'НЛО' приземјено во близина на {TOWN}!
-STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Штета предизвикана од рудник за јаглен во близина на {TOWN}!
-STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Поплави!{}Најмалку {COMMA} исчезнати лица, се претпоставува дека се загинати!
+STR_NEWS_DISASTER_ZEPPELIN                                      :{BIG_FONT}{BLACK}Цепелинска несреќа на {STATION}!
+STR_NEWS_DISASTER_SMALL_UFO                                     :{BIG_FONT}{BLACK}Возило уништено при судир со 'НЛО'!
+STR_NEWS_DISASTER_AIRPLANE_OIL_REFINERY                         :{BIG_FONT}{BLACK}Експлозија на рафинерија во близина на {TOWN}!
+STR_NEWS_DISASTER_HELICOPTER_FACTORY                            :{BIG_FONT}{BLACK}Фабрика уништена под сомнителни околности во близина на {TOWN}!
+STR_NEWS_DISASTER_BIG_UFO                                       :{BIG_FONT}{BLACK}'НЛО' приземјено во близина на {TOWN}!
+STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIG_FONT}{BLACK}Штета предизвикана од рудник за јаглен во близина на {TOWN}!
+STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIG_FONT}{BLACK}Поплави!{}Најмалку {COMMA} исчезнати лица, се претпоставува дека се загинати!
 
 
 
@@ -896,7 +896,7 @@ STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP_TOOLTIP                    :{BLACK}Избе
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Информации за земјишна област
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Цена за чистење: {LTBLUE}N/A
-STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Цена за чистење: {RED}{CURRENCY}
+STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Цена за чистење: {RED}{CURRENCY_LONG}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Сопственик: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Локална власт: {LTBLUE}{STRING}
@@ -1048,8 +1048,8 @@ STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Не ч�
 
 # Station view window
 STR_STATION_VIEW_WAITING_TITLE                                  :{BLACK}Чекање: {WHITE}{STRING}
-STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO}
-STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({SHORTCARGO} пренасочено од {STATION})
+STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO_LONG}
+STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO_SHORT} пренасочено од {STATION})
 
 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Прифаќа: {WHITE}{STRING}
 
@@ -1092,7 +1092,7 @@ STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING}
 
 STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Авион - кликни на авионот за информации
 
-STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Годинашна заработка: {CURRENCY} (лани: {CURRENCY})
+STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Годинашна заработка: {CURRENCY_LONG} (лани: {CURRENCY_LONG})
 
 STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :Достапни Возови
 STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :Достапни Возила
@@ -1214,8 +1214,8 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Име �
 # Extra buttons for train details windows
 
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Вкупен капацитет на овој воз:
-STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) (x{NUM})
 
 
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Товар
@@ -1227,8 +1227,8 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Капа
 
 # Vehicle refit
 STR_REFIT_TITLE                                                 :{GOLD}Одбери тип на товар за носење:
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Нов капацитет: {GOLD}{CARGO}{}{BLACK}Пренамената чини: {GOLD}{CURRENCY}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Нов капацитет: {GOLD}{CARGO}, {GOLD}{CARGO}{}{BLACK} Цена на ремонтирам: {GOLD}{CURRENCY}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Нов капацитет: {GOLD}{CARGO_LONG}{}{BLACK}Пренамената чини: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Нов капацитет: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK} Цена на ремонтирам: {GOLD}{CURRENCY_LONG}
 
 STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Одбери тип на товар што ќе го носи бродот
 STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Одбери тип на товар за авионот
@@ -1326,7 +1326,7 @@ STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Пор�
 # Generic construction errors
 STR_ERROR_OFF_EDGE_OF_MAP                                       :{WHITE}Надвор од работ на мапата
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP                              :{WHITE}Преблизу до работ на мапата
-STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY                     :{WHITE}Недоволно средства - потребни {CURRENCY}
+STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY                     :{WHITE}Недоволно средства - потребни {CURRENCY_LONG}
 STR_ERROR_FLAT_LAND_REQUIRED                                    :{WHITE}Потребно е рамно земјиште
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Ова не е можно...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Не може да се исчисти оваа област...
@@ -1483,37 +1483,37 @@ STR_COMPANY_SOMEONE                                             :некој
 # Viewport strings
 STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
 STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
-STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
-STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINY_FONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINY_FONT}{WHITE}{TOWN}
 
-STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
-STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINY_FONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINY_FONT}{WHITE}{SIGN}
 
-STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
-STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATION_FEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINY_FONT}{STATION}
 
 STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
-STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINY_FONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
-STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
+STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANY_NUM}
 STR_DEPOT_NAME                                                  :{DEPOT}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
 STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
+STR_PRESIDENT_NAME                                              :{PRESIDENT_NAME}
 STR_SIGN_NAME                                                   :{SIGN}
 STR_STATION_NAME                                                :{STATION}
 STR_TOWN_NAME                                                   :{TOWN}
 STR_VEHICLE_NAME                                                :{VEHICLE}
 STR_WAYPOINT_NAME                                               :{WAYPOINT}
 
-STR_JUST_CARGO                                                  :{CARGO}
+STR_JUST_CARGO                                                  :{CARGO_LONG}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
-STR_JUST_CURRENCY                                               :{CURRENCY}
+STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
+STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -1524,25 +1524,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 
 # Slightly 'raw' stringcodes with colour or size
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
-STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINY_FONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINY_FONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
-STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
+STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_TINY_GROUP                                                  :{TINYFONT}{GROUP}
+STR_DATE_LONG_SMALL                                             :{TINY_FONT}{BLACK}{DATE_LONG}
+STR_TINY_GROUP                                                  :{TINY_FONT}{GROUP}
 STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
-STR_TINY_BLACK_STATION                                          :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATION                                          :{TINY_FONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
-STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
+STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}
+STR_TINY_RIGHT_ARROW                                            :{TINY_FONT}{RIGHT_ARROW}
 
 STR_BLACK_1                                                     :{BLACK}1
 STR_BLACK_2                                                     :{BLACK}2