--- a/config.lib Sun Jul 22 21:10:59 2007 +0000
+++ b/config.lib Sun Jul 22 21:24:42 2007 +0000
@@ -60,8 +60,9 @@
with_freetype="1"
with_fontconfig="1"
with_psp_config="1"
+ with_threads="1"
- save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os cpu_type revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_distcc with_ccache with_osx_sysroot enable_universal enable_osx_g5 enable_unicode with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config CC CXX CFLAGS LDFLAGS"
+ save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os cpu_type revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_distcc with_osx_sysroot enable_universal enable_osx_g5 enable_unicode with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config with_threads CC CXX CFLAGS LDFLAGS"
}
detect_params() {
@@ -245,6 +246,10 @@
--with-application-bundle) with_application_bundle="1";;
--with-application-bundle=*) with_application_bundle="$optarg";;
+ --without-threads) with_threads="0";;
+ --with-threads) with_threads="1";;
+ --with-threads=*) with_threads="$optarg";;
+
CC=* | --CC=*) CC="$optarg";;
CXX=* | --CXX=*) CXX="$optarg";;
CFLAGS=* | --CFLAGS=*) CFLAGS="$optarg";;
@@ -782,6 +787,10 @@
LDFLAGS="$LDFLAGS -pg"
fi
+ if [ "$with_threads" = "0" ]; then
+ CFLAGS="$CFLAGS -DNO_THREADS"
+ fi
+
# Enable some things only for certain GCC versions
cc_version=`$cc_host -dumpversion | cut -c 1,3`
@@ -819,13 +828,14 @@
if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then
LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
- # GCC 4.0+ complains about that we break strict-aliasing.
- # On most places we don't see how to fix it, and it doesn't
- # break anything. So disable strict-aliasing to make the
- # compiler all happy.
- if [ $cc_version -ge 40 ]; then
- CFLAGS="$CFLAGS -fno-strict-aliasing"
- fi
+ fi
+
+ # GCC 4.0+ complains about that we break strict-aliasing.
+ # On most places we don't see how to fix it, and it doesn't
+ # break anything. So disable strict-aliasing to make the
+ # compiler all happy.
+ if [ $cc_version -ge 40 ]; then
+ CFLAGS="$CFLAGS -fno-strict-aliasing"
fi
if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
--- a/configure Sun Jul 22 21:10:59 2007 +0000
+++ b/configure Sun Jul 22 21:24:42 2007 +0000
@@ -96,6 +96,7 @@
if ($0 == "MSVC" && "'$os'" != "MSVC") { next; }
if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0") { next; }
if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" ) { next; }
+ if ($0 == "NO_THREADS" && "'$with_threads'" == "0") { next; }
skip += 1;
--- a/projects/generate Sun Jul 22 21:10:59 2007 +0000
+++ b/projects/generate Sun Jul 22 21:24:42 2007 +0000
@@ -36,6 +36,7 @@
enable_dedicated="0"
with_cocoa="0"
enable_directmusic="1"
+with_threads="1"
file_prefix="..\\\\src\\\\"
safety_check() {
@@ -84,6 +85,7 @@
if ($0 == "MSVC" && "'$os'" != "MSVC") { next; }
if ($0 == "DIRECTMUSIC" && "'$enable_directmusic'" != "1") { next; }
if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" ) { next; }
+ if ($0 == "NO_THREADS" && "'$with_threads'" == "0") { next; }
skip += 1;
--- a/src/build_vehicle_gui.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/build_vehicle_gui.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -503,7 +503,7 @@
/* Draw road vehicle specific details */
static int DrawRoadVehPurchaseInfo(int x, int y, EngineID engine_number, const RoadVehicleInfo *rvi)
{
- bool refittable = (_engine_info[engine_number].refit_mask != 0);
+ bool refittable = (EngInfo(engine_number)->refit_mask != 0);
/* Purchase cost - Max speed */
SetDParam(0, GetEngineProperty(engine_number, 0x11, rvi->base_cost) * (_price.roadveh_base >> 3) >> 5);
--- a/src/cargotype.h Sun Jul 22 21:10:59 2007 +0000
+++ b/src/cargotype.h Sun Jul 22 21:24:42 2007 +0000
@@ -34,7 +34,7 @@
uint8 callback_mask;
StringID name;
- StringID name_plural;
+ StringID name_single;
StringID units_volume;
StringID quantifier;
StringID abbrev;
--- a/src/economy.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/economy.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -871,7 +871,7 @@
/* if mode is false, use the singular form */
const CargoSpec *cs = GetCargo(s->cargo_type);
- SetDParam(0, mode ? cs->name_plural : cs->name);
+ SetDParam(0, mode ? cs->name : cs->name_single);
if (s->age < 12) {
if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL) {
--- a/src/industry.h Sun Jul 22 21:10:59 2007 +0000
+++ b/src/industry.h Sun Jul 22 21:24:42 2007 +0000
@@ -20,6 +20,7 @@
INVALID_INDUSTRYTYPE = NUM_INDUSTRYTYPES, ///< one above amount is considered invalid
NUM_INDUSTRYTILES = NEW_INDUSTRYTILEOFFSET, ///< total number of industry tiles, new and old
INVALID_INDUSTRYTILE = NUM_INDUSTRYTILES, ///< one above amount is considered invalid
+ INDUSTRY_COMPLETED = 3, ///< final stage of industry construction.
};
enum {
--- a/src/industry_cmd.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/industry_cmd.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -31,6 +31,7 @@
#include "water_map.h"
#include "tree_map.h"
#include "cargotype.h"
+#include "newgrf_commons.h"
#include "newgrf_industries.h"
#include "newgrf_industrytiles.h"
#include "newgrf_callbacks.h"
@@ -64,7 +65,6 @@
_industry_specs[i].enabled = HASBIT(_origin_industry_specs[i].climate_availability, _opt.landscape);
}
-
memset(&_industry_tile_specs, 0, sizeof(_industry_tile_specs));
memcpy(&_industry_tile_specs, &_origin_industry_tile_specs, sizeof(_origin_industry_tile_specs));
}
@@ -123,7 +123,7 @@
* Accessor for array _industry_tile_specs.
* This will ensure at once : proper access and
* not allowing modifications of it.
- * @param gfx of industrytile (which is the index in _industry_specs)
+ * @param gfx of industrytile (which is the index in _industry_tile_specs)
* @pre gfx < INVALID_INDUSTRYTILE
* @return a pointer to the corresponding industrytile spec
**/
@@ -277,7 +277,7 @@
}
dits = &_industry_draw_tile_data[gfx << 2 | (indts->anim_state ?
- GetIndustryAnimationState(ti->tile) & 3 :
+ GetIndustryAnimationState(ti->tile) & INDUSTRY_COMPLETED :
GetIndustryConstructionStage(ti->tile))];
image = dits->ground.sprite;
@@ -643,9 +643,7 @@
SetIndustryConstructionCounter(tile, 0);
SetIndustryConstructionStage(tile, stage);
StartStopIndustryTileAnimation(tile, IAT_CONSTRUCTION_STATE_CHANGE);
- if (stage == 3) {
- SetIndustryCompleted(tile, true);
- }
+ if (stage == INDUSTRY_COMPLETED) SetIndustryCompleted(tile, true);
MarkTileDirtyByTile(tile);
@@ -684,7 +682,6 @@
}
}
-
static void TileLoopIndustry_BubbleGenerator(TileIndex tile)
{
int dir;
@@ -819,7 +816,6 @@
}
}
-
static void ClickTile_Industry(TileIndex tile)
{
ShowIndustryViewWindow(GetIndustryIndex(tile));
@@ -1061,7 +1057,6 @@
}
}
-
static bool CheckNewIndustry_NULL(TileIndex tile)
{
return true;
@@ -1714,7 +1709,9 @@
}
}
-/* Change industry production or do closure */
+/** Change industry production or do closure
+ * @param i Industry for which changes are performed
+ */
static void ExtChangeIndustryProduction(Industry *i)
{
bool closeit = true;
@@ -2050,13 +2047,44 @@
{
Industry *ind;
- /* Write the vehicles */
+ /* Write the industries */
FOR_ALL_INDUSTRIES(ind) {
SlSetArrayIndex(ind->index);
SlObject(ind, _industry_desc);
}
}
+/* Save and load the mapping between the industry/tile id on the map, and the grf file
+ * it came from. */
+static const SaveLoad _industries_id_mapping_desc[] = {
+ SLE_VAR(EntityIDMapping, grfid, SLE_UINT32),
+ SLE_VAR(EntityIDMapping, entity_id, SLE_UINT8),
+ SLE_VAR(EntityIDMapping, substitute_id, SLE_UINT8),
+ SLE_END()
+};
+
+static void Save_IIDS()
+{
+ uint i;
+ uint j = _industry_mngr.GetMaxMapping();
+
+ for (i = 0; i < j; i++) {
+ SlSetArrayIndex(i);
+ SlObject(&_industry_mngr.mapping_ID[i], _industries_id_mapping_desc);
+ }
+}
+
+static void Save_TIDS()
+{
+ uint i;
+ uint j = _industile_mngr.GetMaxMapping();
+
+ for (i = 0; i < j; i++) {
+ SlSetArrayIndex(i);
+ SlObject(&_industile_mngr.mapping_ID[i], _industries_id_mapping_desc);
+ }
+}
+
static void Load_INDY()
{
int index;
@@ -2075,6 +2103,44 @@
}
}
+static void Load_IIDS()
+{
+ int index;
+ uint max_id;
+
+ /* clear the current mapping stored.
+ * This will create the manager if ever it is not yet done */
+ _industry_mngr.ResetMapping();
+
+ /* get boundary for the temporary map loader NUM_INDUSTRYTYPES? */
+ max_id = _industry_mngr.GetMaxMapping();
+
+ while ((index = SlIterateArray()) != -1) {
+ if ((uint)index >= max_id) break;
+ SlObject(&_industry_mngr.mapping_ID[index], _industries_id_mapping_desc);
+ }
+}
+
+static void Load_TIDS()
+{
+ int index;
+ uint max_id;
+
+ /* clear the current mapping stored.
+ * This will create the manager if ever it is not yet done */
+ _industile_mngr.ResetMapping();
+
+ /* get boundary for the temporary map loader NUM_INDUSTILES? */
+ max_id = _industile_mngr.GetMaxMapping();
+
+ while ((index = SlIterateArray()) != -1) {
+ if ((uint)index >= max_id) break;
+ SlObject(&_industile_mngr.mapping_ID[index], _industries_id_mapping_desc);
+ }
+}
+
extern const ChunkHandler _industry_chunk_handlers[] = {
- { 'INDY', Save_INDY, Load_INDY, CH_ARRAY | CH_LAST},
+ { 'INDY', Save_INDY, Load_INDY, CH_ARRAY},
+ { 'IIDS', Save_IIDS, Load_IIDS, CH_ARRAY},
+ { 'TIDS', Save_TIDS, Load_TIDS, CH_ARRAY | CH_LAST},
};
--- a/src/industry_gui.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/industry_gui.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -24,6 +24,7 @@
#include "newgrf_callbacks.h"
#include "newgrf_industries.h"
#include "newgrf_text.h"
+#include "date.h"
extern Industry *CreateNewIndustry(TileIndex tile, IndustryType type);
@@ -58,12 +59,22 @@
DYNA_INDU_RESIZE_WIDGET,
};
+/** Attached struct to the window extended data */
+struct fnd_d {
+ int index; ///< index of the element in the matrix
+ IndustryType select; ///< industry corresponding to the above index
+ uint16 callback_timer; ///< timer counter for callback eventual verification
+ bool timer_enabled; ///< timer can be used
+};
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(fnd_d));
+
+/** Helper struct holding the available industries for current situation */
static struct IndustryData {
- uint16 count;
- IndustryType select;
- byte index[NUM_INDUSTRYTYPES + 1];
- StringID additional_text[NUM_INDUSTRYTYPES + 1];
-} _industrydata;
+ uint16 count; ///< How many industries are loaded
+ IndustryType index[NUM_INDUSTRYTYPES + 1]; ///< Type of industry, in the order it was loaded
+ StringID text[NUM_INDUSTRYTYPES + 1]; ///< Text coming from CBM_IND_FUND_MORE_TEXT (if ever)
+ bool enabled[NUM_INDUSTRYTYPES + 1]; ///< availability state, coming from CBID_INDUSTRY_AVAILABLE (if ever)
+} _fund_gui;
static void BuildDynamicIndustryWndProc(Window *w, WindowEvent *e)
{
@@ -84,29 +95,31 @@
w->resize.height = w->height -= 44;
}
+ WP(w, fnd_d).timer_enabled = _loaded_newgrf_features.has_newindustries;
+
/* Initilialize structures */
- memset(&_industrydata.index, 0xFF, NUM_INDUSTRYTYPES);
- memset(&_industrydata.additional_text, STR_NULL, NUM_INDUSTRYTYPES);
- _industrydata.count = 0;
+ memset(&_fund_gui.index, 0xFF, NUM_INDUSTRYTYPES);
+ memset(&_fund_gui.text, STR_NULL, NUM_INDUSTRYTYPES);
+ memset(&_fund_gui.enabled, false, NUM_INDUSTRYTYPES);
+ _fund_gui.count = 0;
- /* first indutry type is selected.
- * I'll be damned if there are none available ;) */
- _industrydata.select = 0;
w->vscroll.cap = 8; // rows in grid, same in scroller
w->resize.step_height = 13;
if (_game_mode == GM_EDITOR) { // give room for the Many Random "button"
- _industrydata.index[_industrydata.count] = INVALID_INDUSTRYTYPE;
- _industrydata.count++;
+ _fund_gui.index[_fund_gui.count] = INVALID_INDUSTRYTYPE;
+ _fund_gui.count++;
+ WP(w, fnd_d).timer_enabled = false;
}
/* We'll perform two distinct loops, one for secondary industries, and the other one for
- * primary ones. Each loop will fill the _industrydata structure. */
+ * primary ones. Each loop will fill the _fund_gui structure. */
for (ind = IT_COAL_MINE; ind < NUM_INDUSTRYTYPES; ind++) {
indsp = GetIndustrySpec(ind);
if (indsp->enabled && (!indsp->IsRawIndustry() || _game_mode == GM_EDITOR)) {
- _industrydata.index[_industrydata.count] = ind;
- _industrydata.count++;
+ _fund_gui.index[_fund_gui.count] = ind;
+ _fund_gui.enabled[_fund_gui.count] = CheckIfCallBackAllowsAvailability(ind, IACT_USERCREATION);
+ _fund_gui.count++;
}
}
@@ -114,44 +127,55 @@
for (ind = IT_COAL_MINE; ind < NUM_INDUSTRYTYPES; ind++) {
indsp = GetIndustrySpec(ind);
if (indsp->enabled && indsp->IsRawIndustry()) {
- _industrydata.index[_industrydata.count] = ind;
- _industrydata.count++;
+ _fund_gui.index[_fund_gui.count] = ind;
+ _fund_gui.enabled[_fund_gui.count] = CheckIfCallBackAllowsAvailability(ind, IACT_USERCREATION);
+ _fund_gui.count++;
}
}
}
+
+ /* first indutry type is selected.
+ * I'll be damned if there are none available ;) */
+ WP(w, fnd_d).index = 0;
+ WP(w, fnd_d).select = _fund_gui.index[0];
+ WP(w, fnd_d).callback_timer = DAY_TICKS;
} break;
case WE_PAINT: {
- const IndustrySpec *indsp = (_industrydata.index[_industrydata.select] == INVALID_INDUSTRYTYPE) ? NULL : GetIndustrySpec(_industrydata.index[_industrydata.select]);
+ const IndustrySpec *indsp = (WP(w, fnd_d).select == INVALID_INDUSTRYTYPE) ? NULL : GetIndustrySpec(WP(w, fnd_d).select);
StringID str = STR_4827_REQUIRES;
int x_str = w->widget[DYNA_INDU_INFOPANEL].left + 3;
int y_str = w->widget[DYNA_INDU_INFOPANEL].top + 3;
const Widget *wi = &w->widget[DYNA_INDU_INFOPANEL];
int max_width = wi->right - wi->left - 4;
- /* Raw industries might be prospected. Show this fact by changing the string */
+ /* Raw industries might be prospected. Show this fact by changing the string
+ * In Editor, you just build, while ingame, or you fund or you prospect */
if (_game_mode == GM_EDITOR) {
+ /* We've chosen many random industries but no industries have been specified */
+ if (indsp == NULL) _fund_gui.enabled[WP(w, fnd_d).index] = _opt.diff.number_industries != 0;
w->widget[DYNA_INDU_FUND_WIDGET].data = STR_BUILD_NEW_INDUSTRY;
} else {
w->widget[DYNA_INDU_FUND_WIDGET].data = (_patches.raw_industry_construction == 2 && indsp->IsRawIndustry()) ? STR_PROSPECT_NEW_INDUSTRY : STR_FUND_NEW_INDUSTRY;
}
+ SetWindowWidgetDisabledState(w, DYNA_INDU_FUND_WIDGET, !_fund_gui.enabled[WP(w, fnd_d).index]);
- SetVScrollCount(w, _industrydata.count);
+ SetVScrollCount(w, _fund_gui.count);
DrawWindowWidgets(w);
/* and now with the matrix painting */
- for (byte i = 0; i < w->vscroll.cap && ((i + w->vscroll.pos) < _industrydata.count); i++) {
+ for (byte i = 0; i < w->vscroll.cap && ((i + w->vscroll.pos) < _fund_gui.count); i++) {
int offset = i * 13;
int x = 3;
int y = 16;
- bool selected = _industrydata.select == i + w->vscroll.pos;
+ bool selected = WP(w, fnd_d).index == i + w->vscroll.pos;
- if (_industrydata.index[i + w->vscroll.pos] == INVALID_INDUSTRYTYPE) {
+ if (_fund_gui.index[i + w->vscroll.pos] == INVALID_INDUSTRYTYPE) {
DrawString(21, y + offset, STR_MANY_RANDOM_INDUSTRIES, selected ? 12 : 6);
continue;
}
- const IndustrySpec *indsp = GetIndustrySpec(_industrydata.index[i + w->vscroll.pos]);
+ const IndustrySpec *indsp = GetIndustrySpec(_fund_gui.index[i + w->vscroll.pos]);
/* Draw the name of the industry in white is selected, otherwise, in orange */
DrawString(20, y + offset, indsp->name, selected ? 12 : 6);
@@ -159,7 +183,7 @@
GfxFillRect(x + 1, y + 2 + offset, x + 9, y + 6 + offset, indsp->map_colour);
}
- if (_industrydata.index[_industrydata.select] == INVALID_INDUSTRYTYPE) {
+ if (WP(w, fnd_d).select == INVALID_INDUSTRYTYPE) {
DrawStringMultiLine(x_str, y_str, STR_RANDOM_INDUSTRIES_TIP, max_width, wi->bottom - wi->top - 40);
break;
}
@@ -201,12 +225,12 @@
DrawStringTruncated(x_str, y_str, str, 0, max_width);
/* Get the additional purchase info text, if it has not already been */
- if (_industrydata.additional_text[_industrydata.select] == STR_NULL) { // Have i been called already?
+ if (_fund_gui.text[WP(w, fnd_d).index] == STR_NULL) { // Have i been called already?
if (HASBIT(indsp->callback_flags, CBM_IND_FUND_MORE_TEXT)) { // No. Can it be called?
- uint16 callback_res = GetIndustryCallback(CBID_INDUSTRY_FUND_MORE_TEXT, 0, 0, NULL, _industrydata.index[_industrydata.select], INVALID_TILE);
+ uint16 callback_res = GetIndustryCallback(CBID_INDUSTRY_FUND_MORE_TEXT, 0, 0, NULL, WP(w, fnd_d).select, INVALID_TILE);
if (callback_res != CALLBACK_FAILED) { // Did it failed?
StringID newtxt = GetGRFStringID(indsp->grf_prop.grffile->grfid, 0xD000 + callback_res); // No. here's the new string
- _industrydata.additional_text[_industrydata.select] = newtxt; // Store it for further usage
+ _fund_gui.text[WP(w, fnd_d).index] = newtxt; // Store it for further usage
}
}
}
@@ -214,27 +238,28 @@
y_str += 11;
/* Draw the Additional purchase text, provided by newgrf callback, if any.
* Otherwhise, will print Nothing */
- if (_industrydata.additional_text[_industrydata.select] != STR_NULL &&
- _industrydata.additional_text[_industrydata.select] != STR_UNDEFINED) {
-
- SetDParam(0, _industrydata.additional_text[_industrydata.select]);
- DrawStringMultiLine(x_str, y_str, STR_JUST_STRING, max_width, wi->bottom - wi->top - 40); // text is white, for now
+ str = _fund_gui.text[WP(w, fnd_d).index];
+ if (str != STR_NULL && str != STR_UNDEFINED) {
+ SetDParam(0, str);
+ DrawStringMultiLine(x_str, y_str, STR_JUST_STRING, max_width, wi->bottom - wi->top - 40);
}
} break;
case WE_CLICK:
switch (e->we.click.widget) {
case DYNA_INDU_MATRIX_WIDGET: {
- IndustryType type;
+ const IndustrySpec *indsp;
int y = (e->we.click.pt.y - w->widget[DYNA_INDU_MATRIX_WIDGET].top) / 13 + w->vscroll.pos ;
- if (y >= 0 && y < _industrydata.count) { //Isit within the boundaries of available data?
- _industrydata.select = y;
- type = _industrydata.index[_industrydata.select];
+ if (y >= 0 && y < _fund_gui.count) { // Is it within the boundaries of available data?
+ WP(w, fnd_d).index = y;
+ WP(w, fnd_d).select = _fund_gui.index[WP(w, fnd_d).index];
+ indsp = (WP(w, fnd_d).select == INVALID_INDUSTRYTYPE) ? NULL : GetIndustrySpec(WP(w, fnd_d).select);
SetWindowDirty(w);
- if ((_game_mode != GM_EDITOR && _patches.raw_industry_construction == 2 && GetIndustrySpec(type)->IsRawIndustry()) ||
- type == INVALID_INDUSTRYTYPE) {
+
+ if ((_game_mode != GM_EDITOR && _patches.raw_industry_construction == 2 && indsp != NULL && indsp->IsRawIndustry()) ||
+ WP(w, fnd_d).select == INVALID_INDUSTRYTYPE) {
/* Reset the button state if going to prospecting or "build many industries" */
RaiseWindowButtons(w);
ResetObjectToPlace();
@@ -243,11 +268,8 @@
} break;
case DYNA_INDU_FUND_WIDGET: {
- IndustryType type = _industrydata.index[_industrydata.select];
-
- if (type == INVALID_INDUSTRYTYPE) {
+ if (WP(w, fnd_d).select == INVALID_INDUSTRYTYPE) {
HandleButtonClick(w, DYNA_INDU_FUND_WIDGET);
- WP(w, def_d).data_1 = -1;
if (GetNumTowns() == 0) {
ShowErrorMessage(STR_0286_MUST_BUILD_TOWN_FIRST, STR_CAN_T_GENERATE_INDUSTRIES, 0, 0);
@@ -257,30 +279,30 @@
GenerateIndustries();
_generating_world = false;
}
- } else if (_game_mode != GM_EDITOR && _patches.raw_industry_construction == 2 && GetIndustrySpec(type)->IsRawIndustry()) {
- DoCommandP(0, type, 0, NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY));
+ } else if (_game_mode != GM_EDITOR && _patches.raw_industry_construction == 2 && GetIndustrySpec(WP(w, fnd_d).select)->IsRawIndustry()) {
+ DoCommandP(0, WP(w, fnd_d).select, 0, NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY));
HandleButtonClick(w, DYNA_INDU_FUND_WIDGET);
- WP(w, def_d).data_1 = -1;
- } else if (HandlePlacePushButton(w, DYNA_INDU_FUND_WIDGET, SPR_CURSOR_INDUSTRY, 1, NULL)) {
- WP(w, def_d).data_1 = _industrydata.select;
+ } else {
+ HandlePlacePushButton(w, DYNA_INDU_FUND_WIDGET, SPR_CURSOR_INDUSTRY, 1, NULL);
}
} break;
}
break;
case WE_RESIZE: {
+ /* Adjust the number of items in the matrix depending of the rezise */
w->vscroll.cap += e->we.sizing.diff.y / (int)w->resize.step_height;
w->widget[DYNA_INDU_MATRIX_WIDGET].data = (w->vscroll.cap << 8) + 1;
} break;
case WE_PLACE_OBJ: {
- IndustryType type = _industrydata.index[_industrydata.select];
+ /* We do not need to protect ourselves against "Random Many Industries" in this mode */
+ const IndustrySpec *indsp = GetIndustrySpec(WP(w, fnd_d).select);
- if (WP(w, def_d).data_1 == -1) break;
if (_game_mode == GM_EDITOR) {
/* Show error if no town exists at all */
if (GetNumTowns() == 0) {
- SetDParam(0, GetIndustrySpec(type)->name);
+ SetDParam(0, indsp->name);
ShowErrorMessage(STR_0286_MUST_BUILD_TOWN_FIRST, STR_0285_CAN_T_BUILD_HERE, e->we.place.pt.x, e->we.place.pt.y);
return;
}
@@ -288,28 +310,43 @@
_current_player = OWNER_NONE;
_generating_world = true;
_ignore_restrictions = true;
- if (!TryBuildIndustry(e->we.place.tile, type)) {
- SetDParam(0, GetIndustrySpec(type)->name);
+ if (!TryBuildIndustry(e->we.place.tile, WP(w, fnd_d).select)) {
+ SetDParam(0, indsp->name);
ShowErrorMessage(_error_message, STR_0285_CAN_T_BUILD_HERE, e->we.place.pt.x, e->we.place.pt.y);
- } else {
- ResetObjectToPlace();
}
+
_ignore_restrictions = false;
_generating_world = false;
- } else if (DoCommandP(e->we.place.tile, type, 0, NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY))) {
- ResetObjectToPlace();
- }
+ } else DoCommandP(e->we.place.tile, WP(w, fnd_d).select, 0, NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY));
+
+ /* Whatever the outcome of the actions, just reset the cursor and the system */
+ ResetObjectToPlace();
} break;
- case WE_ABORT_PLACE_OBJ:
- RaiseWindowButtons(w);
+ case WE_TICK:
+ if (!WP(w, fnd_d).timer_enabled) break;
+ if (--WP(w, fnd_d).callback_timer == 0) {
+ /* We have just passed another day.
+ * See if we need to update availability of currently selected industry */
+ WP(w, fnd_d).callback_timer = DAY_TICKS; //restart counter
+
+ const IndustrySpec *indsp = GetIndustrySpec(WP(w, fnd_d).select);
+
+ if (indsp->enabled) {
+ bool call_back_result = CheckIfCallBackAllowsAvailability(WP(w, fnd_d).select, IACT_USERCREATION);
+
+ /* Only if result does match the previous state would it require a redraw. */
+ if (call_back_result != _fund_gui.enabled[WP(w, fnd_d).index]) {
+ _fund_gui.enabled[WP(w, fnd_d).index] = call_back_result;
+ SetWindowDirty(w);
+ }
+ }
+ }
break;
case WE_TIMEOUT:
- if (WP(w, def_d).data_1 == -1) {
- RaiseWindowButtons(w);
- WP(w, def_d).data_1 = 0;
- }
+ case WE_ABORT_PLACE_OBJ:
+ RaiseWindowButtons(w);
break;
}
}
@@ -341,11 +378,13 @@
static void UpdateIndustryProduction(Industry *i);
-static inline bool isProductionMinimum(const Industry *i, int pt) {
+static inline bool isProductionMinimum(const Industry *i, int pt)
+{
return i->production_rate[pt] == 1;
}
-static inline bool isProductionMaximum(const Industry *i, int pt) {
+static inline bool isProductionMaximum(const Industry *i, int pt)
+{
return i->production_rate[pt] == 255;
}
@@ -356,12 +395,18 @@
(ind->accepts_cargo[0] == CT_INVALID || ind->accepts_cargo[0] == CT_VALUABLES));
}
+/** Information to store about the industry window */
+struct indview_d : public vp_d {
+ byte editbox_line; ///< The line clicked to open the edit box
+ byte clicked_line; ///< The line of the button that has been clicked
+ byte clicked_button; ///< The button that has been clicked (to raise)
+ byte production_offset_y; ///< The offset of the production texts/buttons
+};
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(indview_d));
+
+
static void IndustryViewWndProc(Window *w, WindowEvent *e)
{
- /* WP(w,vp2_d).data_1 is for the editbox line
- * WP(w,vp2_d).data_2 is for the clickline
- * WP(w,vp2_d).data_3 is for the click pos (left or right) */
-
switch (e->event) {
case WE_CREATE: {
/* Count the number of lines that we need to resize the GUI with */
@@ -435,6 +480,7 @@
if (ind->accepts_cargo[0] != CT_INVALID) y += 10;
DrawString(2, y, STR_482A_PRODUCTION_LAST_MONTH, 0);
y += 10;
+ WP(w, indview_d).production_offset_y = y;
}
SetDParam(0, ind->produced_cargo[j]);
@@ -444,7 +490,7 @@
DrawString(4 + (IsProductionAlterable(i) ? 30 : 0), y, STR_482B_TRANSPORTED, 0);
/* Let's put out those buttons.. */
if (IsProductionAlterable(i)) {
- DrawArrowButtons(5, y, 3, (WP(w, vp2_d).data_2 == j + 1) ? WP(w, vp2_d).data_3 : 0,
+ DrawArrowButtons(5, y, 3, (WP(w, indview_d).clicked_line == j + 1) ? WP(w, indview_d).clicked_button : 0,
!isProductionMinimum(i, j), !isProductionMaximum(i, j));
}
y += 10;
@@ -476,10 +522,9 @@
/* We should work if needed.. */
if (!IsProductionAlterable(i)) return;
-
x = e->we.click.pt.x;
- line = (e->we.click.pt.y - 121) / 10;
- if (e->we.click.pt.y >= 121 && IS_INT_INSIDE(line, 0, 2) &&
+ line = (e->we.click.pt.y - WP(w, indview_d).production_offset_y) / 10;
+ if (e->we.click.pt.y >= WP(w, indview_d).production_offset_y && IS_INT_INSIDE(line, 0, 2) &&
GetIndustrySpec(i->type)->produced_cargo[line] != CT_INVALID) {
if (IS_INT_INSIDE(x, 5, 25) ) {
/* Clicked buttons, decrease or increase production */
@@ -494,11 +539,11 @@
UpdateIndustryProduction(i);
SetWindowDirty(w);
w->flags4 |= 5 << WF_TIMEOUT_SHL;
- WP(w, vp2_d).data_2 = line + 1;
- WP(w, vp2_d).data_3 = (x < 15 ? 1 : 2);
+ WP(w, indview_d).clicked_line = line + 1;
+ WP(w, indview_d).clicked_button = (x < 15 ? 1 : 2);
} else if (IS_INT_INSIDE(x, 34, 160)) {
/* clicked the text */
- WP(w, vp2_d).data_1 = line;
+ WP(w, indview_d).editbox_line = line;
SetDParam(0, i->production_rate[line] * 8);
ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_CONFIG_GAME_PRODUCTION, 10, 100, w, CS_ALPHANUMERAL);
}
@@ -512,15 +557,15 @@
}
break;
case WE_TIMEOUT:
- WP(w, vp2_d).data_2 = 0;
- WP(w, vp2_d).data_3 = 0;
+ WP(w, indview_d).clicked_line = 0;
+ WP(w, indview_d).clicked_button = 0;
SetWindowDirty(w);
break;
case WE_ON_EDIT_TEXT:
if (e->we.edittext.str[0] != '\0') {
Industry* i = GetIndustry(w->window_number);
- int line = WP(w, vp2_d).data_1;
+ int line = WP(w, indview_d).editbox_line;
i->production_rate[line] = clampu(atoi(e->we.edittext.str), 0, 255);
UpdateIndustryProduction(i);
@@ -566,13 +611,21 @@
if (w != NULL) {
w->flags4 |= WF_DISABLE_VP_SCROLL;
- WP(w, vp2_d).data_1 = 0;
- WP(w, vp2_d).data_2 = 0;
- WP(w, vp2_d).data_3 = 0;
+ WP(w, indview_d).editbox_line = 0;
+ WP(w, indview_d).clicked_line = 0;
+ WP(w, indview_d).clicked_button = 0;
AssignWindowViewport(w, 3, 17, 0xFE, 0x56, GetIndustry(w->window_number)->xy + TileDiffXY(1, 1), ZOOM_LVL_INDUSTRY);
}
}
+enum {
+ DIRECTORY_INDU_SORTBYNAME = 3,
+ DIRECTORY_INDU_SORTBYTYPE,
+ DIRECTORY_INDU_SORTBYPROD,
+ DIRECTORY_INDU_SORTBYTRANSPORT,
+ DIRECTORY_INDU_SHOWINDU = 8,
+};
+
static const Widget _industry_directory_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 13, 11, 495, 0, 13, STR_INDUSTRYDIR_CAPTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
@@ -752,40 +805,40 @@
case WE_CLICK:
switch (e->we.click.widget) {
- case 3: {
- _industry_sort_order = _industry_sort_order == 0 ? 1 : 0;
- _industry_sort_dirty = true;
- SetWindowDirty(w);
- } break;
-
- case 4: {
- _industry_sort_order = _industry_sort_order == 2 ? 3 : 2;
- _industry_sort_dirty = true;
- SetWindowDirty(w);
- } break;
+ case DIRECTORY_INDU_SORTBYNAME: {
+ _industry_sort_order = _industry_sort_order == 0 ? 1 : 0;
+ _industry_sort_dirty = true;
+ SetWindowDirty(w);
+ } break;
- case 5: {
- _industry_sort_order = _industry_sort_order == 4 ? 5 : 4;
- _industry_sort_dirty = true;
- SetWindowDirty(w);
- } break;
+ case DIRECTORY_INDU_SORTBYTYPE: {
+ _industry_sort_order = _industry_sort_order == 2 ? 3 : 2;
+ _industry_sort_dirty = true;
+ SetWindowDirty(w);
+ } break;
- case 6: {
- _industry_sort_order = _industry_sort_order == 6 ? 7 : 6;
- _industry_sort_dirty = true;
- SetWindowDirty(w);
- } break;
+ case DIRECTORY_INDU_SORTBYPROD: {
+ _industry_sort_order = _industry_sort_order == 4 ? 5 : 4;
+ _industry_sort_dirty = true;
+ SetWindowDirty(w);
+ } break;
- case 8: {
- int y = (e->we.click.pt.y - 28) / 10;
- uint16 p;
+ case DIRECTORY_INDU_SORTBYTRANSPORT: {
+ _industry_sort_order = _industry_sort_order == 6 ? 7 : 6;
+ _industry_sort_dirty = true;
+ SetWindowDirty(w);
+ } break;
- if (!IS_INT_INSIDE(y, 0, w->vscroll.cap)) return;
- p = y + w->vscroll.pos;
- if (p < _num_industry_sort) {
- ScrollMainWindowToTile(_industry_sort[p]->xy);
- }
- } break;
+ case DIRECTORY_INDU_SHOWINDU: {
+ int y = (e->we.click.pt.y - 28) / 10;
+ uint16 p;
+
+ if (!IS_INT_INSIDE(y, 0, w->vscroll.cap)) return;
+ p = y + w->vscroll.pos;
+ if (p < _num_industry_sort) {
+ ScrollMainWindowToTile(_industry_sort[p]->xy);
+ }
+ } break;
}
break;
--- a/src/lang/american.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/american.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Show information on local authority
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} local authority
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transport company ratings:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidies
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subsidies on offer for services taking:
STR_2027_FROM_TO :{ORANGE}{STRING} from {STRING} to {STRING}
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Income Graph
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -3333,6 +3333,10 @@
STR_GROUP_ALL_ROADS :All road vehicles
STR_GROUP_ALL_SHIPS :All ships
STR_GROUP_ALL_AIRCRAFTS :All aircraft
+STR_GROUP_DEFAULT_TRAINS :Ungrouped trains
+STR_GROUP_DEFAULT_ROADS :Ungrouped road vehicles
+STR_GROUP_DEFAULT_SHIPS :Ungrouped ships
+STR_GROUP_DEFAULT_AIRCRAFTS :Ungrouped aircraft
STR_GROUP_TINY_NUM :{TINYFONT}{COMMA}
STR_GROUP_ADD_SHARED_VEHICLE :Add shared vehicles
STR_GROUP_REMOVE_ALL_VEHICLES :Remove all vehicles
--- a/src/lang/brazilian_portuguese.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/brazilian_portuguese.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1728,7 +1728,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Exibir informações sobre a autoridade local
STR_2022_LOCAL_AUTHORITY :{WHITE}autoridade local de {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Avaliações das empresas
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsídios
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ofertas de transporte subsidiados
STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} para {STRING}
@@ -2216,7 +2216,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Rendimentos
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/bulgarian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/bulgarian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1721,7 +1721,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Показване на информация за местните власти
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} местни власти
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Рейтинги на транспортни компании:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Субсидии
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Субсидии за превоз на:
STR_2027_FROM_TO :{ORANGE}{STRING} от {STRING} до {STRING}
@@ -2207,7 +2207,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Всичко:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Графика на приходите
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/catalan.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/catalan.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Mostra informació de l'autoritat local
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} autoritat local
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ratis de l'Empresa de Transports:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subvencions
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subvencions per prestació de serveis oferts:
STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} a {STRING}
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gràfic d'Ingressos
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/croatian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/croatian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -2,6 +2,7 @@
##ownname Hrvatski
##isocode hr_HR
##plural 6
+##case nom gen dat aku vok lok ins
##gender male female middle
#
@@ -22,50 +23,92 @@
STR_000C_ACCEPTS :{BLACK}Prihvaća: {WHITE}
STR_000D_ACCEPTS :{BLACK}Prihvaća: {GOLD}
STR_000E :
-STR_000F_PASSENGERS :Putnici
-STR_0010_COAL :Ugljen
-STR_0011_MAIL :Pošta
-STR_0012_OIL :Nafta
-STR_0013_LIVESTOCK :Domaće životinje
-STR_0014_GOODS :Robe
-STR_0015_GRAIN :Žito
-STR_0016_WOOD :Drvo
-STR_0017_IRON_ORE :Željezo
-STR_0018_STEEL :Čelik
-STR_0019_VALUABLES :Dragocjenosti
-STR_001A_COPPER_ORE :Bakar
-STR_001B_MAIZE :Kukuruz
-STR_001C_FRUIT :Voće
-STR_001D_DIAMONDS :Dijamanti
-STR_001E_FOOD :Hrana
-STR_001F_PAPER :Papir
-STR_0020_GOLD :Zlato
-STR_0021_WATER :Voda
-STR_0022_WHEAT :Pšenica
-STR_0023_RUBBER :Guma
-STR_0024_SUGAR :Šećer
-STR_0025_TOYS :Igračke
-STR_0026_CANDY :Slatkiši
-STR_0027_COLA :Cola
-STR_0028_COTTON_CANDY :Šećerna vuna
-STR_0029_BUBBLES :Baloni
-STR_002A_TOFFEE :Mliječne karamele
-STR_002B_BATTERIES :Baterije
-STR_002C_PLASTIC :Plastika
-STR_002D_FIZZY_DRINKS :Gazirana pića
+STR_000F_PASSENGERS :putnici
+STR_0010_COAL :ugljen
+STR_0010_COAL.gen :ugljena
+STR_0011_MAIL :pošta
+STR_0011_MAIL.gen :pošte
+STR_0012_OIL :nafta
+STR_0012_OIL.gen :nafte
+STR_0013_LIVESTOCK :domaće životinje
+STR_0013_LIVESTOCK.gen :domaćih životinja
+STR_0014_GOODS :robe
+STR_0014_GOODS.gen :roba
+STR_0015_GRAIN :žito
+STR_0015_GRAIN.gen :žita
+STR_0016_WOOD :drvo
+STR_0016_WOOD.gen :drva
+STR_0017_IRON_ORE :željezo
+STR_0017_IRON_ORE.gen :željeza
+STR_0018_STEEL :čelik
+STR_0018_STEEL.gen :čelika
+STR_0019_VALUABLES :dragocjenosti
+STR_0019_VALUABLES.gen :dragocjenosti
+STR_001A_COPPER_ORE :bakar
+STR_001A_COPPER_ORE.gen :bakra
+STR_001B_MAIZE :kukuruz
+STR_001B_MAIZE.gen :kukuruza
+STR_001C_FRUIT :voće
+STR_001C_FRUIT.gen :voća
+STR_001D_DIAMONDS :dijamanti
+STR_001D_DIAMONDS.gen :dijamanata
+STR_001E_FOOD :hrana
+STR_001E_FOOD.gen :hrane
+STR_001F_PAPER :papir
+STR_001F_PAPER.gen :papira
+STR_0020_GOLD :zlato
+STR_0020_GOLD.gen :zlata
+STR_0021_WATER :voda
+STR_0021_WATER.gen :vode
+STR_0022_WHEAT :pšenica
+STR_0022_WHEAT.gen :pšenice
+STR_0023_RUBBER :guma
+STR_0023_RUBBER.gen :gume
+STR_0024_SUGAR :šećer
+STR_0024_SUGAR.gen :šećera
+STR_0025_TOYS :igrače
+STR_0025_TOYS.gen :igračaka
+STR_0026_CANDY :slatkiši
+STR_0026_CANDY.gen :slatkiša
+STR_0027_COLA :cola
+STR_0027_COLA.gen :cole
+STR_0028_COTTON_CANDY :šećerna vuna
+STR_0028_COTTON_CANDY.gen :šećerne vune
+STR_0029_BUBBLES :baloni
+STR_0029_BUBBLES.gen :balona
+STR_002A_TOFFEE :mliječne karamele
+STR_002A_TOFFEE.gen :mliječnih karamela
+STR_002B_BATTERIES :baterije
+STR_002B_BATTERIES.gen :baterija
+STR_002C_PLASTIC :plastika
+STR_002C_PLASTIC.gen :plastike
+STR_002D_FIZZY_DRINKS :gazirana pića
+STR_002D_FIZZY_DRINKS.gen :gaziranih pića
STR_002E :
-STR_002F_PASSENGER :Putnik
-STR_0030_COAL :Ugljen
-STR_0031_MAIL :Pošta
-STR_0032_OIL :Nafta
-STR_0033_LIVESTOCK :Domaće životinje
-STR_0034_GOODS :Robe
-STR_0035_GRAIN :Žito
-STR_0036_WOOD :Drvo
-STR_0037_IRON_ORE :Željezo
-STR_0038_STEEL :Čelik
-STR_0039_VALUABLES :Dragocjenosti
-STR_003A_COPPER_ORE :Bakar
+STR_002F_PASSENGER :putnik
+STR_002F_PASSENGER.gen :putnika
+STR_0030_COAL :ugljen
+STR_0030_COAL.gen :ugljena
+STR_0031_MAIL :pošta
+STR_0031_MAIL.gen :pošte
+STR_0032_OIL :nafta
+STR_0032_OIL.gen :nafte
+STR_0033_LIVESTOCK :domaće životinje
+STR_0033_LIVESTOCK.gen :domaćih životinja
+STR_0034_GOODS :robe
+STR_0034_GOODS.gen :roba
+STR_0035_GRAIN :žito
+STR_0035_GRAIN.gen :žita
+STR_0036_WOOD :drvo
+STR_0036_WOOD.gen :drva
+STR_0037_IRON_ORE :željezo
+STR_0037_IRON_ORE.gen :željeza
+STR_0038_STEEL :čelik
+STR_0038_STEEL.gen :čelika
+STR_0039_VALUABLES :dragocjenosti
+STR_0039_VALUABLES.gen :dragocjenosti
+STR_003A_COPPER_ORE :bakar
+STR_003A_COPPER_ORE.gen :bakra
STR_003B_MAIZE :Kukuruz
STR_003C_FRUIT :Voće
STR_003D_DIAMOND :Dijamant
@@ -154,7 +197,7 @@
STR_00AE :{WHITE}{DATE_SHORT}
STR_00AF :{WHITE}{DATE_LONG}
STR_00B0_MAP :{WHITE}Karta - {STRING}
-STR_00B1_GAME_OPTIONS :{WHITE}Opcije za igru
+STR_00B1_GAME_OPTIONS :{WHITE}Postavke igre
STR_00B2_MESSAGE :{YELLOW}Poruka
STR_00B3_MESSAGE_FROM :{YELLOW}Poruka od {STRING}
STR_POPUP_CAUTION_CAPTION :{WHITE}Oprez!
@@ -222,7 +265,7 @@
STR_00FB_POWER_STATION :{BLACK}{TINYFONT}Elektrana
STR_00FC_FOREST :{BLACK}{TINYFONT}Šuma
STR_00FD_SAWMILL :{BLACK}{TINYFONT}Pilana
-STR_00FE_OIL_REFINERY :{BLACK}{TINYFONT}Naftna rafinerija
+STR_00FE_OIL_REFINERY :{BLACK}{TINYFONT}Rafinerija nafte
STR_00FF_FARM :{BLACK}{TINYFONT}Farma
STR_0100_FACTORY :{BLACK}{TINYFONT}Tvornica
STR_0101_PRINTING_WORKS :{BLACK}{TINYFONT}Tiskara
@@ -349,7 +392,7 @@
STR_UNITS_FORCE_SI :{COMMA} kN
############ range for menu starts
-STR_0154_OPERATING_PROFIT_GRAPH :Graf dobiti od poslovanja
+STR_0154_OPERATING_PROFIT_GRAPH :Grafikon operativne dobiti
STR_0155_INCOME_GRAPH :Graf prihoda
STR_0156_DELIVERED_CARGO_GRAPH :Graf isporučenog tereta
STR_0157_PERFORMANCE_HISTORY_GRAPH :Graf povijesti učinka
@@ -364,7 +407,7 @@
STR_015D_LOAD_GAME :Učitaj igru
STR_015E_QUIT_GAME :Napusti igru
STR_015F_QUIT :Izlaz
-STR_ABANDON_GAME_QUERY :{YELLOW}Jeste li sigurni da želite napustiti ovu igru?
+STR_ABANDON_GAME_QUERY :{YELLOW}Jesi li siguran da želiš napustiti ovu igru?
STR_0161_QUIT_GAME :{WHITE}Napusti igru
STR_SORT_ORDER_TIP :{BLACK}Izaberi način sortiranja (silazno/uzlazno)
STR_SORT_CRITERIA_TIP :{BLACK}Izaberi kriterij za sortiranje
@@ -378,8 +421,8 @@
STR_SORT_BY_DROPDOWN_NAME :Ime
STR_SORT_BY_DATE :{BLACK}Datum
STR_SORT_BY_NUMBER :Broj
-STR_SORT_BY_PROFIT_LAST_YEAR :Zarada prošle godine
-STR_SORT_BY_PROFIT_THIS_YEAR :Zarada ove godine
+STR_SORT_BY_PROFIT_LAST_YEAR :Dobit prošle godine
+STR_SORT_BY_PROFIT_THIS_YEAR :Dobit ove godine
STR_SORT_BY_AGE :Godine
STR_SORT_BY_RELIABILITY :Pouzdanost
STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE :Totalna nosivost po vrsti tereta
@@ -474,7 +517,7 @@
STR_0195_SHOW_VEGETATION_ON_MAP :{BLACK}Prikaži vegetaciju na karti
STR_0196_SHOW_LAND_OWNERS_ON_MAP :{BLACK}Prikaži vlasnike zemlje na karti
STR_0197_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Prikaži/sakrij imena grada na karti
-STR_0198_PROFIT_THIS_YEAR_LAST_YEAR :{TINYFONT}{BLACK}Ovogodišnja zarada: {CURRENCY} (prošlogodišnja: {CURRENCY})
+STR_0198_PROFIT_THIS_YEAR_LAST_YEAR :{TINYFONT}{BLACK}Ovogodišnja dobit: {CURRENCY} (prošlogodišnja: {CURRENCY})
############ range for service numbers starts
STR_AGE :{COMMA} godin{P a e a} ({COMMA})
@@ -633,7 +676,7 @@
STR_RESET_LANDSCAPE_CONFIRMATION_TEXT :{WHITE}Jeste li sigurni da želite obrisati sve u vlasništvu igrača?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Stvaranje krajolika
STR_022F_TOWN_GENERATION :{BLACK}Stvaranje gradova
-STR_0230_INDUSTRY_GENERATION :{BLACK}Stvaranje industrija
+STR_0230_INDUSTRY_GENERATION :{BLACK}Stvaranje industrije
STR_0231_ROAD_CONSTRUCTION :{BLACK}Izgradnja ceste
STR_0233_TOWN_GENERATION :{WHITE}Stvaranje gradova
STR_0234_NEW_TOWN :{BLACK}Novi grad
@@ -688,7 +731,7 @@
STR_0263_CONSTRUCT_POWER_STATION :{BLACK}Izgradi elektranu
STR_0264_CONSTRUCT_SAWMILL :{BLACK}Izgradi pilanu
STR_0265_PLANT_FOREST :{BLACK}Posadi šumu
-STR_0266_CONSTRUCT_OIL_REFINERY :{BLACK}Izgradi naftnu rafineriju
+STR_0266_CONSTRUCT_OIL_REFINERY :{BLACK}Izgradi rafineriju nafte
STR_0267_CONSTRUCT_OIL_RIG_CAN_ONLY :{BLACK}Izgradi naftnu bušotinu (može biti sagrađena samo blizu rubova karte)
STR_0268_CONSTRUCT_FACTORY :{BLACK}Izgradi tvornicu
STR_0269_CONSTRUCT_STEEL_MILL :{BLACK}Izgradi čeličanu
@@ -767,24 +810,24 @@
STR_02BB_TOWN_DIRECTORY :Popis gradova
STR_02BC_VEHICLE_DESIGN_NAMES :{BLACK}Imena dizajna vozila
STR_02BD :{BLACK}{STRING}
-STR_02BE_DEFAULT :Pretpostavljeno
-STR_02BF_CUSTOM :Prilagođeno
-STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Spremi prilagođena imena
+STR_02BE_DEFAULT :Zadano
+STR_02BF_CUSTOM :Proizvoljno
+STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Spremi proizvoljna imena
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Odabir imena dizajna vozila
-STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Spremi prilagođena imena dizajna vozila
+STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Spremi proizvoljna imena dizajna vozila
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Opcije igre
+STR_02C3_GAME_OPTIONS :Postavke igre
STR_02C5_DIFFICULTY_SETTINGS :Postavke težine
STR_02C7_CONFIG_PATCHES :Konfiguriraj zakrpe
STR_NEWGRF_SETTINGS :Postavke NewGRF-a
STR_TRANSPARENCY_OPTIONS :Opcije prozirnosti
STR_GAMEOPTMENU_0A :
-STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Prikazana imena gradova
-STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Prikazana imena stanica
-STR_02CE_SIGNS_DISPLAYED :{SETX 12}Prikazani znakovi
-STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Prikazana čvorišta
+STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Prikaži imena gradova
+STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Prikaži imena stanica
+STR_02CE_SIGNS_DISPLAYED :{SETX 12}Prikaži znakove
+STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Prikaži čvorišta
STR_02D0_FULL_ANIMATION :{SETX 12}Sve animacije
STR_02D2_FULL_DETAIL :{SETX 12}Svi detalji
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Prozirne građevine
@@ -818,9 +861,9 @@
STR_02E0_CURRENCY_UNITS :{BLACK}Novčane jedinice
STR_02E1 :{BLACK}{SKIP}{STRING}
STR_02E2_CURRENCY_UNITS_SELECTION :{BLACK}Odabir novčanih jedinica
-STR_MEASURING_UNITS :{BLACK}Mjerne jedinice
+STR_MEASURING_UNITS :{BLACK}Mjerni sustav
STR_02E4 :{BLACK}{SKIP}{SKIP}{STRING}
-STR_MEASURING_UNITS_SELECTION :{BLACK}Odabir mjernih jedinica
+STR_MEASURING_UNITS_SELECTION :{BLACK}Odabir mjernog sustava
STR_02E6_ROAD_VEHICLES :{BLACK}Cestovna vozila
STR_02E7 :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
STR_02E8_SELECT_SIDE_OF_ROAD_FOR :{BLACK}Izaberi na kojoj će strani ceste vozila prometovati
@@ -839,12 +882,12 @@
STR_02FA_EVERY_12_MONTHS :Svakih 12 mjeseci
STR_02FB_START_A_NEW_GAME :{BLACK}Započni novu igru
STR_02FC_LOAD_A_SAVED_GAME :{BLACK}Učitaj spremljenu igru
-STR_02FE_CREATE_A_CUSTOMIZED_GAME :{BLACK}Izradi prilagođeni igrački svijet/scenarij
+STR_02FE_CREATE_A_CUSTOMIZED_GAME :{BLACK}Izradi proizvoljni igrački svijet/scenarij
STR_02FF_SELECT_SINGLE_PLAYER_GAME :{BLACK}Odaberi igru za jednog igrača
STR_0300_SELECT_MULTIPLAYER_GAME :{BLACK}Odaberi igru za 2-8 igrača
-STR_0301_DISPLAY_GAME_OPTIONS :{BLACK}Prikaži opcije igre
+STR_0301_DISPLAY_GAME_OPTIONS :{BLACK}Prikaži postavke igre
STR_0302_DISPLAY_DIFFICULTY_OPTIONS :{BLACK}Prikaži opcije težine
-STR_0303_START_A_NEW_GAME_USING :{BLACK}Započni novu igru koristeći prilagođeni scenarij
+STR_0303_START_A_NEW_GAME_USING :{BLACK}Započni novu igru koristeći proizvoljni scenarij
STR_0304_QUIT :{BLACK}Završi
STR_0305_QUIT_OPENTTD :{BLACK}Završi 'OpenTTD'
STR_0307_OPENTTD :{WHITE}OpenTTD {REV}
@@ -856,8 +899,8 @@
STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Financiraj izgradnju nove industrije
############ range for menu starts
-STR_INDUSTRY_DIR :Lista gospodarstava
-STR_0313_FUND_NEW_INDUSTRY :Financiraj novo gospodarstvo
+STR_INDUSTRY_DIR :Lista industrija
+STR_0313_FUND_NEW_INDUSTRY :Financiraj novu industriju
############ range ends here
STR_0314_FUND_NEW_INDUSTRY :{WHITE}Financiraj novu industriju
@@ -872,7 +915,7 @@
STR_0329_PURCHASE_LAND_FOR_FUTURE :{BLACK}Kupi zemlju za buduću uporabu
STR_032F_AUTOSAVE :{RED}AUTOMATSKO SPREMANJE
-STR_SAVING_GAME :{RED}* * SAVING GAME * *
+STR_SAVING_GAME :{RED}* * SPREMAM IGRU * *
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Spremanje još u tijeku,{}molimo pričekajte dok se ne završi!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Izaberi glazbeni program 'Ezy Street style'
@@ -985,7 +1028,7 @@
STR_END_OF_SHARED_ORDERS :{SETX 10}- - Kraj dijeljenih naredbi - -
STR_TRAIN_IS_LOST :{WHITE}Vlak {COMMA} se izgubio.
-STR_TRAIN_IS_UNPROFITABLE :{WHITE}Prošlogodišnja zarada vlaka {COMMA} bila je {CURRENCY}
+STR_TRAIN_IS_UNPROFITABLE :{WHITE}Prošlogodišnja dobit vlaka {COMMA} bila je {CURRENCY}
STR_EURO_INTRODUCE :{BLACK}{BIGFONT}Europska Monetarna Unija!{}{}Euro je predstavljen kao jedinstvena valuta za svakodnevnu uporabu u tvojoj zemlji!
# Start of order review system.
@@ -1035,10 +1078,10 @@
STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Dostavi teret u stanicu samo ako u njoj postoji potražnja: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LONGBRIDGES :{LTBLUE}Dopusti izgradnju vrlo dugačkih mostova: {ORANGE}{STRING}
STR_CONFIG_PATCHES_GOTODEPOT :{LTBLUE}Dopusti naredbe za slanje u spremište: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD :{LTBLUE}Ručna metoda izgradnje za primarnu industriju: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD :{LTBLUE}Ručna metoda izgradnje primarne industrije: {ORANGE}{STRING}
STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :ništa
STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :kao i druge industrije
-STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospektivno
+STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prosperirajuće
STR_CONFIG_PATCHES_MULTIPINDTOWN :{LTBLUE}Dopusti više sličnih industrija po gradu: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SAMEINDCLOSE :{LTBLUE}Moguće je graditi spojene industrije iste vrste: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LONGDATE :{LTBLUE}Uvijek prikaži dugi datum u statusnoj traci: {ORANGE}{STRING}
@@ -1105,14 +1148,14 @@
STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLL :Skrolaj kartom
STR_CONFIG_PATCHES_SCROLLWHEEL_OFF :Isključeno
STR_CONFIG_PATCHES_SCROLLWHEEL_MULTIPLIER :{LTBLUE}Brzina kotačića za skrolanje: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PAUSE_ON_NEW_GAME :{LTBLUE}Automatski pauziraj kad pokrećeš novu igru: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_PAUSE_ON_NEW_GAME :{LTBLUE}Automatski pauziraj prilikom pokretanja nove igre: {ORANGE}{STRING}
STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS :{LTBLUE}Koristi naprednu listu vozila: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LOADING_INDICATORS :{LTBLUE}Koristi indikatore utovara: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TIMETABLE_ALLOW :{LTBLUE}Uključi raspored za vozila: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS :{LTBLUE}Pokaži raspored u otkucajima radije nego u danima: {ORANGE}{STRING}
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE :{LTBLUE}Zadana vrsta tračnica (poslije nove igre/podizanja igre): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL :Normalne Tračnice
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL :Elektrificirane Tračnice
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL :Normalne tračnice
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL :Elektrificirane tračnice
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL :Monopruga
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MAGLEV :Maglev
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST :Prvi dostupan
@@ -1156,7 +1199,7 @@
STR_CONFIG_PATCHES_TOWN_LAYOUT_INVALID :{WHITE}Izgled grada "bezviše cesta" nije valjan u editoru scenarija
STR_CONFIG_PATCHES_TOWN_LAYOUT :{LTBLUE}Odaberi grad-cesta raspored: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TOWN_LAYOUT_NO_ROADS :nema više cesta
-STR_CONFIG_PATCHES_TOWN_LAYOUT_DEFAULT :inicijalno
+STR_CONFIG_PATCHES_TOWN_LAYOUT_DEFAULT :zadano
STR_CONFIG_PATCHES_TOWN_LAYOUT_BETTER_ROADS :bolje ceste
STR_CONFIG_PATCHES_TOWN_LAYOUT_2X2_GRID :2x2 mreža
STR_CONFIG_PATCHES_TOWN_LAYOUT_3X3_GRID :3x3 mreža
@@ -1165,7 +1208,7 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT :Lijevo
STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER :Sredina
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Desno
-STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Radijus hvazanja prozora: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Radijus hvatanja prozora: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Radijus hvatanja prozora: {ORANGE}isključen
STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Brzina rasta gradova: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Ništa
@@ -1221,6 +1264,8 @@
STR_WAYPOINTNAME_CITY : Čvorište{TOWN}
STR_WAYPOINTNAME_CITY_SERIAL :Čvorište {TOWN} #{COMMA}
STR_LANDINFO_WAYPOINT :Čvorište
+STR_LANDINFO_WAYPOINT.gen :čvorišta
+STR_LANDINFO_WAYPOINT.dat :čvorištu
STR_WAYPOINT :{WHITE}Čvorište
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Odaberi vrstu čvorišta
@@ -1228,12 +1273,12 @@
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
-STR_EDIT_WAYPOINT_NAME :{WHITE}Promjeni ime čvorišta
+STR_EDIT_WAYPOINT_NAME :{WHITE}Promijeni ime čvorišta
-STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Ne možeš promijeniti ime smjerokaza...
+STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Ne možeš promijeniti ime čvorišta...
STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Promijeni tračnicu u čvorište
-STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Ne možeš izgraditi željeznički smjerokaz ovdje...
-STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Ne možeš ukloniti željeznički smjerokaz odavdje...
+STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Ne možeš izgraditi željezničko čvorište ovdje...
+STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Ne možeš ukloniti željezničko čvorište odavdje...
STR_BUILD_AUTORAIL_TIP :{BLACK}Izgradi željezničku tračnicu koristeći Autorail modus
@@ -1303,12 +1348,12 @@
STR_CONSTRUCT_TOFFEE_QUARRY_TIP :{BLACK}Financiraj kamenolom mliječne karamele
STR_CONSTRUCT_SUGAR_MINE_TIP :{BLACK}Izgradi šećeranu
-STR_INDUSTRYDIR_CAPTION :{WHITE}Gospodarstva
+STR_INDUSTRYDIR_CAPTION :{WHITE}Industrije
STR_INDUSTRYDIR_ITEM :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% prevezeno)
STR_INDUSTRYDIR_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% prevezeno)
STR_INDUSTRYDIR_ITEM_NOPROD :{ORANGE}{INDUSTRY}
-STR_INDUSTRY_TOO_CLOSE :{WHITE}...preblizu drugom gospodarstvu
+STR_INDUSTRY_TOO_CLOSE :{WHITE}...preblizu drugoj industriji
STR_RAIL_REFIT_VEHICLE_TO_CARRY :{BLACK}Prepravi vlak kako bi nosio drugu vrstu tereta
STR_RAIL_REFIT_VEHICLE :{BLACK}Prepravi vlak
@@ -1404,7 +1449,7 @@
STR_NETWORK_LANGUAGE_TIP :{BLACK}Drugi igrači znati će kojim se jezikom govori na poslužitelju
STR_NETWORK_COMBO5 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
STR_NETWORK_START_GAME :{BLACK}Započni igru
-STR_NETWORK_START_GAME_TIP :{BLACK}Započni novu igru u mreži na nasumičnoj mapi ili iz scenarija
+STR_NETWORK_START_GAME_TIP :{BLACK}Započni novu igru u mreži na nasumičnoj mapi ili iz nasumičnog scenarija
STR_NETWORK_LOAD_GAME :{BLACK}Učitaj igru
STR_NETWORK_LOAD_GAME_TIP :{BLACK}Nastavi snimljenu igru za više igrača (pazite da se spojite pod svojim imenom)
@@ -1440,7 +1485,7 @@
STR_NETWORK_LANG_UKRAINIAN :Ukrajinski
############ End of leave-in-this-order
-STR_NETWORK_GAME_LOBBY :{WHITE}Predvorje multiplayer igre
+STR_NETWORK_GAME_LOBBY :{WHITE}Predvorje igre za više igrača
STR_NETWORK_PREPARE_TO_JOIN :{BLACK}Pripremanje za pridruživanje: {ORANGE}{STRING}
STR_NETWORK_COMPANY_LIST_TIP :{BLACK}Popis svih kompanija trenutno u igri. Možete se pridružiti jednoj ili osnovati novu ako postoji slobodno mjesto
@@ -1495,7 +1540,7 @@
STR_NETWORK_ERR_NEWGRF_MISMATCH :{WHITE} Ne mogu se spojiti zbog neslaganja u NewGRF
STR_NETWORK_ERR_DESYNC :{WHITE} Neuspješno usklađivanje mrežne igre
STR_NETWORK_ERR_LOSTCONNECTION :{WHITE} Izgubljena veza sa mrežnom igrom
-STR_NETWORK_ERR_SAVEGAMEERROR :{WHITE} Nemoguće je učitati snimljenu igru
+STR_NETWORK_ERR_SAVEGAMEERROR :{WHITE} Nije moguće učitati snimljenu igru
STR_NETWORK_ERR_SERVER_START :{WHITE} Nemoguće je pokrenuti poslužitelja
STR_NETWORK_ERR_CLIENT_START :{WHITE} Nije se moguće spojiti
STR_NETWORK_ERR_TIMEOUT :{WHITE} Istekla je veza #{NUM}
@@ -1727,7 +1772,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Prikaži informacije o lokalnoj samoupravi
STR_2022_LOCAL_AUTHORITY :{WHITE}Lokalna samouprava {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ocjene prijevoznih tvrtki:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subvencije
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ponuđene subvencije za pružanje usluga:
STR_2027_FROM_TO :{ORANGE}{STRING} od {STRING} do {STRING}
@@ -1739,10 +1784,10 @@
STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Istekla je ponuda subvencije:{}{}Prijevoz tereta ( {STRING} ) od {STRING} do {STRING} neće više biti subvencioniran.
STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Povučena subvencija:{}{}Prijevoz tereta ( {STRING} ) od {STATION} do {STATION} nije više subvencioniran.
STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Ponuđena je subvencija:{}{}Prvi koji preveze teret ({STRING}) od {STRING} do {STRING} dobivat će subvenciju od lokalne samouprave!
-STR_2031_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Subvencija je dodjeljena tvrtki {COMPANY}!{}{}Prijevoz tereta ({STRING}) od {STATION} do {STATION} plaćat će se 50% više slijedećih godinu dana!
-STR_2032_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Subvencija je dodjeljena tvrtki {COMPANY}!{}{}Prijevoz tereta ({STRING}) od {STATION} do {STATION} plaćat će se dvostruko slijedećih godinu dana!
-STR_2033_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Subvencija je dodjeljena tvrtki {COMPANY}!{}{}Prijevoz tereta ({STRING}) od {STATION} do {STATION} plaćat će se trostruko slijedećih godinu dana!
-STR_2034_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Subvencija je dodjeljena tvrtki {COMPANY}!{}{}Prijevoz tereta ({STRING}) od {STATION} do {STATION} plaćat će se četverostruko slijedećih godinu dana!
+STR_2031_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Subvencija je dodjeljena tvrtki {COMPANY}!{}{}Prijevoz tereta ({STRING}) od {STATION} do {STATION} plaćat će se 50% više sljedećih godinu dana!
+STR_2032_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Subvencija je dodjeljena tvrtki {COMPANY}!{}{}Prijevoz tereta ({STRING}) od {STATION} do {STATION} plaćat će se dvostruko sljedećih godinu dana!
+STR_2033_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Subvencija je dodjeljena tvrtki {COMPANY}!{}{}Prijevoz tereta ({STRING}) od {STATION} do {STATION} plaćat će se trostruko sljedećih godinu dana!
+STR_2034_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Subvencija je dodjeljena tvrtki {COMPANY}!{}{}Prijevoz tereta ({STRING}) od {STATION} do {STATION} plaćat će se četverostruko sljedećih godinu dana!
STR_2035_LOCAL_AUTHORITY_REFUSES :{WHITE}{TOWN} lokalne vlasti odbijaju dozvoliti izgradnju još jedne zračne luke u ovom gradu
STR_2036_COTTAGES :Kolibe
STR_2037_HOUSES :Kuće
@@ -1774,8 +1819,8 @@
STR_2050_FUND_THE_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW} Financiraj popravak gradske mreže prometnica. Uzrokuje značajne poremećaje u cestovnom prometu do 6 mjeseci.{} Trošak: {CURRENCY}
STR_2051_BUILD_A_STATUE_IN_HONOR :{WHITE}{STRING}{}{YELLOW} Izgradi kip u čast svoje tvrke.{} Trošak: {CURRENCY}
STR_2052_FUND_THE_CONSTRUCTION_OF :{WHITE}{STRING}{}{YELLOW} Financiraj izgradnju novih poslovnih prostora u gradu.{} Trošak: {CURRENCY}
-STR_2053_BUY_1_YEAR_S_EXCLUSIVE :{WHITE}{STRING}{}{YELLOW} Kupi jednogodišnje ekskluzivno pravo prijevoza u gradu. Gradska vlast će dopustiti putnicima i teretu da koriste samo stanice tvoje tvrtke.{} Trošak: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC :{WHITE}{STRING}{}{YELLOW}Podmiti lokalnu vlast zbog povećanja rejtinga, riskirajući ozbiljne kazne ako vas uhvate{} Trošak: {CURRENCY}
+STR_2053_BUY_1_YEAR_S_EXCLUSIVE :{WHITE}{STRING}{}{YELLOW} Kupi jednogodišnje ekskluzivno pravo prijevoza u gradu. Gradska vlast će dopustiti putnicima i teretu da koriste stanice samo tvoje tvrtke.{} Trošak: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC :{WHITE}{STRING}{}{YELLOW} Podmiti lokalnu vlast zbog povećanja rejtinga, riskirajući ozbiljne kazne ako vas uhvate{} Trošak: {CURRENCY}
STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING :{BIGFONT}{BLACK}{TOWN} zahvatile prometne gužve!{}{}Program popravka cesta koji financira tvrtka {COMPANY} slijedećih će 6 mjeseci zadavati glavobolje motociskistima!
STR_2056 :{TINYFONT}{WHITE}{TOWN}
STR_2057 :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -1922,16 +1967,16 @@
STR_4009_GAME_LOAD_FAILED :{WHITE}Učitavanje igre nije uspjelo{}{STRING}
STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR :Interna greška: {STRING}
STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME :Pokvarena spremljena igra - {STRING}
-STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Igra je spremljena sa novijom verzijom
-STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Ne mogu pročitati datoteku
+STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Spremljena igra je stvorena s novijom verzijom
+STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Datoteka nije čitljiva
STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Ne mogu pisati u datoteku
STR_400A_LIST_OF_DRIVES_DIRECTORIES :{BLACK}Popis diskova, mapa i spremljenih datoteka
STR_400B_CURRENTLY_SELECTED_NAME :{BLACK}Trenutno odabrano ime za spremanje igre
STR_400C_DELETE_THE_CURRENTLY_SELECTED :{BLACK}Obriši trenutno odabranu spremljenu igru
-STR_400D_SAVE_THE_CURRENT_GAME_USING :{BLACK}Spremi ovu igru, koristeći odabrano ime
+STR_400D_SAVE_THE_CURRENT_GAME_USING :{BLACK}Spremi trenutnu igru koristeći odabrano ime
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Odaberi vrstu nove igre
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Odaberi scenarij (zeleno), namještenu igru (plavo), ili nasumičnu novu igru
-STR_4010_GENERATE_RANDOM_NEW_GAME :Izradi nasumičnu novu igru
+STR_4010_GENERATE_RANDOM_NEW_GAME :Stvori nasumičnu novu igru
STR_4011_LOAD_HEIGHTMAP :{WHITE}Učitaj visinsku kartu
##id 0x4800
@@ -1994,7 +2039,7 @@
STR_482D_NEW_UNDER_CONSTRUCTION :{BLACK}{BIGFONT}Započela je izgradnja nove industrije ( {STRING} ) u blizini grada {TOWN}!
STR_482E_NEW_BEING_PLANTED_NEAR :{BLACK}{BIGFONT}Nova {STRING} trenutno se sadi blizu grada {TOWN}!
STR_482F_COST :{BLACK}Trošak: {YELLOW}{CURRENCY}
-STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY :{WHITE}Ovdje ne možeš izgraditi ovu vrstu industrije ovdje...
+STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY :{WHITE}Ovdje nije moguće izgraditi ovu vrstu industrije...
STR_4831_FOREST_CAN_ONLY_BE_PLANTED :{WHITE}...šume mogu jedino biti posađene iznad linije snijega
STR_4832_ANNOUNCES_IMMINENT_CLOSURE :{BLACK}{BIGFONT}{INDUSTRY} objavljuje skoro zatvaranje!
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO :{BLACK}{BIGFONT}Zbog problema u nabavi {INDUSTRY} se uskoro zatvara!
@@ -2006,8 +2051,8 @@
STR_4839_PRODUCTION_DOWN_BY_50 :{BLACK}{BIGFONT}{INDUSTRY} smanjuje proizvodnju za 50%
STR_483A_INSECT_INFESTATION_CAUSES :{BLACK}{BIGFONT}{INDUSTRY} pod najezdom kukaca! Havarija!{}Proizvodnja je pala za 50%
STR_483B_CAN_ONLY_BE_POSITIONED :{WHITE}...može se postaviti samo blizu rubova karte
-STR_INDUSTRY_PROD_GOUP :{BLACK}{BIGFONT}{STRING} prozivodnja u {INDUSTRY} povećana je {COMMA}%!
-STR_INDUSTRY_PROD_GODOWN :{BLACK}{BIGFONT}{STRING} prozivodnja u {INDUSTRY} smanjena je {COMMA}%!
+STR_INDUSTRY_PROD_GOUP :{BLACK}{BIGFONT}Proizvodnja {STRING.gen} u {INDUSTRY} povećana je za {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN :{BLACK}{BIGFONT}Proizvodnja {STRING.gen} u {INDUSTRY} smanjena je za {COMMA}%!
##id 0x5000
STR_5000_TRAIN_IN_TUNNEL :{WHITE}Vlak u tunelu
@@ -2122,7 +2167,7 @@
STR_6806_COMPETITOR_START_TIME :{LTBLUE}Vrijeme početka igre natjecatelja: {ORANGE}{STRING}
STR_6807_NO_OF_TOWNS :{LTBLUE}Broj gradova: {ORANGE}{STRING}
STR_6808_NO_OF_INDUSTRIES :{LTBLUE}Broj gospodarstava: {ORANGE}{STRING}
-STR_6809_MAXIMUM_INITIAL_LOAN_000 :{LTBLUE}Maksimalni početni kredit: {ORANGE}{CURRENCY}
+STR_6809_MAXIMUM_INITIAL_LOAN_000 :{LTBLUE}Maksimalni početni zajam: {ORANGE}{CURRENCY}
STR_680A_INITIAL_INTEREST_RATE :{LTBLUE}Početna kamata kredita: {ORANGE}{COMMA}%
STR_680B_VEHICLE_RUNNING_COSTS :{LTBLUE}Troškovi uporabe vozila: {ORANGE}{STRING}
STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR :{LTBLUE}Brzina razvoja natjecatelja: {ORANGE}{STRING}
@@ -2213,30 +2258,30 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Ukupno:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf prihoda
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
-STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Graf operativnih prihoda
+STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Grafikon operativne dobiti
STR_7026_BANK_BALANCE :{WHITE}Bankovna bilanca
-STR_7027_LOAN :{WHITE}Kredit
+STR_7027_LOAN :{WHITE}Zajam
STR_MAX_LOAN :{WHITE}Maks zajam: {BLACK}{CURRENCY}
STR_7028 :{BLACK}{CURRENCY}
STR_7029_BORROW :{BLACK}Pozajmi {SKIP}{SKIP}{CURRENCY}
STR_702A_REPAY :{BLACK}Otplati {SKIP}{SKIP}{CURRENCY}
-STR_702B_MAXIMUM_PERMITTED_LOAN :{WHITE}...najveći dopušteni kredit iznosi {CURRENCY}
+STR_702B_MAXIMUM_PERMITTED_LOAN :{WHITE}...najveći dopušteni zajam iznosi {CURRENCY}
STR_702C_CAN_T_BORROW_ANY_MORE_MONEY :{WHITE}Ne možeš dobiti još kredita...
-STR_702D_LOAN_ALREADY_REPAYED :{WHITE}...nemaš kredita za otplatu
+STR_702D_LOAN_ALREADY_REPAYED :{WHITE}...nema zajma za otplatu
STR_702E_REQUIRED :{WHITE}...{CURRENCY} potrebno
-STR_702F_CAN_T_REPAY_LOAN :{WHITE}Ne možeš otplatiti kredit...
+STR_702F_CAN_T_REPAY_LOAN :{WHITE}Ne možeš otplatiti zajam...
STR_INSUFFICIENT_FUNDS :{WHITE}Ne možeš dati novac koji je pozajmljen od banke...
STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT :{BLACK}Odaberi novo lice za direktora
STR_7031_CHANGE_THE_COMPANY_VEHICLE :{BLACK}Promijeni izgled vozila tvrtke
STR_7032_CHANGE_THE_PRESIDENT_S :{BLACK}Promjeni ime direktora
STR_7033_CHANGE_THE_COMPANY_NAME :{BLACK}Promijeni ime tvrtke
STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Klikni na odabranu boju
-STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Povećaj iznos kredita
-STR_7036_REPAY_PART_OF_LOAN :{BLACK}Otplati dio kredita
+STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Povećaj iznos zajma
+STR_7036_REPAY_PART_OF_LOAN :{BLACK}Otplati dio zajma
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Direktor)
STR_7038_INAUGURATED :{GOLD}Na poziciji od: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Vozila:
@@ -2268,7 +2313,7 @@
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{COMPANY} će biti rasprodana ili objaviti bankrot ukoliko se učinak uskoro ne poboljša!
STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Direktor)
STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Spajanje prijevoznih tvrki!
-STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{COMPANY} je bila prodana tvrtki {COMPANY} za {CURRENCY}!
+STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{COMPANY} je prodana tvrtki {COMPANY} za {CURRENCY}!
STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Tražimo prijevoznu tvrku koja bi preuzela našu tvrtku.{}{}Želiš li kupiti tvrtku{COMPANY} za {CURRENCY}?
STR_705C_BANKRUPT :{BLACK}{BIGFONT}Bankrot!
STR_705D_HAS_BEEN_CLOSED_DOWN_BY :{BLACK}{BIGFONT}{COMPANY} je zatvorena od strane kreditora i sva je imovina rasprodana!
@@ -2313,7 +2358,7 @@
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} je preuzeta od strane tvrtke {COMPANY}!
STR_7080_PROTECTED :{WHITE}Ova tvrka još nije dovoljno stara da bi trgovala udjelima...
-STR_LIVERY_DEFAULT :Standardna opskrba hranom
+STR_LIVERY_DEFAULT :Standardna boja
STR_LIVERY_STEAM :Parna lokomotva
STR_LIVERY_DIESEL :Dieselska lokomotiva
STR_LIVERY_ELECTRIC :Električna lokomotiva
@@ -2322,12 +2367,12 @@
STR_LIVERY_DMU :DMU
STR_LIVERY_EMU :EMU
STR_LIVERY_PASSENGER_WAGON_STEAM :Lokomotiva s putnicima (Parna)
-STR_LIVERY_PASSENGER_WAGON_DIESEL :Lokomotiva s putnicima (Dieselska)
+STR_LIVERY_PASSENGER_WAGON_DIESEL :Putnička lokomotiva (dizelska)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Lokomotiva s putnicima (Električna)
STR_LIVERY_FREIGHT_WAGON :Teretni vagon
STR_LIVERY_BUS :Autobus
STR_LIVERY_TRUCK :Kamion
-STR_LIVERY_PASSENGER_SHIP :Trajekt
+STR_LIVERY_PASSENGER_SHIP :Putnički trajekt
STR_LIVERY_FREIGHT_SHIP :Teretni brod
STR_LIVERY_HELICOPTER :Helikopter
STR_LIVERY_SMALL_PLANE :Mali zrakoplov
@@ -2372,7 +2417,7 @@
STR_8018_SH_40_ELECTRIC :SH '40' (Električni)
STR_8019_T_I_M_ELECTRIC :'T.I.M.' (Električni)
STR_801A_ASIASTAR_ELECTRIC :'AsiaStar' (Električni)
-STR_801B_PASSENGER_CAR :Putnički prijevoz
+STR_801B_PASSENGER_CAR :Putnički vagon
STR_801C_MAIL_VAN :Poštanski kombi
STR_801D_COAL_CAR :Kamion za ugljen
STR_801E_OIL_TANKER :Naftna cisterna
@@ -2402,7 +2447,7 @@
STR_8036_X2001_ELECTRIC :'X2001' (Električni)
STR_8037_MILLENNIUM_Z1_ELECTRIC :'Millennium Z1' (Električni)
STR_8038_WIZZOWOW_Z99 :Wizzowow Z99
-STR_8039_PASSENGER_CAR :Putnički prijevoz
+STR_8039_PASSENGER_CAR :Putnički vagon
STR_803A_MAIL_VAN :Poštanski kombi
STR_803B_COAL_CAR :Kamion za ugljen
STR_803C_OIL_TANKER :Naftni tanker
@@ -2477,9 +2522,9 @@
STR_8081_MIGHTYMOVER_MAIL_TRUCK :MightyMover Poštanski Kamion
STR_8082_POWERNAUGHT_MAIL_TRUCK :Powernaught Poštanski Kamion
STR_8083_WIZZOWOW_MAIL_TRUCK :Wizzwow Poštanski Kamion
-STR_8084_WITCOMBE_OIL_TANKER :Witcombe Tanker Ulja
-STR_8085_FOSTER_OIL_TANKER :Foster Tanker Ulja
-STR_8086_PERRY_OIL_TANKER :Perry Tanker Ulja
+STR_8084_WITCOMBE_OIL_TANKER :Witcombe naftna cisterna
+STR_8085_FOSTER_OIL_TANKER :Foster naftna cisterna
+STR_8086_PERRY_OIL_TANKER :Perry naftna cisterna
STR_8087_TALBOTT_LIVESTOCK_VAN :Tallbot Stočni Kamion
STR_8088_UHL_LIVESTOCK_VAN :Uhl Stočni Kamion
STR_8089_FOSTER_LIVESTOCK_VAN :Foster Stočni Kamion
@@ -2549,13 +2594,13 @@
STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK :MightyMover kamion s žvakačim gumama
STR_80CA_POWERNAUGHT_BUBBLE_TRUCK :Powernaught kamion s žvakačim gumama
STR_80CB_WIZZOWOW_BUBBLE_TRUCK :Wizzowow kamion s žvakačim gumama
-STR_80CC_MPS_OIL_TANKER :MPS Tanker Ulja
-STR_80CD_CS_INC_OIL_TANKER :CS-Inc. Tanker Ulja
-STR_80CE_MPS_PASSENGER_FERRY :MPS Trajekt
-STR_80CF_FFP_PASSENGER_FERRY :FFP Trajekt
+STR_80CC_MPS_OIL_TANKER :MPS naftna cisterna
+STR_80CD_CS_INC_OIL_TANKER :CS-Inc. naftna cisterna
+STR_80CE_MPS_PASSENGER_FERRY :MPS putnički trajekt
+STR_80CF_FFP_PASSENGER_FERRY :FFP putnički trajekt
STR_80D0_BAKEWELL_300_HOVERCRAFT :Bakewell 300 Lebdjelica
-STR_80D1_CHUGGER_CHUG_PASSENGER :Chugger-Chug Trajekt
-STR_80D2_SHIVERSHAKE_PASSENGER_FERRY :Shivershake Trajekt
+STR_80D1_CHUGGER_CHUG_PASSENGER :Chugger-Chug putnički trajekt
+STR_80D2_SHIVERSHAKE_PASSENGER_FERRY :Shivershake putnički trajekt
STR_80D3_YATE_CARGO_SHIP :Yate Teretni Brod
STR_80D4_BAKEWELL_CARGO_SHIP :Bakewell Teretni Brod
STR_80D5_MIGHTYMOVER_CARGO_SHIP :Mightymover Teretni Brod
@@ -2612,7 +2657,7 @@
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} Spremište vlakova
-STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi vlak stiže na {STATION}!
+STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi vlak je stigao na {STATION}!
STR_8802_DETAILS :{WHITE}{VEHICLE} (Detalji)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Vlak na putu
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2745,12 +2790,12 @@
STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Obriši potrebno vrijeme za označenu naredbu
STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Resetiraj brojač kašnjenja, kako bi vozilo stiglo na vrijeme
STR_SERVICE_HINT :{BLACK}Preskoči ovu narudžbu osim ako servis nije potreban
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Trošak: {CURRENCY} Težina: {WEIGHT_S}{}Brzina: {VELOCITY} Snaga: {POWER}{}Troškovi održavanja: {CURRENCY}/god{}Kapacitet: {CARGO}
+STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Trošak: {CURRENCY} Težina: {WEIGHT_S}{}Brzina: {VELOCITY} Snaga: {POWER}{}Troškovi uporabe: {CURRENCY}/god{}Kapacitet: {CARGO}
STR_885C_BROKEN_DOWN :{RED}Pokvaren
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Starost: {LTBLUE}{STRING}{BLACK} Troškovi uporabe: {LTBLUE}{CURRENCY}/god
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Težina {LTBLUE}{WEIGHT_S} {BLACK}Snaga: {LTBLUE}{POWER}{BLACK} Maks. brzina: {LTBLUE}{VELOCITY}
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Težina: {LTBLUE}{WEIGHT_S} {BLACK}Snaga: {LTBLUE}{POWER}{BLACK} Maks. brzina: {LTBLUE}{VELOCITY} {BLACK}Maks. T.E.: {LTBLUE}{FORCE}
-STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Zarada ove godine: {LTBLUE}{CURRENCY} (prošle godine: {CURRENCY})
+STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Dobit ove godine: {LTBLUE}{CURRENCY} (prošle godine: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Pouzdanost: {LTBLUE}{COMMA}% {BLACK}Kvarova od zadnjeg servisa: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Zaustavljen
STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL :{WHITE}Ne mogu natjerati vlak da ignorira signale dok je opasnost...
@@ -2802,7 +2847,7 @@
STR_900C_DETAILS :{WHITE}{VEHICLE} (Detalji)
STR_900D_AGE_RUNNING_COST_YR :{BLACK}Starost: {LTBLUE}{STRING}{BLACK} Trošak uporabe {LTBLUE}{CURRENCY}/god
STR_900E_MAX_SPEED :{BLACK}Maks brzina: {LTBLUE}{VELOCITY}
-STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Zarada ove godine: {LTBLUE}{CURRENCY} (prošle godine: {CURRENCY})
+STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Dobit ove godine: {LTBLUE}{CURRENCY} (prošle godine: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Pouzdanost: {LTBLUE}{COMMA}% {BLACK}Kvarovi od posljednjeg servisa: {LTBLUE}{COMMA}
STR_9011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Kapacitet: {LTBLUE}{CARGO}
@@ -2837,10 +2882,10 @@
STR_902C_NAME_ROAD_VEHICLE :{WHITE}Imenuj cestovno vozilo
STR_902D_CAN_T_NAME_ROAD_VEHICLE :{WHITE}Ne mogu imenovati cestovno vozilo...
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Imenuj cestovno vozilo
-STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi bus stiže na {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi kamion stiže na {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Građani slave . . .{}Prvi putnički tramvaj stigao na stanicu {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Građani slave . . .{}Prvi teretni vlak je stigao u {STATION}!
+STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi bus je stigao na {STATION}!
+STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi kamion je stigao na {STATION}!
+STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Građani slave . . .{}Prvi putnički tramvaj je stigao na {STATION}!
+STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Građani slave . . .{}Prvi teretni tramvaj je stigao u {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}Vozač poginuo u eksploziji nakon sudara s vlakom
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}{COMMA} poginulih u eksploziji nakon sudara s vlakom
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Ne mogu natjerati vozilo da se okrene...
@@ -2878,7 +2923,7 @@
STR_9811_DETAILS :{WHITE}{VEHICLE} (Detalji)
STR_9812_AGE_RUNNING_COST_YR :{BLACK}Starost: {LTBLUE}{STRING}{BLACK} Trošak uporabe: {LTBLUE}{CURRENCY}/god
STR_9813_MAX_SPEED :{BLACK}Maks. brzina: {LTBLUE}{VELOCITY}
-STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Zarada ove godine: {LTBLUE}{CURRENCY} (prošle godine: {CURRENCY})
+STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Dobit ove godine: {LTBLUE}{CURRENCY} (prošle godine: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Pouzdanost: {LTBLUE}{COMMA}% {BLACK}Kvarova od posljednjeg servisa: {LTBLUE}{COMMA}
STR_9816_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Izgrađeno: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Zapremnina: {LTBLUE}{CARGO}
@@ -2910,7 +2955,7 @@
STR_9831_NAME_SHIP :{WHITE}Imenuj brod
STR_9832_CAN_T_NAME_SHIP :{WHITE}Ne mogu imenovati brod...
-STR_9833_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi brod stigao do {STATION}!
+STR_9833_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi brod je stigao u {STATION}!
STR_9834_POSITION_BUOY_WHICH_CAN :{BLACK}Smjesti plutaču koja može biti korištena kao pokazatelj puta
STR_9835_CAN_T_POSITION_BUOY_HERE :{WHITE}Ne mogu staviti plutaču ovdje...
STR_9836_RENAME :{BLACK}Preimenuj
@@ -2946,7 +2991,7 @@
STR_A00C_DETAILS :{WHITE}{VEHICLE} (Detalji)
STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Starost: {LTBLUE}{STRING}{BLACK} Troškovi uporabe {LTBLUE}{CURRENCY}/god
STR_A00E_MAX_SPEED :{BLACK}Maks brzina: {LTBLUE}{VELOCITY}
-STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Zarada ove godine: {LTBLUE}{CURRENCY} (prošle godine: {CURRENCY})
+STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Dobit ove godine: {LTBLUE}{CURRENCY} (prošle godine: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Pouzdanost: {LTBLUE}{COMMA}% {BLACK}Kvarova od poslijednjeg servisa: {LTBLUE}{COMMA}
STR_A011_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Ne mogu poslati zrakoplov u hangar
@@ -2982,7 +3027,7 @@
STR_A030_NAME_AIRCRAFT :{WHITE}Imenuj zrakoplov
STR_A031_CAN_T_NAME_AIRCRAFT :{WHITE}Ne mogu imenovati zrakoplov...
STR_A032_NAME_AIRCRAFT :{BLACK}Imenuj zrakoplov
-STR_A033_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi zrakoplov stigao je na {STATION}!
+STR_A033_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi zrakoplov je stigao na {STATION}!
STR_A034_PLANE_CRASH_DIE_IN_FIREBALL :{BLACK}{BIGFONT}Pad zrakoplova!{}{COMMA} poginulih u eksploziji na {STATION}
STR_PLANE_CRASH_OUT_OF_FUEL :{BLACK}{BIGFONT}Avionska nesreća{}Avion je ostao bez goriva, {COMMA} poginulo u nesreći
STR_A036 :{TINYFONT}{BLACK}{STATION}
@@ -2996,10 +3041,10 @@
STR_A03E_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Izaberi vrstu tereta koju će zrakoplov nositi
STR_A03F_REFIT_AIRCRAFT_TO_CARRY :{BLACK}Prenamijeni zrakoplov da nosi označenu vrstu tereta
STR_A040_SELECT_CARGO_TYPE_TO_CARRY :{GOLD}Označi vrstu tereta za prijenos:
-STR_A041_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Novi kapacitet: {GOLD}{STRING}{}{BLACK}Trošak prenamijene: {GOLD}{CURRENCY}
+STR_A041_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Novi kapacitet: {GOLD}{STRING}{}{BLACK}Trošak prenamjene: {GOLD}{CURRENCY}
STR_A042_CAN_T_REFIT_AIRCRAFT :{WHITE}Ne mogu prenamijeniti zrakoplov...
STR_GO_TO_AIRPORT_HANGAR :Idi u {STATION} Hangar
-SERVICE_AT_AIRPORT_HANGAR :Servisiranje u hangaru {STATION}
+SERVICE_AT_AIRPORT_HANGAR :Servis u hangaru {STATION}
STR_TIMETABLE_TITLE :{WHITE}{VEHICLE} (Raspored)
@@ -3025,7 +3070,7 @@
############ Those following lines need to be in this order!!
STR_PERFORMANCE_DETAIL_VEHICLES :{BLACK}Vozila:
STR_PERFORMANCE_DETAIL_STATIONS :{BLACK}Stations:
-STR_PERFORMANCE_DETAIL_MIN_PROFIT :{BLACK}Min. prihod:
+STR_PERFORMANCE_DETAIL_MIN_PROFIT :{BLACK}Min. dobit:
STR_PERFORMANCE_DETAIL_MIN_INCOME :{BLACK}Min. prihod:
STR_PERFORMANCE_DETAIL_MAX_INCOME :{BLACK}Maks. prihod:
STR_PERFORMANCE_DETAIL_DELIVERED :{BLACK}Dostavljeno:
@@ -3036,13 +3081,13 @@
############ End of order list
STR_PERFORMANCE_DETAIL_VEHICLES_TIP :{BLACK}Broj vozila; ovo uključuje cestovna vozila, vlakove, brodove i avione
STR_PERFORMANCE_DETAIL_STATIONS_TIP :{BLACK}Broj dijelova stanice. Svaki dio stanice (npr. željeznički kolodvor, autobusna postaja, aerodrom) se računa, čak i ako su spojene kao jedna stanica
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP :{BLACK}Profit vozila sa najnižim prihodom(od svih vozila starijih od 2 godine)
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP :{BLACK}Dobit vozila s najnižim prihodom (od svih vozila starijih od 2 godine)
STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP :{BLACK}Količina gotovine ostvarene u mjesecu sa najnižim profitom u zadnjih 12 četvrtina
STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP :{BLACK}Količina gotovine ostvarene u mjesecu za najvišim profitom u zadnjih 12 četvrtina
STR_PERFORMANCE_DETAIL_DELIVERED_TIP :{BLACK}Jedinice tereta dostavljene u zadnje četiri četvrtine
STR_PERFORMANCE_DETAIL_CARGO_TIP :{BLACK}Broj vrsta tereta dostavljenog u zadnjoj četvrtini
STR_PERFORMANCE_DETAIL_MONEY_TIP :{BLACK}Količina novca koji ova kompanija ima u banci
-STR_PERFORMANCE_DETAIL_LOAN_TIP :{BLACK}Iznos novca koji je ova kompanija pozajmila
+STR_PERFORMANCE_DETAIL_LOAN_TIP :{BLACK}Iznos novca koji je ova tvrtka pozajmila
STR_PERFORMANCE_DETAIL_TOTAL_TIP :{BLACK}Totalni broj bodova od mogućih bodova
STR_NEWGRF_SETTINGS_BUTTON :{BLACK}NewGRF Postavke
@@ -3104,7 +3149,7 @@
STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Prebaci se na euro: {ORANGE}{NUM}
STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Prebaci se na euro: {ORANGE}nikad
STR_CURRENCY_PREVIEW :{LTBLUE}Prikaz: {ORANGE}{CURRENCY}
-STR_CURRENCY_CHANGE_PARAMETER :{BLACK}Promijeni parametar proizvoljne valute
+STR_CURRENCY_CHANGE_PARAMETER :{BLACK}Promijeni parametre proizvoljne valute
STR_TRAIN :{BLACK}{TRAIN}
STR_BUS :{BLACK}{BUS}
@@ -3205,7 +3250,7 @@
STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Trošak: {GOLD}{CURRENCY}{BLACK} Težina {GOLD}{WEIGHT_S}
STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Brzina: {GOLD}{VELOCITY}{BLACK} Snaga: {GOLD}{POWER}
STR_PURCHASE_INFO_SPEED :{BLACK}Brzina: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Radni trošak: {GOLD}{CURRENCY}/god
+STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Trošak uporabe: {GOLD}{CURRENCY}/god
STR_PURCHASE_INFO_CAPACITY :{BLACK}Kapacitet: {GOLD}{CARGO}{STRING}
STR_PURCHASE_INFO_DESIGNED_LIFE :{BLACK}Dizajnirana: {GOLD}{NUM}{BLACK} Životni vijek: {GOLD}{COMMA} godina
STR_PURCHASE_INFO_RELIABILITY :{BLACK}Maks. pouzdanost: {GOLD}{COMMA}%
@@ -3230,7 +3275,7 @@
STR_LAND_GENERATOR :{BLACK}Izrađivač zemljišta:
STR_TREE_PLACER :{BLACK} Algoritam za drveće:
STR_HEIGHTMAP_ROTATION :{BLACK}Rotacija visinske mape:
-STR_TERRAIN_TYPE :{BLACK}Tip terena:
+STR_TERRAIN_TYPE :{BLACK}Vrsta terena:
STR_QUANTITY_OF_SEA_LAKES :{BLACK}Razina mora:
STR_SMOOTHNESS :{BLACK}Graduacija:
STR_SNOW_LINE_HEIGHT :{BLACK}Visina linije snijega
@@ -3259,7 +3304,7 @@
STR_TREE_GENERATION :{BLACK}Generiranje drveća
STR_UNMOVABLE_GENERATION :{BLACK}Nepomično generiranje
STR_CLEARING_TILES :{BLACK}Generiranje grubog i stjenovitog područja
-STR_SETTINGUP_GAME :{BLACK}Uspostavljam igru
+STR_SETTINGUP_GAME :{BLACK}Pripremam igru
STR_PREPARING_TILELOOP :{BLACK}Izvršavam tile-petlju
STR_PREPARING_GAME :{BLACK}Pripremam igru
STR_DIFFICULTY_TO_CUSTOM :{WHITE}Ova akcija je izmjenila težinu na proizvoljnu
--- a/src/lang/czech.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/czech.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1032,7 +1032,7 @@
STR_LITERS :litrů
STR_ITEMS :kusů
STR_CRATES :krabic
-STR_RES_OTHER :jiné
+STR_RES_OTHER :Jiné
STR_NOTHING :
STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
@@ -1092,7 +1092,7 @@
STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Vozit zboží do stanice jen když je poptávka: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LONGBRIDGES :{LTBLUE}Povolit stavbu velmi dlouhých mostů: {ORANGE}{STRING}
STR_CONFIG_PATCHES_GOTODEPOT :{LTBLUE}Povolit příkaz 'jeď do depa': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD :{LTBLUE}Způsob manuálního budování průmyslu těžby surovin: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD :{LTBLUE}Způsob manuálního budování primárního průmyslu: {ORANGE}{STRING}
STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :žádný
STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :jako u ostatniho průmyslu
STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :průzkum
@@ -1167,14 +1167,14 @@
STR_CONFIG_PATCHES_LOADING_INDICATORS :{LTBLUE}Používat ukazatele naložení: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TIMETABLE_ALLOW :{LTBLUE}Povolit jízdní řády vozidel: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS :{LTBLUE}Zobrazit jízdní řády v cyklech místo ve dnech: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE :{LTBLUE}Standardní druh kolejí (v nové hře/po načtení hry): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL :Normální koleje
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL :Elektrifikované koleje
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL :Monorail
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MAGLEV :Maglev
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST :První dostupný
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_LAST :Nejlepší dostupný
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MOST_USED :Nejpoužívanější
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE :{LTBLUE}Výchozí druh kolejí (v nové hře/po načtení hry): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL :normální koleje
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL :elektrifikované koleje
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL :monorail
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MAGLEV :maglev
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST :první dostupný
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_LAST :poslední dostupný
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MOST_USED :nejpoužívanější
STR_CONFIG_PATCHES_ALWAYS_BUILD_INFRASTRUCTURE :{LTBLUE}Zobrazit nástroje pro budování i bez dostupných vozidel: {ORANGE}{STRING}
STR_CONFIG_PATCHES_MAX_TRAINS :{LTBLUE}Maximum vlaků na hráče: {ORANGE}{STRING}
@@ -1784,7 +1784,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Ukázat informace o místní správě
STR_2022_LOCAL_AUTHORITY :{WHITE}Místní správa města {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Hodnocení společností:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Dotace
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Nabídnuté dotace pro službu:
STR_2027_FROM_TO :{ORANGE}{STRING.big} z {STRING} do {STRING}
@@ -2041,6 +2041,8 @@
############ range for produces starts
STR_INDUSTRY_WINDOW_WAITING_FOR_PROCESSING :{BLACK}Náklad čekající na zpracování:
STR_INDUSTRY_WINDOW_WAITING_STOCKPILE_CARGO :{YELLOW}{CARGO}{BLACK}
+STR_4827_PRODUCES :{BLACK}Produkuje: {YELLOW}{STRING}
+STR_4828_PRODUCES :{BLACK}Produkuje: {YELLOW}{STRING}, {STRING}
############ range for produces ends
STR_482A_PRODUCTION_LAST_MONTH :{BLACK}Produkce minulý měsíc:
@@ -2268,7 +2270,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Celkem:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf příjmu
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2801,7 +2803,7 @@
STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Vložit nový příkaz před označený příkaz nebo na konec seznamu
STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Označený příkaz provádět do plného naložení
STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Označený příkaz vyloží vozidlo
-STR_TIMETABLE_TOOLTIP :{BLACK}Jízdní řád - příkaz vybrat kliknutím.
+STR_TIMETABLE_TOOLTIP :{BLACK}Jízdní řád - příkaz vybereš kliknutím.
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Změnit čas pro splnění jízdního příkazu
STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Zrušit čas pro splnění jízdního příkazu
STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Smazat ukazatel zpoždění, takže vozidlo pojede na čas
@@ -2844,11 +2846,11 @@
STR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Toto vozidlo v této stanici nestaví.
STR_TIMETABLE_CHANGE_TIME :{BLACK}Změnit čas
STR_TIMETABLE_STATUS_ON_TIME :Vozidlo jede na čas
-STR_TIMETABLE_STATUS_LATE :Vozidlo má {STRING} zpoždění
+STR_TIMETABLE_STATUS_LATE :Vozidlo má {STRING} zpoždění
STR_TIMETABLE_STATUS_EARLY :Vozidlo jede {STRING} napřed
STR_TIMETABLE_TOTAL_TIME :Tento jízdní řád bude trvat {STRING}
STR_TIMETABLE_TOTAL_TIME_INCOMPLETE :Tento jízdní řád bude trvat nejméně {STRING} (vozidla mimo jízdní řád)
-STR_TIMETABLE_AUTOFILL :{BLACK}Vyplnit automaticky
+STR_TIMETABLE_AUTOFILL :{BLACK}Automaticky
STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Vyplnit jízdní řád automaticky s hodnotami z první jízdy
##id 0x9000
@@ -3395,6 +3397,10 @@
STR_GROUP_ALL_ROADS :Všechna silniční vozidla
STR_GROUP_ALL_SHIPS :Všechny lodě
STR_GROUP_ALL_AIRCRAFTS :Všechna letadla
+STR_GROUP_DEFAULT_TRAINS :Nezařazené vlaky
+STR_GROUP_DEFAULT_ROADS :Nezařazená silniční vozidla
+STR_GROUP_DEFAULT_SHIPS :Nezařazené lodě
+STR_GROUP_DEFAULT_AIRCRAFTS :Nezařazená letadla
STR_GROUP_TINY_NUM :{TINYFONT}{COMMA}
STR_GROUP_ADD_SHARED_VEHICLE :Přidat sdílená vozidla
STR_GROUP_REMOVE_ALL_VEHICLES :Odstranit všechna vozidla
@@ -3439,3 +3445,7 @@
########
+STR_FUND_NEW_INDUSTRY :{BLACK}Financovat
+STR_PROSPECT_NEW_INDUSTRY :{BLACK}Hledat
+STR_BUILD_NEW_INDUSTRY :{BLACK}Postavit
+STR_INDUSTRY_SELECTION_HINT :{BLACK}Vyber si vhodnou továrnu ze seznamu
--- a/src/lang/danish.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/danish.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Vis information om de lokale myndigheder
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} lokal myndighed
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transportselskabsbedømmelse:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Tilskudsordninger
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Tilskudsordninger i licitation:
STR_2027_FROM_TO :{ORANGE}{STRING} fra {STRING} til {STRING}
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf over indkomst
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/dutch.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/dutch.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Geef informatie over de gemeente weer
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN}'s gemeenteraad
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Reputatie van transportbedrijven:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidies
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Beschikbare subsidies:
STR_2027_FROM_TO :{ORANGE}{STRING} van {STRING} naar {STRING}
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totaal:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Inkomstengrafiek
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/english.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/english.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Show information on local authority
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} local authority
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transport company ratings:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidies
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subsidies on offer for services taking:
STR_2027_FROM_TO :{ORANGE}{STRING} from {STRING2} to {STRING2}
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Income Graph
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/esperanto.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/esperanto.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1658,7 +1658,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Montru informojn pri lokaj estroj
STR_2022_LOCAL_AUTHORITY :{WHITE}Lokaj estroj de {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Takso de transportkompanioj:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subvencioj
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subvencioj haveblas por jenaj servoj:
STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} al {STRING}
@@ -2125,7 +2125,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Entute:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Enspeza Grafiko
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/estonian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/estonian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1700,7 +1700,7 @@
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Rööbastee tuleb eelnevalt lammutada
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Rööbastee ehitamine
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Elektrifitseeritud rööbastee ehitus
-STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Monorööbastee ehitamine
+STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Monorelsi ehitamine
STR_100C_MAGLEV_CONSTRUCTION :{WHITE}Elektromageetilise rööbastee ehitamine
STR_100D_SELECT_RAIL_BRIDGE :{WHITE}Vali raudteesild
STR_100E_CAN_T_BUILD_TRAIN_DEPOT :{WHITE}Siia ei saa depood ehitada...
@@ -1712,7 +1712,7 @@
STR_1014_TRAIN_DEPOT_ORIENTATION :{WHITE}Depoo suund
STR_1015_RAILROAD_CONSTRUCTION :Rööbastee ehitamine
STR_TOOLB_ELRAIL_CONSTRUCTION :Elektrifitseeritud rööbastee ehitus
-STR_1016_MONORAIL_CONSTRUCTION :Monorööbastee ehitamine
+STR_1016_MONORAIL_CONSTRUCTION :Monorelsi ehitamine
STR_1017_MAGLEV_CONSTRUCTION :Elektromagneetilise rööbastee ehitamine
STR_1018_BUILD_RAILROAD_TRACK :{BLACK}Ehita rööbasteed
STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING :{BLACK}Ehita rongidepoo (rongide ehitamiseks ja hoolduseks)
@@ -1826,7 +1826,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Näita teavet kohaliku omavalitsuse kohta
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} kohalik omavalitsus
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ettevõtete hinnangud:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Toetused
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Pakutavad toetused teenusepakkumise eest:
STR_2027_FROM_TO :{ORANGE}{STRING} kohast {STRING} kohta {STRING}
@@ -2312,7 +2312,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Kokku:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Tulugraafik
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2416,7 +2416,7 @@
STR_LIVERY_STEAM :Aurumootorvedur
STR_LIVERY_DIESEL :Diiselmootorvedur
STR_LIVERY_ELECTRIC :Elektrimootorvedur
-STR_LIVERY_MONORAIL :Monorelss-mootorvedur
+STR_LIVERY_MONORAIL :Monorelssvedur
STR_LIVERY_MAGLEV :Elektromagneetiline mootorvedur
STR_LIVERY_DMU :DMU
STR_LIVERY_EMU :EMU
@@ -2684,7 +2684,7 @@
STR_80ED_YATE_AEROSPACE_YAE46 :Yate Aerospace YAe46
STR_80EE_DINGER_100 :Dinger 100
STR_80EF_AIRTAXI_A34_1000 :AirTaxi A34-1000
-STR_80F0_YATE_Z_SHUTTLE :Yate Z-Shuttle
+STR_80F0_YATE_Z_SHUTTLE :Yate Z-süstik
STR_80F1_KELLING_K1 :Kelling K1
STR_80F2_KELLING_K6 :Kelling K6
STR_80F3_KELLING_K7 :Kelling K7
@@ -2697,9 +2697,9 @@
STR_80FA_FLASHBANG_X1 :Flashbang X1
STR_80FB_JUGGERPLANE_M1 :Juggerplane M1
STR_80FC_FLASHBANG_WIZZER :Flashbang Wizzer
-STR_80FD_TRICARIO_HELICOPTER :Tricario Helicopter
-STR_80FE_GURU_X2_HELICOPTER :Guru X2 Helicopter
-STR_80FF_POWERNAUT_HELICOPTER :Powernaut Helicopter
+STR_80FD_TRICARIO_HELICOPTER :Tricario helikopter
+STR_80FE_GURU_X2_HELICOPTER :Guru X2 helikopter
+STR_80FF_POWERNAUT_HELICOPTER :Powernaut helikopter
STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE :{WHITE}Teade veovahendi tootjalt
STR_8101_WE_HAVE_JUST_DESIGNED_A :{GOLD}Me oleme just kujundanud uue {STRING}{P "" i} - kas te tahaksite testida seda aasta aega enne, kui see on saadaval kõigile?
STR_8102_RAILROAD_LOCOMOTIVE :raudteevedur
@@ -2717,17 +2717,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Mine {STATION}
-STR_8807_GO_TO_TRANSFER :Mine {STATION} (Vea ja võta laadung)
-STR_8808_GO_TO_UNLOAD :Mine {STATION} (Laadi maha)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Mine {STATION} (Vea ja jäta tühjaks)
-STR_880A_GO_TO_LOAD :Mine {STATION} (Laadi)
-STR_880B_GO_TO_TRANSFER_LOAD :Mine {STATION} (Vea ja oota täislaadingut)
+STR_8807_GO_TO_TRANSFER :Mine {STATION} (vea ja võta laadung peale)
+STR_8808_GO_TO_UNLOAD :Mine {STATION} (laadi maha)
+STR_8809_GO_TO_TRANSFER_UNLOAD :Mine {STATION} (vea ja jäta tühjaks)
+STR_880A_GO_TO_LOAD :Mine {STATION} (laadi)
+STR_880B_GO_TO_TRANSFER_LOAD :Mine {STATION} (vea ja oota täislaadungit)
STR_880C_GO_NON_STOP_TO :Sõida läbi {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Sõida läbi {STATION} (Vea ja oota täislaadingut)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Sõida läbi {STATION} (Laadi maha)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Sõida läbi {STATION} (Vea ja jäta tühjaks)
+STR_880D_GO_TO_NON_STOP_TRANSFER :Sõida läbi {STATION} (vea ja oota täislaadungit)
+STR_880E_GO_NON_STOP_TO_UNLOAD :Sõida läbi {STATION} (laadi maha)
+STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Sõida läbi {STATION} (vea ja jäta tühjaks)
STR_8810_GO_NON_STOP_TO_LOAD :Sõida läbi {STATION} (laadi)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Sõida läbi {STATION} (Vea ja oota täislaadingut)
+STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Sõida läbi {STATION} (vea ja oota täislaadungit)
STR_GO_TO_TRAIN_DEPOT :Mine linna {TOWN} rongidepoosse
STR_SERVICE_AT_TRAIN_DEPOT :Hoolda linna {TOWN} rongidepoos
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Sõida läbi linna {TOWN} rongidepoo
@@ -2760,8 +2760,8 @@
STR_881C_NEW_RAIL_VEHICLES :{WHITE}Uus raudteeveerem
STR_NEW_ELRAIL_VEHICLES :{WHITE}Uus elektriraudteeveerem
-STR_881D_NEW_MONORAIL_VEHICLES :{WHITE}Uus Monorelssi Sõiduk
-STR_881E_NEW_MAGLEV_VEHICLES :{WHITE}Uus Maglevi Sõiduk
+STR_881D_NEW_MONORAIL_VEHICLES :{WHITE}Uued monorelsi sõidukid
+STR_881E_NEW_MAGLEV_VEHICLES :{WHITE}Uus maglevi sõiduk
STR_ALL_AVAIL_RAIL_VEHICLES :{WHITE}Raudteesõidukid
STR_881F_BUILD_VEHICLE :{BLACK}Ehita veovahend
@@ -2774,7 +2774,7 @@
STR_8820_RENAME :{BLACK}Muuda nime
STR_8823_SKIP :{BLACK}Jäta vahele
STR_8824_DELETE :{BLACK}Kustuta
-STR_8825_NON_STOP :{BLACK}Peatuseta
+STR_8825_NON_STOP :{BLACK}Peatusteta
STR_8826_GO_TO :{BLACK}Mine
STR_8827_FULL_LOAD :{BLACK}Laadi täis
STR_8828_UNLOAD :{BLACK}Laadi maha
@@ -2783,7 +2783,7 @@
STR_REFIT_ORDER :(Taasseadista {STRING})
STR_TIMETABLE_VIEW :{BLACK}Sõiduplaan
STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Näita sõiduplaani
-STR_8829_ORDERS :{WHITE}{VEHICLE} (Käsud)
+STR_8829_ORDERS :{WHITE}{VEHICLE} (käsud)
STR_882A_END_OF_ORDERS :{SETX 10}- - Käskude Lõpp - -
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Hooldus
--- a/src/lang/finnish.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/finnish.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1723,7 +1723,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Näytä tietoja paikallisviranomaisista.
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN}: viranomaiset
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Kuljetusyhtiön arvioinnit:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Tuet
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Tarjotut tuet:
STR_2027_FROM_TO :{ORANGE}{STRING} välille {STRING}-{STRING}
@@ -2209,7 +2209,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Yhteensä:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Tulokuvaaja
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/french.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/french.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1727,7 +1727,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Afficher des informations sur la municipalité
STR_2022_LOCAL_AUTHORITY :{WHITE}Municipalité de {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Qualité de service des compagnies:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subventions
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Offres de subvention pour le transport de:
STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} à {STRING}
@@ -2213,7 +2213,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graphique du Revenu
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/galician.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/galician.txt Sun Jul 22 21:24:42 2007 +0000
@@ -2,6 +2,7 @@
##ownname Galego
##isocode gl_ES
##plural 0
+##gender m f n
#
@@ -281,6 +282,7 @@
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
STR_OSNAME_OS2 :OS/2
+STR_OSNAME_SUNOS :SunOS
STR_013B_OWNED_BY :{WHITE}...É propiedade de {STRING}
STR_013C_CARGO :{BLACK}Carga
@@ -296,6 +298,7 @@
STR_0141_LOAD_GAME :{BLACK}Cargar Partida
STR_SINGLE_PLAYER :{BLACK}Un Xogador
STR_MULTIPLAYER :{BLACK}Multixogador
+STR_SCENARIO_EDITOR :{BLACK}Editor De Escenarios
STR_64 :64
STR_128 :128
@@ -389,6 +392,7 @@
STR_ENGINE_SORT_POWER_VS_RUNNING_COST :Potencia/Coste Mantemento
STR_ENGINE_SORT_CARGO_CAPACITY :Capacidade De Carga
STR_NO_WAITING_CARGO :{BLACK}Non queda ningún tipo de carga en espera
+STR_SELECT_ALL_FACILITIES :{BLACK}Seleccionar tódolos edificios
STR_MANAGE_LIST :{BLACK}Xestionar lista
STR_REPLACE_VEHICLES :Reemplazar Vehículos
STR_SEND_TRAIN_TO_DEPOT :Enviar o Depósito
@@ -728,6 +732,7 @@
STR_02A1_SMALL :{BLACK}Pequeno
STR_02A2_MEDIUM :{BLACK}Mediano
STR_02A3_LARGE :{BLACK}Grande
+STR_SCENARIO_EDITOR_CITY :{BLACK}Cidade
STR_02A4_SELECT_TOWN_SIZE :{BLACK}Selecciona o tamaño da cidade:
STR_02A5_TOWN_SIZE :{YELLOW}Tamaño da cidade:
@@ -751,7 +756,7 @@
STR_02C3_GAME_OPTIONS :Opcións da Partida
STR_02C5_DIFFICULTY_SETTINGS :Configuración de Dificultade
STR_02C7_CONFIG_PATCHES :Configuración dos Parches
-STR_NEWGRF_SETTINGS :Configuración de Newgrf
+STR_NEWGRF_SETTINGS :Configuración NewGRF
STR_GAMEOPTMENU_0A :
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Amosar nomes de cidades
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Amosae nomes de estacións
@@ -1076,6 +1081,7 @@
STR_CONFIG_PATCHES_ALLOW_SHARES :{LTBLUE}Permiti-la compra de accións por outras compañías
STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY :{LTBLUE}Cando se arrastre, colocar siniais cada: {ORANGE}{STRING} cadrado(s)
+STR_CONFIG_PATCHES_TOWN_LAYOUT_DEFAULT :defecto
STR_CONFIG_PATCHES_TOOLBAR_POS :{LTBLUE}Posición da barra de ferramentas principal: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT :Esquerda
@@ -1083,6 +1089,12 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Dereita
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Radio de captura da fiestra: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Radio de agarre da fiestra: {ORANGE}desactivado
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Velocidade de crecemento das cidades: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Ningún
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Lento
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normal
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Rápido
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Moi rápido
STR_CONFIG_PATCHES_GUI :{BLACK}Interface
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Construcción
@@ -1161,6 +1173,7 @@
STR_TREES_RANDOM_TYPE_TIP :{BLACK}Colocar árbores dun tipo aleatorio
STR_CANT_BUILD_CANALS :{WHITE}Non se pode construí-los canais aí...
+STR_BUILD_CANALS_TIP :{BLACK}Construir canais.
STR_LANDINFO_CANAL :Canal
STR_CANT_BUILD_LOCKS :{WHITE}Non se pode construí-lo peche aí...
@@ -1314,6 +1327,25 @@
STR_NETWORK_LANG_ENGLISH :Inglés
STR_NETWORK_LANG_GERMAN :Alemán
STR_NETWORK_LANG_FRENCH :Francés
+STR_NETWORK_LANG_BRAZILIAN :Brasileiro
+STR_NETWORK_LANG_BULGARIAN :Búlgaro
+STR_NETWORK_LANG_CZECH :Checo
+STR_NETWORK_LANG_DANISH :Danés
+STR_NETWORK_LANG_DUTCH :Holandés
+STR_NETWORK_LANG_FINNISH :Finés
+STR_NETWORK_LANG_HUNGARIAN :Húngaro
+STR_NETWORK_LANG_ITALIAN :Italiano
+STR_NETWORK_LANG_JAPANESE :Xaponés
+STR_NETWORK_LANG_KOREAN :Coreano
+STR_NETWORK_LANG_POLISH :Polaco
+STR_NETWORK_LANG_PORTUGUESE :Portugués
+STR_NETWORK_LANG_ROMANIAN :Rumano
+STR_NETWORK_LANG_RUSSIAN :Ruso
+STR_NETWORK_LANG_SLOVAK :Eslovaco
+STR_NETWORK_LANG_SLOVENIAN :Esloveno
+STR_NETWORK_LANG_SPANISH :Español
+STR_NETWORK_LANG_SWEDISH :Sueco
+STR_NETWORK_LANG_TURKISH :Turco
############ End of leave-in-this-order
STR_NETWORK_GAME_LOBBY :{WHITE}Sala de espera de partida multixogador
@@ -1567,7 +1599,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Mostra-la información sobre a autoridade local
STR_2022_LOCAL_AUTHORITY :{WHITE}Autoridade local de {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Puntuacións das compañías de transporte:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidios
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Sibsidios en oferta para sevicios que transporten:
STR_2027_FROM_TO :{ORANGE}{STRING} dende {STRING} ata {STRING}
@@ -1808,6 +1840,12 @@
STR_4829_REQUIRES :{BLACK}Require: {YELLOW}{STRING}, {STRING}, {STRING}
############ range for requires ends
+############ range for produces starts
+STR_INDUSTRY_WINDOW_WAITING_STOCKPILE_CARGO :{YELLOW}{CARGO}{BLACK}
+STR_4827_PRODUCES :{BLACK}Produce: {YELLOW}{STRING}
+STR_4828_PRODUCES :{BLACK}Produce: {YELLOW}{STRING}, {STRING}
+############ range for produces ends
+
STR_482A_PRODUCTION_LAST_MONTH :{BLACK}Producción no último mes:
STR_482B_TRANSPORTED :{YELLOW}{CARGO}{BLACK} ({COMMA}% transportado)
STR_482C_CENTER_THE_MAIN_VIEW_ON :{BLACK}Centra-la vista principal na situación da industria
@@ -2031,7 +2069,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Ingresos
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -2805,10 +2843,10 @@
STR_PERFORMANCE_DETAIL_TOTAL_TIP :{BLACK}Puntos totais de puntos posibles
STR_NEWGRF_SETTINGS_BUTTON :{BLACK}Configuración NewGRF
-STR_NEWGRF_SETTINGS_CAPTION :{WHITE}Configuración Newgrf
+STR_NEWGRF_SETTINGS_CAPTION :{WHITE}Configuración NewGRF
STR_NEWGRF_APPLY_CHANGES :{BLACK}Aplica-los cambios
STR_NEWGRF_SET_PARAMETERS :{BLACK}Conf. parámetros
-STR_NEWGRF_TIP :{BLACK}Unha lista de tódolos sets Newgrf que tes instalados. Pincha nun set para cambia-la configuración
+STR_NEWGRF_TIP :{BLACK}Unha lista de tódolos sets NewGRF que tes instalados. Pincha nun set para cambia-la configuración
STR_NEWGRF_NO_FILES_INSTALLED :{BLACK}¡Non hai ficheiros newgrf instalados! Consulta no manual as instruccións para instalar novos gráficos
STR_NEWGRF_FILENAME :{BLACK}Ficheiro: {SILVER}{STRING}
STR_NEWGRF_GRF_ID :{BLACK}GRF ID: {SILVER}{STRING}
@@ -2823,9 +2861,9 @@
STR_NEWGRF_ADD_TIP :{BLACK}Engadir un novo arquivo NewGRF á lista
STR_NEWGRF_REMOVE :{BLACK}Eliminar
STR_NEWGRF_REMOVE_TIP :{BLACK}Elimina-lo arquivo NewGRF seleccionado da lista
-STR_NEWGRF_MOVEUP :{BLACK}Mover Arriba
+STR_NEWGRF_MOVEUP :{BLACK}Subir
STR_NEWGRF_MOVEUP_TIP :{BLACK}Move-lo arquivo NewGRF seleccionado arriba na lista
-STR_NEWGRF_MOVEDOWN :{BLACK}Mover Abaixo
+STR_NEWGRF_MOVEDOWN :{BLACK}Baixar
STR_NEWGRF_MOVEDOWN_TIP :{BLACK}Move-lo arquivo NewGRF seleccionado abaixo na lista
STR_NEWGRF_PARAMETER :{BLACK}Parámetros: {SILVER}{STRING}
@@ -3048,3 +3086,4 @@
#### Improved sign GUI
########
+
--- a/src/lang/german.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/german.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1727,7 +1727,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Zeige Einzelheiten der Stadtverwaltung
STR_2022_LOCAL_AUTHORITY :{WHITE}Stadtverwaltung {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Bewertung der Transportfirma:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subventionen
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subventionsangebot für:
STR_2027_FROM_TO :{ORANGE}{STRING} von {STRING} nach {STRING}
@@ -2213,7 +2213,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Gesamt:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Einkommensdiagramm
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/hungarian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/hungarian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1792,7 +1792,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Az önkormányzat adatainak megmutatása
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} önkormányzata
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Vélemény a szállítási cégekről:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Támogatások
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Támogatás jár
STR_2027_FROM_TO :{ORANGE}{STRING} szállításáért {STRING} és {STRING} között
@@ -2315,7 +2315,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Összesen:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Jövedelem grafikon
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/icelandic.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/icelandic.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1625,7 +1625,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Sýna upplýsingar um bæjaryfirvöld
STR_2022_LOCAL_AUTHORITY :{WHITE}Bæjaryfirvöld {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Einkunnir flutningsfyrirtækis:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Samstarfssamningar
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Samstarfssamningar í boði fyrir eftirfarandi þjónustur:
STR_2027_FROM_TO :{ORANGE}{STRING} frá {STRING} til {STRING}
@@ -2090,7 +2090,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Summa:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Tekjulínurit
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/italian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/italian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1728,7 +1728,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Mostra informazioni sull'autorità locale
STR_2022_LOCAL_AUTHORITY :{WHITE}Autorità locale di {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Valutazione delle compagnie di trasporto:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Sussidi
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Sussidi offerti per la realizzazione di servizi:
STR_2027_FROM_TO :{ORANGE}{STRING} da {STRING} a {STRING}
@@ -2214,7 +2214,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totale:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Grafico incassi
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/japanese.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/japanese.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}町議会の情報を表示します
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN}の町議会
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}会社の町内の世評：
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}：{ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}：{ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}助成金
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}次の運送経路に助成金を提案：
STR_2027_FROM_TO :{ORANGE}{STRING}を{STRING}から{STRING}へ
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}合計：
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}損益グラフ
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/korean.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/korean.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1727,7 +1727,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}지역당국 정보 보기
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} 지역당국
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}회사 운송 성취도:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}보조금
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}제공되는 보조금:
STR_2027_FROM_TO :{ORANGE}{1:STRING}에서 {2:STRING}까지 {0:STRING} 수송
@@ -2213,7 +2213,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}총계:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}수익 그래프
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/lithuanian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/lithuanian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1655,7 +1655,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Rodyti informaciją apie valdzią
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} vietinė valdžia
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transporto kompanijų reitingai:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidijos
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Dar nepanaudotos subsidijos:
STR_2027_FROM_TO :{ORANGE}{STRING} iš {STRING} į {STRING}
@@ -2120,7 +2120,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Viso:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Pajamu diagrama
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/norwegian_bokmal.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/norwegian_bokmal.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1680,7 +1680,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Vis informasjon om bystyret
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN}s bystyre
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Vurdering av transportfirma:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidier
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Tilbudte subsidier:
STR_2027_FROM_TO :{ORANGE}{STRING} fra {STRING} til {STRING}
@@ -2149,7 +2149,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totalt:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Inntektsgraf
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/norwegian_nynorsk.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/norwegian_nynorsk.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1727,7 +1727,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Vis informasjon om bystyret
STR_2022_LOCAL_AUTHORITY :{WHITE}Bystyret i {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Vurdering av transportfirma:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidiar
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Tilbydde subsidiar:
STR_2027_FROM_TO :{ORANGE}{STRING} frå {STRING} til {STRING}
@@ -2213,7 +2213,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totalt:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf over inntekter
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/piglatin.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/piglatin.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Owshay informationway onway ocallay authorityway
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} ocallay authorityway
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ansporttray ompanycay atingsray:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Ubsidiessay
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ubsidiessay onway offerway orfay ervicessay akingtay:
STR_2027_FROM_TO :{ORANGE}{STRING} omfray {STRING} otay {STRING}
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Otaltay:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Incomeway Aphgray
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/polish.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/polish.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1809,7 +1809,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Pokaż informacje o lokalnych władzach
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} lokalne władze
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ocena transportu firmy:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsydia
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Oferta subsydiów dla usługi przewozu:
STR_2027_FROM_TO :{ORANGE}{STRING} z {STRING} do {STRING}
@@ -2324,7 +2324,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Łącznie:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Wykres przychodów
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/portuguese.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/portuguese.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Ver informações sobre a autoridade local
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} autoridade local
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Avaliações da companhia de transporte
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsídios
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Oferta de subsídios para os serviços:
STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} para {STRING}
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Rendimentos
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/romanian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/romanian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Afişează informaţii referitoare la autoritatea locală
STR_2022_LOCAL_AUTHORITY :{WHITE}Autoritatea locală din {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Evaluarea companiilor de transport:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subvenţii (F6)
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subvenţii disponibile:
STR_2027_FROM_TO :{ORANGE}- {STRING} de la {STRING} la {STRING}
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graficul veniturilor
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/russian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/russian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1728,7 +1728,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Информация о местных властях
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} местные власти
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Рейтинг транспортной компании
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Субсидии
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Свободные субсидии
STR_2027_FROM_TO :{ORANGE}{STRING.p} по маршруту из {STRING} в {STRING}
@@ -2225,7 +2225,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}ИТОГО:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}График доходов
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/simplified_chinese.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/simplified_chinese.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1648,7 +1648,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}显示地方政府的信息
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} 地方政府
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}对运输公司评价：
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}财政补贴项目
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}尚未中标的项目：
STR_2027_FROM_TO :{ORANGE}将 {STRING} 从 {STRING} 运送到 {STRING}
@@ -2113,7 +2113,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}总计：
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}收入图表
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/slovak.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/slovak.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1790,7 +1790,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Zobrazit informacie o miestnej sprave
STR_2022_LOCAL_AUTHORITY :{WHITE}Miestna sprava {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Hodnotenie dopravnych spolocnosti:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Dotacie
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ponuknute dotacie:
STR_2027_FROM_TO :{ORANGE}{STRING} z {STRING} do {STRING}
@@ -2276,7 +2276,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Spolu:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf príjmov
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
@@ -3397,6 +3397,10 @@
STR_GROUP_ALL_ROADS :Všetky cestné vozidlá
STR_GROUP_ALL_SHIPS :Všetky lode
STR_GROUP_ALL_AIRCRAFTS :Všetky lietadlá
+STR_GROUP_DEFAULT_TRAINS :Nezaradené vlaky
+STR_GROUP_DEFAULT_ROADS :Nezaradené vozidlá
+STR_GROUP_DEFAULT_SHIPS :Nezaradené lode
+STR_GROUP_DEFAULT_AIRCRAFTS :Nezaradené lietadlá
STR_GROUP_TINY_NUM :{TINYFONT}{COMMA}
STR_GROUP_ADD_SHARED_VEHICLE :Pridat zdielané vozidlá
STR_GROUP_REMOVE_ALL_VEHICLES :Odstránit všetky vozidlá
--- a/src/lang/slovenian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/slovenian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1768,7 +1768,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Pokaži informacije o mestni oblasti
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} mestni svet
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ocene prevoznega podjetja:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subvencije
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ponudba subvencije za storitev:
STR_2027_FROM_TO :{ORANGE}Prevoz {STRING.r} iz {STRING} v {STRING}
@@ -2292,7 +2292,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Skupaj:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf prihodkov
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/spanish.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/spanish.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1727,7 +1727,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Mostrar información sobre autoridades locales
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} autoridad local
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ranking de empresas de transporte:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subvenciones
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Se ofrecen subvenciones por llevar:
STR_2027_FROM_TO :{ORANGE}{STRING} desde {STRING} a {STRING}
@@ -2213,7 +2213,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Total:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Ingresos
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/swedish.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/swedish.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Visa information om de lokala myndigheterna
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} lokala myndigheter
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transportföretags värderingar:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subventioner
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Aktuella subventioner:
STR_2027_FROM_TO :{ORANGE}{STRING} från {STRING} till {STRING}
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totalt:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Graf över inkomster
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/traditional_chinese.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/traditional_chinese.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1726,7 +1726,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}顯示地方政府資訊
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} 地方政府
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}運輸公司評比：
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}：{ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}：{ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}補助
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}提供補助的運輸服務：
STR_2027_FROM_TO :{ORANGE}將 {STRING} 從 {STRING} 運到 {STRING}
@@ -2212,7 +2212,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}總計：
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}收入圖
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/turkish.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/turkish.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1710,7 +1710,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Belediye hakkında bilgi göster
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} belediyesi
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Taşıma şirketi reytingleri:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}İhaleler
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Beklenen ihaleler:
STR_2027_FROM_TO :{ORANGE}{STRING} {STRING} -> {STRING}
@@ -2190,7 +2190,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Toplam:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Gelir Grafiği
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/ukrainian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/ukrainian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1852,7 +1852,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Інформація про місцеву владу
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} місцева влада
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Рейтинги компаній:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Субсидії
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Пропонуються субсидії:-
STR_2027_FROM_TO :{ORANGE}Перевезення {STRING.r} з {STRING} до {STRING}
@@ -2375,7 +2375,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Всього:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Графік доходів
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/unfinished/afrikaans.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/unfinished/afrikaans.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1522,7 +1522,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Wys inlingting oor plaaslike raad
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} plaaslike raad
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Vervoer maatskappy graderings:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidiee
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subsidiee op aanbod vir diens opneming:
STR_2027_FROM_TO :{ORANGE}{STRING} van {STRING} tot {STRING}
@@ -1967,7 +1967,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totaal:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Inkome Grafiek
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
--- a/src/lang/unfinished/frisian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/unfinished/frisian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -910,7 +910,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Lit ynformaasje sjen oer de gemeente
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} gemeente
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transportbedrieuw rang:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsydzjes
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subsydzjes dy't oanbean wurde:
STR_2027_FROM_TO :{ORANGE}{STRING} fan {STRING} nei {STRING}
@@ -1196,7 +1196,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Totaal:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Ynkomsten Grafyk
STR_7024 :{COMMA}
STR_7027_LOAN :{WHITE}Liening
--- a/src/lang/unfinished/greek.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/unfinished/greek.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1385,7 +1385,7 @@
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}Εμφάνιση πληροφοριών για την τοπική αρχή
STR_2022_LOCAL_AUTHORITY :{WHITE}Τοπική αρχή της πόλης {TOWN}
STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ποσοστά εταιρείας μεταφορών:
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Χρηματοδοτήσεις
STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Τρέχουσες χρηματοδοτήσεις για υπηρεσίες παίρνοντας:
STR_2027_FROM_TO :{ORANGE}{STRING} από {STRING} πρός {STRING}
@@ -1794,7 +1794,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Σύνολο:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_7022_INCOME_GRAPH :{WHITE}Γράφημα Εισοδήματος
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Γράφημα Ενεργών Εσόδων
--- a/src/lang/unfinished/latvian.txt Sun Jul 22 21:10:59 2007 +0000
+++ b/src/lang/unfinished/latvian.txt Sun Jul 22 21:24:42 2007 +0000
@@ -1437,7 +1437,7 @@
STR_2017_FOUNTAIN :Stru'klaka
STR_2018_PARK :Parks
STR_201E_STADIUM :Stadions
-STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING}
+STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}Subsidijas
STR_202A_NONE :{ORANGE}Neviens
STR_2036_COTTAGES :Kotedži
@@ -1662,7 +1662,7 @@
STR_701E :{BLACK}-{CURRENCY}
STR_701F :{BLACK}+{CURRENCY}
STR_7020_TOTAL :{WHITE}Kopā:
-STR_7021 :{COMPANY}{COMPANYNUM}
+STR_7021 :{COMPANY} {COMPANYNUM}
STR_CURRCOMPACT :{CURRCOMPACT}
STR_7024 :{COMMA}
STR_7027_LOAN :{WHITE}Aizdevums
--- a/src/misc/autoptr.hpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/misc/autoptr.hpp Sun Jul 22 21:24:42 2007 +0000
@@ -38,13 +38,14 @@
FORCEINLINE ~AutoPtrT()
{
if (m_p != NULL) {
- delete m_p;
+ T *p = m_p;
m_p = NULL;
+ delete p;
}
}
/** give-up ownership and NULLify the raw pointer */
- FORCEINLINE T* Release()
+ FORCEINLINE T* Detach()
{
T* p = m_p;
m_p = NULL;
@@ -80,8 +81,16 @@
/** assignment operator */
FORCEINLINE AutoPtrT& operator = (const AutoPtrT& src)
{
+ /* Save original pointer and replace it with the given one to avoid recursive calls. */
+ T* p = m_p;
m_p = src.m_p;
+
if (m_p != NULL) src.m_p = NULL;
+
+ if (p != NULL) {
+ /* Now we can safely delete the old one. */
+ delete p;
+ }
return *this;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/misc/countedobj.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -0,0 +1,21 @@
+/* $Id$ */
+
+#include "../stdafx.h"
+
+#include "countedptr.hpp"
+
+int32 SimpleCountedObject::AddRef()
+{
+ return ++m_ref_cnt;
+}
+
+int32 SimpleCountedObject::Release()
+{
+ int32 res = --m_ref_cnt;
+ assert(res >= 0);
+ if (res == 0) {
+ FinalRelease();
+ delete this;
+ }
+ return res;
+}
--- a/src/misc/countedptr.hpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/misc/countedptr.hpp Sun Jul 22 21:24:42 2007 +0000
@@ -5,7 +5,6 @@
#ifndef COUNTEDPTR_HPP
#define COUNTEDPTR_HPP
-#if 0 // reenable when needed
/** @file CCountedPtr - smart pointer implementation */
/** CCountedPtr - simple reference counting smart pointer.
@@ -44,7 +43,7 @@
public:
/** release smart pointer (and decrement ref count) if not null */
- FORCEINLINE void Release() {if (m_pT != NULL) {m_pT->Release(); m_pT = NULL;}}
+ FORCEINLINE void Release() {if (m_pT != NULL) {Tcls* pT = m_pT; m_pT = NULL; pT->Release();}}
/** dereference of smart pointer - const way */
FORCEINLINE const Tcls* operator -> () const {assert(m_pT != NULL); return m_pT;};
@@ -56,7 +55,7 @@
FORCEINLINE operator const Tcls*() const {assert(m_pT == NULL); return m_pT;}
/** raw pointer casting operator - non-const way */
- FORCEINLINE operator Tcls*() {assert(m_pT == NULL); return m_pT;}
+ FORCEINLINE operator Tcls*() {return m_pT;}
/** operator & to support output arguments */
FORCEINLINE Tcls** operator &() {assert(m_pT == NULL); return &m_pT;}
@@ -65,7 +64,7 @@
FORCEINLINE CCountedPtr& operator = (Tcls* pT) {Assign(pT); return *this;}
/** assignment operator from another smart ptr */
- FORCEINLINE CCountedPtr& operator = (CCountedPtr& src) {Assign(src.m_pT); return *this;}
+ FORCEINLINE CCountedPtr& operator = (const CCountedPtr& src) {Assign(src.m_pT); return *this;}
/** assignment operator helper */
FORCEINLINE void Assign(Tcls* pT);
@@ -74,10 +73,10 @@
FORCEINLINE bool IsNull() const {return m_pT == NULL;}
/** another way how to test for NULL value */
- FORCEINLINE bool operator == (const CCountedPtr& sp) const {return m_pT == sp.m_pT;}
+ //FORCEINLINE bool operator == (const CCountedPtr& sp) const {return m_pT == sp.m_pT;}
/** yet another way how to test for NULL value */
- FORCEINLINE bool operator != (const CCountedPtr& sp) const {return m_pT != sp.m_pT;}
+ //FORCEINLINE bool operator != (const CCountedPtr& sp) const {return m_pT != sp.m_pT;}
/** assign pointer w/o incrementing ref count */
FORCEINLINE void Attach(Tcls* pT) {Release(); m_pT = pT;}
@@ -98,5 +97,64 @@
}
}
-#endif /* 0 */
+/**
+ * Adapter wrapper for CCountedPtr like classes that can't be used directly by stl
+ * collections as item type. For example CCountedPtr has overloaded operator & which
+ * prevents using CCountedPtr in stl collections (i.e. std::list<CCountedPtr<MyType> >)
+ */
+template <class T> struct AdaptT {
+ T m_t;
+
+ /** construct by wrapping the given object */
+ AdaptT(const T &t)
+ : m_t(t)
+ {}
+
+ /** assignment operator */
+ T& operator = (const T &t)
+ {
+ m_t = t;
+ return t;
+ }
+
+ /** type-cast operator (used when AdaptT is used instead of T) */
+ operator T& ()
+ {
+ return m_t;
+ }
+
+ /** const type-cast operator (used when AdaptT is used instead of const T) */
+ operator const T& () const
+ {
+ return m_t;
+ }
+};
+
+
+/** Simple counted object. Use it as base of your struct/class if you want to use
+ * basic reference counting. Your struct/class will destroy and free itself when
+ * last reference to it is released (using Relese() method). The initial reference
+ * count (when it is created) is zero (don't forget AddRef() at least one time if
+ * not using CCountedPtr<T>.
+ *
+ * @see misc/countedobj.cpp for implementation.
+ */
+struct SimpleCountedObject {
+ int32 m_ref_cnt;
+
+ SimpleCountedObject()
+ : m_ref_cnt(0)
+ {}
+
+ virtual ~SimpleCountedObject()
+ {};
+
+ virtual int32 AddRef();
+ virtual int32 Release();
+ virtual void FinalRelease() {};
+};
+
+
+
+
#endif /* COUNTEDPTR_HPP */
--- a/src/newgrf.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/newgrf.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -1538,8 +1538,8 @@
cs->name = grf_load_word(&buf);
break;
- case 0x0A: /* String for cargo name, plural */
- cs->name_plural = grf_load_word(&buf);
+ case 0x0A: /* String for 1 unit of cargo */
+ cs->name_single = grf_load_word(&buf);
break;
case 0x0B:
@@ -5520,7 +5520,7 @@
if (!cs->IsValid() || cs->grfid == 0) continue;
cs->name = MapGRFStringID(cs->grfid, cs->name);
- cs->name_plural = MapGRFStringID(cs->grfid, cs->name_plural);
+ cs->name_single = MapGRFStringID(cs->grfid, cs->name_single);
cs->units_volume = MapGRFStringID(cs->grfid, cs->units_volume);
cs->quantifier = MapGRFStringID(cs->grfid, cs->quantifier);
cs->abbrev = MapGRFStringID(cs->grfid, cs->abbrev);
--- a/src/newgrf_callbacks.h Sun Jul 22 21:10:59 2007 +0000
+++ b/src/newgrf_callbacks.h Sun Jul 22 21:24:42 2007 +0000
@@ -75,7 +75,7 @@
CBID_HOUSE_DESTRUCTION = 0x21,
/** Called to determine if the given industry type is available */
- CBID_INDUSTRY_AVAILABLE = 0x22, // not implemented
+ CBID_INDUSTRY_AVAILABLE = 0x22,
/** This callback is called from vehicle purchase lists. It returns a value to be
* used as a custom string ID in the 0xD000 range. */
--- a/src/os2.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/os2.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -44,6 +44,8 @@
_dos_getdrive(&save); // save original drive
#else
save = _getdrive(); // save original drive
+ char wd[MAX_PATH];
+ getcwd(wd, MAX_PATH);
total = 'z';
#endif
@@ -55,7 +57,7 @@
for (disk = 'A';; disk++) {
_chdrive(disk);
#endif
- if (disk >= total) return;
+ if (disk >= total) break;
#ifndef __INNOTEK_LIBC__
_dos_getdrive(&disk2);
@@ -80,7 +82,7 @@
#ifndef __INNOTEK_LIBC__
_dos_setdrive(save, &total);
#else
- _chdrive(save);
+ chdir(wd);
#endif
}
--- a/src/roadveh_gui.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/roadveh_gui.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -279,7 +279,7 @@
SetWindowWidgetDisabledState(w, 11, !is_localplayer);
/* Disable refit button if vehicle not refittable */
SetWindowWidgetDisabledState(w, 12, !is_localplayer ||
- _engine_info[v->engine_type].refit_mask == 0);
+ EngInfo(v->engine_type)->refit_mask == 0);
/* draw widgets & caption */
SetDParam(0, v->index);
--- a/src/signs.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/signs.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -14,7 +14,8 @@
#include "command.h"
#include "variables.h"
-static Sign *_new_sign;
+SignID _new_sign_id;
+uint _total_signs;
/**
* Called if a new block is added to the sign-pool
@@ -145,7 +146,8 @@
MarkSignDirty(si);
InvalidateWindow(WC_SIGN_LIST, 0);
_sign_sort_dirty = true;
- _new_sign = si;
+ _new_sign_id = si->index;
+ _total_signs++;
}
return CommandCost();
@@ -199,6 +201,7 @@
InvalidateWindow(WC_SIGN_LIST, 0);
_sign_sort_dirty = true;
+ _total_signs--;
}
}
@@ -215,7 +218,7 @@
void CcPlaceSign(bool success, TileIndex tile, uint32 p1, uint32 p2)
{
if (success) {
- ShowRenameSignWindow(_new_sign);
+ ShowRenameSignWindow(GetSign(_new_sign_id));
ResetObjectToPlace();
}
}
@@ -238,6 +241,7 @@
*/
void InitializeSigns()
{
+ _total_signs = 0;
CleanPool(&_Sign_pool);
AddBlockToPool(&_Sign_pool);
}
@@ -275,6 +279,7 @@
*/
static void Load_SIGN()
{
+ _total_signs = 0;
int index;
while ((index = SlIterateArray()) != -1) {
Sign *si;
@@ -284,6 +289,8 @@
si = GetSign(index);
SlObject(si, _sign_desc);
+
+ _total_signs++;
}
_sign_sort_dirty = true;
--- a/src/signs.h Sun Jul 22 21:10:59 2007 +0000
+++ b/src/signs.h Sun Jul 22 21:24:42 2007 +0000
@@ -18,6 +18,12 @@
SignID index;
};
+enum {
+ INVALID_SIGN = 0xFFFF,
+};
+
+extern SignID _new_sign_id;
+
DECLARE_OLD_POOL(Sign, Sign, 2, 16000)
static inline SignID GetMaxSignIndex()
@@ -32,7 +38,8 @@
static inline uint GetNumSigns()
{
- return GetSignPoolSize();
+ extern uint _total_signs;
+ return _total_signs;
}
/**
--- a/src/station_cmd.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/station_cmd.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -1004,7 +1004,7 @@
RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station */
- st_auto_delete.Release();
+ st_auto_delete.Detach();
}
return cost;
@@ -1383,8 +1383,8 @@
RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station and the new road stop */
- st_auto_delete.Release();
- rs_auto_delete.Release();
+ st_auto_delete.Detach();
+ rs_auto_delete.Detach();
}
return cost;
}
@@ -1657,7 +1657,7 @@
RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station */
- st_auto_delete.Release();
+ st_auto_delete.Detach();
}
return cost;
@@ -1781,7 +1781,7 @@
RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station */
- st_auto_delete.Release();
+ st_auto_delete.Detach();
}
return CommandCost(_price.build_dock);
@@ -1948,7 +1948,7 @@
RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station */
- st_auto_delete.Release();
+ st_auto_delete.Detach();
}
return CommandCost(_price.build_dock);
}
--- a/src/stdafx.h Sun Jul 22 21:10:59 2007 +0000
+++ b/src/stdafx.h Sun Jul 22 21:24:42 2007 +0000
@@ -341,13 +341,18 @@
CDECL error(const char *str, ...);
#define NOT_REACHED() error("NOT_REACHED triggered at line %i of %s", __LINE__, __FILE__)
-#if !defined(MORPHOS)
-/* MorphOS doesn't know wchars, the rest does :( */
+#if defined(MORPHOS)
+/* MorphOS doesn't have C++ conformant _stricmp... */
+#define _stricmp stricmp
+#elif defined(OPENBSD)
+/* OpenBSD uses strcasecmp(3) */
+#define _stricmp strcasecmp
+#endif
+
+#if !defined(MORPHOS) && !defined(OPENBSD)
+/* MorphOS & OpenBSD don't know wchars, the rest does :( */
#define HAS_WCHAR
-#else
-/* And MorphOS doesn't have C++ conformant _stricmp... */
-#define _stricmp stricmp
-#endif /* !defined(MORHPOS) */
+#endif /* !defined(MORPHOS) && !defined(OPENBSD) */
#if !defined(MAX_PATH)
# define MAX_PATH 260
--- a/src/table/build_industry.h Sun Jul 22 21:10:59 2007 +0000
+++ b/src/table/build_industry.h Sun Jul 22 21:24:42 2007 +0000
@@ -1312,7 +1312,7 @@
151, 0xA6666666, 0, 3, 3, 0, 0, 6, 5, 0, 15,
IT_GOLD_MINE, IT_DIAMOND_MINE, IT_INVALID, CHECK_NOTHING,
CT_INVALID, 0, CT_INVALID, 0, 5,
- CT_GOLD, 256, CT_INVALID, 0, CT_INVALID, 0,
+ CT_GOLD, 0, CT_INVALID, 0, CT_INVALID, 0,
INDUSTRYLIFE_BLACK_HOLE, 1 << LT_ARCTIC | 1 << LT_TROPIC,
INDUSTRYBEH_ONLY_INTOWN,
STR_4812_BANK, STR_482D_NEW_UNDER_CONSTRUCTION,
@@ -1372,7 +1372,7 @@
115, 0xFFFFFFFF, 0, 0, 4, 0, 0, 0, 8, 0, 208,
IT_WATER_SUPPLY, IT_INVALID, IT_INVALID, CHECK_WATER,
CT_INVALID, 0, CT_INVALID, 0, 5,
- CT_WATER, 256, CT_INVALID, 0, CT_INVALID, 0,
+ CT_WATER, 0, CT_INVALID, 0, CT_INVALID, 0,
INDUSTRYLIFE_BLACK_HOLE, 1 << LT_TROPIC,
INDUSTRYBEH_ONLY_INTOWN,
STR_4818_WATER_TOWER, STR_482D_NEW_UNDER_CONSTRUCTION,
@@ -1452,7 +1452,7 @@
133, 0xFFFFFFFF, 0, 0, 0, 3, 0, 0, 0, 4, 208,
IT_TOY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_INVALID, 0, CT_INVALID, 0, 5,
- CT_TOYS, 256, CT_INVALID, 0, CT_INVALID, 0,
+ CT_TOYS, 0, CT_INVALID, 0, CT_INVALID, 0,
INDUSTRYLIFE_BLACK_HOLE, 1 << LT_TOYLAND,
INDUSTRYBEH_ONLY_NEARTOWN,
STR_4820_TOY_SHOP, STR_482D_NEW_UNDER_CONSTRUCTION,
--- a/src/vehicle.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/vehicle.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -2723,7 +2723,7 @@
scheme = LS_FREIGHT_WAGON;
}
} else {
- bool is_mu = HASBIT(_engine_info[engine_type].misc_flags, EF_RAIL_IS_MU);
+ bool is_mu = HASBIT(EngInfo(engine_type)->misc_flags, EF_RAIL_IS_MU);
switch (rvi->engclass) {
default: NOT_REACHED();
--- a/src/window.cpp Sun Jul 22 21:10:59 2007 +0000
+++ b/src/window.cpp Sun Jul 22 21:24:42 2007 +0000
@@ -1619,14 +1619,14 @@
/* here allows scrolling in both x and y axis */
#define scrollspeed 3
if (x - 15 < 0) {
- WP(w, vp_d).scrollpos_x += ScaleByZoom((x - 15) * scrollspeed, vp->zoom);
+ WP(w, vp_d).dest_scrollpos_x += ScaleByZoom((x - 15) * scrollspeed, vp->zoom);
} else if (15 - (vp->width - x) > 0) {
- WP(w, vp_d).scrollpos_x += ScaleByZoom((15 - (vp->width - x)) * scrollspeed, vp->zoom);
+ WP(w, vp_d).dest_scrollpos_x += ScaleByZoom((15 - (vp->width - x)) * scrollspeed, vp->zoom);
}
if (y - 15 < 0) {
- WP(w, vp_d).scrollpos_y += ScaleByZoom((y - 15) * scrollspeed, vp->zoom);
+ WP(w, vp_d).dest_scrollpos_y += ScaleByZoom((y - 15) * scrollspeed, vp->zoom);
} else if (15 - (vp->height - y) > 0) {
- WP(w,vp_d).scrollpos_y += ScaleByZoom((15 - (vp->height - y)) * scrollspeed, vp->zoom);
+ WP(w, vp_d).dest_scrollpos_y += ScaleByZoom((15 - (vp->height - y)) * scrollspeed, vp->zoom);
}
#undef scrollspeed
}
--- a/src/window.h Sun Jul 22 21:10:59 2007 +0000
+++ b/src/window.h Sun Jul 22 21:24:42 2007 +0000
@@ -410,19 +410,6 @@
};
assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vp_d));
-/* vp2_d is the same as vp_d, except for the data_# values.. */
-struct vp2_d {
- VehicleID follow_vehicle;
- int32 scrollpos_x;
- int32 scrollpos_y;
- int32 dest_scrollpos_x;
- int32 dest_scrollpos_y;
- byte data_1;
- byte data_2;
- byte data_3;
-};
-assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vp2_d));
-
struct news_d {
uint16 follow_vehicle;
int32 scrollpos_x;