--- a/Makefile.lang.in Sun Feb 03 01:34:21 2008 +0000
+++ b/Makefile.lang.in Sun Feb 03 20:34:26 2008 +0000
@@ -36,7 +36,7 @@
all: table/strings.h $(LANGS)
-strgen.o: $(SRC_DIR)/strgen/strgen.cpp endian_host.h
+strgen.o: $(SRC_DIR)/strgen/strgen.cpp endian_host.h $(SRC_DIR)/table/control_codes.h
$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
--- a/config.lib Sun Feb 03 01:34:21 2008 +0000
+++ b/config.lib Sun Feb 03 20:34:26 2008 +0000
@@ -635,7 +635,7 @@
distcc="$with_distcc"
fi
if [ "$with_distcc" != "0" ]; then
- res="`$distcc --version 2>/dev/null | head -n 1 | cut -b 0-6`"
+ res="`$distcc --version 2>/dev/null | head -n 1 | cut -b 1-6`"
if [ "$res" != "distcc" ]; then
distcc=""
log 1 "checking distcc... no"
@@ -664,7 +664,7 @@
ccache="$with_ccache"
fi
if [ "$with_ccache" != "0" ]; then
- res="`$ccache --version 2>/dev/null | head -n 1 | cut -b 0-6`"
+ res="`$ccache --version 2>/dev/null | head -n 1 | cut -b 1-6`"
if [ "$res" != "ccache" ]; then
ccache=""
log 1 "checking ccache... no"
--- a/docs/Readme_Windows_MSVC.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/docs/Readme_Windows_MSVC.txt Sun Feb 03 20:34:26 2008 +0000
@@ -6,11 +6,11 @@
SUPPORTED MSVC COMPILERS
------------------------
-OpenTTD includes projects for MSVC 2003.NET and MSVC 2005.NET. Both will
+OpenTTD includes projects for MSVC 2005.NET and MSVC 2008.NET. Both will
compile out of the box, providing you have the required libraries/headers;
-which ones, see below. There is no support for VS6, you are therefore
-strongly encouraged to either upgrade to MSVC 2005 Express (free) or use GCC.
-MSVC 2002 probably works as well, but it has not been tested.
+which ones, see below. There is no support for VS6 or MSVC 2002, or
+MSVC 2003.NET. You are therefore strongly encouraged to either upgrade to
+MSVC 2005 Express (free) or use GCC.
1) REQUIRED FILES
@@ -74,20 +74,6 @@
list, above all others, otherwise compilation will most likely fail!!
-2.3) DEBUGGING - WORKING DIRECTORY (MSVC 2003 ONLY!)
-----------------------------------------------------
-The very first time you check out and compile OpenTTD with Visual Studio 2003, running
-the binary will complain about missing files. You need to go into and change a setting
-
-OpenTTD > Project > Properties > Configuration (All Configurations) > ...
- Configuration Properties > Debugging >
-
- * Working Directory: ..\bin
-
-VS 2005 works out of the box because Microsoft allowed a user to supply a humanly-
-readable defaults file (openttd_vs80.vcproj.user), whereas 2003 is braindead.
-
-
3) TTD GRAPHICS FILES
---------------------
Copy the following files from Transport Tycoon Deluxe to the bin/data folder
@@ -102,12 +88,12 @@
4) COMPILING
------------
-Open trunk/openttd[_vs80].sln
+Open trunk/openttd_vs[89]0.sln
Set the build mode to 'Release' in
Build > Configuration manager > Active solution configuration > select "Release"
Compile...
-If everything works well the binary should be in trunk/objs/[Win32]/Release/openttd.exe
+If everything works well the binary should be in trunk/objs/Win[32|64]/Release/openttd.exe
5) EDITING, CHANGING SOURCE CODE
@@ -126,4 +112,4 @@
within a few days as the problem is noticed and fixed.
An up-to-date version of this README can be found on the wiki:
-http://wiki.openttd.org/index.php/MicrosoftVisualCExpress
\ No newline at end of file
+http://wiki.openttd.org/index.php/MicrosoftVisualCExpress
--- a/docs/landscape.html Sun Feb 03 01:34:21 2008 +0000
+++ b/docs/landscape.html Sun Feb 03 20:34:26 2008 +0000
@@ -38,8 +38,8 @@
<a name = "tropic_zone">
Bits 1..0 :
<table border="1">
- <tr bgcolor="#CCCCCC"><td colspan="2">Only meaningfull in tropic climate.<br>It contains the definition of the two available zones</td></tr>
- <tr><td><tt>00</tt> </td><td>invalid zone</td></tr>
+ <tr bgcolor="#CCCCCC"><td colspan="2">Only meaningfull in tropic climate.<br>It contains the definition of the available zones</td></tr>
+ <tr><td><tt>00</tt> </td><td>normal</td></tr>
<tr><td><tt>01</tt> </td><td>desert</td></tr>
<tr><td><tt>02</tt> </td><td>rain forest</td></tr>
</table>
@@ -79,78 +79,92 @@
<td>
<ul>
<li>m1: <a href="#OwnershipInfo">owner</a> of the tile (normally <tt>10</tt>)</li>
+ <li>m2: see fields</li>
+ <li>m3 bits 3..0: see fields</li>
<li>m4 bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none)</li>
<li>m4 bits 4..2: same as 7..5, but for the SE border</li>
<li>m5 bits 7..5: update counter, incremented on every periodic processing for tile types,
other than <tt>03</tt>, <tt>07</tt>, <tt>0B</tt>, <tt>10</tt> and above.<BR>
on wraparound, the tile is updated (for fields, the type of fields in m3 is increased, for other types the tile type in m5 is increased).<BR>
For snow and desert, these bits are not used, tile is updated on every periodic processing.</li>
- <li>m5 bits 4..0: tile type:
+ <li>m5 bits 4..2: tile type:
<table>
<tr>
- <td nowrap valign=top><tt>00</tt> </td>
- <td align=left>bare land</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>01</tt> </td>
- <td align=left>1/3 grass</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>02</tt> </td>
- <td align=left>2/3 grass</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>03</tt> </td>
- <td align=left>full grass</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>07</tt> </td>
- <td align=left>rough land</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>0B</tt> </td>
- <td align=left>rocks</td>
+ <td nowrap valign=top><tt>0</tt> </td>
+ <td align=left>bare land / grass</td>
</tr>
<tr>
- <td nowrap valign=top><tt>0F</tt> </td>
- <td align=left>fields; type of fields in m3 bits 3..0 (legal values: 0 through 9)<br>
- m2: Index into the array of industries (farms), INVALID_INDUSTRY (0xFFFF) if farm has been removed</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>10</tt> </td>
- <td align=left>1/4 snow</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>11</tt> </td>
- <td align=left>2/4 snow</td>
+ <td nowrap valign=top><tt>1</tt> </td>
+ <td align=left>rough land (density must be 3)</td>
</tr>
<tr>
- <td nowrap valign=top><tt>12</tt> </td>
- <td align=left>3/4 snow</td>
+ <td nowrap valign=top><tt>2</tt> </td>
+ <td align=left>rocks (density must be 3)</td>
</tr>
<tr>
- <td nowrap valign=top><tt>13</tt> </td>
- <td align=left>full snow</td>
+ <td nowrap valign=top><tt>3</tt> </td>
+ <td align=left>fields (density must be 3)
+ <ul>
+ <li>m2: index into the array of industries (farms), INVALID_INDUSTRY (0xFFFF) if farm has been removed</li>
+ <li>m3 bits 3..0: field type (legal values: 0 through 9)</li>
+ </ul>
+ </td>
</tr>
<tr>
- <td nowrap valign=top><tt>15</tt> </td>
- <td align=left>partial desert</td>
+ <td nowrap valign=top><tt>4</tt> </td>
+ <td align=left>snow</td>
</tr>
<tr>
- <td nowrap valign=top><tt>17</tt> </td>
- <td align=left>full desert</td>
+ <td nowrap valign=top><tt>5</tt> </td>
+ <td align=left>desert (density must be 1 or 3)</td>
+ </tr>
+ </table>
+ </li>
+ <li>m5 bits 1..0: density:
+ <table>
+ <tr>
+ <td nowrap valign=top><tt>0</tt> </td>
+ <td>bare land</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td>1/4 snow</td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>1</tt> </td>
+ <td>1/3 grass</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td>2/4 snow; </td>
+ <td>1/2 desert</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>2</tt> </td>
+ <td>2/3 grass</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td>3/4 snow</td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>3</tt> </td>
+ <td>full grass; </td>
+ <td>rough land; </td>
+ <td>rocks; </td>
+ <td>fields; </td>
+ <td>full snow; </td>
+ <td>full desert</td>
</tr>
</table>
</li>
@@ -168,105 +182,108 @@
<td valign=top nowrap> </td>
<td>
<ul>
+ <li>m1: <a href="#OwnershipInfo">owner</a> of the tile</li>
+ <li>m2: see waypoint and signals</li>
+ <li>m3 bits 7..4: see signals</li>
+ <li>m3 bits 3..0 = <a name="TrackType">track type</a>:
+ <table>
+ <tr>
+ <td><tt>0</tt> </td>
+ <td>conventional railway</td>
+ </tr>
+
+ <tr>
+ <td><tt>1</tt> </td>
+ <td>electrified railway</td>
+ </tr>
+
+ <tr>
+ <td><tt>2</tt> </td>
+ <td>monorail</td>
+ </tr>
+
+ <tr>
+ <td><tt>3</tt> </td>
+ <td>maglev</td>
+ </tr>
+ </table>
+ </li>
+ <li>m4 bits 7..4: see signals</li>
+ <li>m4 bits 3..0: Ground type (values with fences are not valid for depots and checkpoints)
+ <table>
+ <tr>
+ <td nowrap valign=top><tt>0</tt> </td>
+ <td align=left>on bare land</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>1</tt> </td>
+ <td align=left>on grass, no fences</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>2</tt> </td>
+ <td align=left>fence on the NW side</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>3</tt> </td>
+ <td align=left>fence on the SE side</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>4</tt> </td>
+ <td align=left>fences on the NW and SE sides</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>5</tt> </td>
+ <td align=left>fence on the NE side</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>6</tt> </td>
+ <td align=left>fence on the SW side</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>7</tt> </td>
+ <td align=left>fences on the NE and SW sides</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>8</tt> </td>
+ <td align=left>fence on the E side (track in the W corner)</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>9</tt> </td>
+ <td align=left>fence on the W side (track in the E corner)</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>A</tt> </td>
+ <td align=left>fence on the S side (track in the N corner)</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>B</tt> </td>
+ <td align=left>fence on the N side (track in the S corner)</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>C</tt> </td>
+ <td align=left>on snow or desert</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>D</tt> </td>
+ <td align=left>on grass with fence and shore or water on the free halftile</td>
+ </tr>
+ </table>
+ </li>
<li>m5 bit 7 clear: railway track
<ul>
- <li>m1: <a href="#OwnershipInfo">owner</a> of the track</li>
- <li>m3 bits 3..0 = <a name="TrackType">track type</a>:
- <table>
- <tr>
- <td><tt>0</tt> </td>
- <td>conventional railway</td>
- </tr>
-
- <tr>
- <td><tt>1</tt> </td>
- <td>electrified railway</td>
- </tr>
-
- <tr>
- <td><tt>2</tt> </td>
- <td>monorail</td>
- </tr>
-
- <tr>
- <td><tt>3</tt> </td>
- <td>maglev</td>
- </tr>
- </table>
- </li>
- <li>m4 bits 3..0:
- <table>
- <tr>
- <td nowrap valign=top><tt>0</tt> </td>
- <td align=left>on bare land</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>1</tt> </td>
- <td align=left>on grass, no fences</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>2</tt> </td>
- <td align=left>fence on the NW side</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>3</tt> </td>
- <td align=left>fence on the SE side</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>4</tt> </td>
- <td align=left>fences on the NW and SE sides</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>5</tt> </td>
- <td align=left>fence on the NE side</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>6</tt> </td>
- <td align=left>fence on the SW side</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>7</tt> </td>
- <td align=left>fences on the NE and SW sides</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>8</tt> </td>
- <td align=left>fence on the E side (track in the W corner)</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>9</tt> </td>
- <td align=left>fence on the W side (track in the E corner)</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>A</tt> </td>
- <td align=left>fence on the S side (track in the N corner)</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>B</tt> </td>
- <td align=left>fence on the N side (track in the S corner)</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>C</tt> </td>
- <td align=left>on snow or desert</td>
- </tr>
-
- <tr>
- <td nowrap valign=top><tt>D</tt> </td>
- <td align=left>on grass with fence and water on the lower halftile</td>
- </tr>
- </table>
- </li>
<li>m5 bits 5..0: track layout: bit set = track present:
<table>
<tr>
@@ -300,170 +317,136 @@
</tr>
</table>
</li>
- </ul>
- </li>
- <li>m5 bit 7 set: railway depot / checkpoints
- <ul>
- <li>m1: <a href="#OwnershipInfo">owner</a> of the depot / checkpoint</li>
- <li>m2: For waypoints, index into the array of waypoints.</li>
- <li>m3 bits 3..0 = <a href="#TrackType">track type</a></li>
- <li>m4 bits 3..0 = ground type, as per m4 bits 3..0 for railway tiles.</li>
- <li>m5 value C0..C3: railway depot
+ <li>m5 bit 6 set = with signals:<BR>
+ There are at most 4 signals on a tile. The signals 0..3 belong to the directions:
<table>
<tr>
- <td colspan=2>m5 bits 1..0</td>
- </tr>
-
- <tr>
- <td colspan=2>direction: exit towards:</td>
+ <td></td>
+ <td>Track <tt>0</tt> (X) </td>
+ <td>Track <tt>1</tt> (Y) </td>
+ <td>Track <tt>2</tt> (north) </td>
+ <td>Track <tt>3</tt> (south) </td>
+ <td>Track <tt>4</tt> (west) </td>
+ <td>Track <tt>5</tt> (east)</td>
</tr>
<tr>
- <td><tt>00</tt> </td>
- <td>NE</td>
- </tr>
-
- <tr>
- <td><tt>01</tt> </td>
- <td>SE</td>
+ <td align=left>Signal <tt>0</tt> </td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td>west</td>
+ <td></td>
+ <td>south</td>
</tr>
<tr>
- <td><tt>02</tt> </td>
- <td>SW</td>
+ <td align=left>Signal <tt>1</tt> </td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td>east</td>
+ <td></td>
+ <td>north</td>
</tr>
<tr>
- <td><tt>03</tt> </td>
- <td>NW</td>
- </tr>
- </table>
- </li>
- <li>m5 value 80..81: checkpoint
- <table>
- <tr>
- <td colspan=2>bit 0</td>
+ <td align=left>Signal <tt>2</tt> </td>
+ <td>south-west</td>
+ <td>north-west</td>
+ <td>west</td>
+ <td></td>
+ <td>south</td>
+ <td></td>
</tr>
<tr>
- <td>clear</td>
+ <td align=left>Signal <tt>3</tt> </td>
+ <td>north-east</td>
+ <td>south-east</td>
+ <td>east</td>
+ <td></td>
+ <td>north</td>
+ <td></td>
+ </tr>
+ </table>
+ <ul>
+ <li>m2 bit 6: Signal 0 and 1: set = semaphore signals, clear = light signals</li>
+ <li>m2 bit 2: Signal 2 and 3: set = semaphore signals, clear = light signals</li>
+ <li>m2 bits 5..4: type of signal 0 and 1 (same values as m2 bits 1..0)</li>
+ <li>m2 bits 1..0: type of signal 2 and 3
+ <table>
+ <tr>
+ <td nowrap="nowrap" valign="top"><tt>00</tt>: </td>
+ <td align="left">normal signals</td>
+ </tr>
+
+ <tr>
+ <td nowrap="nowrap" valign="top"><tt>01</tt>: </td>
+ <td align="left">pre-signals</td>
+ </tr>
+
+ <tr>
+ <td nowrap="nowrap" valign="top"><tt>10</tt>: </td>
+ <td align="left">exit-signals</td>
+ </tr>
+
+ <tr>
+ <td nowrap="nowrap" valign="top"><tt>11</tt>: </td>
+ <td align="left">combo-signals</td>
+ </tr>
+ </table>
+ </li>
+
+ <li>m3 bits 7..4: bit set = signal 3..0 present</li>
+ <li>m4 bits 7..4: bit clear = signal 3..0 shows red</li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li>m5 bit 7 set, bit 6 clear: checkpoint
+ <ul>
+ <li>m2: index into the array of waypoints.</li>
+ <li>m5 bit 0:
+ <table>
+ <tr>
+ <td><tt>0</tt> </td>
<td>in X direction</td>
</tr>
<tr>
- <td>set</td>
+ <td><tt>1</tt> </td>
<td>in Y direction</td>
</tr>
</table>
</li>
</ul>
- </li>
- <li>m5 bit 6 set = with signals:
- <ul>
- <li>m4 bits 7..4: bit clear = signal shows red; same bits as in m3</li>
- <li>m2 bit 2 <i>(6)</i>: set = semaphore signals, clear = light signals <i>(lower and right tracks)</i></li>
- <li>m2 bits 1..0 <i>(5..4)</i>: type of signal <i>(lower and right tracks)</i>
- <table>
+ </li>
+ <li>m5 bit 7 set, bit 6 set: railway depot
+ <ul>
+ <li>m5 bits 1..0: exit towards
+ <table>
<tr>
- <td nowrap="nowrap" valign="top"><tt>00</tt>: </td>
- <td align="left">normal signals</td>
- </tr>
-
- <tr>
- <td nowrap="nowrap" valign="top"><tt>01</tt>: </td>
- <td align="left">pre-signals</td>
- </tr>
-
- <tr>
- <td nowrap="nowrap" valign="top"><tt>10</tt>: </td>
- <td align="left">exit-signals</td>
+ <td><tt>0</tt> </td>
+ <td>NE</td>
</tr>
<tr>
- <td nowrap="nowrap" valign="top"><tt>11</tt>: </td>
- <td align="left">combo-signals</td>
+ <td><tt>1</tt> </td>
+ <td>SE</td>
+ </tr>
+
+ <tr>
+ <td><tt>2</tt> </td>
+ <td>SW</td>
+ </tr>
+
+ <tr>
+ <td><tt>3</tt> </td>
+ <td>NW</td>
</tr>
</table>
</li>
-
- <li>m3 bits 7..4: bit set = signal present:
- <ul>
- <li>For track in the X direction:
- <table>
- <tr>
- <td nowrap="nowrap" valign="top">bit 6: </td>
- <td align="left">signal in the SW direction</td>
- </tr>
-
- <tr>
- <td nowrap="nowrap" valign="top">bit 7: </td>
- <td align="left">signal in the NE direction</td>
- </tr>
- </table>
- </li>
-
- <li>For track in the Y direction:
- <table>
- <tr>
- <td nowrap="nowrap" valign="top">bit 6: </td>
- <td align="left">signal in the NW direction</td>
- </tr>
-
- <tr>
- <td nowrap="nowrap" valign="top">bit 7: </td>
- <td align="left">signal in the SE direction</td>
- </tr>
- </table>
- </li>
-
- <li>For tracks in the W-E direction:
- <table>
- <tr>
- <td nowrap="nowrap" valign="top">bit 4: </td>
- <td align="left">signal in the W direction on the track in the S corner</td>
- </tr>
-
- <tr>
- <td nowrap="nowrap" valign="top">bit 5: </td>
- <td align="left">signal in the E direction on the track in the S corner</td>
- </tr>
-
- <tr>
- <td nowrap="nowrap" valign="top">bit 6: </td>
- <td align="left">signal in the W direction on the track in the N corner</td>
- </tr>
- <tr>
- <td nowrap="nowrap" valign="top">bit 7: </td>
- <td align="left">signal in the E direction on the track in the N corner</td>
- </tr>
- </table>
- </li>
-
- <li>For tracks in the N-S direction:
- <table>
- <tr>
- <td nowrap="nowrap" valign="top">bit 4: </td>
- <td align="left">signal in the S direction on the track in the E corner</td>
- </tr>
-
- <tr>
- <td nowrap="nowrap" valign="top">bit 5: </td>
- <td align="left">signal in the N direction on the track in the E corner</td>
- </tr>
-
- <tr>
- <td nowrap="nowrap" valign="top">bit 6: </td>
- <td align="left">signal in the S direction on the track in the W corner</td>
- </tr>
-
- <tr>
- <td nowrap="nowrap" valign="top">bit 7: </td>
- <td align="left">signal in the N direction on the track in the W corner</td>
- </tr>
- </table>
- </li>
- </ul>
- </li>
</ul>
</li>
<li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
@@ -480,11 +463,28 @@
<td valign=top nowrap> </td>
<td>
<ul>
- <li>m5 bits 7..6 clear: road
+ <li>m3 bit 7 set = on snow or desert</li>
+ <li>m7 bits 7..5: present road types
+ <table>
+ <tr>
+ <td>bit 0 </td>
+ <td>normal road</td>
+ </tr>
+
+ <tr>
+ <td>bit 1 </td>
+ <td>tram</td>
+ </tr>
+
+ <tr>
+ <td>bit 2 </td>
+ <td>reserved</td>
+ </tr>
+ </table>
+ </li>
+ <li>m5 bits 7 clear: road or level-crossing
<ul>
- <li>m1: <a href="#OwnershipInfo">owner</a> of the road type #1</li>
<li>m2: Index into the array of towns, 0 for non-town roads</li>
- <li>m3 bit 7 set = on snow or desert</li>
<li>m3 bits 6..4:
<table>
<tr>
@@ -517,57 +517,96 @@
</tr>
</table>
</li>
- <li>m3 bits 3..0: counter for the roadworks</li>
- <li>m4 bits 3..0: road layout road type #1: bit set = road piece present:
- <table>
- <tr>
- <td nowrap valign=top>bit 0: </td>
- <td align=left>NW piece</td>
- </tr>
- <tr>
- <td nowrap valign=top>bit 1: </td>
- <td align=left>SW piece</td>
- </tr>
- <tr>
- <td nowrap valign=top>bit 2: </td>
- <td align=left>SE piece</td>
- </tr>
- <tr>
- <td nowrap valign=top>bit 3: </td>
- <td align=left>NE piece</td>
- </tr>
- </table>
+ <li>m5 bits 3..0: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
+ <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road type 2 (reserved)
+ <li>m5 bit 6 clear: road
+ <ul>
+ <li>m1: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
+ <li>m3 bits 3..0: counter for the roadworks</li>
+ <li>m4 bits 3..0: road layout road type 0 (normal road): bit set = road piece present:
+ <table>
+ <tr>
+ <td align=left>bit 0: </td>
+ <td>NW piece</td>
+ </tr>
+ <tr>
+ <td align=left>bit 1: </td>
+ <td>SW piece</td>
+ </tr>
+ <tr>
+ <td align=left>bit 2: </td>
+ <td>SE piece</td>
+ </tr>
+ <tr>
+ <td align=left>bit 3: </td>
+ <td>NE piece</td>
+ </tr>
+ </table>
+ </li>
+ <li>m4 bits 7..4: road layout road type 1 (tram)</li>
+ <li>m6 bits 5..2: road layout road type 2 (reserved)</li>
+ <li>m5 bits 5..4: bits to disallow vehicles to go a specific direction
+ <table>
+ <tr>
+ <td align=left>bit 0: </td>
+ <td>set = disallow driving in south-west or south-east direction</td>
+ </tr>
+ <tr>
+ <td align=left>bit 1: </td>
+ <td>set = disallow driving in north-west or north-east direction</td>
+ </tr>
+ </table>
+ </li>
+ </ul>
</li>
- <li>m4 bits 7..4: road layout road type #2
- <li>m5 bits 5..4: bits to disallow vehicles to go a specific direction
- <li>m5 bits 3..0: owner of road type #2
- <li>m6 bits 5..2: road layout road type #3
- <li>m7 bits 7..5: road types
- <li>m7 bits 4..0: owner of road type #3
+ <li>m5 bit 6 set: level crossing
+ <ul>
+ <li>m1: <a href="#OwnershipInfo">owner</a> of the railway track</li>
+ <li>m3 bits 3..0: <a href="#TrackType">railway track type</a></li>
+ <li>m4 bit 6: direction
+ <table>
+ <tr>
+ <td align=left><tt>0</tt> </td>
+ <td align=left>road in the X direction, rail in Y</td>
+ </tr>
+ <tr>
+ <td align=left><tt>1</tt> </td>
+ <td align=left>road in the Y direction, rail in X</td>
+ </tr>
+ </table>
+ </li>
+ <li>m4 bit 5: set if crossing lights are on</li>
+ <li>m4 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
+ </ul>
</li>
</ul>
</li>
<li>m5 bit 7 set, bit 6 clear: road depot
<ul>
<li>m1: <a href="#OwnershipInfo">owner</a> of the depot</li>
- <li>m3 bit 7 set = on snow or desert (not displayed, but set internally)</li>
- <li>m5 bits 3..0 - direction: exit towards: <tt>0</tt> = NE, <tt>1</tt> = SE, <tt>2</tt> = SW, <tt>3</tt> = NW</li>
- <li>m7 bits 7..5: road types
- </ul>
- </li>
- <li>m5 bit 6 set, bit 7 clear: level crossing
- <ul>
- <li>m1: <a href="#OwnershipInfo">owner</a> of the railway track</li>
- <li>m2: Index into the array of towns, 0 for non-town roads</li>
- <li>m3 bit 7 set = on snow or desert</li>
- <li>m3 bits 6..4: <tt>0</tt> - on bare land, <tt>1</tt> - on grass, <tt>2</tt> or higher - paved</li>
- <li>m3 bits 3..0: <a href="#TrackType">track type</a></li>
- <li>m4 bit 6: clear - road in the X direction, set - road in the Y direction (railway track always perpendicular)</li>
- <li>m4 bit 5: set if crossing lights are on</li>
- <li>m4 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type #1</li>
- <li>m5 bits 3..0: owner of road type #2
- <li>m7 bits 7..5: road types
- <li>m7 bits 4..0: owner of road type #3
+ <li>m5 bits 3..0: exit towards:
+ <table>
+ <tr>
+ <td><tt>0</tt> </td>
+ <td>NE</td>
+ </tr>
+
+ <tr>
+ <td><tt>1</tt> </td>
+ <td>SE</td>
+ </tr>
+
+ <tr>
+ <td><tt>2</tt> </td>
+ <td>SW</td>
+ </tr>
+
+ <tr>
+ <td><tt>3</tt> </td>
+ <td>NW</td>
+ </tr>
+ </table>
+ </li>
</ul>
</li>
<li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
@@ -585,12 +624,12 @@
<td>
<ul>
<li>m1 : Random bits <a href="#newhouses">(newhouses)</a> </li>
- <li>m2 : index into the array of industries</li>
+ <li>m2 : index into the array of towns</li>
<li>m3 bit 7 :
<ul>
<li> set : House is complete
<ul>
- <li>m5 : age of House. Maximum been 255, which means 255 years and more</li>
+ <li>m5 : year of house construction (relative to 1920); clamped to 0..255 (1920..2175)</li>
</ul>
</li>
<li> clear : House is in construction
@@ -601,8 +640,8 @@
</ul>
</li>
</ul>
- <li>m3 bit 6 : 9th bit of house type (m4), allowing 512 different types.</li>
- <li>m3 bits 5..0 : triggers activated <a href="#newhouses">(newhouses)</a></li>
+ <li>m3 bit 6 : bit 8 of house type (m4), allowing 512 different types.</li>
+ <li>m3 bits 4..0 : triggers activated <a href="#newhouses">(newhouses)</a></li>
<li>m4 : <a href="landscape_externals.html">town building type</a> (with m3[6] bit)</li>
<li>m5 : see m3 bit 7</li>
<li>m6 :
@@ -657,22 +696,28 @@
<td>
<ul>
<li>m1: <a href="#OwnershipInfo">owner</a> (normally <tt>10</tt>)</li>
- <li>m2 bits 5..4:
+ <li>m2 bits 7..6: ground density
+ <li>m2 bits 5..4: ground
<table>
<tr>
- <td nowrap valign=top><tt>0</tt> </td>
- <td align=left>on grass</td>
+ <td align=left><tt>0</tt> </td>
+ <td>on grass</td>
</tr>
<tr>
- <td nowrap valign=top><tt>1</tt> </td>
- <td align=left>on rough land</td>
+ <td align=left><tt>1</tt> </td>
+ <td>on rough land (density must be 3)</td>
</tr>
<tr>
- <td nowrap valign=top><tt>2</tt> </td>
- <td align=left>on snow or desert; m2 bits 7..6 - amount of snow or desert (for desert always set to 3 in TTD)</td>
+ <td align=left><tt>2</tt> </td>
+ <td>on snow or desert</td>
+ </tr>
+
+ <tr>
+ <td align=left><tt>3</tt> </td>
+ <td>on shore (density must be 3)</td>
</tr>
</table>
</li>
@@ -747,7 +792,9 @@
<li>m1: <a href="#OwnershipInfo">owner</a> of the station</li>
<li>m2: index into the array of stations</li>
<li>m3 bits 7..4: persistent random data for newstations</li>
- <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations, must be 0 for all the other stations</li>
+ <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations</li>
+ <li>m3 bits 2..0: present road types for road stops</li>
+ <li>m3 bits 1..0: water class for buoys and water part of docks</li>
<li>m4: custom station id; 0 means standard graphics</li>
<li>m5: graphics index (range from 0..255 for each station type):
<table>
@@ -780,24 +827,32 @@
</tr>
<tr>
- <td nowrap valign=top><tt>00</tt>..<tt>03</tt> </td>
- <td align=left>lorry loading area/truck station : exit towards:
+ <td nowrap valign=top><tt>00</tt>..<tt>05</tt> </td>
+ <td align=left>road stops:
<table>
<tr>
<td><tt>00</tt> </td>
- <td align=left>NE</td>
+ <td align=left>exit towards NE</td>
</tr>
<tr>
<td><tt>01</tt> </td>
- <td align=left>SE</td>
+ <td align=left>exit towards SE</td>
</tr>
<tr>
<td><tt>02</tt> </td>
- <td align=left>SW</td>
+ <td align=left>exit towards SW</td>
</tr>
<tr>
<td><tt>03</tt> </td>
- <td align=left>NW</td>
+ <td align=left>exit towards NW</td>
+ </tr>
+ <tr>
+ <td><tt>04</tt> </td>
+ <td align=left>drive through X</td>
+ </tr>
+ <tr>
+ <td><tt>05</tt> </td>
+ <td align=left>drive through Y</td>
</tr>
</table>
</td>
@@ -837,7 +892,7 @@
</table>
</li>
<li>m6 bit 7: 1 when newstation is an fsmport, otherwise 0</li>
- <li>m6 bits 3..5: the station type (rail, airport, truck, bus, oilrig, dock, buoy)</li>
+ <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy)</li>
<li>m6 bit 2: 1 when a drive through road stop is built over a town owned road, otherwise 0</li>
<li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
</ul>
@@ -852,12 +907,15 @@
<td valign=top nowrap> </td>
<td>
<ul>
- <li>m1: <a href="#OwnershipInfo">owner</a> (for water and coasts normally <tt>11</tt>)</li>
+ <li>m1: <a href="#OwnershipInfo">owner</a> (for sea, rivers, and coasts normally <tt>11</tt>)</li>
+ <li>m3 bits 1..0 : Water class (sea, canal or river)
+ <li>m4: Owner of the water when ship depot</li>
+ <li>m4: Random data for canal or river tiles</li>
<li>m5: tile type:
<table>
<tr>
<td nowrap valign=top><tt>00</tt> </td>
- <td align=left>water</td>
+ <td align=left>water, canal or river</td>
</tr>
<tr>
@@ -866,11 +924,6 @@
</tr>
<tr>
- <td noswap valign=top><tt>02</tt> </td>
- <td align=left>river</td>
- </tr>
-
- <tr>
<td nowrap valign=top><tt>10</tt>..<tt>1B</tt> </td>
<td align=left>canal locks
<table>
@@ -951,8 +1004,6 @@
</tr>
</table>
</li>
- <li>m4: Owner of the water when ship depot</li>
- <li>m4: Random data for canal or river tiles</li>
<li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
<li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
</ul>
@@ -980,12 +1031,14 @@
<ul>
<li>m1 bit 7: clear = under construction
<ul>
- <li>m1 bits 4..2: construction counter, for buildings under construction incremented on every periodic tile processing</li>
+ <li>m1 bits 3..2: construction counter, for buildings under construction incremented on every periodic tile processing</li>
<li>m1 bits 1..0: stage of construction (<tt>3</tt> = completed), incremented when the construction counter wraps around<br>
the meaning is different for some animated tiles which are never under construction (types <tt>01</tt>, <tt>1E</tt>..<tt>20</tt>, <tt>30</tt>, <tt>58</tt>; see above)</li>
</ul>
</li>
<li>m2: index into the array of industries</li>
+ <li>m3: animation state</li>
+ <li>m4: animation loop</li>
<li>m5: type (plus m6 bit 2):<br>
<small>(note: this is not the same as the industry type, which is stored in the array of industries)</small>
@@ -1291,10 +1344,9 @@
</tr>
</table>
</li>
+ <li>m6 bits 5..3: random triggers (NewGRF)</li>
+ <li>m6 bit 2: bit 8 of type (see m5)</li>
<li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
- <li>m3: animation state</li>
- <li>m4: animation loop</li>
- <li>m6 bits 3..5: random triggers (NewGRF)</li>
<li>m7: random bits (NewGRF)</li>
</ul>
</td>
@@ -1308,18 +1360,14 @@
<td valign=top nowrap> </td>
<td>
<ul>
- <li>m5 bits 7..4 clear: tunnel entrance/exit
- <ul>
- <li>m1: <a href="#OwnershipInfo">owner</a> of the tunnel</li>
- <li>m3 bits 3..0 = <a href="#TrackType">track type</a> for railway tunnel, must be 0 for road tunnel</li>
- <li>m4 bit 7 set = on snow or desert</li>
- <li>m5 bits 3..2: <tt>0</tt> - railway tunnel, <tt>1</tt> - road tunnel</li>
- <li>m5 bits 1..0 - direction: entrance towards: <tt>0</tt> = NE, <tt>1</tt> = SE, <tt>2</tt> = SW, <tt>3</tt> = NW</li>
- </ul>
- </li>
+ <li>m1: <a href="#OwnershipInfo">owner</a></li>
+ <li>m2 bits 7..4: see bridge ramp</li>
+ <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway</li>
+ <li>m3 bits 2..0: present road types for road</li>
+ <li>m4 bit 7 set = on snow or desert</li>
+ <li>m5 bits 7 clear: tunnel entrance/exit</li>
<li>m5 bit 7 set: bridge ramp
<ul>
- <li>m1: <a href="#OwnershipInfo">owner</a> of the bridge</li>
<li>m2 bits 7..4: <a name="BridgeType">bridge type</a>:
<table>
<tr>
@@ -1393,14 +1441,57 @@
<td align=center>200</td>
<td align=left>tubular, steel</td>
</tr>
+
+ <tr>
+ <td nowrap valign=top><tt>B</tt> </td>
+ <td align=center>320</td>
+ <td align=left>tubular, steel</td>
+ </tr>
+
+ <tr>
+ <td nowrap valign=top><tt>C</tt> </td>
+ <td align=center>380</td>
+ <td align=left>tubular, silicon</td>
+ </tr>
</table>
</li>
- <li>m3 bits 3..0 = <a href="#TrackType">type of track</a> on the bridge, must be 0 for road bridge</li>
- <li>m4 bit 7 set = on snow or desert</li>
- <li>m5 bits 3..2: <tt>0</tt> - railway bridge, <tt>1</tt> - road bridge</li>
- <li>m5 bits 1..0: DiagDirection onto the bridge</li>
</ul>
</li>
+ <li>m5 bits 3..2: transport type
+ <table>
+ <tr>
+ <td><tt>0</tt> </td>
+ <td>railway</td>
+ </tr>
+
+ <tr>
+ <td><tt>1</tt> </td>
+ <td>road</td>
+ </tr>
+ </li>
+ <li>m5 bits 1..0: direction onto the bridge / out of the tunnel
+ <table>
+ <tr>
+ <td><tt>0</tt> </td>
+ <td>NE</td>
+ </tr>
+
+ <tr>
+ <td><tt>1</tt> </td>
+ <td>SE</td>
+ </tr>
+
+ <tr>
+ <td><tt>2</tt> </td>
+ <td>SW</td>
+ </tr>
+
+ <tr>
+ <td><tt>3</tt> </td>
+ <td>NW</td>
+ </tr>
+ </table>
+ </li>
<li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
<li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
</ul>
@@ -1415,13 +1506,9 @@
<td valign=top nowrap> </td>
<td>
<ul>
- <li>m1 : <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
- <li>m2 :
- <ul>
- <li>for company statue (m5 = 02), TownID on which the statue is built in</li>
- </ul>
- </li>
- <li>m5 : tile type:
+ <li>m1: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
+ <li>m2: see company statue
+ <li>m5: tile type:
<table>
<tr>
<td nowrap valign=top><tt>00</tt> </td>
@@ -1435,7 +1522,11 @@
<tr>
<td nowrap valign=top><tt>02</tt> </td>
- <td align=left>company statue</td>
+ <td align=left>company statue
+ <ul>
+ <li>m2: TownID on which the statue is built in</li>
+ </ul>
+ </td>
</tr>
<tr>
--- a/docs/landscape_grid.html Sun Feb 03 01:34:21 2008 +0000
+++ b/docs/landscape_grid.html Sun Feb 03 20:34:26 2008 +0000
@@ -6,6 +6,7 @@
<title>OpenTTD Landscape Internals - #2</title>
<style type="text/css">
span.abuse { font-family: "Courier New", Courier, mono; background-color: rgb(255, 58, 31); }
+ span.option{ font-family: "Courier New", Courier, mono; background-color: rgb(255,255, 30); }
span.free { font-family: "Courier New", Courier, mono; background-color: rgb(30, 178, 54); }
span.used { font-family: "Courier New", Courier, mono; }
td.bits { white-space: nowrap; text-align: center; font-family: "Courier New", Courier, mono; }
@@ -22,7 +23,8 @@
<ul>
<li><span style="font-weight: bold;"><span class="free">O</span></span> - bit is free</li>
<li><span style="font-weight: bold;"><span class="used">X</span></span> - bit is used</li>
- <li><span style="font-weight: bold;"><span class="abuse"> </span></span> - bit of attribute is abused for different purposes</li>
+ <li><span style="font-weight: bold;"><span class="abuse"> </span></span> - bit of attribute is abused for different purposes, i.e. other bits define the actual meaning.</li>
+ <li><span style="font-weight: bold;"><span class="option">~</span></span> - bit is accessed, but does not really have a meaning (e.g. owner of clear land is always OWNER_NONE)</li>
</ul>
<p>
<ul>
@@ -64,7 +66,7 @@
<td rowspan="2">0</td>
<td class="caption">ground</td>
<td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="option">~~~~ ~~~~</span></td>
<td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
<td class="bits">XXXX XX<span class="free">OO</span></td>
@@ -75,23 +77,34 @@
<tr>
<td class="caption">farmland</td>
<td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
+ <td class="bits"><span class="option">~~~~ ~~~~</span></td>
<td class="bits">XXXX XXXX XXXX XXXX</td>
<td class="bits"><span class="free">OOOO</span> XXXX</td>
<td class="bits">-inherit-</td>
- <td class="bits"><span class="free">OOO</span>X XXXX</td>
+ <td class="bits">-inherit-</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
</tr>
<tr>
- <td rowspan=3>1</td>
+ <td rowspan=4>1</td>
<td class="caption">rail</td>
<td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="option">~~~</span>X XXXX</td>
+ <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+ <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
+ <td class="bits"><span class="free">OOOO</span> XXXX</td>
<td class="bits">XXXX XXXX</td>
+ <td class="bits">XX<span class="free">OO OO</span>XX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ </tr>
+ <tr>
+ <td class="caption">rail with signals</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
<td class="bits"><span class="free">OOOO OOOO O</span>XXX <span class="free">O</span>XXX</td>
+ <td class="bits">XXXX <span class="option">~~</span>XX</td>
<td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits">-inherit-</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
</tr>
@@ -100,9 +113,9 @@
<td class="bits">-inherit-</td>
<td class="bits">-inherit-</td>
<td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+ <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
<td class="bits"><span class="free">OOOO</span> XXXX</td>
- <td class="bits"><span class="free">OOOO</span> XXXX</td>
- <td class="bits">XX<span class="free">OO O</span>XXX</td>
+ <td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
</tr>
@@ -111,9 +124,9 @@
<td class="bits">-inherit-</td>
<td class="bits">-inherit-</td>
<td class="bits">XXXX XXXX XXXX XXXX</td>
+ <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
<td class="bits"><span class="free">OOOO</span> XXXX</td>
- <td class="bits"><span class="free">OOOO</span> XXXX</td>
- <td class="bits">XX<span class="free">OO O</span>XXX</td>
+ <td class="bits">XX<span class="free">OO OOO</span>X</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
</tr>
@@ -121,7 +134,7 @@
<td rowspan=3>2</td>
<td class="caption">road</td>
<td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="option">~~~</span>X XXXX</td>
<td class="bits">XXXX XXXX XXXX XXXX</td>
<td class="bits">XXXX XXXX</td>
<td class="bits">XXXX XXXX</td>
@@ -134,11 +147,11 @@
<td class="bits">-inherit-</td>
<td class="bits">-inherit-</td>
<td class="bits">-inherit-</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits">XXXX <span class="option">~~</span>XX</td>
<td class="bits"><span class="free">O</span>XXX XXXX</td>
<td class="bits">XX<span class="free">OO</span> XXXX</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits">-inherit-</td>
</tr>
<tr>
<td class="caption">road depot</td>
@@ -147,7 +160,7 @@
<td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
<td class="bits">X<span class="free">OOO OOOO</span></td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
- <td class="bits">XX<span class="free">OO</span> XXXX</td>
+ <td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits">XXX<span class="free">O OOOO</span></td>
</tr>
@@ -157,45 +170,122 @@
<td class="bits">XXXX XXXX</td>
<td class="bits">XXXX XXXX</td>
<td class="bits">XXXX XXXX XXXX XXXX</td>
- <td class="bits">XX<span class="free">O</span>X XXXX</td>
+ <td class="bits">XX<span class="free">O</span><span class="option">~ ~~</span>XX</td>
<td class="bits">XXXX XXXX</td>
- <td class="bits">XX<span class="abuse">XX XXXX</span></td>
- <td class="bits"><span class="abuse">XXXX XX</span>XX</td>
- <td class="bits"><span class="abuse">X</span>XX<span class="abuse">X XXX</span>X</td>
+ <td class="bits">XXX<span class="abuse">X XXXX</span></td>
+ <td class="bits"><span class="abuse">XXXX X</span>XXX</td>
+ <td class="bits">XXXX <span class="abuse">XXXX</span></td>
</tr>
<tr>
<td>4</td>
<td class="caption">trees</td>
<td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="option">~~~~ ~~~~</span></td>
<td class="bits"><span class="free">OOOO OOOO</span> XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="option">~~</span>XX XXXX</td>
<td class="bits">XXXX XX<span class="free">OO</span></td>
<td class="bits">XX<span class="free">OO O</span>XXX</td>
<td class="bits"><span class="free">OOOO OO</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
</tr>
<tr>
- <td>5</td>
- <td class="caption">station</td>
+ <td rowspan=6>5</td>
+ <td class="caption">rail station</td>
+ <td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="option">~~~</span>X XXXX</td>
+ <td class="bits">XXXX XXXX XXXX XXXX</td>
+ <td class="bits">XXXX <span class="option">~~</span>XX</td>
<td class="bits">XXXX XXXX</td>
<td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ </tr>
+ <tr>
+ <td class="caption">road stop</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits"><span class="free">OOOO O</span>XXX</td>
+ <td class="bits"><span class="option">~~~~ ~~~~</span></td>
+ <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
<td class="bits">X<span class="free">O</span>XX XXXX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
</tr>
<tr>
- <td>6</td>
- <td class="caption">water</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="caption">dock</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits"><span class="free">OOOO OO</span>XX</td>
+ <td class="bits"><span class="option">~~~~ ~~~~</span></td>
+ <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
+ <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ </tr>
+ <tr>
+ <td class="caption">airport</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ <td class="bits"><span class="option">~~~~ ~~~~</span></td>
<td class="bits">XXXX XXXX</td>
- <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+ <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
+ </tr>
+ <tr>
+ <td class="caption">buoy</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits"><span class="free">OOOO OO</span>XX</td>
+ <td class="bits"><span class="option">~~~~ ~~~~</span></td>
+ <td class="bits"><span class="option">~~~~ ~~~~</span></td>
+ <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ </tr>
+ <tr>
+ <td class="caption">oilrig</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ <td class="bits"><span class="option">~~~~ ~~~~</span></td>
+ <td class="bits"><span class="option">~~~~ ~~~~</span></td>
+ <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ </tr>
+ <tr>
+ <td rowspan=3>6</td>
+ <td class="caption">sea, shore</td>
<td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="option">~~~</span>X XXXX</td>
+ <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+ <td class="bits"><span class="free">OOOO OO</span>XX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ <td class="bits">X<span class="option">~~</span>X XXXX</td>
+ <td class="bits">XX<span class="free">OO OO</span>XX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ </tr>
+ <tr>
+ <td class="caption">canal, river</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+ <td class="bits"><span class="free">OOOO OO</span>XX</td>
<td class="bits">XXXX XXXX</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">XX<span class="free">OO OO</span>XX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ </tr>
+ <tr>
+ <td class="caption">shipdepot</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+ <td class="bits"><span class="free">OOOO OO</span>XX</td>
+ <td class="bits">XXXX XXXX</td>
+ <td class="bits">-inherit-</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
</tr>
@@ -203,7 +293,7 @@
<td>8</td>
<td class="caption">industry</td>
<td class="bits">XXXX XXXX</td>
- <td class="bits"><span class="abuse">X</span><span class="free">OO</span><span class="abuse">X
+ <td class="bits">X<span class="free">OOO</span> <span class="abuse">
XXXX</span></td>
<td class="bits">XXXX XXXX XXXX XXXX</td>
<td class="bits">XXXX XXXX</td>
@@ -216,35 +306,45 @@
<td rowspan=2>9</td>
<td class="caption">tunnel entrance</td>
<td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="option">~~~</span>X XXXX</td>
<td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
- <td class="bits"><span class="free">OOOO</span> XXXX</td>
+ <td class="bits"><span class="free">OOOO</span> <span class="option">~</span><span class="abuse">XXX</span></td>
<td class="bits">X<span class="free">OOO OOOO</span></td>
- <td class="bits">X<span class="free">OOO</span> XXXX</td>
+ <td class="bits">X<span class="free">OOO</span> <span class="option">~</span>XXX</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
</tr>
<tr>
<td>bridge ramp</td>
- <td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
- <td class="bits"><span class="free">OOOO OOOO</span> <span class="abuse">XXXX</span>
- <span class="free">OOOO</span></td>
- <td class="bits"><span class="free">OOOO</span> XXXX</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits"><span class="free">OOOO OOOO</span> XXXX <span class="free">OOOO</span></td>
+ <td class="bits"><span class="free">OOOO</span> <span class="option">~</span><span class="abuse">XXX</span></td>
<td class="bits">X<span class="free">OOO OOOO</span></td>
- <td class="bits">X<span class="free">OOO</span> XXXX</td>
+ <td class="bits">X<span class="free">OOO</span> <span class="option">~</span>XXX</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
</tr>
<tr>
- <td>A</td>
+ <td rowspan=2>A</td>
<td class="caption">unmovables</td>
<td class="bits">XXXX XXXX</td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits"><span class="option">~~~</span>X XXXX</td>
<td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
- <td class="bits">XXXX XXXX</td>
+ <td class="bits">X<span class="option">~~</span>X XXXX</td>
+ <td class="bits">XX<span class="free">OO OO</span>XX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ </tr>
+ <tr>
+ <td class="caption">company statue</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">-inherit-</td>
+ <td class="bits">XXXX XXXX XXXX XXXX</td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ <td class="bits"><span class="free">OOOO OOOO</span></td>
+ <td class="bits">-inherit-</td>
<td class="bits">XX<span class="free">OO OO</span>XX</td>
<td class="bits"><span class="free">OOOO OOOO</span></td>
</tr>
--- a/projects/generate Sun Feb 03 01:34:21 2008 +0000
+++ b/projects/generate Sun Feb 03 20:34:26 2008 +0000
@@ -25,13 +25,6 @@
# langs_vs80.vcproj is for MSVC 2005
# strgen_vs80.vcproj is for MSVC 2005
-# openttd.sln is for MSVC 2003
-# openttd.vcproj is for MSVC 2003
-# langs.vcproj is for MSVC 2003
-# strgen.vcproj is for MSVC 2003
-
-# openttd.tgt is for WatCom
-
# First, collect the list of Windows files
@@ -110,7 +103,7 @@
print " <Filter";
print " Name=\\""$0"\\"";
- print " Filter=\\"\\">";
+ print " >";
}
next;
@@ -121,7 +114,8 @@
gsub(" ", "", $0);
gsub("/", "\\\\", $0);
print " <File";
- print " RelativePath=\\".\\\\'$file_prefix'"$0"\\">";
+ print " RelativePath=\\".\\\\'$file_prefix'"$0"\\"";
+ print " >";
print " </File>";
}
}
@@ -138,15 +132,18 @@
i=`basename $i | sed s/.txt$//g`
RES="$RES
<File
- RelativePath=\"..\\src\\lang\\"$i".txt\">
+ RelativePath=\"..\\src\\lang\\"$i".txt\"
+ >
<FileConfiguration
- Name=\"Debug|Win32\">
+ Name=\"Debug|Win32\"
+ >
<Tool
Name=\"VCCustomBuildTool\"
Description=\"Generating "$i" language file\"
CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang "\$(InputPath)"
\"
AdditionalDependencies=\"\"
- Outputs=\"..\\bin\\lang\\"$i".lng\"/>
+ Outputs=\"..\\bin\\lang\\"$i".lng\"
+ />
</FileConfiguration>
</File>"
done
@@ -165,22 +162,7 @@
}
' > "$ROOT_DIR/projects/$2"
- # The files-list
- echo "$1" | awk -v type="$3" '
- /
/ {
- if (type == "msvc2003") gsub("
", "\n", $0);
- }
- /Filter="">/ {
- if (type == "msvc2005") gsub("Filter=\"\">", ">", $0);
- }
- /"\/>/ {
- if (type == "msvc2005") gsub("/>", "\n" substr($0, 1, index($0, $1) - 2) "/>", $0);
- }
- /">/ {
- if (type == "msvc2005") gsub(">", "\n" substr($0, 1, index($0, $1) - 1) ">", $0);
- }
- { print $0 }
- ' >> "$ROOT_DIR/projects/$2"
+ echo "$1" >> "$ROOT_DIR/projects/$2"
# Everything below the !!FILES!! marker
cat "$ROOT_DIR/projects/$2".in | tr '\r' '\n' | awk '
@@ -199,9 +181,7 @@
load_main_data "$ROOT_DIR/source.list" openttd
load_lang_data "$ROOT_DIR/src/lang/*.txt" lang
-generate "$openttd" "openttd.vcproj" "msvc2003"
-generate "$openttd" "openttd_vs80.vcproj" "msvc2005"
-generate "$openttd" "openttd_vs90.vcproj" "msvc2005"
-generate "$lang" "langs.vcproj" "msvc2003"
-generate "$lang" "langs_vs80.vcproj" "msvc2005"
-generate "$lang" "langs_vs90.vcproj" "msvc2005"
+generate "$openttd" "openttd_vs80.vcproj"
+generate "$openttd" "openttd_vs90.vcproj"
+generate "$lang" "langs_vs80.vcproj"
+generate "$lang" "langs_vs90.vcproj"
--- a/projects/langs.vcproj Sun Feb 03 01:34:21 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="langs"
- ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
- RootNamespace="langs"
- SccProjectName=""
- SccLocalPath=""
- Keyword="MakeFileProj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\bin\lang\"
- IntermediateDirectory="..\objs\langs\"
- ConfigurationType="10"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="./langs.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"
- Description="Generating strings.h"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
-
- <File
- RelativePath="..\src\lang\afrikaans.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating afrikaans language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\afrikaans.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\brazilian_portuguese.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating brazilian_portuguese language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\brazilian_portuguese.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\bulgarian.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating bulgarian language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\bulgarian.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\catalan.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating catalan language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\catalan.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\croatian.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating croatian language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\croatian.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\czech.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating czech language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\czech.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\danish.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating danish language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\danish.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\dutch.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating dutch language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\dutch.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\english.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating english language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\english.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\english_US.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating english_US language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\english_US.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\esperanto.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating esperanto language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\esperanto.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\estonian.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating estonian language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\estonian.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\finnish.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating finnish language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\finnish.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\french.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating french language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\french.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\galician.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating galician language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\galician.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\german.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating german language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\german.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\hungarian.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating hungarian language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\hungarian.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\icelandic.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating icelandic language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\icelandic.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\italian.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating italian language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\italian.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\japanese.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating japanese language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\japanese.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\korean.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating korean language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\korean.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\lithuanian.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating lithuanian language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\lithuanian.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\norwegian_bokmal.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating norwegian_bokmal language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\norwegian_bokmal.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\norwegian_nynorsk.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating norwegian_nynorsk language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\norwegian_nynorsk.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\origveh.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating origveh language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\origveh.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\piglatin.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating piglatin language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\piglatin.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\polish.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating polish language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\polish.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\portuguese.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating portuguese language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\portuguese.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\romanian.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating romanian language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\romanian.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\russian.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating russian language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\russian.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\simplified_chinese.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating simplified_chinese language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\simplified_chinese.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\slovak.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating slovak language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\slovak.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\slovenian.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating slovenian language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\slovenian.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\spanish.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating spanish language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\spanish.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\swedish.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating swedish language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\swedish.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\traditional_chinese.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating traditional_chinese language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\traditional_chinese.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\turkish.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating turkish language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\turkish.lng"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\lang\ukrainian.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating ukrainian language file"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
-"
- AdditionalDependencies=""
- Outputs="..\bin\lang\ukrainian.lng"/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
--- a/projects/langs.vcproj.in Sun Feb 03 01:34:21 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="langs"
- ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
- RootNamespace="langs"
- SccProjectName=""
- SccLocalPath=""
- Keyword="MakeFileProj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\bin\lang\"
- IntermediateDirectory="..\objs\langs\"
- ConfigurationType="10"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="./langs.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"
- Description="Generating strings.h"
- CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
-!!FILES!!
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
--- a/projects/openttd.sln Sun Feb 03 01:34:21 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd.vcproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
- ProjectSection(ProjectDependencies) = postProject
- {0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966}
- {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs.vcproj", "{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
- ProjectSection(ProjectDependencies) = postProject
- {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug.ActiveCfg = Debug|Win32
- {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug.Build.0 = Debug|Win32
- {668328A0-B40E-4CDB-BD72-D0064424414A}.Release.ActiveCfg = Release|Win32
- {668328A0-B40E-4CDB-BD72-D0064424414A}.Release.Build.0 = Release|Win32
- {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.ActiveCfg = Release|Win32
- {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.Build.0 = Release|Win32
- {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.ActiveCfg = Release|Win32
- {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.Build.0 = Release|Win32
- {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug.ActiveCfg = Debug|Win32
- {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug.Build.0 = Debug|Win32
- {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release.ActiveCfg = Debug|Win32
- {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release.Build.0 = Debug|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
- GlobalSection(DPCodeReviewSolutionGUID) = preSolution
- DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
- EndGlobalSection
-EndGlobal
--- a/projects/openttd.tgt Sun Feb 03 01:34:21 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2667 +0,0 @@
-40
-targetIdent
-0
-MProject
-1
-MComponent
-0
-2
-WString
-4
-OEXE
-3
-WString
-5
-op2en
-1
-0
-0
-4
-MCommand
-0
-5
-MCommand
-0
-6
-MItem
-11
-openttd.exe
-7
-WString
-4
-OEXE
-8
-WVList
-8
-9
-MRState
-10
-WString
-7
-OS2LINK
-11
-WString
-25
-?????No debug information
-1
-1
-12
-MRState
-13
-WString
-7
-OS2LINK
-14
-WString
-14
-?????Debug All
-1
-0
-15
-MVState
-16
-WString
-7
-OS2LINK
-17
-WString
-11
-?????Stack:
-1
-18
-WString
-7
-2097152
-0
-19
-MVState
-20
-WString
-7
-OS2LINK
-21
-WString
-18
-?????Libraries(,):
-1
-22
-WString
-24
-png.lib zlib.lib sdl.lib
-0
-23
-MCState
-24
-WString
-7
-OS2LINK
-25
-WString
-13
-?????Map file
-0
-0
-26
-MVState
-27
-WString
-7
-OS2LINK
-28
-WString
-11
-?????Stack:
-0
-29
-WString
-7
-4194304
-0
-30
-MVState
-31
-WString
-7
-OS2LINK
-32
-WString
-18
-?????Libraries(,):
-0
-33
-WString
-34
-mmpm2.lib png.lib zlib.lib sdl.lib
-0
-34
-MVState
-35
-WString
-7
-OS2LINK
-36
-WString
-17
-o????Description:
-0
-37
-WString
-7
-OpenTTD
-0
-38
-WVList
-3
-39
-ActionStates
-40
-WString
-5
-&Make
-41
-WVList
-0
-42
-ActionStates
-43
-WString
-4
-&Run
-44
-WVList
-0
-45
-ActionStates
-46
-WString
-7
-Sam&ple
-47
-WVList
-0
--1
-1
-1
-0
-48
-WPickList
-127
-49
-MItem
-3
-*.c
-50
-WString
-4
-COBJ
-51
-WVList
-14
-52
-MVState
-53
-WString
-3
-WCC
-54
-WString
-28
-?????Disable Warning message
-1
-55
-WString
-3
-202
-0
-56
-MVState
-57
-WString
-3
-WCC
-58
-WString
-23
-?????Macro definitions:
-1
-59
-WString
-50
-ENABLE_NETWORK=1 WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1
-0
-60
-MRState
-61
-WString
-3
-WCC
-62
-WString
-21
-?????4 byte alignment
-1
-1
-63
-MRState
-64
-WString
-3
-WCC
-65
-WString
-21
-?????No optimizations
-1
-0
-66
-MRState
-67
-WString
-3
-WCC
-68
-WString
-24
-?????Space optimizations
-1
-1
-69
-MRState
-70
-WString
-3
-WCC
-71
-WString
-29
-?????No debugging information
-1
-1
-72
-MRState
-73
-WString
-3
-WCC
-74
-WString
-24
-?????Full debugging info
-1
-0
-75
-MVState
-76
-WString
-3
-WCC
-77
-WString
-28
-?????Disable Warning message
-0
-78
-WString
-3
-202
-0
-79
-MVState
-80
-WString
-3
-WCC
-81
-WString
-23
-?????Macro definitions:
-0
-82
-WString
-61
-ENABLE_NETWORK=1 WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1 WITH_REV=1
-0
-83
-MCState
-84
-WString
-3
-WCC
-85
-WString
-31
-?????Force enums to be type int
-0
-1
-86
-MRState
-87
-WString
-3
-WCC
-88
-WString
-29
-?????No debugging information
-0
-1
-89
-MRState
-90
-WString
-3
-WCC
-91
-WString
-28
-?????Line number information
-0
-0
-92
-MRState
-93
-WString
-3
-WCC
-94
-WString
-39
-??2??Pentium Pro Register based calling
-0
-0
-95
-MRState
-96
-WString
-3
-WCC
-97
-WString
-36
-??2??Pentium Pro Stack based calling
-0
-1
-98
-WVList
-0
--1
-1
-1
-0
-99
-MItem
-7
-ai\ai.c
-100
-WString
-4
-COBJ
-101
-WVList
-0
-102
-WVList
-0
-49
-1
-1
-0
-103
-MItem
-20
-ai\default\default.c
-104
-WString
-4
-COBJ
-105
-WVList
-0
-106
-WVList
-0
-49
-1
-1
-0
-107
-MItem
-17
-ai\trolly\build.c
-108
-WString
-4
-COBJ
-109
-WVList
-0
-110
-WVList
-0
-49
-1
-1
-0
-111
-MItem
-22
-ai\trolly\pathfinder.c
-112
-WString
-4
-COBJ
-113
-WVList
-0
-114
-WVList
-0
-49
-1
-1
-0
-115
-MItem
-18
-ai\trolly\shared.c
-116
-WString
-4
-COBJ
-117
-WVList
-0
-118
-WVList
-0
-49
-1
-1
-0
-119
-MItem
-18
-ai\trolly\trolly.c
-120
-WString
-4
-COBJ
-121
-WVList
-0
-122
-WVList
-0
-49
-1
-1
-0
-123
-MItem
-14
-aircraft_cmd.c
-124
-WString
-4
-COBJ
-125
-WVList
-0
-126
-WVList
-0
-49
-1
-1
-0
-127
-MItem
-14
-aircraft_gui.c
-128
-WString
-4
-COBJ
-129
-WVList
-0
-130
-WVList
-0
-49
-1
-1
-0
-131
-MItem
-9
-airport.c
-132
-WString
-4
-COBJ
-133
-WVList
-0
-134
-WVList
-0
-49
-1
-1
-0
-135
-MItem
-13
-airport_gui.c
-136
-WString
-4
-COBJ
-137
-WVList
-0
-138
-WVList
-0
-49
-1
-1
-0
-139
-MItem
-8
-aystar.c
-140
-WString
-4
-COBJ
-141
-WVList
-0
-142
-WVList
-0
-49
-1
-1
-0
-143
-MItem
-12
-bridge_gui.c
-144
-WString
-4
-COBJ
-145
-WVList
-0
-146
-WVList
-0
-49
-1
-1
-0
-147
-MItem
-12
-bridge_map.c
-148
-WString
-4
-COBJ
-149
-WVList
-0
-150
-WVList
-0
-49
-1
-1
-0
-151
-MItem
-16
-callback_table.c
-152
-WString
-4
-COBJ
-153
-WVList
-0
-154
-WVList
-0
-49
-1
-1
-0
-155
-MItem
-11
-clear_cmd.c
-156
-WString
-4
-COBJ
-157
-WVList
-0
-158
-WVList
-0
-49
-1
-1
-0
-159
-MItem
-9
-command.c
-160
-WString
-4
-COBJ
-161
-WVList
-0
-162
-WVList
-0
-49
-1
-1
-0
-163
-MItem
-9
-console.c
-164
-WString
-4
-COBJ
-165
-WVList
-0
-166
-WVList
-0
-49
-1
-1
-0
-167
-MItem
-14
-console_cmds.c
-168
-WString
-4
-COBJ
-169
-WVList
-0
-170
-WVList
-0
-49
-1
-1
-0
-171
-MItem
-10
-currency.c
-172
-WString
-4
-COBJ
-173
-WVList
-0
-174
-WVList
-0
-49
-1
-1
-0
-175
-MItem
-7
-debug.c
-176
-WString
-4
-COBJ
-177
-WVList
-0
-178
-WVList
-0
-49
-1
-1
-0
-179
-MItem
-11
-dedicated.c
-180
-WString
-4
-COBJ
-181
-WVList
-0
-182
-WVList
-0
-49
-1
-1
-0
-183
-MItem
-7
-depot.c
-184
-WString
-4
-COBJ
-185
-WVList
-0
-186
-WVList
-0
-49
-1
-1
-0
-187
-MItem
-14
-disaster_cmd.c
-188
-WString
-4
-COBJ
-189
-WVList
-0
-190
-WVList
-0
-49
-1
-1
-0
-191
-MItem
-10
-dock_gui.c
-192
-WString
-4
-COBJ
-193
-WVList
-0
-194
-WVList
-0
-49
-1
-1
-0
-195
-MItem
-8
-driver.c
-196
-WString
-4
-COBJ
-197
-WVList
-0
-198
-WVList
-0
-49
-1
-1
-0
-199
-MItem
-12
-dummy_land.c
-200
-WString
-4
-COBJ
-201
-WVList
-0
-202
-WVList
-0
-49
-1
-1
-0
-203
-MItem
-9
-economy.c
-204
-WString
-4
-COBJ
-205
-WVList
-0
-206
-WVList
-0
-49
-1
-1
-0
-207
-MItem
-8
-elrail.c
-208
-WString
-4
-COBJ
-209
-WVList
-0
-210
-WVList
-0
-49
-1
-1
-0
-211
-MItem
-8
-engine.c
-212
-WString
-4
-COBJ
-213
-WVList
-0
-214
-WVList
-0
-49
-1
-1
-0
-215
-MItem
-12
-engine_gui.c
-216
-WString
-4
-COBJ
-217
-WVList
-0
-218
-WVList
-0
-49
-1
-1
-0
-219
-MItem
-8
-fileio.c
-220
-WString
-4
-COBJ
-221
-WVList
-0
-222
-WVList
-0
-49
-1
-1
-0
-223
-MItem
-5
-gfx.c
-224
-WString
-4
-COBJ
-225
-WVList
-0
-226
-WVList
-0
-49
-1
-1
-0
-227
-MItem
-9
-gfxinit.c
-228
-WString
-4
-COBJ
-229
-WVList
-0
-230
-WVList
-0
-49
-1
-1
-0
-231
-MItem
-11
-graph_gui.c
-232
-WString
-4
-COBJ
-233
-WVList
-0
-234
-WVList
-0
-49
-1
-1
-0
-235
-MItem
-14
-industry_cmd.c
-236
-WString
-4
-COBJ
-237
-WVList
-0
-238
-WVList
-0
-49
-1
-1
-0
-239
-MItem
-14
-industry_gui.c
-240
-WString
-4
-COBJ
-241
-WVList
-0
-242
-WVList
-0
-49
-1
-1
-0
-243
-MItem
-11
-intro_gui.c
-244
-WString
-4
-COBJ
-245
-WVList
-0
-246
-WVList
-0
-49
-1
-1
-0
-247
-MItem
-11
-landscape.c
-248
-WString
-4
-COBJ
-249
-WVList
-0
-250
-WVList
-0
-49
-1
-1
-0
-251
-MItem
-10
-main_gui.c
-252
-WString
-4
-COBJ
-253
-WVList
-0
-254
-WVList
-0
-49
-1
-1
-0
-255
-MItem
-5
-map.c
-256
-WString
-4
-COBJ
-257
-WVList
-0
-258
-WVList
-0
-49
-1
-1
-0
-259
-MItem
-5
-md5.c
-260
-WString
-4
-COBJ
-261
-WVList
-0
-262
-WVList
-0
-49
-1
-1
-0
-263
-MItem
-10
-mersenne.c
-264
-WString
-4
-COBJ
-265
-WVList
-0
-266
-WVList
-0
-49
-1
-1
-0
-267
-MItem
-9
-minilzo.c
-268
-WString
-4
-COBJ
-269
-WVList
-0
-270
-WVList
-0
-49
-1
-1
-0
-271
-MItem
-6
-misc.c
-272
-WString
-4
-COBJ
-273
-WVList
-0
-274
-WVList
-0
-49
-1
-1
-0
-275
-MItem
-10
-misc_cmd.c
-276
-WString
-4
-COBJ
-277
-WVList
-0
-278
-WVList
-0
-49
-1
-1
-0
-279
-MItem
-10
-misc_gui.c
-280
-WString
-4
-COBJ
-281
-WVList
-0
-282
-WVList
-0
-49
-1
-1
-0
-283
-MItem
-7
-mixer.c
-284
-WString
-4
-COBJ
-285
-WVList
-0
-286
-WVList
-0
-49
-1
-1
-0
-287
-MItem
-14
-music\null_m.c
-288
-WString
-4
-COBJ
-289
-WVList
-0
-290
-WVList
-0
-49
-1
-1
-0
-291
-MItem
-13
-music\os2_m.c
-292
-WString
-4
-COBJ
-293
-WVList
-0
-294
-WVList
-0
-49
-1
-1
-0
-295
-MItem
-11
-music_gui.c
-296
-WString
-4
-COBJ
-297
-WVList
-0
-298
-WVList
-0
-49
-1
-1
-0
-299
-MItem
-9
-namegen.c
-300
-WString
-4
-COBJ
-301
-WVList
-0
-302
-WVList
-0
-49
-1
-1
-0
-303
-MItem
-9
-network.c
-304
-WString
-4
-COBJ
-305
-WVList
-0
-306
-WVList
-0
-49
-1
-1
-0
-307
-MItem
-16
-network_client.c
-308
-WString
-4
-COBJ
-309
-WVList
-0
-310
-WVList
-0
-49
-1
-1
-0
-311
-MItem
-14
-network_data.c
-312
-WString
-4
-COBJ
-313
-WVList
-0
-314
-WVList
-0
-49
-1
-1
-0
-315
-MItem
-18
-network_gamelist.c
-316
-WString
-4
-COBJ
-317
-WVList
-0
-318
-WVList
-0
-49
-1
-1
-0
-319
-MItem
-13
-network_gui.c
-320
-WString
-4
-COBJ
-321
-WVList
-0
-322
-WVList
-0
-49
-1
-1
-0
-323
-MItem
-16
-network_server.c
-324
-WString
-4
-COBJ
-325
-WVList
-0
-326
-WVList
-0
-49
-1
-1
-0
-327
-MItem
-13
-network_udp.c
-328
-WString
-4
-COBJ
-329
-WVList
-0
-330
-WVList
-0
-49
-1
-1
-0
-331
-MItem
-8
-newgrf.c
-332
-WString
-4
-COBJ
-333
-WVList
-0
-334
-WVList
-0
-49
-1
-1
-0
-335
-MItem
-15
-newgrf_engine.c
-336
-WString
-4
-COBJ
-337
-WVList
-0
-338
-WVList
-0
-49
-1
-1
-0
-339
-MItem
-16
-newgrf_station.c
-340
-WString
-4
-COBJ
-341
-WVList
-0
-342
-WVList
-0
-49
-1
-1
-0
-343
-MItem
-10
-news_gui.c
-344
-WString
-4
-COBJ
-345
-WVList
-0
-346
-WVList
-0
-49
-1
-1
-0
-347
-MItem
-5
-npf.c
-348
-WString
-4
-COBJ
-349
-WVList
-0
-350
-WVList
-0
-49
-1
-1
-0
-351
-MItem
-11
-oldloader.c
-352
-WString
-4
-COBJ
-353
-WVList
-0
-354
-WVList
-0
-49
-1
-1
-0
-355
-MItem
-9
-openttd.c
-356
-WString
-4
-COBJ
-357
-WVList
-0
-358
-WVList
-0
-49
-1
-1
-0
-359
-MItem
-11
-order_cmd.c
-360
-WString
-4
-COBJ
-361
-WVList
-0
-362
-WVList
-0
-49
-1
-1
-0
-363
-MItem
-11
-order_gui.c
-364
-WString
-4
-COBJ
-365
-WVList
-0
-366
-WVList
-0
-49
-1
-1
-0
-367
-MItem
-5
-os2.c
-368
-WString
-4
-COBJ
-369
-WVList
-0
-370
-WVList
-0
-49
-1
-1
-0
-371
-MItem
-10
-os_timer.c
-372
-WString
-4
-COBJ
-373
-WVList
-0
-374
-WVList
-0
-49
-1
-1
-0
-375
-MItem
-10
-pathfind.c
-376
-WString
-4
-COBJ
-377
-WVList
-0
-378
-WVList
-0
-49
-1
-1
-0
-379
-MItem
-12
-player_gui.c
-380
-WString
-4
-COBJ
-381
-WVList
-0
-382
-WVList
-0
-49
-1
-1
-0
-383
-MItem
-9
-players.c
-384
-WString
-4
-COBJ
-385
-WVList
-0
-386
-WVList
-0
-49
-1
-1
-0
-387
-MItem
-6
-oldpool.c
-388
-WString
-4
-COBJ
-389
-WVList
-0
-390
-WVList
-0
-49
-1
-1
-0
-391
-MItem
-7
-queue.c
-392
-WString
-4
-COBJ
-393
-WVList
-0
-394
-WVList
-0
-49
-1
-1
-0
-395
-MItem
-6
-rail.c
-396
-WString
-4
-COBJ
-397
-WVList
-0
-398
-WVList
-0
-49
-1
-1
-0
-399
-MItem
-10
-rail_cmd.c
-400
-WString
-4
-COBJ
-401
-WVList
-0
-402
-WVList
-0
-49
-1
-1
-0
-403
-MItem
-10
-rail_gui.c
-404
-WString
-4
-COBJ
-405
-WVList
-0
-406
-WVList
-0
-49
-1
-1
-0
-407
-MItem
-5
-rev.c
-408
-WString
-4
-COBJ
-409
-WVList
-0
-410
-WVList
-1
-411
-ActionStates
-412
-WString
-5
-&Make
-413
-WVList
-0
-49
-1
-1
-0
-414
-MItem
-10
-road_cmd.c
-415
-WString
-4
-COBJ
-416
-WVList
-0
-417
-WVList
-0
-49
-1
-1
-0
-418
-MItem
-10
-road_gui.c
-419
-WString
-4
-COBJ
-420
-WVList
-0
-421
-WVList
-0
-49
-1
-1
-0
-422
-MItem
-10
-road_map.c
-423
-WString
-4
-COBJ
-424
-WVList
-0
-425
-WVList
-0
-49
-1
-1
-0
-426
-MItem
-13
-roadveh_cmd.c
-427
-WString
-4
-COBJ
-428
-WVList
-0
-429
-WVList
-0
-49
-1
-1
-0
-430
-MItem
-13
-roadveh_gui.c
-431
-WString
-4
-COBJ
-432
-WVList
-0
-433
-WVList
-0
-49
-1
-1
-0
-434
-MItem
-10
-saveload.c
-435
-WString
-4
-COBJ
-436
-WVList
-0
-437
-WVList
-0
-49
-1
-1
-0
-438
-MItem
-12
-screenshot.c
-439
-WString
-4
-COBJ
-440
-WVList
-0
-441
-WVList
-0
-49
-1
-1
-0
-442
-MItem
-5
-sdl.c
-443
-WString
-4
-COBJ
-444
-WVList
-0
-445
-WVList
-0
-49
-1
-1
-0
-446
-MItem
-10
-settings.c
-447
-WString
-4
-COBJ
-448
-WVList
-0
-449
-WVList
-0
-49
-1
-1
-0
-450
-MItem
-14
-settings_gui.c
-451
-WString
-4
-COBJ
-452
-WVList
-0
-453
-WVList
-0
-49
-1
-1
-0
-454
-MItem
-10
-ship_cmd.c
-455
-WString
-4
-COBJ
-456
-WVList
-0
-457
-WVList
-0
-49
-1
-1
-0
-458
-MItem
-10
-ship_gui.c
-459
-WString
-4
-COBJ
-460
-WVList
-0
-461
-WVList
-0
-49
-1
-1
-0
-462
-MItem
-7
-signs.c
-463
-WString
-4
-COBJ
-464
-WVList
-0
-465
-WVList
-0
-49
-1
-1
-0
-466
-MItem
-14
-smallmap_gui.c
-467
-WString
-4
-COBJ
-468
-WVList
-0
-469
-WVList
-0
-49
-1
-1
-0
-470
-MItem
-7
-sound.c
-471
-WString
-4
-COBJ
-472
-WVList
-0
-473
-WVList
-0
-49
-1
-1
-0
-474
-MItem
-14
-sound\null_s.c
-475
-WString
-4
-COBJ
-476
-WVList
-0
-477
-WVList
-0
-49
-1
-1
-0
-478
-MItem
-13
-sound\sdl_s.c
-479
-WString
-4
-COBJ
-480
-WVList
-0
-481
-WVList
-0
-49
-1
-1
-0
-482
-MItem
-8
-sprite.c
-483
-WString
-4
-COBJ
-484
-WVList
-0
-485
-WVList
-0
-49
-1
-1
-0
-486
-MItem
-13
-spritecache.c
-487
-WString
-4
-COBJ
-488
-WVList
-0
-489
-WVList
-0
-49
-1
-1
-0
-490
-MItem
-13
-station_cmd.c
-491
-WString
-4
-COBJ
-492
-WVList
-0
-493
-WVList
-0
-49
-1
-1
-0
-494
-MItem
-13
-station_gui.c
-495
-WString
-4
-COBJ
-496
-WVList
-0
-497
-WVList
-0
-49
-1
-1
-0
-498
-MItem
-13
-station_map.c
-499
-WString
-4
-COBJ
-500
-WVList
-0
-501
-WVList
-0
-49
-1
-1
-0
-502
-MItem
-8
-StdAfx.c
-503
-WString
-4
-COBJ
-504
-WVList
-0
-505
-WVList
-0
-49
-1
-1
-0
-506
-MItem
-8
-string.c
-507
-WString
-4
-COBJ
-508
-WVList
-0
-509
-WVList
-0
-49
-1
-1
-0
-510
-MItem
-9
-strings.c
-511
-WString
-4
-COBJ
-512
-WVList
-0
-513
-WVList
-0
-49
-1
-1
-0
-514
-MItem
-13
-subsidy_gui.c
-515
-WString
-4
-COBJ
-516
-WVList
-0
-517
-WVList
-0
-49
-1
-1
-0
-518
-MItem
-15
-terraform_gui.c
-519
-WString
-4
-COBJ
-520
-WVList
-0
-521
-WVList
-0
-49
-1
-1
-0
-522
-MItem
-9
-texteff.c
-523
-WString
-4
-COBJ
-524
-WVList
-0
-525
-WVList
-0
-49
-1
-1
-0
-526
-MItem
-8
-thread.c
-527
-WString
-4
-COBJ
-528
-WVList
-0
-529
-WVList
-0
-49
-1
-1
-0
-530
-MItem
-6
-tile.c
-531
-WString
-4
-COBJ
-532
-WVList
-0
-533
-WVList
-0
-49
-1
-1
-0
-534
-MItem
-10
-town_cmd.c
-535
-WString
-4
-COBJ
-536
-WVList
-0
-537
-WVList
-0
-49
-1
-1
-0
-538
-MItem
-10
-town_gui.c
-539
-WString
-4
-COBJ
-540
-WVList
-0
-541
-WVList
-0
-49
-1
-1
-0
-542
-MItem
-11
-train_cmd.c
-543
-WString
-4
-COBJ
-544
-WVList
-0
-545
-WVList
-0
-49
-1
-1
-0
-546
-MItem
-11
-train_gui.c
-547
-WString
-4
-COBJ
-548
-WVList
-0
-549
-WVList
-0
-49
-1
-1
-0
-550
-MItem
-10
-tree_cmd.c
-551
-WString
-4
-COBJ
-552
-WVList
-0
-553
-WVList
-0
-49
-1
-1
-0
-554
-MItem
-12
-tunnel_map.c
-555
-WString
-4
-COBJ
-556
-WVList
-0
-557
-WVList
-0
-49
-1
-1
-0
-558
-MItem
-18
-tunnelbridge_cmd.c
-559
-WString
-4
-COBJ
-560
-WVList
-0
-561
-WVList
-0
-49
-1
-1
-0
-562
-MItem
-15
-unmovable_cmd.c
-563
-WString
-4
-COBJ
-564
-WVList
-0
-565
-WVList
-0
-49
-1
-1
-0
-566
-MItem
-9
-vehicle.c
-567
-WString
-4
-COBJ
-568
-WVList
-0
-569
-WVList
-0
-49
-1
-1
-0
-570
-MItem
-13
-vehicle_gui.c
-571
-WString
-4
-COBJ
-572
-WVList
-0
-573
-WVList
-0
-49
-1
-1
-0
-574
-MItem
-19
-video\dedicated_v.c
-575
-WString
-4
-COBJ
-576
-WVList
-0
-577
-WVList
-0
-49
-1
-1
-0
-578
-MItem
-14
-video\null_v.c
-579
-WString
-4
-COBJ
-580
-WVList
-0
-581
-WVList
-0
-49
-1
-1
-0
-582
-MItem
-13
-video\sdl_v.c
-583
-WString
-4
-COBJ
-584
-WVList
-0
-585
-WVList
-0
-49
-1
-1
-0
-586
-MItem
-10
-viewport.c
-587
-WString
-4
-COBJ
-588
-WVList
-0
-589
-WVList
-0
-49
-1
-1
-0
-590
-MItem
-11
-water_cmd.c
-591
-WString
-4
-COBJ
-592
-WVList
-0
-593
-WVList
-0
-49
-1
-1
-0
-594
-MItem
-10
-waypoint.c
-595
-WString
-4
-COBJ
-596
-WVList
-0
-597
-WVList
-0
-49
-1
-1
-0
-598
-MItem
-8
-widget.c
-599
-WString
-4
-COBJ
-600
-WVList
-0
-601
-WVList
-0
-49
-1
-1
-0
-602
-MItem
-8
-window.c
-603
-WString
-4
-COBJ
-604
-WVList
-0
-605
-WVList
-0
-49
-1
-1
-0
--- a/projects/openttd.vcproj Sun Feb 03 01:34:21 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1441 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="openttd"
- RootNamespace="openttd"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- GlobalOptimizations="TRUE"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="TRUE"
- FavorSizeOrSpeed="2"
- OmitFramePointers="TRUE"
- OptimizeForProcessor="1"
- AdditionalIncludeDirectories="..\objs\langs"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
- StringPooling="TRUE"
- ExceptionHandling="TRUE"
- RuntimeLibrary="0"
- StructMemberAlignment="3"
- BufferSecurityCheck="FALSE"
- EnableFunctionLevelLinking="TRUE"
- DefaultCharIsUnsigned="TRUE"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- AssemblerOutput="2"
- AssemblerListingLocation="$(IntDir)/"
- ObjectFile="$(IntDir)/"
- ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
- BrowseInformation="1"
- BrowseInformationFile="$(IntDir)/"
- WarningLevel="3"
- WarnAsError="TRUE"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CallingConvention="1"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- OptimizeForWindows98="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/openttd.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"
- Description="Determining version number"
- CommandLine=""$(InputDir)/determineversion.vbs""/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1053"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
- IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\objs\langs"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- AssemblerListingLocation="$(IntDir)/"
- ObjectFile="$(IntDir)/"
- ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
- WarningLevel="3"
- WarnAsError="TRUE"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="FALSE"
- DebugInformationFormat="4"
- CallingConvention="1"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- IgnoreDefaultLibraryNames="LIBCMT.lib"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/openttd.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"
- Description="Determining version number"
- CommandLine=""$(InputDir)/determineversion.vbs""/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1053"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="">
- <File
- RelativePath=".\..\src\airport.cpp">
- </File>
- <File
- RelativePath=".\..\src\articulated_vehicles.cpp">
- </File>
- <File
- RelativePath=".\..\src\autoreplace_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\aystar.cpp">
- </File>
- <File
- RelativePath=".\..\src\bmp.cpp">
- </File>
- <File
- RelativePath=".\..\src\callback_table.cpp">
- </File>
- <File
- RelativePath=".\..\src\cargopacket.cpp">
- </File>
- <File
- RelativePath=".\..\src\cargotype.cpp">
- </File>
- <File
- RelativePath=".\..\src\command.cpp">
- </File>
- <File
- RelativePath=".\..\src\console.cpp">
- </File>
- <File
- RelativePath=".\..\src\console_cmds.cpp">
- </File>
- <File
- RelativePath=".\..\src\core\bitmath_func.cpp">
- </File>
- <File
- RelativePath=".\..\src\core\random_func.cpp">
- </File>
- <File
- RelativePath=".\..\src\currency.cpp">
- </File>
- <File
- RelativePath=".\..\src\date.cpp">
- </File>
- <File
- RelativePath=".\..\src\debug.cpp">
- </File>
- <File
- RelativePath=".\..\src\dedicated.cpp">
- </File>
- <File
- RelativePath=".\..\src\depot.cpp">
- </File>
- <File
- RelativePath=".\..\src\driver.cpp">
- </File>
- <File
- RelativePath=".\..\src\economy.cpp">
- </File>
- <File
- RelativePath=".\..\src\elrail.cpp">
- </File>
- <File
- RelativePath=".\..\src\engine.cpp">
- </File>
- <File
- RelativePath=".\..\src\fileio.cpp">
- </File>
- <File
- RelativePath=".\..\src\fios.cpp">
- </File>
- <File
- RelativePath=".\..\src\fontcache.cpp">
- </File>
- <File
- RelativePath=".\..\src\fsmblockmap.cpp">
- </File>
- <File
- RelativePath=".\..\src\fsmport.cpp">
- </File>
- <File
- RelativePath=".\..\src\genworld.cpp">
- </File>
- <File
- RelativePath=".\..\src\gfx.cpp">
- </File>
- <File
- RelativePath=".\..\src\gfxinit.cpp">
- </File>
- <File
- RelativePath=".\..\src\heightmap.cpp">
- </File>
- <File
- RelativePath=".\..\src\helpers.cpp">
- </File>
- <File
- RelativePath=".\..\src\landscape.cpp">
- </File>
- <File
- RelativePath=".\..\src\map.cpp">
- </File>
- <File
- RelativePath=".\..\src\md5.cpp">
- </File>
- <File
- RelativePath=".\..\src\minilzo.cpp">
- </File>
- <File
- RelativePath=".\..\src\misc.cpp">
- </File>
- <File
- RelativePath=".\..\src\mixer.cpp">
- </File>
- <File
- RelativePath=".\..\src\music.cpp">
- </File>
- <File
- RelativePath=".\..\src\namegen.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\network.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\network_client.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\network_data.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\network_gamelist.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\network_server.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\network_udp.cpp">
- </File>
- <File
- RelativePath=".\..\src\npf.cpp">
- </File>
- <File
- RelativePath=".\..\src\oldloader.cpp">
- </File>
- <File
- RelativePath=".\..\src\oldpool.cpp">
- </File>
- <File
- RelativePath=".\..\src\openttd.cpp">
- </File>
- <File
- RelativePath=".\..\src\os_timer.cpp">
- </File>
- <File
- RelativePath=".\..\src\ottdres.rc">
- </File>
- <File
- RelativePath=".\..\src\pathfind.cpp">
- </File>
- <File
- RelativePath=".\..\src\players.cpp">
- </File>
- <File
- RelativePath=".\..\src\queue.cpp">
- </File>
- <File
- RelativePath=".\..\src\rail.cpp">
- </File>
- <File
- RelativePath=".\..\src\rev.cpp">
- </File>
- <File
- RelativePath=".\..\src\road.cpp">
- </File>
- <File
- RelativePath=".\..\src\saveload.cpp">
- </File>
- <File
- RelativePath=".\..\src\screenshot.cpp">
- </File>
- <File
- RelativePath=".\..\src\sdl.cpp">
- </File>
- <File
- RelativePath=".\..\src\settings.cpp">
- </File>
- <File
- RelativePath=".\..\src\signal.cpp">
- </File>
- <File
- RelativePath=".\..\src\signs.cpp">
- </File>
- <File
- RelativePath=".\..\src\sound.cpp">
- </File>
- <File
- RelativePath=".\..\src\spritecache.cpp">
- </File>
- <File
- RelativePath=".\..\src\station.cpp">
- </File>
- <File
- RelativePath=".\..\src\string.cpp">
- </File>
- <File
- RelativePath=".\..\src\strings.cpp">
- </File>
- <File
- RelativePath=".\..\src\texteff.cpp">
- </File>
- <File
- RelativePath=".\..\src\tgp.cpp">
- </File>
- <File
- RelativePath=".\..\src\thread.cpp">
- </File>
- <File
- RelativePath=".\..\src\tile_map.cpp">
- </File>
- <File
- RelativePath=".\..\src\vehicle.cpp">
- </File>
- <File
- RelativePath=".\..\src\viewport.cpp">
- </File>
- <File
- RelativePath=".\..\src\waypoint.cpp">
- </File>
- <File
- RelativePath=".\..\src\widget.cpp">
- </File>
- <File
- RelativePath=".\..\src\widgets\dropdown.cpp">
- </File>
- <File
- RelativePath=".\..\src\win32.cpp">
- </File>
- <File
- RelativePath=".\..\src\window.cpp">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="">
- <File
- RelativePath=".\..\src\aircraft.h">
- </File>
- <File
- RelativePath=".\..\src\airport.h">
- </File>
- <File
- RelativePath=".\..\src\articulated_vehicles.h">
- </File>
- <File
- RelativePath=".\..\src\autoslope.h">
- </File>
- <File
- RelativePath=".\..\src\aystar.h">
- </File>
- <File
- RelativePath=".\..\src\bmp.h">
- </File>
- <File
- RelativePath=".\..\src\cargopacket.h">
- </File>
- <File
- RelativePath=".\..\src\cargotype.h">
- </File>
- <File
- RelativePath=".\..\src\command.h">
- </File>
- <File
- RelativePath=".\..\src\console.h">
- </File>
- <File
- RelativePath=".\..\src\core\bitmath_func.hpp">
- </File>
- <File
- RelativePath=".\..\src\core\math_func.hpp">
- </File>
- <File
- RelativePath=".\..\src\core\random_func.hpp">
- </File>
- <File
- RelativePath=".\..\src\currency.h">
- </File>
- <File
- RelativePath=".\..\src\date.h">
- </File>
- <File
- RelativePath=".\..\src\debug.h">
- </File>
- <File
- RelativePath=".\..\src\video\dedicated_v.h">
- </File>
- <File
- RelativePath=".\..\src\depot.h">
- </File>
- <File
- RelativePath=".\..\src\direction.h">
- </File>
- <File
- RelativePath=".\..\src\music\dmusic.h">
- </File>
- <File
- RelativePath=".\..\src\driver.h">
- </File>
- <File
- RelativePath=".\..\src\economy.h">
- </File>
- <File
- RelativePath=".\..\src\engine.h">
- </File>
- <File
- RelativePath=".\..\src\fileio.h">
- </File>
- <File
- RelativePath=".\..\src\fios.h">
- </File>
- <File
- RelativePath=".\..\src\fontcache.h">
- </File>
- <File
- RelativePath=".\..\src\fsmblockmap.h">
- </File>
- <File
- RelativePath=".\..\src\fsmport.h">
- </File>
- <File
- RelativePath=".\..\src\functions.h">
- </File>
- <File
- RelativePath=".\..\src\genworld.h">
- </File>
- <File
- RelativePath=".\..\src\gfx.h">
- </File>
- <File
- RelativePath=".\..\src\gfxinit.h">
- </File>
- <File
- RelativePath=".\..\src\group.h">
- </File>
- <File
- RelativePath=".\..\src\gui.h">
- </File>
- <File
- RelativePath=".\..\src\heightmap.h">
- </File>
- <File
- RelativePath=".\..\src\industry.h">
- </File>
- <File
- RelativePath=".\..\src\landscape.h">
- </File>
- <File
- RelativePath=".\..\src\livery.h">
- </File>
- <File
- RelativePath=".\..\src\map.h">
- </File>
- <File
- RelativePath=".\..\src\md5.h">
- </File>
- <File
- RelativePath=".\..\src\mixer.h">
- </File>
- <File
- RelativePath=".\..\src\music.h">
- </File>
- <File
- RelativePath=".\..\src\network\network.h">
- </File>
- <File
- RelativePath=".\..\src\network\network_client.h">
- </File>
- <File
- RelativePath=".\..\src\network\network_data.h">
- </File>
- <File
- RelativePath=".\..\src\network\network_gamelist.h">
- </File>
- <File
- RelativePath=".\..\src\network\network_gui.h">
- </File>
- <File
- RelativePath=".\..\src\network\network_server.h">
- </File>
- <File
- RelativePath=".\..\src\network\network_udp.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_callbacks.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_canal.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_cargo.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_commons.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_config.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_engine.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_fsmports.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_house.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_industries.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_industrytiles.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_sound.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_spritegroup.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_station.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_storage.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_text.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_town.h">
- </File>
- <File
- RelativePath=".\..\src\newgrf_townname.h">
- </File>
- <File
- RelativePath=".\..\src\news.h">
- </File>
- <File
- RelativePath=".\..\src\npf.h">
- </File>
- <File
- RelativePath=".\..\src\music\null_m.h">
- </File>
- <File
- RelativePath=".\..\src\sound\null_s.h">
- </File>
- <File
- RelativePath=".\..\src\video\null_v.h">
- </File>
- <File
- RelativePath=".\..\src\oldpool.h">
- </File>
- <File
- RelativePath=".\..\src\openttd.h">
- </File>
- <File
- RelativePath=".\..\src\pathfind.h">
- </File>
- <File
- RelativePath=".\..\src\player.h">
- </File>
- <File
- RelativePath=".\..\src\player_face.h">
- </File>
- <File
- RelativePath=".\..\src\queue.h">
- </File>
- <File
- RelativePath=".\..\src\rail.h">
- </File>
- <File
- RelativePath=".\..\src\road_cmd.h">
- </File>
- <File
- RelativePath=".\..\src\saveload.h">
- </File>
- <File
- RelativePath=".\..\src\screenshot.h">
- </File>
- <File
- RelativePath=".\..\src\sound\sdl_s.h">
- </File>
- <File
- RelativePath=".\..\src\video\sdl_v.h">
- </File>
- <File
- RelativePath=".\..\src\settings.h">
- </File>
- <File
- RelativePath=".\..\src\signs.h">
- </File>
- <File
- RelativePath=".\..\src\signal_func.h">
- </File>
- <File
- RelativePath=".\..\src\slope.h">
- </File>
- <File
- RelativePath=".\..\src\sound.h">
- </File>
- <File
- RelativePath=".\..\src\sprite.h">
- </File>
- <File
- RelativePath=".\..\src\spritecache.h">
- </File>
- <File
- RelativePath=".\..\src\station.h">
- </File>
- <File
- RelativePath=".\..\src\station_gui.h">
- </File>
- <File
- RelativePath=".\..\src\stdafx.h">
- </File>
- <File
- RelativePath=".\..\src\string.h">
- </File>
- <File
- RelativePath=".\..\src\texteff.hpp">
- </File>
- <File
- RelativePath=".\..\src\tgp.h">
- </File>
- <File
- RelativePath=".\..\src\thread.h">
- </File>
- <File
- RelativePath=".\..\src\tile.h">
- </File>
- <File
- RelativePath=".\..\src\timetable.h">
- </File>
- <File
- RelativePath=".\..\src\town.h">
- </File>
- <File
- RelativePath=".\..\src\train.h">
- </File>
- <File
- RelativePath=".\..\src\transparency.h">
- </File>
- <File
- RelativePath=".\..\src\transparency_gui.h">
- </File>
- <File
- RelativePath=".\..\src\variables.h">
- </File>
- <File
- RelativePath=".\..\src\vehicle.h">
- </File>
- <File
- RelativePath=".\..\src\vehicle_gui.h">
- </File>
- <File
- RelativePath=".\..\src\viewport.h">
- </File>
- <File
- RelativePath=".\..\src\waypoint.h">
- </File>
- <File
- RelativePath=".\..\src\music\win32_m.h">
- </File>
- <File
- RelativePath=".\..\src\sound\win32_s.h">
- </File>
- <File
- RelativePath=".\..\src\video\win32_v.h">
- </File>
- <File
- RelativePath=".\..\src\window.h">
- </File>
- <File
- RelativePath=".\..\src\widgets\dropdown.h">
- </File>
- <File
- RelativePath=".\..\src\widgets\dropdown_type.h">
- </File>
- <File
- RelativePath=".\..\src\widgets\dropdown_func.h">
- </File>
- <File
- RelativePath=".\..\src\zoom.hpp">
- </File>
- </Filter>
- <Filter
- Name="GUI Source Code"
- Filter="">
- <File
- RelativePath=".\..\src\aircraft_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\airport_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\autoreplace_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\bridge_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\build_vehicle_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\depot_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\dock_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\engine_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\genworld_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\graph_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\group_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\industry_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\intro_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\main_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\misc_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\music_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\network_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\news_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\order_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\player_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\rail_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\road_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\roadveh_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\settings_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\ship_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\signs_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\smallmap_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\station_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\subsidy_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\terraform_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\timetable_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\town_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\train_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\transparency_gui.cpp">
- </File>
- <File
- RelativePath=".\..\src\vehicle_gui.cpp">
- </File>
- </Filter>
- <Filter
- Name="Landscape"
- Filter="">
- <File
- RelativePath=".\..\src\aircraft_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\clear_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\disaster_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\dummy_land.cpp">
- </File>
- <File
- RelativePath=".\..\src\group_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\industry_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\misc_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\order_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\rail_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\road_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\roadveh_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\ship_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\station_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\terraform_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\timetable_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\town_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\train_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\tree_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\tunnelbridge_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\unmovable_cmd.cpp">
- </File>
- <File
- RelativePath=".\..\src\water_cmd.cpp">
- </File>
- </Filter>
- <Filter
- Name="Tables"
- Filter="">
- <File
- RelativePath=".\..\src\table\ai_rail.h">
- </File>
- <File
- RelativePath=".\..\src\table\animcursors.h">
- </File>
- <File
- RelativePath=".\..\src\table\autorail.h">
- </File>
- <File
- RelativePath=".\..\src\table\build_industry.h">
- </File>
- <File
- RelativePath=".\..\src\table\cargo_const.h">
- </File>
- <File
- RelativePath=".\..\src\table\clear_land.h">
- </File>
- <File
- RelativePath=".\..\src\table\elrail_data.h">
- </File>
- <File
- RelativePath=".\..\src\table\engines.h">
- </File>
- <File
- RelativePath=".\..\src\table\genland.h">
- </File>
- <File
- RelativePath=".\..\src\table\industry_land.h">
- </File>
- <File
- RelativePath=".\..\src\table\landscape_sprite.h">
- </File>
- <File
- RelativePath=".\..\src\table\namegen.h">
- </File>
- <File
- RelativePath=".\..\src\table\palettes.h">
- </File>
- <File
- RelativePath=".\..\src\table\road_land.h">
- </File>
- <File
- RelativePath=".\..\src\table\roadveh.h">
- </File>
- <File
- RelativePath=".\..\src\table\sprites.h">
- </File>
- <File
- RelativePath=".\..\src\table\station_land.h">
- </File>
- <File
- RelativePath=".\..\src\..\objs\langs\table\strings.h">
- </File>
- <File
- RelativePath=".\..\src\table\town_land.h">
- </File>
- <File
- RelativePath=".\..\src\table\track_land.h">
- </File>
- <File
- RelativePath=".\..\src\table\train_cmd.h">
- </File>
- <File
- RelativePath=".\..\src\table\tree_land.h">
- </File>
- <File
- RelativePath=".\..\src\table\unmovable_land.h">
- </File>
- <File
- RelativePath=".\..\src\table\water_land.h">
- </File>
- </Filter>
- <Filter
- Name="AI Files"
- Filter="">
- <File
- RelativePath=".\..\src\ai\ai.cpp">
- </File>
- <File
- RelativePath=".\..\src\ai\trolly\build.cpp">
- </File>
- <File
- RelativePath=".\..\src\ai\default\default.cpp">
- </File>
- <File
- RelativePath=".\..\src\ai\trolly\pathfinder.cpp">
- </File>
- <File
- RelativePath=".\..\src\ai\trolly\shared.cpp">
- </File>
- <File
- RelativePath=".\..\src\ai\trolly\trolly.cpp">
- </File>
- </Filter>
- <Filter
- Name="Blitters"
- Filter="">
- <File
- RelativePath=".\..\src\blitter\32bpp_anim.cpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\32bpp_anim.hpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\32bpp_base.cpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\32bpp_base.hpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\32bpp_optimized.cpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\32bpp_optimized.hpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\32bpp_simple.cpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\32bpp_simple.hpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\8bpp_base.cpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\8bpp_base.hpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\8bpp_debug.cpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\8bpp_debug.hpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\8bpp_optimized.cpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\8bpp_optimized.hpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\8bpp_simple.cpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\8bpp_simple.hpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\base.hpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\factory.hpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\null.cpp">
- </File>
- <File
- RelativePath=".\..\src\blitter\null.hpp">
- </File>
- </Filter>
- <Filter
- Name="Drivers"
- Filter="">
- <File
- RelativePath=".\..\src\music\music_driver.hpp">
- </File>
- <File
- RelativePath=".\..\src\sound\sound_driver.hpp">
- </File>
- <File
- RelativePath=".\..\src\video\video_driver.hpp">
- </File>
- </Filter>
- <Filter
- Name="Sprite loaders"
- Filter="">
- <File
- RelativePath=".\..\src\spriteloader\grf.cpp">
- </File>
- <File
- RelativePath=".\..\src\spriteloader\grf.hpp">
- </File>
- <File
- RelativePath=".\..\src\spriteloader\png.cpp">
- </File>
- <File
- RelativePath=".\..\src\spriteloader\png.hpp">
- </File>
- <File
- RelativePath=".\..\src\spriteloader\spriteloader.hpp">
- </File>
- </Filter>
- <Filter
- Name="NewGRF"
- Filter="">
- <File
- RelativePath=".\..\src\newgrf.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_canal.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_cargo.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_commons.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_config.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_engine.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_fsmports.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_house.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_industries.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_industrytiles.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_sound.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_spritegroup.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_station.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_storage.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_text.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_town.cpp">
- </File>
- <File
- RelativePath=".\..\src\newgrf_townname.cpp">
- </File>
- </Filter>
- <Filter
- Name="Map Accessors"
- Filter="">
- <File
- RelativePath=".\..\src\bridge_map.cpp">
- </File>
- <File
- RelativePath=".\..\src\bridge_map.h">
- </File>
- <File
- RelativePath=".\..\src\clear_map.h">
- </File>
- <File
- RelativePath=".\..\src\industry_map.h">
- </File>
- <File
- RelativePath=".\..\src\rail_map.h">
- </File>
- <File
- RelativePath=".\..\src\road_map.cpp">
- </File>
- <File
- RelativePath=".\..\src\road_map.h">
- </File>
- <File
- RelativePath=".\..\src\station_map.h">
- </File>
- <File
- RelativePath=".\..\src\town_map.h">
- </File>
- <File
- RelativePath=".\..\src\tree_map.h">
- </File>
- <File
- RelativePath=".\..\src\tunnel_map.cpp">
- </File>
- <File
- RelativePath=".\..\src\tunnel_map.h">
- </File>
- <File
- RelativePath=".\..\src\tunnelbridge_map.h">
- </File>
- <File
- RelativePath=".\..\src\unmovable_map.h">
- </File>
- <File
- RelativePath=".\..\src\void_map.h">
- </File>
- <File
- RelativePath=".\..\src\water_map.h">
- </File>
- </Filter>
- <Filter
- Name="Misc"
- Filter="">
- <File
- RelativePath=".\..\src\misc\array.hpp">
- </File>
- <File
- RelativePath=".\..\src\misc\autocopyptr.hpp">
- </File>
- <File
- RelativePath=".\..\src\misc\autoptr.hpp">
- </File>
- <File
- RelativePath=".\..\src\misc\binaryheap.hpp">
- </File>
- <File
- RelativePath=".\..\src\misc\blob.hpp">
- </File>
- <File
- RelativePath=".\..\src\misc\countedptr.hpp">
- </File>
- <File
- RelativePath=".\..\src\misc\crc32.hpp">
- </File>
- <File
- RelativePath=".\..\src\misc\dbg_helpers.cpp">
- </File>
- <File
- RelativePath=".\..\src\misc\dbg_helpers.h">
- </File>
- <File
- RelativePath=".\..\src\misc\fixedsizearray.hpp">
- </File>
- <File
- RelativePath=".\..\src\misc\hashtable.hpp">
- </File>
- <File
- RelativePath=".\..\src\misc\str.hpp">
- </File>
- <File
- RelativePath=".\..\src\misc\strapi.hpp">
- </File>
- </Filter>
- <Filter
- Name="Network Core"
- Filter="">
- <File
- RelativePath=".\..\src\network\core\config.h">
- </File>
- <File
- RelativePath=".\..\src\network\core\core.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\core\core.h">
- </File>
- <File
- RelativePath=".\..\src\network\core\game.h">
- </File>
- <File
- RelativePath=".\..\src\network\core\os_abstraction.h">
- </File>
- <File
- RelativePath=".\..\src\network\core\packet.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\core\packet.h">
- </File>
- <File
- RelativePath=".\..\src\network\core\tcp.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\core\tcp.h">
- </File>
- <File
- RelativePath=".\..\src\network\core\udp.cpp">
- </File>
- <File
- RelativePath=".\..\src\network\core\udp.h">
- </File>
- </Filter>
- <Filter
- Name="YAPF"
- Filter="">
- <File
- RelativePath=".\..\src\yapf\follow_track.cpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\follow_track.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\nodelist.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\track_dir.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf.h">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_base.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_common.cpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_common.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_costbase.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_costcache.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_costrail.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_destrail.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_node.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_node_rail.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_node_road.hpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_rail.cpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_road.cpp">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_settings.h">
- </File>
- <File
- RelativePath=".\..\src\yapf\yapf_ship.cpp">
- </File>
- </Filter>
- <Filter
- Name="Video"
- Filter="">
- <File
- RelativePath=".\..\src\video\dedicated_v.cpp">
- </File>
- <File
- RelativePath=".\..\src\video\null_v.cpp">
- </File>
- <File
- RelativePath=".\..\src\video\sdl_v.cpp">
- </File>
- <File
- RelativePath=".\..\src\video\win32_v.cpp">
- </File>
- </Filter>
- <Filter
- Name="Music"
- Filter="">
- <File
- RelativePath=".\..\src\music\dmusic.cpp">
- </File>
- <File
- RelativePath=".\..\src\music\null_m.cpp">
- </File>
- <File
- RelativePath=".\..\src\music\win32_m.cpp">
- </File>
- </Filter>
- <Filter
- Name="Sound"
- Filter="">
- <File
- RelativePath=".\..\src\sound\null_s.cpp">
- </File>
- <File
- RelativePath=".\..\src\sound\sdl_s.cpp">
- </File>
- <File
- RelativePath=".\..\src\sound\win32_s.cpp">
- </File>
- </Filter>
- <File
- RelativePath=".\..\media\mainicon.ico">
- </File>
- <File
- RelativePath=".\..\media\openttd.ico">
- </File>
- <File
- RelativePath=".\..\readme.txt">
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
--- a/projects/openttd.vcproj.in Sun Feb 03 01:34:21 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="openttd"
- RootNamespace="openttd"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- GlobalOptimizations="TRUE"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="TRUE"
- FavorSizeOrSpeed="2"
- OmitFramePointers="TRUE"
- OptimizeForProcessor="1"
- AdditionalIncludeDirectories="..\objs\langs"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
- StringPooling="TRUE"
- ExceptionHandling="TRUE"
- RuntimeLibrary="0"
- StructMemberAlignment="3"
- BufferSecurityCheck="FALSE"
- EnableFunctionLevelLinking="TRUE"
- DefaultCharIsUnsigned="TRUE"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- AssemblerOutput="2"
- AssemblerListingLocation="$(IntDir)/"
- ObjectFile="$(IntDir)/"
- ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
- BrowseInformation="1"
- BrowseInformationFile="$(IntDir)/"
- WarningLevel="3"
- WarnAsError="TRUE"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CallingConvention="1"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- OptimizeForWindows98="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/openttd.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"
- Description="Determining version number"
- CommandLine=""$(InputDir)/determineversion.vbs""/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1053"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
- IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\objs\langs"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- AssemblerListingLocation="$(IntDir)/"
- ObjectFile="$(IntDir)/"
- ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
- WarningLevel="3"
- WarnAsError="TRUE"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="FALSE"
- DebugInformationFormat="4"
- CallingConvention="1"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- IgnoreDefaultLibraryNames="LIBCMT.lib"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/openttd.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"
- Description="Determining version number"
- CommandLine=""$(InputDir)/determineversion.vbs""/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1053"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
-!!FILES!!
- <File
- RelativePath=".\..\media\mainicon.ico">
- </File>
- <File
- RelativePath=".\..\media\openttd.ico">
- </File>
- <File
- RelativePath=".\..\readme.txt">
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
--- a/projects/openttd_vs80.vcproj Sun Feb 03 01:34:21 2008 +0000
+++ b/projects/openttd_vs80.vcproj Sun Feb 03 20:34:26 2008 +0000
@@ -1192,6 +1192,10 @@
>
</File>
<File
+ RelativePath=".\..\src\tunnelbridge.h"
+ >
+ </File>
+ <File
RelativePath=".\..\src\variables.h"
>
</File>
--- a/projects/openttd_vs90.vcproj Sun Feb 03 01:34:21 2008 +0000
+++ b/projects/openttd_vs90.vcproj Sun Feb 03 20:34:26 2008 +0000
@@ -1173,6 +1173,10 @@
>
</File>
<File
+ RelativePath=".\..\src\tunnelbridge.h"
+ >
+ </File>
+ <File
RelativePath=".\..\src\variables.h"
>
</File>
--- a/projects/strgen.vcproj Sun Feb 03 01:34:21 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="strgen"
- RootNamespace="strgen"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\objs\strgen\"
- IntermediateDirectory="..\objs\strgen\"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- GlobalOptimizations="TRUE"
- FavorSizeOrSpeed="2"
- PreprocessorDefinitions="STRGEN;WIN32;NDEBUG;_CONSOLE"
- BasicRuntimeChecks="0"
- RuntimeLibrary="5"
- PrecompiledHeaderFile=""
- AssemblerOutput="2"
- AssemblerListingLocation="$(IntDir)"
- ObjectFile="$(IntDir)"
- ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
- WarningLevel="3"
- WarnAsError="TRUE"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(IntDir)\strgen.exe"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(IntDir)\strgen.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/strgen.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1053"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath="..\src\strgen\strgen.cpp">
- </File>
- <File
- RelativePath="..\src\string.cpp">
- </File>
- </Filter>
- <File
- RelativePath="..\src\macros.h">
- </File>
- <File
- RelativePath="..\src\stdafx.h">
- </File>
- <File
- RelativePath="..\src\string.h">
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
--- a/source.list Sun Feb 03 01:34:21 2008 +0000
+++ b/source.list Sun Feb 03 20:34:26 2008 +0000
@@ -206,6 +206,7 @@
train.h
transparency.h
transparency_gui.h
+tunnelbridge.h
variables.h
vehicle.h
vehicle_gui.h
--- a/src/ai/default/default.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/ai/default/default.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -31,6 +31,7 @@
#include "../../player_base.h"
#include "../../settings_type.h"
#include "default.h"
+#include "../../tunnelbridge.h"
#include "../../table/ai_rail.h"
@@ -139,10 +140,9 @@
{
EngineID best_veh_index = INVALID_ENGINE;
byte best_veh_score = 0;
- CommandCost ret;
EngineID i;
- for (i = 0; i < NUM_TRAIN_ENGINES; i++) {
+ FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_TRAIN) {
const RailVehicleInfo *rvi = RailVehInfo(i);
const Engine* e = GetEngine(i);
@@ -154,7 +154,10 @@
continue;
}
- ret = DoCommand(tile, i, 0, 0, CMD_BUILD_RAIL_VEHICLE);
+ /* Don't choose an engine designated for passenger use for freight. */
+ if (rvi->ai_passenger_only != 0 && flag == 1) continue;
+
+ CommandCost ret = DoCommand(tile, i, 0, 0, CMD_BUILD_RAIL_VEHICLE);
if (CmdSucceeded(ret) && ret.GetCost() <= money && rvi->ai_rank >= best_veh_score) {
best_veh_score = rvi->ai_rank;
best_veh_index = i;
@@ -168,14 +171,11 @@
{
EngineID best_veh_index = INVALID_ENGINE;
int32 best_veh_rating = 0;
- EngineID i = ROAD_ENGINES_INDEX;
- EngineID end = i + NUM_ROAD_ENGINES;
-
- for (; i != end; i++) {
+ EngineID i;
+
+ FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_ROAD) {
const RoadVehicleInfo *rvi = RoadVehInfo(i);
const Engine* e = GetEngine(i);
- int32 rating;
- CommandCost ret;
if (!HasBit(e->player_avail, _current_player) || e->reliability < 0x8A3D) {
continue;
@@ -185,10 +185,10 @@
if (rvi->cargo_type != cargo && !CanRefitTo(i, cargo)) continue;
/* Rate and compare the engine by speed & capacity */
- rating = rvi->max_speed * rvi->capacity;
+ int rating = rvi->max_speed * rvi->capacity;
if (rating <= best_veh_rating) continue;
- ret = DoCommand(tile, i, 0, 0, CMD_BUILD_ROAD_VEH);
+ CommandCost ret = DoCommand(tile, i, 0, 0, CMD_BUILD_ROAD_VEH);
if (CmdFailed(ret)) continue;
/* Add the cost of refitting */
@@ -202,23 +202,28 @@
return best_veh_index;
}
-static EngineID AiChooseAircraftToBuild(Money money, byte flag)
+/**
+ * Choose aircraft to build.
+ * @param money current AI money
+ * @param forbidden forbidden flags - AIR_HELI = 0 (always allowed), AIR_CTOL = 1 (bit 0), AIR_FAST = 2 (bit 1)
+ * @return EngineID of aircraft to build
+ */
+static EngineID AiChooseAircraftToBuild(Money money, byte forbidden)
{
EngineID best_veh_index = INVALID_ENGINE;
Money best_veh_cost = 0;
EngineID i;
- for (i = AIRCRAFT_ENGINES_INDEX; i != AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES; i++) {
+ FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_AIRCRAFT) {
const Engine* e = GetEngine(i);
- CommandCost ret;
if (!HasBit(e->player_avail, _current_player) || e->reliability < 0x8A3D) {
continue;
}
- if ((AircraftVehInfo(i)->subtype & AIR_CTOL) != flag) continue;
-
- ret = DoCommand(0, i, 0, DC_QUERY_COST, CMD_BUILD_AIRCRAFT);
+ if ((AircraftVehInfo(i)->subtype & forbidden) != 0) continue;
+
+ CommandCost ret = DoCommand(0, i, 0, DC_QUERY_COST, CMD_BUILD_AIRCRAFT);
if (CmdSucceeded(ret) && ret.GetCost() <= money && ret.GetCost() >= best_veh_cost) {
best_veh_cost = ret.GetCost();
best_veh_index = i;
@@ -253,8 +258,24 @@
static EngineID AiChooseAircraftToReplaceWith(const Player* p, const Vehicle* v)
{
Money avail_money = p->player_money + v->value;
+
+ /* determine forbidden aircraft bits */
+ byte forbidden = 0;
+ const Order *o;
+
+ FOR_VEHICLE_ORDERS(v, o) {
+ if (!o->IsValid()) continue;
+ if (!IsValidStationID(o->dest)) continue;
+ const Station *st = GetStation(o->dest);
+ if (!(st->facilities & FACIL_AIRPORT)) continue;
+
+ AirportFTAClass::Flags flags = st->Airport()->flags;
+ if (!(flags & AirportFTAClass::AIRPLANES)) forbidden |= AIR_CTOL | AIR_FAST; // no planes for heliports / oil rigs
+ if (flags & AirportFTAClass::SHORT_STRIP) forbidden |= AIR_FAST; // no fast planes for small airports
+ }
+
return AiChooseAircraftToBuild(
- avail_money, AircraftVehInfo(v->engine_type)->subtype & AIR_CTOL
+ avail_money, forbidden
);
}
@@ -1369,7 +1390,7 @@
/* Get aircraft that would be bought for this route
* (probably, as conditions may change before the route is fully built,
* like running out of money and having to select different aircraft, etc ...) */
- EngineID veh = AiChooseAircraftToBuild(p->player_money, _players_ai[p->index].build_kind != 0 ? 0 : AIR_CTOL);
+ EngineID veh = AiChooseAircraftToBuild(p->player_money, _players_ai[p->index].build_kind != 0 ? AIR_CTOL : 0);
/* No aircraft buildable mean no aircraft route */
if (veh == INVALID_ENGINE) return;
@@ -1903,7 +1924,7 @@
arpfd.tile2 = _players_ai[p->index].cur_tile_a;
arpfd.flag = false;
arpfd.count = 0;
- FollowTrack(_players_ai[p->index].cur_tile_a + TileOffsByDiagDir(_players_ai[p->index].cur_dir_a), 0x2000 | TRANSPORT_RAIL, 0, ReverseDiagDir(_players_ai[p->index].cur_dir_a),
+ FollowTrack(_players_ai[p->index].cur_tile_a + TileOffsByDiagDir(_players_ai[p->index].cur_dir_a), TRANSPORT_RAIL, 0, ReverseDiagDir(_players_ai[p->index].cur_dir_a),
(TPFEnumProc*)AiEnumFollowTrack, NULL, &arpfd);
return arpfd.count > 8;
}
@@ -2178,7 +2199,7 @@
if (arf.best_ptr[0] & 0x80) {
int i;
- int32 bridge_len = GetBridgeLength(arf.bridge_end_tile, _players_ai[p->index].cur_tile_a);
+ int32 bridge_len = GetTunnelBridgeLength(arf.bridge_end_tile, _players_ai[p->index].cur_tile_a);
/* Figure out which (rail)bridge type to build
* start with best bridge, then go down to worse and worse bridges
@@ -2233,7 +2254,7 @@
return false;
_players_ai[p->index].cur_tile_a = TILE_MASK(_build_tunnel_endtile - TileOffsByDiagDir(_players_ai[p->index].cur_dir_a));
return true;
- } else {
+ } else { // IsBridge(tile)
// Check if the bridge points in the right direction.
// This is not really needed the first place AiRemoveTileAndGoForward is called.
if (DiagDirToAxis(GetTunnelBridgeDirection(tile)) != (_players_ai[p->index].cur_dir_a & 1)) return false;
@@ -2871,7 +2892,7 @@
uint i;
FOR_EACH_SET_BIT(i, bits) {
- FollowTrack(tile, 0x3000 | TRANSPORT_ROAD, ROADTYPES_ROAD, (DiagDirection)_dir_by_track[i], (TPFEnumProc*)AiEnumFollowRoad, NULL, &are);
+ FollowTrack(tile, 0x1000 | TRANSPORT_ROAD, ROADTYPES_ROAD, (DiagDirection)_dir_by_track[i], (TPFEnumProc*)AiEnumFollowRoad, NULL, &are);
}
if (DistanceManhattan(tile, are.dest) <= are.best_dist) return false;
@@ -3070,7 +3091,7 @@
int i;
int32 bridge_len;
_players_ai[p->index].cur_tile_a = arf.bridge_end_tile;
- bridge_len = GetBridgeLength(tile, _players_ai[p->index].cur_tile_a); // tile
+ bridge_len = GetTunnelBridgeLength(tile, _players_ai[p->index].cur_tile_a); // tile
/* Figure out what (road)bridge type to build
* start with best bridge, then go down to worse and worse bridges
@@ -3485,7 +3506,20 @@
int i;
VehicleID loco_id;
- veh = AiChooseAircraftToBuild(p->player_money, _players_ai[p->index].build_kind != 0 ? 0 : AIR_CTOL);
+ /* determine forbidden aircraft bits */
+ byte forbidden = 0;
+ for (i = 0; _players_ai[p->index].order_list_blocks[i] != 0xFF; i++) {
+ const AiBuildRec *aib = (&_players_ai[p->index].src) + _players_ai[p->index].order_list_blocks[i];
+ const Station *st = GetStationByTile(aib->use_tile);
+
+ if (st == NULL || !(st->facilities & FACIL_AIRPORT)) continue;
+
+ AirportFTAClass::Flags flags = st->Airport()->flags;
+ if (!(flags & AirportFTAClass::AIRPLANES)) forbidden |= AIR_CTOL | AIR_FAST; // no planes for heliports / oil rigs
+ if (flags & AirportFTAClass::SHORT_STRIP) forbidden |= AIR_FAST; // no fast planes for small airports
+ }
+
+ veh = AiChooseAircraftToBuild(p->player_money, forbidden);
if (veh == INVALID_ENGINE) return;
/* XXX - Have the AI pick the hangar terminal in an airport. Eg get airport-type
--- a/src/ai/trolly/build.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/ai/trolly/build.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -15,6 +15,8 @@
#include "../../player_base.h"
#include "../../player_func.h"
#include "../ai.h"
+#include "../../tunnelbridge.h"
+
// Build HQ
// Params:
@@ -58,7 +60,7 @@
int bridge_type, bridge_len, type, type2;
// Find a good bridgetype (the best money can buy)
- bridge_len = GetBridgeLength(tile_a, tile_b);
+ bridge_len = GetTunnelBridgeLength(tile_a, tile_b);
type = type2 = 0;
for (bridge_type = MAX_BRIDGES-1; bridge_type >= 0; bridge_type--) {
if (CheckBridge_Stuff(bridge_type, bridge_len)) {
@@ -234,30 +236,29 @@
} else {
EngineID best_veh_index = INVALID_ENGINE;
int32 best_veh_rating = 0;
- EngineID start = ROAD_ENGINES_INDEX;
- EngineID end = ROAD_ENGINES_INDEX + NUM_ROAD_ENGINES;
EngineID i;
/* Loop through all road vehicles */
- for (i = start; i != end; i++) {
+ FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_ROAD) {
const RoadVehicleInfo *rvi = RoadVehInfo(i);
const Engine* e = GetEngine(i);
- int32 rating;
- CommandCost ret;
/* Skip vehicles which can't take our cargo type */
if (rvi->cargo_type != _players_ainew[p->index].cargo && !CanRefitTo(i, _players_ainew[p->index].cargo)) continue;
+ /* Skip trams */
+ if (HasBit(EngInfo(i)->misc_flags, EF_ROAD_TRAM)) continue;
+
// Is it availiable?
// Also, check if the reliability of the vehicle is above the AI_VEHICLE_MIN_RELIABILTY
if (!HasBit(e->player_avail, _current_player) || e->reliability * 100 < AI_VEHICLE_MIN_RELIABILTY << 16) continue;
/* Rate and compare the engine by speed & capacity */
- rating = rvi->max_speed * rvi->capacity;
+ int rating = rvi->max_speed * rvi->capacity;
if (rating <= best_veh_rating) continue;
// Can we build it?
- ret = AI_DoCommand(0, i, 0, DC_QUERY_COST, CMD_BUILD_ROAD_VEH);
+ CommandCost ret = AI_DoCommand(0, i, 0, DC_QUERY_COST, CMD_BUILD_ROAD_VEH);
if (CmdFailed(ret)) continue;
best_veh_rating = rating;
--- a/src/ai/trolly/pathfinder.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/ai/trolly/pathfinder.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -14,6 +14,7 @@
#include "../../variables.h"
#include "../../player_base.h"
#include "../../player_func.h"
+#include "../../tunnelbridge.h"
#define TEST_STATION_NO_DIR 0xFF
@@ -320,7 +321,7 @@
new_tile += TileOffsByDiagDir(dir);
// Precheck, is the length allowed?
- if (!CheckBridge_Stuff(0, GetBridgeLength(tile, new_tile))) break;
+ if (!CheckBridge_Stuff(0, GetTunnelBridgeLength(tile, new_tile))) break;
// Check if we hit the station-tile.. we don't like that!
if (TILES_BETWEEN(new_tile, PathFinderInfo->end_tile_tl, PathFinderInfo->end_tile_br)) break;
@@ -340,14 +341,11 @@
// Next, check for tunnels!
// Tunnels can only be built on slopes corresponding to the direction
// For now, we check both sides for this tile.. terraforming gives fuzzy result
- if ((dir == DIAGDIR_NE && tileh == SLOPE_NE) ||
- (dir == DIAGDIR_SE && tileh == SLOPE_SE) ||
- (dir == DIAGDIR_SW && tileh == SLOPE_SW) ||
- (dir == DIAGDIR_NW && tileh == SLOPE_NW)) {
+ if (tileh == InclinedSlope(dir)) {
// Now simply check if a tunnel can be build
ret = AI_DoCommand(tile, (PathFinderInfo->rail_or_road?0:0x200), 0, DC_AUTO, CMD_BUILD_TUNNEL);
tileh = GetTileSlope(_build_tunnel_endtile, NULL);
- if (CmdSucceeded(ret) && (tileh == SLOPE_SW || tileh == SLOPE_SE || tileh == SLOPE_NW || tileh == SLOPE_NE)) {
+ if (CmdSucceeded(ret) && IsInclinedSlope(tileh)) {
aystar->neighbours[aystar->num_neighbours].tile = _build_tunnel_endtile;
aystar->neighbours[aystar->num_neighbours].user_data[0] = AI_PATHFINDER_FLAG_TUNNEL + (dir << 8);
aystar->neighbours[aystar->num_neighbours++].direction = 0;
@@ -399,10 +397,9 @@
if (parent_tileh != SLOPE_FLAT && parent->path.parent != NULL) {
// Skip if the tile was from a bridge or tunnel
if (parent->path.node.user_data[0] == 0 && current->user_data[0] == 0) {
- static const uint32 SLOPED_TILEHS = (1 << SLOPE_NW) | (1 << SLOPE_SW) | (1 << SLOPE_SE) | (1 << SLOPE_NE);
if (PathFinderInfo->rail_or_road) {
Foundation f = GetRailFoundation(parent_tileh, (TrackBits)(1 << AiNew_GetRailDirection(parent->path.parent->node.tile, parent->path.node.tile, current->tile)));
- if (IsInclinedFoundation(f) || (!IsFoundation(f) && HasBit(SLOPED_TILEHS, parent_tileh))) {
+ if (IsInclinedFoundation(f) || (!IsFoundation(f) && IsInclinedSlope(parent_tileh))) {
res += AI_PATHFINDER_TILE_GOES_UP_PENALTY;
} else {
res += AI_PATHFINDER_FOUNDATION_PENALTY;
@@ -410,7 +407,7 @@
} else {
if (!IsRoad(parent->path.node.tile) || !IsTileType(parent->path.node.tile, MP_TUNNELBRIDGE)) {
Foundation f = GetRoadFoundation(parent_tileh, (RoadBits)AiNew_GetRoadDirection(parent->path.parent->node.tile, parent->path.node.tile, current->tile));
- if (IsInclinedFoundation(f) || (!IsFoundation(f) && HasBit(SLOPED_TILEHS, parent_tileh))) {
+ if (IsInclinedFoundation(f) || (!IsFoundation(f) && IsInclinedSlope(parent_tileh))) {
res += AI_PATHFINDER_TILE_GOES_UP_PENALTY;
} else {
res += AI_PATHFINDER_FOUNDATION_PENALTY;
@@ -425,14 +422,14 @@
int r;
// Tunnels are very expensive when build on long routes..
// Ironicly, we are using BridgeCode here ;)
- r = AI_PATHFINDER_TUNNEL_PENALTY * GetBridgeLength(current->tile, parent->path.node.tile);
+ r = AI_PATHFINDER_TUNNEL_PENALTY * GetTunnelBridgeLength(current->tile, parent->path.node.tile);
res += r + (r >> 8);
}
// Are we part of a bridge?
if ((AI_PATHFINDER_FLAG_BRIDGE & current->user_data[0]) != 0) {
// That means for every length a penalty
- res += AI_PATHFINDER_BRIDGE_PENALTY * GetBridgeLength(current->tile, parent->path.node.tile);
+ res += AI_PATHFINDER_BRIDGE_PENALTY * GetTunnelBridgeLength(current->tile, parent->path.node.tile);
// Check if we are going up or down, first for the starting point
// In user_data[0] is at the 8th bit the direction
if (!HasBridgeFlatRamp(parent_tileh, (Axis)((current->user_data[0] >> 8) & 1))) res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
--- a/src/aircraft.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/aircraft.h Sun Feb 03 20:34:26 2008 +0000
@@ -126,6 +126,7 @@
Money GetRunningCost() const { return AircraftVehInfo(this->engine_type)->running_cost * _price.aircraft_running; }
bool IsInDepot() const { return (this->vehstatus & VS_HIDDEN) != 0 && IsHangarTile(this->tile); }
void Tick();
+ void OnNewDay();
};
#endif /* AIRCRAFT_H */
--- a/src/aircraft_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/aircraft_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -764,27 +764,27 @@
}
}
-void OnNewDay_Aircraft(Vehicle *v)
+void Aircraft::OnNewDay()
{
- if (!IsNormalAircraft(v)) return;
-
- if ((++v->day_counter & 7) == 0) DecreaseVehicleValue(v);
-
- CheckOrders(v);
+ if (!IsNormalAircraft(this)) return;
- CheckVehicleBreakdown(v);
- AgeVehicle(v);
- CheckIfAircraftNeedsService(v);
-
- if (v->vehstatus & VS_STOPPED) return;
+ if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
- CommandCost cost = CommandCost(EXPENSES_AIRCRAFT_RUN, GetVehicleProperty(v, 0x0E, AircraftVehInfo(v->engine_type)->running_cost) * _price.aircraft_running / 364);
+ CheckOrders(this);
- v->profit_this_year -= cost.GetCost() >> 8;
+ CheckVehicleBreakdown(this);
+ AgeVehicle(this);
+ CheckIfAircraftNeedsService(this);
- SubtractMoneyFromPlayerFract(v->owner, cost);
+ if (this->vehstatus & VS_STOPPED) return;
- InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
+ CommandCost cost = CommandCost(EXPENSES_AIRCRAFT_RUN, GetVehicleProperty(this, 0x0E, AircraftVehInfo(this->engine_type)->running_cost) * _price.aircraft_running / 364);
+
+ this->profit_this_year -= cost.GetCost() >> 8;
+
+ SubtractMoneyFromPlayerFract(this->owner, cost);
+
+ InvalidateWindow(WC_VEHICLE_DETAILS, this->index);
InvalidateWindowClasses(WC_AIRCRAFT_LIST);
}
--- a/src/airport_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/airport_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -255,7 +255,12 @@
if (fsmportspec->layout_mask != NULL) _thd.FSMportMask = &fsmportspec->layout_mask[_airport.layout_set]; // irregular airport support
int rad = _patches.modified_catchment ? fsmportspec->portFSM->catchment : 4;
if (_station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
- DrawStationCoverageAreaText(2, 206, SCT_ALL, rad);
+ int text_end = DrawStationCoverageAreaText(2, 206, SCT_ALL, rad) + 4;
+ if (text_end > w->widget[6].bottom) {
+ SetWindowDirty(w);
+ ResizeWindowForWidget(w, 6, 0, text_end - w->widget[6].bottom);
+ SetWindowDirty(w);
+ }
} else {
/* if nothing is selectable, draw the image of the first in the non-selectable list, but grey out the preview */
fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, 0);
@@ -282,8 +287,6 @@
DrawStringTruncated(9, y, STR_STAT_CLASS_DFLT, i == _airport.station_type ? 12 : 16, 118);
}
}
-
-
break;
}
--- a/src/autoreplace_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/autoreplace_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -215,7 +215,7 @@
DoCommand(0, (front->index << 16) | new_v->index, 1, DC_EXEC, CMD_MOVE_RAIL_VEHICLE);
} else {
// copy/clone the orders
- DoCommand(0, (old_v->index << 16) | new_v->index, IsOrderListShared(old_v) ? CO_SHARE : CO_COPY, DC_EXEC, CMD_CLONE_ORDER);
+ DoCommand(0, (old_v->index << 16) | new_v->index, old_v->IsOrderListShared() ? CO_SHARE : CO_COPY, DC_EXEC, CMD_CLONE_ORDER);
new_v->cur_order_index = old_v->cur_order_index;
ChangeVehicleViewWindow(old_v, new_v);
new_v->profit_this_year = old_v->profit_this_year;
--- a/src/autoreplace_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/autoreplace_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -345,7 +345,13 @@
/* Also draw the details if an engine is selected */
if (WP(w, replaceveh_d).sel_engine[i] != INVALID_ENGINE) {
const Widget *wi = &w->widget[i == 0 ? RVW_WIDGET_LEFT_DETAILS : RVW_WIDGET_RIGHT_DETAILS];
- DrawVehiclePurchaseInfo(wi->left + 2, wi->top + 1, wi->right - wi->left - 2, WP(w, replaceveh_d).sel_engine[i]);
+ int text_end = DrawVehiclePurchaseInfo(wi->left + 2, wi->top + 1, wi->right - wi->left - 2, WP(w, replaceveh_d).sel_engine[i]);
+
+ if (text_end > wi->bottom) {
+ SetWindowDirty(w);
+ ResizeWindowForWidget(w, i == 0 ? RVW_WIDGET_LEFT_DETAILS : RVW_WIDGET_RIGHT_DETAILS, 0, text_end - wi->bottom);
+ SetWindowDirty(w);
+ }
}
}
--- a/src/bridge.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/bridge.h Sun Feb 03 20:34:26 2008 +0000
@@ -16,14 +16,16 @@
/** Struct containing information about a single bridge type
*/
struct Bridge {
- Year avail_year; ///< the year in which the bridge becomes available
- byte min_length; ///< the minimum length of the bridge (not counting start and end tile)
- byte max_length; ///< the maximum length of the bridge (not counting start and end tile)
- uint16 price; ///< the relative price of the bridge
+ Year avail_year; ///< the year where it becomes available
+ byte min_length; ///< the minimum length (not counting start and end tile)
+ byte max_length; ///< the maximum length (not counting start and end tile)
+ uint16 price; ///< the price multiplier
uint16 speed; ///< maximum travel speed
SpriteID sprite; ///< the sprite which is used in the GUI
SpriteID pal; ///< the palette which is used in the GUI
StringID material; ///< the string that contains the bridge description
+ StringID name_rail; ///< description of the bridge, when built for road
+ StringID name_road; ///< description of the bridge, when built for road
PalSpriteID **sprite_table; ///< table of sprites for drawing the bridge
byte flags; ///< bit 0 set: disable drawing of far pillars.
};
@@ -43,7 +45,6 @@
void DrawBridgeMiddle(const TileInfo *ti);
bool CheckBridge_Stuff(byte bridge_type, uint bridge_len);
-uint32 GetBridgeLength(TileIndex begin, TileIndex end);
int CalcBridgeLenCostFactor(int x);
#endif /* BRIDGE_H */
--- a/src/bridge_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/bridge_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -16,6 +16,7 @@
#include "map_func.h"
#include "viewport_func.h"
#include "gfx_func.h"
+#include "tunnelbridge.h"
#include "table/strings.h"
@@ -182,7 +183,7 @@
/* check which bridges can be built
* get absolute bridge length
* length of the middle parts of the bridge */
- const uint bridge_len = GetBridgeLength(start, end);
+ const uint bridge_len = GetTunnelBridgeLength(start, end);
/* total length of bridge */
const uint tot_bridgedata_len = CalcBridgeLenCostFactor(bridge_len + 2);
--- a/src/build_vehicle_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/build_vehicle_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -773,7 +773,8 @@
* Also check to see if the previously selected engine is still available,
* and if not, reset selection to INVALID_ENGINE. This could be the case
* when engines become obsolete and are removed */
- for (EngineID eid = 0; eid < NUM_TRAIN_ENGINES; eid++) {
+ EngineID eid;
+ FOR_ALL_ENGINEIDS_OF_TYPE(eid, VEH_TRAIN) {
const RailVehicleInfo *rvi = RailVehInfo(eid);
if (bv->filter.railtype != RAILTYPE_END && !HasPowerOnRail(rvi->railtype, bv->filter.railtype)) continue;
@@ -811,7 +812,8 @@
EngList_RemoveAll(&bv->eng_list);
- for (EngineID eid = ROAD_ENGINES_INDEX; eid < ROAD_ENGINES_INDEX + NUM_ROAD_ENGINES; eid++) {
+ EngineID eid;
+ FOR_ALL_ENGINEIDS_OF_TYPE(eid, VEH_ROAD) {
if (!IsEngineBuildable(eid, VEH_ROAD, _local_player)) continue;
if (!HasBit(bv->filter.roadtypes, HasBit(EngInfo(eid)->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD)) continue;
EngList_Add(&bv->eng_list, eid);
@@ -829,7 +831,8 @@
EngList_RemoveAll(&bv->eng_list);
- for (EngineID eid = SHIP_ENGINES_INDEX; eid < SHIP_ENGINES_INDEX + NUM_SHIP_ENGINES; eid++) {
+ EngineID eid;
+ FOR_ALL_ENGINEIDS_OF_TYPE(eid, VEH_SHIP) {
if (!IsEngineBuildable(eid, VEH_SHIP, _local_player)) continue;
EngList_Add(&bv->eng_list, eid);
@@ -850,7 +853,8 @@
* Also check to see if the previously selected plane is still available,
* and if not, reset selection to INVALID_ENGINE. This could be the case
* when planes become obsolete and are removed */
- for (EngineID eid = AIRCRAFT_ENGINES_INDEX; eid < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES; eid++) {
+ EngineID eid;
+ FOR_ALL_ENGINEIDS_OF_TYPE(eid, VEH_AIRCRAFT) {
if (!IsEngineBuildable(eid, VEH_AIRCRAFT, _local_player)) continue;
/* First VEH_END window_numbers are fake to allow a window open for all different types at once */
if (w->window_number > VEH_END && !CanAircraftUseStation(eid, w->window_number)) continue;
@@ -954,23 +958,6 @@
}
}
-static void ExpandPurchaseInfoWidget(Window *w, int expand_by)
-{
- Widget *wi = &w->widget[BUILD_VEHICLE_WIDGET_PANEL];
-
- SetWindowDirty(w);
- wi->bottom += expand_by;
-
- for (uint i = BUILD_VEHICLE_WIDGET_BUILD; i < BUILD_VEHICLE_WIDGET_END; i++) {
- wi = &w->widget[i];
- wi->top += expand_by;
- wi->bottom += expand_by;
- }
-
- w->height += expand_by;
- SetWindowDirty(w);
-}
-
static void DrawBuildVehicleWindow(Window *w)
{
const buildvehicle_d *bv = &WP(w, buildvehicle_d);
@@ -992,7 +979,11 @@
const Widget *wi = &w->widget[BUILD_VEHICLE_WIDGET_PANEL];
int text_end = DrawVehiclePurchaseInfo(2, wi->top + 1, wi->right - wi->left - 2, bv->sel_engine);
- if (text_end > wi->bottom) ExpandPurchaseInfoWidget(w, text_end - wi->bottom);
+ if (text_end > wi->bottom) {
+ SetWindowDirty(w);
+ ResizeWindowForWidget(w, BUILD_VEHICLE_WIDGET_PANEL, 0, text_end - wi->bottom);
+ SetWindowDirty(w);
+ }
}
DrawSortButtonState(w, BUILD_VEHICLE_WIDGET_SORT_ASSENDING_DESCENDING, bv->descending_sort_order ? SBS_DOWN : SBS_UP);
--- a/src/command.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/command.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -572,7 +572,9 @@
!(cmd & (CMD_NETWORK_COMMAND | CMD_SHOW_NO_ERROR)) &&
(cmd & 0xFF) != CMD_PAUSE) {
/* estimate the cost. */
+ SetTownRatingTestMode(true);
res = proc(tile, flags, p1, p2);
+ SetTownRatingTestMode(false);
if (CmdFailed(res)) {
res.SetGlobalErrorMessage();
ShowErrorMessage(_error_message, error_part1, x, y);
--- a/src/core/random_func.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/core/random_func.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -6,20 +6,26 @@
#include "random_func.hpp"
#include "bitmath_func.hpp"
-uint32 _random_seeds[2][2];
+Randomizer _random, _interactive_random;
-uint32 InteractiveRandom()
+uint32 Randomizer::Next()
{
- const uint32 s = _random_seeds[1][0];
- const uint32 t = _random_seeds[1][1];
+ const uint32 s = this->state[0];
+ const uint32 t = this->state[1];
- _random_seeds[1][0] = s + ROR(t ^ 0x1234567F, 7) + 1;
- return _random_seeds[1][1] = ROR(s, 3) - 1;
+ this->state[0] = s + ROR(t ^ 0x1234567F, 7) + 1;
+ return this->state[1] = ROR(s, 3) - 1;
}
-uint InteractiveRandomRange(uint max)
+uint32 Randomizer::Next(uint16 max)
{
- return GB(InteractiveRandom(), 0, 16) * max >> 16;
+ return GB(this->Next(), 0, 16) * max >> 16;
+}
+
+void Randomizer::SetSeed(uint32 seed)
+{
+ this->state[0] = seed;
+ this->state[1] = seed;
}
#ifdef MERSENNE_TWISTER
@@ -119,28 +125,24 @@
#else /* MERSENNE_TWISTER */
void SetRandomSeed(uint32 seed)
{
- _random_seeds[0][0] = seed;
- _random_seeds[0][1] = seed;
- _random_seeds[1][0] = seed * 0x1234567;
- _random_seeds[1][1] = _random_seeds[1][0];
+ _random.SetSeed(seed);
+ _interactive_random.SetSeed(seed * 0x1234567);
}
#ifdef RANDOM_DEBUG
#include "../network/network_data.h"
+#include "../variables.h" /* _frame_counter */
+#include "../player_func.h"
+
uint32 DoRandom(int line, const char *file)
{
- if (_networking && (DEREF_CLIENT(0)->status != STATUS_INACTIVE || !_network_server))
+ if (_networking && (DEREF_CLIENT(0)->status != STATUS_INACTIVE || !_network_server)) {
printf("Random [%d/%d] %s:%d\n",_frame_counter, (byte)_current_player, file, line);
-#else /* RANDOM_DEBUG */
-uint32 Random()
-{
+ }
+
+ return _random.Next();
+}
#endif /* RANDOM_DEBUG */
- const uint32 s = _random_seeds[0][0];
- const uint32 t = _random_seeds[0][1];
-
- _random_seeds[0][0] = s + ROR(t ^ 0x1234567F, 7) + 1;
- return _random_seeds[0][1] = ROR(s, 3) - 1;
-}
#endif /* MERSENNE_TWISTER */
#if defined(RANDOM_DEBUG) && !defined(MERSENNE_TWISTER)
@@ -148,9 +150,4 @@
{
return GB(DoRandom(line, file), 0, 16) * max >> 16;
}
-#else /* RANDOM_DEBUG & !MERSENNE_TWISTER */
-uint RandomRange(uint max)
-{
- return GB(Random(), 0, 16) * max >> 16;
-}
#endif /* RANDOM_DEBUG & !MERSENNE_TWISTER */
--- a/src/core/random_func.hpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/core/random_func.hpp Sun Feb 03 20:34:26 2008 +0000
@@ -27,6 +27,35 @@
// Doesn't work with network yet.
// #define MERSENNE_TWISTER
+/**
+ * Structure to encapsulate the pseudo random number generators.
+ */
+struct Randomizer {
+ /** The state of the randomizer */
+ uint32 state[2];
+
+ /**
+ * Generate the next pseudo random number
+ * @return the random number
+ */
+ uint32 Next();
+
+ /**
+ * Generate the next pseudo random number scaled to max
+ * @param max the maximum value of the returned random number
+ * @return the random number
+ */
+ uint32 Next(uint16 max);
+
+ /**
+ * (Re)set the state of the random number generator.
+ * @param seed the new state
+ */
+ void SetSeed(uint32 seed);
+};
+extern Randomizer _random; ///< Random used in the game state calculations
+extern Randomizer _interactive_random; ///< Random used every else where is does not (directly) influence the game state
+
void SetRandomSeed(uint32 seed);
#ifdef RANDOM_DEBUG
#define Random() DoRandom(__LINE__, __FILE__)
@@ -34,12 +63,12 @@
#define RandomRange(max) DoRandomRange(max, __LINE__, __FILE__)
uint DoRandomRange(uint max, int line, const char *file);
#else
- uint32 Random();
- uint RandomRange(uint max);
+ static inline uint32 Random() { return _random.Next(); }
+ static inline uint32 RandomRange(uint16 max) { return _random.Next(max); }
#endif
-uint32 InteractiveRandom(); // Used for random sequences that are not the same on the other end of the multiplayer link
-uint InteractiveRandomRange(uint max);
+static inline uint32 InteractiveRandom() { return _interactive_random.Next(); }
+static inline uint32 InteractiveRandomRange(uint16 max) { return _interactive_random.Next(max); }
/**
* Checks if a given randomize-number is below a given probability.
@@ -100,6 +129,4 @@
return Chance16I(a, b, r);
}
-extern uint32 _random_seeds[2][2];
-
#endif /* RANDOM_FUNC_HPP */
--- a/src/date.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/date.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -165,24 +165,6 @@
/** Functions used by the IncreaseDate function */
-extern void OnNewDay_Train(Vehicle *v);
-extern void OnNewDay_RoadVeh(Vehicle *v);
-extern void OnNewDay_Aircraft(Vehicle *v);
-extern void OnNewDay_Ship(Vehicle *v);
-static void OnNewDay_EffectVehicle(Vehicle *v) { /* empty */ }
-extern void OnNewDay_DisasterVehicle(Vehicle *v);
-
-typedef void OnNewVehicleDayProc(Vehicle *v);
-
-static OnNewVehicleDayProc * _on_new_vehicle_day_proc[] = {
- OnNewDay_Train,
- OnNewDay_RoadVeh,
- OnNewDay_Ship,
- OnNewDay_Aircraft,
- OnNewDay_EffectVehicle,
- OnNewDay_DisasterVehicle,
-};
-
extern void WaypointsDailyLoop();
extern void ChatMessageDailyLoop();
extern void EnginesDailyLoop();
@@ -225,7 +207,7 @@
if (v->IsValid()) {
/* Call the 32-day callback if needed */
CheckVehicle32Day(v);
- _on_new_vehicle_day_proc[v->type](v);
+ v->OnNewDay();
}
}
}
--- a/src/debug.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/debug.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -59,50 +59,34 @@
#if !defined(NO_DEBUG_MESSAGES)
-/** Functionized DEBUG macro for compilers that don't support
- * variadic macros (__VA_ARGS__) such as...yes MSVC2003 and lower */
-#if defined(NO_VARARG_MACRO)
-void CDECL DEBUG(int name, int level, ...)
-{
- va_list va;
- const char *dbg;
- const DebugLevel *dl = &debug_level[name];
-
- if (level != 0 && *dl->level < level) return;
- dbg = dl->name;
- va_start(va, level);
-#else
void CDECL debug(const char *dbg, ...)
{
va_list va;
va_start(va, dbg);
-#endif /* NO_VARARG_MACRO */
- {
- const char *s;
- char buf[1024];
-
- s = va_arg(va, const char*);
- vsnprintf(buf, lengthof(buf), s, va);
- va_end(va);
-#if defined(ENABLE_NETWORK)
- if (_debug_socket != INVALID_SOCKET) {
- char buf2[lengthof(buf) + 32];
+ const char *s;
+ char buf[1024];
- snprintf(buf2, lengthof(buf2), "dbg: [%s] %s\n", dbg, buf);
- send(_debug_socket, buf2, strlen(buf2), 0);
- } else
+ s = va_arg(va, const char*);
+ vsnprintf(buf, lengthof(buf), s, va);
+ va_end(va);
+#if defined(ENABLE_NETWORK)
+ if (_debug_socket != INVALID_SOCKET) {
+ char buf2[lengthof(buf) + 32];
+
+ snprintf(buf2, lengthof(buf2), "dbg: [%s] %s\n", dbg, buf);
+ send(_debug_socket, buf2, strlen(buf2), 0);
+ } else
#endif /* ENABLE_NETWORK */
- {
+ {
#if defined(WINCE)
- /* We need to do OTTD2FS twice, but as it uses a static buffer, we need to store one temporary */
- TCHAR tbuf[512];
- _sntprintf(tbuf, sizeof(tbuf), _T("%s"), OTTD2FS(dbg));
- NKDbgPrintfW(_T("dbg: [%s] %s\n"), tbuf, OTTD2FS(buf));
+ /* We need to do OTTD2FS twice, but as it uses a static buffer, we need to store one temporary */
+ TCHAR tbuf[512];
+ _sntprintf(tbuf, sizeof(tbuf), _T("%s"), OTTD2FS(dbg));
+ NKDbgPrintfW(_T("dbg: [%s] %s\n"), tbuf, OTTD2FS(buf));
#else
- fprintf(stderr, "dbg: [%s] %s\n", dbg, buf);
+ fprintf(stderr, "dbg: [%s] %s\n", dbg, buf);
#endif
- IConsoleDebug(dbg, buf);
- }
+ IConsoleDebug(dbg, buf);
}
}
#endif /* NO_DEBUG_MESSAGES */
--- a/src/debug.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/debug.h Sun Feb 03 20:34:26 2008 +0000
@@ -19,44 +19,14 @@
* 6.. - extremely detailed spamming
*/
-/* Of course MSVC 2003 and lower has no support for variadic macros
- * so we need to work around this... *sigh* */
-#if defined(_MSC_VER) && (_MSC_VER < 1400)
- #define NO_VARARG_MACRO
-#endif
-
-#if defined(NO_VARARG_MACRO)
- enum DebugLevelType {
- ai,
- driver,
- grf,
- map,
- misc,
- ms,
- net,
- sprite,
- oldloader,
- ntp,
- npf,
- yapf,
- freetype,
- sl,
- station,
- };
-#endif /* NO_VARARG_MACRO */
-
#ifdef NO_DEBUG_MESSAGES
- #if defined(NO_VARARG_MACRO)
- static inline void DEBUG(int name, int level, ...) {}
- #elif defined(__GNUC__) && (__GNUC__ < 3)
+ #if defined(__GNUC__) && (__GNUC__ < 3)
#define DEBUG(name, level, args...)
#else
#define DEBUG(name, level, ...)
#endif
#else /* NO_DEBUG_MESSAGES */
- #if defined(NO_VARARG_MACRO)
- void CDECL DEBUG(int name, int level, ...);
- #elif defined(__GNUC__) && (__GNUC__ < 3)
+ #if defined(__GNUC__) && (__GNUC__ < 3)
#define DEBUG(name, level, args...) if ((level == 0) || ( _debug_ ## name ## _level >= level)) debug(#name, args)
#else
#define DEBUG(name, level, ...) if (level == 0 || _debug_ ## name ## _level >= level) debug(#name, __VA_ARGS__)
@@ -78,9 +48,7 @@
extern int _debug_sl_level;
extern int _debug_station_level;
- #if !defined(NO_VARARG_MACRO)
- void CDECL debug(const char *dbg, ...);
- #endif /* NO_VARARG_MACRO */
+ void CDECL debug(const char *dbg, ...);
#endif /* NO_DEBUG_MESSAGES */
void SetDebugString(const char *s);
--- a/src/disaster_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/disaster_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -752,12 +752,6 @@
_disastervehicle_tick_procs[this->subtype](this);
}
-
-void OnNewDay_DisasterVehicle(Vehicle *v)
-{
- // not used
-}
-
typedef void DisasterInitProc();
--- a/src/dock_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/dock_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -19,6 +19,7 @@
#include "viewport_func.h"
#include "gfx_func.h"
#include "player_func.h"
+#include "slope_func.h"
#include "table/sprites.h"
#include "table/strings.h"
@@ -189,14 +190,11 @@
TileIndex tile_from;
TileIndex tile_to;
- tile_from = tile_to = e->we.place.tile;
- switch (GetTileSlope(tile_from, NULL)) {
- case SLOPE_SW: tile_to += TileDiffXY(-1, 0); break;
- case SLOPE_SE: tile_to += TileDiffXY( 0, -1); break;
- case SLOPE_NW: tile_to += TileDiffXY( 0, 1); break;
- case SLOPE_NE: tile_to += TileDiffXY( 1, 0); break;
- default: break;
- }
+ tile_from = e->we.place.tile;
+
+ DiagDirection dir = GetInclinedSlopeDirection(GetTileSlope(tile_from, NULL));
+ tile_to = (dir != INVALID_DIAGDIR ? TileAddByDiagDir(tile_from, ReverseDiagDir(dir)) : tile_from);
+
VpSetPresizeRange(tile_from, tile_to);
} break;
@@ -261,7 +259,12 @@
if (_station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
- DrawStationCoverageAreaText(4, 50, SCT_ALL, rad);
+ int text_end = DrawStationCoverageAreaText(4, 50, SCT_ALL, rad) + 4;
+ if (text_end > w->widget[2].bottom) {
+ SetWindowDirty(w);
+ ResizeWindowForWidget(w, 2, 0, text_end - w->widget[2].bottom);
+ SetWindowDirty(w);
+ }
break;
}
--- a/src/economy.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/economy.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -1871,7 +1871,7 @@
if (!p->is_active) return CMD_ERROR;
/* Protect new companies from hostile takeovers */
- if (_cur_year - p->inaugurated_year < 6) return_cmd_error(STR_7080_PROTECTED);
+ if (_cur_year - p->inaugurated_year < 6) return_cmd_error(STR_PROTECTED);
/* Those lines are here for network-protection (clients can be slow) */
if (GetAmountOwnedBy(p, PLAYER_SPECTATOR) == 0) return cost;
--- a/src/elrail.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/elrail.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -64,6 +64,7 @@
#include "tunnelbridge_map.h"
#include "vehicle_func.h"
#include "player_base.h"
+#include "tunnelbridge.h"
#include "table/sprites.h"
#include "table/elrail_data.h"
@@ -73,8 +74,11 @@
return (TLG)((HasBit(TileX(t), 0) << 1) + HasBit(TileY(t), 0));
}
-/** Finds which Rail Bits are present on a given tile. For bridge tiles,
- * returns track bits under the bridge
+/**
+ * Finds which Electrified Rail Bits are present on a given tile.
+ * @param t tile to check
+ * @param override pointer to PCP override, can be NULL
+ * @return trackbits of tile if it is electrified
*/
static TrackBits GetRailTrackBitsUniversal(TileIndex t, byte *override)
{
@@ -93,7 +97,7 @@
case MP_TUNNELBRIDGE:
if (GetRailType(t) != RAILTYPE_ELECTRIC) return TRACK_BIT_NONE;
- if (override != NULL && (IsTunnel(t) || DistanceMax(t, GetOtherBridgeEnd(t)) > 1)) {
+ if (override != NULL && (IsTunnel(t) || GetTunnelBridgeLength(t, GetOtherBridgeEnd(t)) > 0)) {
*override = 1 << GetTunnelBridgeDirection(t);
}
return AxisToTrackBits(DiagDirToAxis(GetTunnelBridgeDirection(t)));
@@ -126,13 +130,7 @@
} else if (*tileh != SLOPE_FLAT) {
*tileh = SLOPE_FLAT;
} else {
- switch (GetTunnelBridgeDirection(tile)) {
- case DIAGDIR_NE: *tileh = SLOPE_NE; break;
- case DIAGDIR_SE: *tileh = SLOPE_SE; break;
- case DIAGDIR_SW: *tileh = SLOPE_SW; break;
- case DIAGDIR_NW: *tileh = SLOPE_NW; break;
- default: NOT_REACHED();
- }
+ *tileh = InclinedSlope(GetTunnelBridgeDirection(tile));
}
}
}
@@ -383,8 +381,8 @@
TileIndex end = GetSouthernBridgeEnd(ti->tile);
TileIndex start = GetOtherBridgeEnd(end);
- uint length = GetBridgeLength(start, end);
- uint num = DistanceMax(ti->tile, start);
+ uint length = GetTunnelBridgeLength(start, end);
+ uint num = GetTunnelBridgeLength(ti->tile, start) + 1;
uint height;
const SortableSpriteStruct *sss;
@@ -421,7 +419,7 @@
}
/* need a pylon on the southern end of the bridge */
- if (DistanceMax(ti->tile, start) == length) {
+ if (GetTunnelBridgeLength(ti->tile, start) + 1 == length) {
DiagDirection PCPpos = (axis == AXIS_X ? DIAGDIR_SW : DIAGDIR_SE);
Direction PPPpos = (axis == AXIS_X ? DIR_NW : DIR_NE);
if (HasBit(tlg, (axis == AXIS_X ? 0 : 1))) PPPpos = ReverseDir(PPPpos);
@@ -471,7 +469,6 @@
int32 SettingsDisableElrail(int32 p1)
{
- EngineID e_id;
Vehicle *v;
Player *p;
bool disable = (p1 != 0);
@@ -481,8 +478,9 @@
const RailType new_railtype = disable ? RAILTYPE_RAIL : RAILTYPE_ELECTRIC;
/* walk through all train engines */
- for (e_id = 0; e_id < NUM_TRAIN_ENGINES; e_id++) {
- RailVehicleInfo *rv_info = &_rail_vehicle_info[e_id];
+ EngineID eid;
+ FOR_ALL_ENGINEIDS_OF_TYPE(eid, VEH_TRAIN) {
+ RailVehicleInfo *rv_info = &_rail_vehicle_info[eid];
/* if it is an electric rail engine and its railtype is the wrong one */
if (rv_info->engclass == 2 && rv_info->railtype == old_railtype) {
/* change it to the proper one */
--- a/src/engine.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/engine.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -172,12 +172,6 @@
e->flags |= ENGINE_AVAILABLE;
e->player_avail = 0;
}
-
- /* This sets up type for the engine
- * It is needed if you want to ask the engine what type it is
- * It should hopefully be the same as when you ask a vehicle what it is
- * but using this, you can ask what type an engine number is
- * even if it is not a vehicle (yet)*/
}
}
@@ -348,10 +342,9 @@
void EnginesMonthlyLoop()
{
- Engine *e;
-
if (_cur_year < YEAR_ENGINE_AGING_STOPS) {
- for (e = _engines; e != endof(_engines); e++) {
+ Engine *e;
+ FOR_ALL_ENGINES(e) {
/* Age the vehicle */
if (e->flags & ENGINE_AVAILABLE && e->age != 0xFFFF) {
e->age++;
--- a/src/engine.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/engine.h Sun Feb 03 20:34:26 2008 +0000
@@ -42,6 +42,7 @@
byte capacity;
CargoID cargo_type;
byte ai_rank;
+ byte ai_passenger_only; ///< Bit value to tell AI that this engine is for passenger use only
uint16 pow_wag_power;
byte pow_wag_weight;
byte visual_effect; // NOTE: this is not 100% implemented yet, at the moment it is only used as a 'fallback' value
--- a/src/fontcache.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/fontcache.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -518,34 +518,38 @@
void InitializeUnicodeGlyphMap()
{
- FontSize size;
- SpriteID base;
- SpriteID sprite;
- uint i;
-
- for (size = FS_NORMAL; size != FS_END; size++) {
+ for (FontSize size = FS_NORMAL; size != FS_END; size++) {
/* Clear out existing glyph map if it exists */
if (_unicode_glyph_map[size] != NULL) {
- for (i = 0; i < 256; i++) {
+ for (uint i = 0; i < 256; i++) {
if (_unicode_glyph_map[size][i] != NULL) free(_unicode_glyph_map[size][i]);
}
free(_unicode_glyph_map[size]);
_unicode_glyph_map[size] = NULL;
}
- base = GetFontBase(size);
- for (i = ASCII_LETTERSTART; i < 256; i++) {
- sprite = base + i - ASCII_LETTERSTART;
+ SpriteID base = GetFontBase(size);
+
+ for (uint i = ASCII_LETTERSTART; i < 256; i++) {
+ SpriteID sprite = base + i - ASCII_LETTERSTART;
if (!SpriteExists(sprite)) continue;
SetUnicodeGlyph(size, i, sprite);
SetUnicodeGlyph(size, i + SCC_SPRITE_START, sprite);
}
- for (i = 0; i < lengthof(_default_unicode_map); i++) {
- sprite = base + _default_unicode_map[i].key - ASCII_LETTERSTART;
- SetUnicodeGlyph(size, _default_unicode_map[i].code, sprite);
+
+ for (uint i = 0; i < lengthof(_default_unicode_map); i++) {
+ byte key = _default_unicode_map[i].key;
+ if (key == CLRA || key == CLRL) {
+ /* Clear the glyph. This happens if the glyph at this code point
+ * is non-standard and should be accessed by an SCC_xxx enum
+ * entry only. */
+ if (key == CLRA || size == FS_LARGE) {
+ SetUnicodeGlyph(size, _default_unicode_map[i].code, 0);
+ }
+ } else {
+ SpriteID sprite = base + key - ASCII_LETTERSTART;
+ SetUnicodeGlyph(size, _default_unicode_map[i].code, sprite);
+ }
}
}
}
-
-
-
--- a/src/genworld.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/genworld.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -90,7 +90,7 @@
if (_network_dedicated) DEBUG(net, 0, "Generating map, please wait...");
/* Set the Random() seed to generation_seed so we produce the same map with the same seed */
if (_patches.generation_seed == GENERATE_NEW_SEED) _patches.generation_seed = _patches_newgame.generation_seed = InteractiveRandom();
- _random_seeds[0][0] = _random_seeds[0][1] = _patches.generation_seed;
+ _random.SetSeed(_patches.generation_seed);
SetGeneratingWorldProgress(GWP_MAP_INIT, 2);
SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, VHM_NONE, WC_MAIN_WINDOW, 0);
--- a/src/genworld_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/genworld_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -27,6 +27,7 @@
#include "settings_type.h"
#include "widgets/dropdown_type.h"
#include "widgets/dropdown_func.h"
+#include "core/random_func.hpp"
#include "table/strings.h"
#include "table/sprites.h"
@@ -250,7 +251,7 @@
static const StringID rotation[] = {STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE, STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE, INVALID_STRING_ID};
static const StringID landscape[] = {STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL, STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS, INVALID_STRING_ID};
static const StringID num_towns[] = {STR_NUM_VERY_LOW, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID};
- static const StringID num_inds[] = {STR_26816_NONE, STR_NUM_VERY_LOW, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID};
+ static const StringID num_inds[] = {STR_NONE, STR_NUM_VERY_LOW, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID};
/* Data used for the generate seed edit box */
static querystr_d _genseed_query;
--- a/src/gfx_func.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/gfx_func.h Sun Feb 03 20:34:26 2008 +0000
@@ -69,8 +69,6 @@
void CSleep(int milliseconds);
void UpdateWindows();
-uint32 InteractiveRandom(); //< Used for random sequences that are not the same on the other end of the multiplayer link
-uint InteractiveRandomRange(uint max);
void DrawChatMessage();
void DrawMouseCursor();
void ScreenSizeChanged();
--- a/src/gfxinit.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/gfxinit.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -70,20 +70,15 @@
while ((start = *index_tbl++) != END) {
uint end = *index_tbl++;
- if (start == SKIP) { // skip sprites (amount in second var)
- SkipSprites(end);
- (*sprite_id) += end;
- } else { // load sprites and use indexes from start to end
- do {
- #ifdef NDEBUG
- LoadNextSprite(start, file_index, *sprite_id);
- #else
- bool b = LoadNextSprite(start, file_index, *sprite_id);
- assert(b);
- #endif
- (*sprite_id)++;
- } while (++start <= end);
- }
+ do {
+ #ifdef NDEBUG
+ LoadNextSprite(start, file_index, *sprite_id);
+ #else
+ bool b = LoadNextSprite(start, file_index, *sprite_id);
+ assert(b);
+ #endif
+ (*sprite_id)++;
+ } while (++start <= end);
}
}
@@ -199,95 +194,12 @@
}
-static const SpriteID trg1idx[] = {
- 0, 1, ///< Mouse cursor, ZZZ
-/* Medium font */
- 2, 92, ///< ' ' till 'z'
- SKIP, 36,
- 160, 160, ///< Move Ÿ to the correct position
- 98, 98, ///< Up arrow
- 131, 133,
- SKIP, 1, ///< skip currency sign
- 135, 135,
- SKIP, 1,
- 137, 137,
- SKIP, 1,
- 139, 139,
- 140, 140, ///< @todo Down arrow
- 141, 141,
- 142, 142, ///< @todo Check mark
- 143, 143, ///< @todo Cross
- 144, 144,
- 145, 145, ///< @todo Right arrow
- 146, 149,
- 118, 122, ///< Transport markers
- SKIP, 2,
- 157, 157,
- 114, 115, ///< Small up/down arrows
- SKIP, 1,
- 161, 225,
-/* Small font */
- 226, 316, ///< ' ' till 'z'
- SKIP, 36,
- 384, 384, ///< Move Ÿ to the correct position
- 322, 322, ///< Up arrow
- 355, 357,
- SKIP, 1, ///< skip currency sign
- 359, 359,
- SKIP, 1,
- 361, 361,
- SKIP, 1,
- 363, 363,
- 364, 364, ////< @todo Down arrow
- 365, 366,
- SKIP, 1,
- 368, 368,
- 369, 369, ///< @todo Right arrow
- 370, 373,
- SKIP, 7,
- 381, 381,
- SKIP, 3,
- 385, 449,
-/* Big font */
- 450, 540, ///< ' ' till 'z'
- SKIP, 36,
- 608, 608, ///< Move Ÿ to the correct position
- SKIP, 1,
- 579, 581,
- SKIP, 1,
- 583, 583,
- SKIP, 5,
- 589, 589,
- SKIP, 15,
- 605, 605,
- SKIP, 3,
- 609, 625,
- SKIP, 1,
- 627, 632,
- SKIP, 1,
- 634, 639,
- SKIP, 1,
- 641, 657,
- SKIP, 1,
- 659, 664,
- SKIP, 2,
- 667, 671,
- SKIP, 1,
- 673, 673,
-/* Graphics */
- 674, 4792,
- END
-};
-
static void LoadSpriteTables()
{
const FileList *files = _use_dos_palette ? &files_dos : &files_win;
uint i = FIRST_GRF_SLOT;
- LoadGrfIndexed(files->basic[0].filename, trg1idx, i++);
- DupSprite( 2, 130); // non-breaking space medium
- DupSprite(226, 354); // non-breaking space tiny
- DupSprite(450, 578); // non-breaking space large
+ LoadGrfFile(files->basic[0].filename, 0, i++);
/*
* The second basic file always starts at the given location and does
--- a/src/graph_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/graph_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -43,7 +43,7 @@
};
/* Apparently these don't play well with enums. */
-static const OverflowSafeInt64 INVALID_DATAPOINT = INT64_MAX; // Value used for a datapoint that shouldn't be drawn.
+static const OverflowSafeInt64 INVALID_DATAPOINT(INT64_MAX); // Value used for a datapoint that shouldn't be drawn.
static const uint INVALID_DATAPOINT_POS = UINT_MAX; // Used to determine if the previous point was drawn.
struct GraphDrawer {
--- a/src/industry.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/industry.h Sun Feb 03 20:34:26 2008 +0000
@@ -179,6 +179,7 @@
GRFMappedStringID closure_text; ///< Message appearing when the industry closes
GRFMappedStringID production_up_text; ///< Message appearing when the industry's production is increasing
GRFMappedStringID production_down_text; ///< Message appearing when the industry's production is decreasing
+ GRFMappedStringID station_name; ///< Default name for nearby station
byte appear_ingame[NUM_LANDSCAPE]; ///< Probability of appearance in game
byte appear_creation[NUM_LANDSCAPE]; ///< Probability of appearance during map creation
uint8 number_of_sounds; ///< Number of sounds available in the sounds array
--- a/src/industry_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/industry_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -841,7 +841,7 @@
{
switch (GetTileType(tile)) {
case MP_CLEAR: return IsClearGround(tile, CLEAR_FIELDS) || IsClearGround(tile, CLEAR_SNOW) || IsClearGround(tile, CLEAR_DESERT);
- case MP_TREES: return false;
+ case MP_TREES: return (GetTreeGround(tile) == TREE_GROUND_SHORE);
default: return true;
}
}
@@ -850,7 +850,7 @@
{
switch (GetTileType(tile)) {
case MP_CLEAR: return IsClearGround(tile, CLEAR_SNOW) || IsClearGround(tile, CLEAR_DESERT);
- case MP_TREES: return false;
+ case MP_TREES: return (GetTreeGround(tile) == TREE_GROUND_SHORE);
default: return true;
}
}
@@ -1548,9 +1548,10 @@
* @param flags of operations to conduct
* @param indspec pointer to industry specifications
* @param itspec_index the index of the itsepc to build/fund
+ * @param seed random seed (possibly) used by industries
* @return the pointer of the newly created industry, or NULL if it failed
*/
-static Industry *CreateNewIndustryHelper(TileIndex tile, IndustryType type, uint32 flags, const IndustrySpec *indspec, uint itspec_index)
+static Industry *CreateNewIndustryHelper(TileIndex tile, IndustryType type, uint32 flags, const IndustrySpec *indspec, uint itspec_index, uint32 seed)
{
const IndustryTileTable *it = indspec->table[itspec_index];
bool custom_shape_check = false;
@@ -1558,7 +1559,7 @@
if (!CheckIfIndustryTilesAreFree(tile, it, itspec_index, type, &custom_shape_check)) return NULL;
if (HasBit(GetIndustrySpec(type)->callback_flags, CBM_IND_LOCATION)) {
- if (!CheckIfCallBackAllowsCreation(tile, type, itspec_index)) return NULL;
+ if (!CheckIfCallBackAllowsCreation(tile, type, itspec_index, seed)) return NULL;
} else {
if (!_check_new_industry_procs[indspec->check_proc](tile)) return NULL;
}
@@ -1588,15 +1589,15 @@
/** Build/Fund an industry
* @param tile tile where industry is built
* @param flags of operations to conduct
- * @param p1 industry type see build_industry.h and see industry.h
- * @param p2 first layout to try
+ * @param p1 various bitstuffed elements
+ * - p1 = (bit 0 - 15) - industry type see build_industry.h and see industry.h
+ * - p1 = (bit 16 - 31) - first layout to try
+ * @param p2 seed to use for variable 8F
* @return index of the newly create industry, or CMD_ERROR if it failed
*/
CommandCost CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
{
- const IndustrySpec *indspec;
-
- indspec = GetIndustrySpec(p1);
+ const IndustrySpec *indspec = GetIndustrySpec(GB(p1, 0, 16));
/* Check if the to-be built/founded industry is available for this climate. */
if (!indspec->enabled) {
@@ -1620,7 +1621,7 @@
* because parameter evaluation order is not guaranteed in the c++ standard
*/
tile = RandomTile();
- const Industry *ind = CreateNewIndustryHelper(tile, p1, flags, indspec, RandomRange(indspec->num_table));
+ const Industry *ind = CreateNewIndustryHelper(tile, p1, flags, indspec, RandomRange(indspec->num_table), p2);
if (ind != NULL) {
SetDParam(0, indspec->name);
if (indspec->new_industry_text > STR_LAST_STRINGID) {
@@ -1639,7 +1640,7 @@
} else {
int count = indspec->num_table;
const IndustryTileTable * const *itt = indspec->table;
- int num = Clamp(p2, 0, count - 1);
+ int num = Clamp(GB(p1, 16, 16), 0, count - 1);
_error_message = STR_0239_SITE_UNSUITABLE;
do {
@@ -1647,7 +1648,7 @@
if (--num < 0) num = indspec->num_table - 1;
} while (!CheckIfIndustryTilesAreFree(tile, itt[num], num, p1));
- if (CreateNewIndustryHelper(tile, p1, flags, indspec, num) == NULL) return CMD_ERROR;
+ if (CreateNewIndustryHelper(tile, p1, flags, indspec, num, p2) == NULL) return CMD_ERROR;
}
return CommandCost(EXPENSES_OTHER, indspec->GetConstructionCost());
@@ -1658,7 +1659,8 @@
{
const IndustrySpec *indspec = GetIndustrySpec(type);
- return CreateNewIndustryHelper(tile, type, DC_EXEC, indspec, RandomRange(indspec->num_table));
+ uint32 seed = Random();
+ return CreateNewIndustryHelper(tile, type, DC_EXEC, indspec, RandomRange(indspec->num_table), seed);
}
enum {
@@ -2143,9 +2145,13 @@
}
}
+ /* Increase or Decreasing the production level if needed */
if (increment != 0) {
- i->prod_level = ClampU(i->prod_level + increment, 4, 0x80);
- if (i->prod_level == 4) closeit = true;
+ if (increment < 0 && i->prod_level == 4) {
+ closeit = true;
+ } else {
+ i->prod_level = ClampU(i->prod_level + increment, 4, 0x80);
+ }
}
/* Close if needed and allowed */
--- a/src/industry_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/industry_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -57,6 +57,9 @@
bool enabled[NUM_INDUSTRYTYPES + 1]; ///< availability state, coming from CBID_INDUSTRY_AVAILABLE (if ever)
} _fund_gui;
+assert_compile(lengthof(_fund_gui.index) == lengthof(_fund_gui.text));
+assert_compile(lengthof(_fund_gui.index) == lengthof(_fund_gui.enabled));
+
static void BuildDynamicIndustryWndProc(Window *w, WindowEvent *e)
{
switch (e->event) {
@@ -79,11 +82,14 @@
WP(w, fnd_d).timer_enabled = _loaded_newgrf_features.has_newindustries;
/* Initilialize structures */
- 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;
+ for (uint i = 0; i < lengthof(_fund_gui.index); i++) {
+ _fund_gui.index[i] = 0xFF;
+ _fund_gui.text[i] = STR_NULL;
+ _fund_gui.enabled[i] = false;
+ }
+
w->vscroll.cap = 8; // rows in grid, same in scroller
w->resize.step_height = 13;
@@ -253,7 +259,7 @@
_generating_world = false;
}
} 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));
+ DoCommandP(0, WP(w, fnd_d).select, InteractiveRandom(), NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY));
w->HandleButtonClick(DPIW_FUND_WIDGET);
} else {
HandlePlacePushButton(w, DPIW_FUND_WIDGET, SPR_CURSOR_INDUSTRY, VHM_RECT, NULL);
@@ -272,6 +278,7 @@
bool success = true;
/* We do not need to protect ourselves against "Random Many Industries" in this mode */
const IndustrySpec *indsp = GetIndustrySpec(WP(w, fnd_d).select);
+ uint32 seed = InteractiveRandom();
if (_game_mode == GM_EDITOR) {
/* Show error if no town exists at all */
@@ -284,7 +291,7 @@
_current_player = OWNER_NONE;
_generating_world = true;
_ignore_restrictions = true;
- success = DoCommandP(e->we.place.tile, WP(w, fnd_d).select, InteractiveRandomRange(indsp->num_table), NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY));
+ success = DoCommandP(e->we.place.tile, (InteractiveRandomRange(indsp->num_table) << 16) | WP(w, fnd_d).select, seed, NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY));
if (!success) {
SetDParam(0, indsp->name);
ShowErrorMessage(_error_message, STR_0285_CAN_T_BUILD_HERE, e->we.place.pt.x, e->we.place.pt.y);
@@ -293,7 +300,7 @@
_ignore_restrictions = false;
_generating_world = false;
} else {
- success = DoCommandP(e->we.place.tile, WP(w, fnd_d).select, InteractiveRandomRange(indsp->num_table), NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY));
+ success = DoCommandP(e->we.place.tile, (InteractiveRandomRange(indsp->num_table) << 16) | WP(w, fnd_d).select, seed, NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY));
}
/* If an industry has been built, just reset the cursor and the system */
@@ -384,6 +391,7 @@
IVW_INFO,
IVW_GOTO,
IVW_SPACER,
+ IVW_RESIZE_WIDGET,
};
/** Information to store about the industry window */
@@ -437,13 +445,27 @@
lines++;
}
- if (HasBit(ind->callback_flags, CBM_IND_WINDOW_MORE_TEXT)) lines += 2;
+ if (HasBit(ind->callback_flags, CBM_IND_WINDOW_MORE_TEXT)) {
+ lines += 2;
+ } else {
+ /* Remove the resizing option from the widgets. Do it before the Hiding since it will be overwritten */
+ for (byte j = IVW_INFO; j <= IVW_RESIZE_WIDGET; j++) {
+ w->widget[j].display_flags = RESIZE_NONE;
+ }
+ /* Hide the resize button and enlarge the spacer so it will take its place */
+ w->HideWidget(IVW_RESIZE_WIDGET);
+ w->widget[IVW_SPACER].right = w->widget[IVW_RESIZE_WIDGET].right;
+ }
- for (byte j = 5; j <= 7; j++) {
- if (j != 5) w->widget[j].top += lines * 10;
- w->widget[j].bottom += lines * 10;
+ lines *= 10;
+
+ /* Resize the widgets for the new size, given by the addition of cargos */
+ for (byte j = IVW_INFO; j <= IVW_RESIZE_WIDGET; j++) {
+ if (j != IVW_INFO) w->widget[j].top += lines;
+ w->widget[j].bottom += lines;
}
- w->height += lines * 10;
+ w->height += lines;
+ w->resize.height += lines;
} break;
case WE_PAINT: {
@@ -515,10 +537,12 @@
if (callback_res != CALLBACK_FAILED) {
StringID message = GetGRFStringID(ind->grf_prop.grffile->grfid, 0xD000 + callback_res);
if (message != STR_NULL && message != STR_UNDEFINED) {
+ const Widget *wi = &w->widget[IVW_INFO];
y += 10;
PrepareTextRefStackUsage(6);
- DrawString(2, y, message, TC_FROMSTRING);
+ /* Use all the available space left from where we stand up to the end of the window */
+ DrawStringMultiLine(2, y, message, wi->right - wi->left - 4, wi->bottom - y);
StopTextRefStackUsage();
}
}
@@ -607,9 +631,10 @@
{ WWT_STICKYBOX, RESIZE_NONE, 9, 248, 259, 0, 13, 0x0, STR_STICKY_BUTTON}, // IVW_STICKY
{ WWT_PANEL, RESIZE_NONE, 9, 0, 259, 14, 105, 0x0, STR_NULL}, // IVW_BACKGROUND
{ WWT_INSET, RESIZE_NONE, 9, 2, 257, 16, 103, 0x0, STR_NULL}, // IVW_VIEWPORT
-{ WWT_PANEL, RESIZE_NONE, 9, 0, 259, 106, 147, 0x0, STR_NULL}, // IVW_INFO
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 9, 0, 129, 148, 159, STR_00E4_LOCATION, STR_482C_CENTER_THE_MAIN_VIEW_ON}, // IVW_GOTO
-{ WWT_PANEL, RESIZE_NONE, 9, 130, 259, 148, 159, 0x0, STR_NULL}, // IVW_SPACER
+{ WWT_PANEL, RESIZE_BOTTOM, 9, 0, 259, 106, 147, 0x0, STR_NULL}, // IVW_INFO
+{ WWT_PUSHTXTBTN, RESIZE_TB, 9, 0, 129, 148, 159, STR_00E4_LOCATION, STR_482C_CENTER_THE_MAIN_VIEW_ON}, // IVW_GOTO
+{ WWT_PANEL, RESIZE_TB, 9, 130, 247, 148, 159, 0x0, STR_NULL}, // IVW_SPACER
+{ WWT_RESIZEBOX, RESIZE_TB, 9, 248, 259, 148, 159, 0x0, STR_RESIZE_BUTTON}, // IVW_RESIZE_WIDGET
{ WIDGETS_END},
};
@@ -617,7 +642,7 @@
static const WindowDesc _industry_view_desc = {
WDP_AUTO, WDP_AUTO, 260, 160, 260, 160,
WC_INDUSTRY_VIEW, WC_NONE,
- WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
+ WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_industry_view_widgets,
IndustryViewWndProc
};
--- a/src/intro_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/intro_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -143,9 +143,9 @@
void AskExitGame()
{
#if defined(_WIN32)
- SetDParam(0, STR_0133_WINDOWS);
+ SetDParam(0, STR_OSNAME_WINDOWS);
#elif defined(__APPLE__)
- SetDParam(0, STR_0135_OSX);
+ SetDParam(0, STR_OSNAME_OSX);
#elif defined(__BEOS__)
SetDParam(0, STR_OSNAME_BEOS);
#elif defined(__MORPHOS__)
@@ -157,7 +157,7 @@
#elif defined(SUNOS)
SetDParam(0, STR_OSNAME_SUNOS);
#else
- SetDParam(0, STR_0134_UNIX);
+ SetDParam(0, STR_OSNAME_UNIX);
#endif
ShowQuery(
STR_00C7_QUIT,
--- a/src/landscape.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/landscape.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -142,7 +142,7 @@
int z = 0;
- switch (corners & ~SLOPE_HALFTILE_MASK) {
+ switch (RemoveHalftileSlope(corners)) {
case SLOPE_W:
if (x - y >= 0)
z = (x - y) >> 1;
@@ -254,10 +254,7 @@
int GetSlopeZInCorner(Slope tileh, Corner corner)
{
assert(!IsHalftileSlope(tileh));
- static const int _corner_slopes[4][2] = {
- { SLOPE_W, SLOPE_STEEP_W }, { SLOPE_S, SLOPE_STEEP_S }, { SLOPE_E, SLOPE_STEEP_E }, { SLOPE_N, SLOPE_STEEP_N }
- };
- return ((tileh & _corner_slopes[corner][0]) != 0 ? TILE_HEIGHT : 0) + (tileh == _corner_slopes[corner][1] ? TILE_HEIGHT : 0);
+ return ((tileh & SlopeWithOneCornerRaised(corner)) != 0 ? TILE_HEIGHT : 0) + (tileh == SteepSlope(corner) ? TILE_HEIGHT : 0);
}
/**
@@ -289,10 +286,18 @@
if ((tileh & corners[edge][0]) != 0) *z1 += TILE_HEIGHT; // z1 is raised
if ((tileh & corners[edge][1]) != 0) *z2 += TILE_HEIGHT; // z2 is raised
- if ((tileh & ~SLOPE_HALFTILE_MASK) == corners[edge][2]) *z1 += TILE_HEIGHT; // z1 is highest corner of a steep slope
- if ((tileh & ~SLOPE_HALFTILE_MASK) == corners[edge][3]) *z2 += TILE_HEIGHT; // z2 is highest corner of a steep slope
+ if (RemoveHalftileSlope(tileh) == corners[edge][2]) *z1 += TILE_HEIGHT; // z1 is highest corner of a steep slope
+ if (RemoveHalftileSlope(tileh) == corners[edge][3]) *z2 += TILE_HEIGHT; // z2 is highest corner of a steep slope
}
+/**
+ * Get slope of a tile on top of a (possible) foundation
+ * If a tile does not have a foundation, the function returns the same as GetTileSlope.
+ *
+ * @param tile The tile of interest.
+ * @param z returns the z of the foundation slope. (Can be NULL, if not needed)
+ * @return The slope on top of the foundation.
+ */
Slope GetFoundationSlope(TileIndex tile, uint* z)
{
Slope tileh = GetTileSlope(tile, z);
@@ -631,7 +636,7 @@
for (x = 0; x < maxx; x++) {
MakeClear(sizex * y + x, CLEAR_GRASS, 3);
SetTileHeight(sizex * y + x, 0);
- SetTropicZone(sizex * y + x, TROPICZONE_INVALID);
+ SetTropicZone(sizex * y + x, TROPICZONE_NORMAL);
ClearBridgeMiddle(sizex * y + x);
}
MakeVoid(sizex * y + x);
--- a/src/lang/afrikaans.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/afrikaans.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Plat daal vereis
STR_0008_WAITING :{BLACK}Wag: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (en-roete van
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Aanvaar: {WHITE}
STR_000D_ACCEPTS :{BLACK}Aanvaar: {GOLD}
STR_000E :
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Te veel name bepaal
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Gekies naam alreeds in gebruik
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}Vrag
STR_013D_INFORMATION :{BLACK}Inligting
STR_013E_CAPACITIES :{BLACK}Kapasiteite
-STR_013E_TOTAL_CARGO :{BLACK}Totaale Vrag
+STR_TOTAL_CARGO :{BLACK}Totaale Vrag
STR_013F_CAPACITY :{BLACK}Kapasiteit: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapasiteit: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Totaale vrag kapasitiet van die trein:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Totaale vrag kapasitiet van die trein:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nuwe Speletjie
STR_0141_LOAD_GAME :{BLACK}Laai Speletjie
@@ -727,7 +725,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Uitvee hierdie dorp heeltemal
STR_0292_SAVE_SCENARIO :Spaar draaiboek
STR_0293_LOAD_SCENARIO :Laai draaiboek
-STR_LOAD_HEIGHTMAP :Laai Hoogtekaart
+STR_MENU_LOAD_HEIGHTMAP :Laai Hoogtekaart
STR_0294_QUIT_EDITOR :Laat vaar redigeerder
STR_0295 :
STR_0296_QUIT :Laat vaar
@@ -767,9 +765,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Speletjie opsies
-STR_02C5_DIFFICULTY_SETTINGS :Moeite stellings
-STR_02C7_CONFIG_PATCHES :Konfigureer laslappe
+STR_02C4_GAME_OPTIONS :Speletjie opsies
+STR_02C6_DIFFICULTY_SETTINGS :Moeite stellings
+STR_MENU_CONFIG_PATCHES :Konfigureer laslappe
STR_NEWGRF_SETTINGS :NewGRF stellings
STR_TRANSPARENCY_OPTIONS :Deursigtigheid opsies
STR_GAMEOPTMENU_0A :
@@ -869,8 +867,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Spaar nog in vorder, {}wag asb tot dit klaar is!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Kies 'Ezy Straat styl musiek' musiek lys
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engels (Oorspronkilik)
@@ -1643,41 +1641,41 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Moet pad eers verwyder
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Pad werke in vorder
STR_1802_ROAD_CONSTRUCTION :{WHITE}Pad Konstruksie
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Tremweg Konstruksie
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Tremweg Konstruksie
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Kies Pad Brug
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... een rigting paaie kan nie aansluitings hê nie
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Kan nie pad hier bou nie...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan nie tremweg hier bou nie...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan nie tremweg hier bou nie...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Kan nie pad van hier verwyder nie...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan nie tremweg van hier af verwyder nie...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan nie tremweg van hier af verwyder nie...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Pad Depot Ori�tering
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Trem Depot Orientasie
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Trem Depot Orientasie
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Kan nie pad voertuig depot hier bou nie...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan nie trem voertuig depot hier bou nie...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan nie trem voertuig depot hier bou nie...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Kan nie bus stasie hier bou nie...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Kan nie vragmotor stasie bou nie...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan nie passasier trem stasie bou nie...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan nie vrag trem stasie bou nie...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan nie passasier trem stasie bou nie...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan nie vrag trem stasie bou nie...
STR_180A_ROAD_CONSTRUCTION :Pad konstruksie
-STR_180A_TRAMWAY_CONSTRUCTION :Tremweg konstruksie
+STR_TRAMWAY_CONSTRUCTION :Tremweg konstruksie
STR_180B_BUILD_ROAD_SECTION :{BLACK}Bou pad afdeling
STR_BUILD_AUTOROAD_TIP :{BLACK}Bou pad seksie gebruikend Outopad metode
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Bou tremweg afdeling
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Bou tremweg afdeling
STR_BUILD_AUTOTRAM_TIP :{BLACK}Bou tremweg gebruikend die Outotrem metode
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Bou pad voertuig depot (vir bou en diens van voertuie)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Bou trem voertuig depot (vir bou en diens van voertuie)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Bou trem voertuig depot (vir bou en diens van voertuie)
STR_180D_BUILD_BUS_STATION :{BLACK}Bou bus stasie
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Bou vraagmotor laai area
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Bou passasier trem stasie
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Bou vrag trem stasie
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Bou passasier trem stasie
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Bou vrag trem stasie
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Bou pad brug
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Bou tremweg brug
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Bou tremweg brug
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Bou pad tonnel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Bou tremweg tonnel
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Bou tremweg tonnel
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Tokkel bou/verwyder vir pad bou
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Tokkel bou/verwyder vir tremweg konstruksie
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Tokkel bou/verwyder vir tremweg konstruksie
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Kies pad voertuig depot orientasie
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Kies trem voertuig depot orientasie
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Kies trem voertuig depot orientasie
STR_1814_ROAD :Pad
STR_1815_ROAD_WITH_STREETLIGHTS :Pad met straatligte
STR_1816_TREE_LINED_ROAD :Boom-belynde pad
@@ -1819,8 +1817,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Grens aan meer as een bestaande stasie/laai area
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Te veel stasies/laai areas in die stad
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Te veel stasies/laai areas
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Te veel bushalte
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Te veel vragmotor stasies
+STR_TOO_MANY_BUS_STOPS :{WHITE}Te veel bushalte
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Te veel vragmotor stasies
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Te naby aan 'n ander stasie/laai area
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Moet eers spoorweg stasie afbreek
@@ -1851,12 +1849,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} aanvaar nou {STRING} en {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Bus Stasie Orientasie
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Vragmotor Stasie Orientasie
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passasier Trem Orientasie
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Vrag Trem Orientasie
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passasier Trem Orientasie
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Vrag Trem Orientasie
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Moet eers bus stasie afbreek
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Moet eers vragmotor stasie afbreek
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Moet eers passasier trem stasie afbreek
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Moet eers vrag trem stasie afbreek
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Moet eers passasier trem stasie afbreek
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Moet eers vrag trem stasie afbreek
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Stasie{P "" s}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Geen -
@@ -1868,8 +1866,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Kies lengte van spoorweg stasie
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Kies bus stasie orientasie
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Kies vragmotor laai area orientasie
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Kies passasier trem stasie orientasie
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Kies vrag trem stasie orientasie
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Kies passasier trem stasie orientasie
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Kies vrag trem stasie orientasie
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Senter skerm op stasie
STR_3054_SHOW_STATION_RATINGS :{BLACK}Toon stasie graderings
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Verander naam van stasie
@@ -1891,7 +1889,7 @@
STR_3069_BUOY :Baken
STR_306A_BUOY_IN_THE_WAY :{WHITE}...baken in die pad
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...Stasie te ver van mekaar af
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ongelyk stasies is versper
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ongelyk stasies is versper
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Hou in CTRL om meer as een item te selekteer
STR_UNDEFINED :(undefined string)
@@ -1932,7 +1930,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Kies Nuwe Speletjie Tipe
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Kies draaiboek (groen), vooraf-stel speletjie (blou), of lukraak nuwe speletjie
STR_4010_GENERATE_RANDOM_NEW_GAME :Opwek lukraak nuwe speletjie
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Laai Hoogtekaart
+STR_LOAD_HEIGHTMAP :{WHITE}Laai Hoogtekaart
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} in die pad
@@ -2136,10 +2134,10 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomie: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Trein omkeer: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Rampe: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Stad raad se houding na area herstruktuuring: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Stad raad se houding na area herstruktuuring: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Geen
+STR_NONE :Geen
STR_NUM_VERY_LOW :Baie laag
STR_6816_LOW :Laag
STR_6817_NORMAL :Normaal
@@ -2177,9 +2175,9 @@
STR_6836_OFF :Af
STR_6837_ON :Aan
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Wys ho�telling tabel
-STR_6839_PERMISSIVE :Permissief
-STR_683A_TOLERANT :Toelaatbaar
-STR_683B_HOSTILE :Vyandelik
+STR_PERMISSIVE :Permissief
+STR_TOLERANT :Toelaatbaar
+STR_HOSTILE :Vyandelik
##id 0x7000
STR_7000 :
@@ -2311,7 +2309,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan nie 25% aandeel in die maatskappy verkoop nie...
STR_707D_OWNED_BY :{WHITE}({COMMA}% besit by {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} is deur {COMPANY} oorgevat!
-STR_7080_PROTECTED :{WHITE}Die maatskappy is nie oud genoeg om aandeele te handel nie...
+STR_PROTECTED :{WHITE}Die maatskappy is nie oud genoeg om aandeele te handel nie...
STR_LIVERY_DEFAULT :Standaard Lewery
STR_LIVERY_STEAM :Stoom Enjin
@@ -2618,17 +2616,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Gaan na {STATION}
-STR_8807_GO_TO_TRANSFER :Gaan na {STATION} (Oordrag en vat vrag)
-STR_8808_GO_TO_UNLOAD :Gaan na {STATION} (Aflaai)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Gaan na {STATION} (Oordrag en verlaat leeg)
-STR_880A_GO_TO_LOAD :Gaan na {STATION} (Laai)
-STR_880B_GO_TO_TRANSFER_LOAD :Gaan na {STATION} (Oordrag en wag vir volle lading)
-STR_880C_GO_NON_STOP_TO :Gaan deurgaande na {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Gaan deurgaande na {STATION} (Oordra en neem vrag)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Gaan deurgaande na {STATION} (Aflaai)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Gaan deurgaande na {STATION} (Oordra en verlaat leë)
-STR_8810_GO_NON_STOP_TO_LOAD :Gaan deurgaande na {STATION} (Laai)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Gaan deurgaande na {STATION} (Oordra en wag vir volle lading)
+STR_GO_TO_TRANSFER :Gaan na {STATION} (Oordrag en vat vrag)
+STR_8807_GO_TO_UNLOAD :Gaan na {STATION} (Aflaai)
+STR_GO_TO_TRANSFER_UNLOAD :Gaan na {STATION} (Oordrag en verlaat leeg)
+STR_8808_GO_TO_LOAD :Gaan na {STATION} (Laai)
+STR_GO_TO_TRANSFER_LOAD :Gaan na {STATION} (Oordrag en wag vir volle lading)
+STR_880A_GO_NON_STOP_TO :Gaan deurgaande na {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Gaan deurgaande na {STATION} (Oordra en neem vrag)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Gaan deurgaande na {STATION} (Aflaai)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Gaan deurgaande na {STATION} (Oordra en verlaat leë)
+STR_880C_GO_NON_STOP_TO_LOAD :Gaan deurgaande na {STATION} (Laai)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Gaan deurgaande na {STATION} (Oordra en wag vir volle lading)
STR_GO_TO_TRAIN_DEPOT :Gaan na {TOWN} Trein Depot
STR_SERVICE_AT_TRAIN_DEPOT :Diens by {TOWN} Trein Depot
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Gaan deurgaande na {TOWN} Trein Depot
@@ -2732,7 +2730,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Toon besonderhede van vrag gedra
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Toon besonderhede van trein voertuie
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Toon kapasiteite van elke voertuig
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Toon totaale kapasitiet van trein, verdeel by vrag tipe
+STR_SHOW_TOTAL_CARGO :{BLACK}Toon totaale kapasitiet van trein, verdeel by vrag tipe
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Opdraglys - kliek op 'n opdrag om dit te verlig. CTRL + kliek senter op stasie
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Sprong die huidige opdraag, en begin die volgende. CTRL + kliek sprong na verkieste opdrag
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Vee uit die verlig opdrag
@@ -2763,8 +2761,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan nie rigting van trein omkeer nie...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Hernoem trein voertuig tipe
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Trein voertuig tipe kan nie hernoem word nie...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Maak die verlig opdrag forseer die voertuig om sy vrag te stort
-STR_886F_TRANSFER :{BLACK}Oordra
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Maak die verlig opdrag forseer die voertuig om sy vrag te stort
+STR_TRANSFER :{BLACK}Oordra
STR_CLEAR_TIME :{BLACK}Reinig Tyd
STR_RESET_LATENESS :{BLACK}Herstel Laat Teller
@@ -2841,8 +2839,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Benaam pad voertuig
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste bus arriveer by {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste trok arriveer by {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste passasier trein arriveer by {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste vrag trein arriveer by {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste passasier trein arriveer by {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste vrag trein arriveer by {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Pad Voertuig Botsing!{}Bestuurder sterf in vuurbol na botsing met trein
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Pad voertuig Botsing!{}{COMMA} sterf in vuurbol na botsing met trein
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Kan nie voertuig forseer om te omdraai nie...
@@ -2851,7 +2849,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Hernoem pad voertuig tipe
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Hernoem pad voertuig tipe
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Pad voertuig tipe kan nie hernoem word nie...
-STR_9038_GO_TO_ROADVEH_DEPOT :Gaan na {TOWN} Pad Voertuig Depot
+STR_GO_TO_ROADVEH_DEPOT :Gaan na {TOWN} Pad Voertuig Depot
STR_SERVICE_AT_ROADVEH_DEPOT :Diens by {TOWN} Pad Voertuig Depot
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Herpas pad voertuig om 'n ander vrag tipe te ontvoer
--- a/src/lang/brazilian_portuguese.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/brazilian_portuguese.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Requer terreno plano
STR_0008_WAITING :{BLACK}Aguardando: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (em rota de
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} vindo de {STATION})
STR_000C_ACCEPTS :{BLACK}Aceita: {WHITE}
STR_000D_ACCEPTS :{BLACK}Aceita: {GOLD}
STR_000E :
@@ -276,9 +275,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Muitos nomes definidos
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}O nome escolhido já está em uso
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -289,11 +288,11 @@
STR_013C_CARGO :{BLACK}Carga
STR_013D_INFORMATION :{BLACK}Informação
STR_013E_CAPACITIES :{BLACK}Capacidades
-STR_013E_TOTAL_CARGO :{BLACK}Carga Total
+STR_TOTAL_CARGO :{BLACK}Carga Total
STR_013F_CAPACITY :{BLACK}Capacidade: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capacidade: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Capacidade total deste trem:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Capacidade total deste trem:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Novo Jogo
STR_0141_LOAD_GAME :{BLACK}Abrir Jogo
@@ -481,7 +480,7 @@
STR_019F_TRAIN :{G=m}Trem
STR_01A0_IS_GETTING_OLD :{WHITE}{STRING} {COMMA} está ficando velho
STR_01A1_IS_GETTING_VERY_OLD :{WHITE}{STRING} {COMMA} está ficando muito velho
-STR_01A2_IS_GETTING_VERY_OLD_AND :{WHITE}{STRING} {COMMA} está ficando muito velho e precisa substituição urgente
+STR_01A2_IS_GETTING_VERY_OLD_AND :{WHITE}{STRING} {COMMA} está ficando muito velho e precisa ser substituído urgentemente
STR_01A3_LAND_AREA_INFORMATION :{WHITE}Informações do Terreno
STR_01A4_COST_TO_CLEAR_N_A :{BLACK}Custo para limpar: {LTBLUE}N/D
STR_01A5_COST_TO_CLEAR :{BLACK}Custo para limpar: {LTBLUE}{CURRENCY}
@@ -728,11 +727,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Colocar transmissor
STR_028F_DEFINE_DESERT_AREA :{BLACK}Define área desértica.{} Pressione e segure CTRL para removê-la
STR_CREATE_LAKE :{BLACK}Define área com água.{} Faz um canal, a menos se CTRL for pressionado ao nível do mar, neste caso inundará ao redor
+STR_CREATE_RIVER :{BLACK}Criar Rios
STR_0290_DELETE :{BLACK}Remover
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Remover esta cidade completamente
STR_0292_SAVE_SCENARIO :Salvar cenário
STR_0293_LOAD_SCENARIO :Abrir cenário
-STR_LOAD_HEIGHTMAP :Carregar relevo
+STR_MENU_LOAD_HEIGHTMAP :Carregar relevo
STR_0294_QUIT_EDITOR :Sair do editor
STR_0295 :
STR_0296_QUIT :Sair
@@ -772,9 +772,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Opções do Jogo
-STR_02C5_DIFFICULTY_SETTINGS :Configurações de dificuldade
-STR_02C7_CONFIG_PATCHES :Configurar correções
+STR_02C4_GAME_OPTIONS :Opções do Jogo
+STR_02C6_DIFFICULTY_SETTINGS :Configurações de dificuldade
+STR_MENU_CONFIG_PATCHES :Configurar correções
STR_NEWGRF_SETTINGS :Configurar NewGRF
STR_TRANSPARENCY_OPTIONS :Opções de Transparência
STR_GAMEOPTMENU_0A :
@@ -874,8 +874,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Gravação em progresso,{}por favor aguarde até que termine!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Selecionar programa 'Ezy Street'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglês (Original)
@@ -1398,7 +1398,7 @@
STR_NETWORK_INTERNET_ADVERTISE :Internet (divulgar)
STR_NETWORK_CLIENTS_SELECT :{BLACK}{SKIP}{SKIP}{NUM} cliente{P "" s}
STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}Máximo de clientes:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Escolha o número máximo de clientes. Não precisa estarem todos preenchidos
+STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Escolha o número máximo de clientes. Não é necessário estarem todos preenchidos
STR_NETWORK_COMPANIES_SELECT :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compan{P ia ias}
STR_NETWORK_NUMBER_OF_COMPANIES :{BLACK}Máximo de empresas:
STR_NETWORK_NUMBER_OF_COMPANIES_TIP :{BLACK}Limita o servidor para uma certa quantia de empresas
@@ -1650,42 +1650,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Deve remover a rodovia primeiro
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Recapeamento rodoviário em progresso
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construir rodovias
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Construção de Bonde
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Construção de Bonde
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Selecionar Ponte Rodoviária
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... vias de mão única não podem ter junções
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Impossível construir rodovia aqui...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Impossível construir bonde aqui...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Impossível construir bonde aqui...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Impossível remover rodovia daqui...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Impossível remover bonde daqui...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Impossível remover bonde daqui...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Orientação da Garagem
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orientação do Depósito
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orientação do Depósito
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Impossível construir garagem aqui...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Impossível construir depósito aqui...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Impossível construir depósito aqui...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Impossível construir estação de ônibus...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Impossível construir estação de caminhão
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Impossível construir estação de bonde...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Impossível construir estação de bonde
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Impossível construir estação de bonde...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Impossível construir estação de bonde
STR_180A_ROAD_CONSTRUCTION :Construir rodovias
-STR_180A_TRAMWAY_CONSTRUCTION :Construção de Bonde
+STR_TRAMWAY_CONSTRUCTION :Construção de Bonde
STR_180B_BUILD_ROAD_SECTION :{BLACK}Construir trecho rodoviário
STR_BUILD_AUTOROAD_TIP :{BLACK}Construir estradas usando o modo Autoestrada
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Construir linha de bonde
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Construir linha de bonde
STR_BUILD_AUTOTRAM_TIP :{BLACK}Construir linha de bonde usando o modo Automático
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Construir garagem (para construção e manutenção de automóveis)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construir depósito de bonde (para construção e manutenção de bondes)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construir depósito de bonde (para construção e manutenção de bondes)
STR_180D_BUILD_BUS_STATION :{BLACK}Construir estação de ônibus
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Construir carga de caminhões
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Constuir estação de bonde para passageiros
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Constuir estação de bonde para carga
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Constuir estação de bonde para passageiros
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Constuir estação de bonde para carga
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Construir ponte rodoviária
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Construir ponte de bonde
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Construir ponte de bonde
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Construir túnel rodoviário
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Construir túnel de bonde
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Construir túnel de bonde
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Ativar/Desativar vias de mão única
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Alternar construir/remover para contrução rodoviária
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Alternar construir/remover linhas de bonde e sinais
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Alternar construir/remover linhas de bonde e sinais
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Selecionar a orientação da garagem
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Selecionar a orientação do depósito de bonde
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Selecionar a orientação do depósito de bonde
STR_1814_ROAD :Rodovia
STR_1815_ROAD_WITH_STREETLIGHTS :Rodovia iluminada
STR_1816_TREE_LINED_ROAD :Rodovia arborizada
@@ -1830,8 +1830,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Muito perto de uma estação/local de carga já existente
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Muitas estações/áreas de carga nesta cidade
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Muitas estações/áreas de carga
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Muitas estações de ônibus
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Muitos locais de carga
+STR_TOO_MANY_BUS_STOPS :{WHITE}Muitas estações de ônibus
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Muitos locais de carga
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Muito perto de outra estação/local de carga
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Deve demolir a estação primeiro
@@ -1862,12 +1862,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} agora aceita {STRING} e {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Orientação do estação de ônibus
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Orientação da estação de caminhão
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientação da Estação de Bonde
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientação da Estação de Bonde
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientação da Estação de Bonde
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientação da Estação de Bonde
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Deve demolir a estação de ônibus primeiro
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Deve demolir a estação de caminhão
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Deve demolir a estação de bonde primeiro
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Deve demolir a estação de bonde primeiro
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Deve demolir a estação de bonde primeiro
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Deve demolir a estação de bonde primeiro
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Estações
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Nenhuma -
@@ -1879,8 +1879,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Selecionar o tamanho da estação ferroviária
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Selecionar orientação do estação de ônibus
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Selecionar orientação da área de carga
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Selecionar orientação da estação de bonde
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Selecionar orientação da estação de bonde
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Selecionar orientação da estação de bonde
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Selecionar orientação da estação de bonde
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centralizar visualização no local estação
STR_3054_SHOW_STATION_RATINGS :{BLACK}Exibir avaliações da estação
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Alterar o nome da estação
@@ -1902,7 +1902,7 @@
STR_3069_BUOY :Bóia
STR_306A_BUOY_IN_THE_WAY :{WHITE}...bóia no caminho
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...estação muito extensa
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...Estações não-uniformes desativadas
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...Estações não-uniformes desativadas
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Segure CTRL para selecionar mais de um item
STR_UNDEFINED :(undefined string)
@@ -1943,7 +1943,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Selecionar Novo Tipo de Jogo
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Selecionar cenário (verde), jogo pré-programado (azul), ou novo jogo aleatório
STR_4010_GENERATE_RANDOM_NEW_GAME :Gerar novo jogo aleatório
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Carregar Relevo
+STR_LOAD_HEIGHTMAP :{WHITE}Carregar Relevo
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} no caminho
@@ -2147,10 +2147,10 @@
STR_6813_ECONOMY :{LTBLUE}Economia: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Inverter trem: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Atitude das autoridades sobre reestruturamentos: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Atitude das autoridades sobre reestruturamentos: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Nenhum
+STR_NONE :Nenhum
STR_NUM_VERY_LOW :Muito baixo
STR_6816_LOW :Baixo
STR_6817_NORMAL :Normal
@@ -2188,9 +2188,9 @@
STR_6836_OFF :Off
STR_6837_ON :On
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Exibir melhores pontuações
-STR_6839_PERMISSIVE :Permissivo
-STR_683A_TOLERANT :Tolerante
-STR_683B_HOSTILE :Hostil
+STR_PERMISSIVE :Permissivo
+STR_TOLERANT :Tolerante
+STR_HOSTILE :Hostil
##id 0x7000
STR_7000 :
@@ -2239,7 +2239,7 @@
STR_702B_MAXIMUM_PERMITTED_LOAN :{WHITE}...o empréstimo máximo permitido é de {CURRENCY}
STR_702C_CAN_T_BORROW_ANY_MORE_MONEY :{WHITE}Impossível pedir mais dinheiro emprestado...
STR_702D_LOAN_ALREADY_REPAYED :{WHITE}...não há empréstimo para pagar
-STR_702E_REQUIRED :{WHITE}...{CURRENCY} requerido
+STR_702E_REQUIRED :{WHITE}...precisa de {CURRENCY}
STR_702F_CAN_T_REPAY_LOAN :{WHITE}Impossível pagar empréstimo...
STR_INSUFFICIENT_FUNDS :{WHITE}Impossível dar o dinheiro emprestado do banco
STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT :{BLACK}Selecionar novo rosto para o presidente
@@ -2316,7 +2316,7 @@
STR_MAKE_DEFAULT_COMPANY_PASSWORD :{BLACK}Senha padrão da empresa
STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP :{BLACK}Usar esta senha de empresa como padrão para novas empresas
STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Recessão Mundial!{}{}Economistas temem crise!
-STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Fim do recessão!{}{}Melhoras no comércio inspiram confiança nas indústrias à medida que a economia se fortalece!
+STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Fim da recessão!{}{}Melhoras no comércio inspiram confiança nas indústrias à medida que a economia se fortalece!
STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Alternar entre janela grande/pequena
STR_7076_COMPANY_VALUE :{GOLD}Valor da empresa: {WHITE}{CURRENCY}
STR_7077_BUY_25_SHARE_IN_COMPANY :{BLACK}Comprar 25% de ações
@@ -2327,7 +2327,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Impossível vender 25% das ações desta empresa...
STR_707D_OWNED_BY :{WHITE}({COMMA}% propriedade de {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} foi comprada por {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Esta empresa ainda não troca ações...
+STR_PROTECTED :{WHITE}Esta empresa ainda não troca ações...
STR_LIVERY_DEFAULT :Cores padrão
STR_LIVERY_STEAM :Máquina a Vapor
@@ -2636,17 +2636,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Ir para {STATION}
-STR_8807_GO_TO_TRANSFER :Ir para {STATION} (Transferir e carregar)
-STR_8808_GO_TO_UNLOAD :Ir para {STATION} (Descarregar)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Ir para {STATION} (Transferir e deixar vazio)
-STR_880A_GO_TO_LOAD :Ir para {STATION} (Carregar)
-STR_880B_GO_TO_TRANSFER_LOAD :Ir para {STATION} (Trasferir e aguardar carga total)
-STR_880C_GO_NON_STOP_TO :Ir sem parar para {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Ir sem parar para {STATION} (Transferir e carregar)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Ir sem parar para {STATION} (Descarregar)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sem parar para {STATION} (Transferir e deixar vazio)
-STR_8810_GO_NON_STOP_TO_LOAD :Ir sem parar para {STATION} (Carregar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sem parar para {STATION} (Trasferir e aguardar carga total)
+STR_GO_TO_TRANSFER :Ir para {STATION} (Transferir e carregar)
+STR_8807_GO_TO_UNLOAD :Ir para {STATION} (Descarregar)
+STR_GO_TO_TRANSFER_UNLOAD :Ir para {STATION} (Transferir e deixar vazio)
+STR_8808_GO_TO_LOAD :Ir para {STATION} (Carregar)
+STR_GO_TO_TRANSFER_LOAD :Ir para {STATION} (Trasferir e aguardar carga total)
+STR_880A_GO_NON_STOP_TO :Ir sem parar para {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Ir sem parar para {STATION} (Transferir e carregar)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Ir sem parar para {STATION} (Descarregar)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sem parar para {STATION} (Transferir e deixar vazio)
+STR_880C_GO_NON_STOP_TO_LOAD :Ir sem parar para {STATION} (Carregar)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sem parar para {STATION} (Trasferir e aguardar carga total)
STR_GO_TO_TRAIN_DEPOT :Ir para o depósito de {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Manutenção no depósito de {TOWN}
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ir sem parar para o depósito de {TOWN}
@@ -2750,7 +2750,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Exibir detalhes da carga transportada
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Exibir detalhes dos veículos
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Exibir capacidades de cada veículo
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Exibir capacidade total do trem, dividir por tipo de carga
+STR_SHOW_TOTAL_CARGO :{BLACK}Exibir capacidade total do trem, dividir por tipo de carga
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista de ordens - clique numa ordem para a selecionar
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Pula a ordem atual e executa a próxima. CTRL + clique pula a ordem selecionada
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Remover a ordem selecionada
@@ -2762,7 +2762,7 @@
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Mude a quantidade de tempo que a ordem deverá levar
STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Reseta a quantidade de tempo para a ordem selecionada
STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Reseta o contador de atraso, fazendo o veículo estar na hora
-STR_SERVICE_HINT :{BLACK}Saltar esta ordem a menos que seja preciso manutenção
+STR_SERVICE_HINT :{BLACK}Pular esta ordem a menos que necessite de manutenção
STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Custo: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY} Potência: {POWER}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {CARGO}
STR_885C_BROKEN_DOWN :{RED}Quebrado
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Idade: {LTBLUE}{STRING}{BLACK} Custo de circulação: {LTBLUE}{CURRENCY}/ano
@@ -2781,8 +2781,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Impossível inverter a direção do trem...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renomear tipo de veículo ferroviário
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Impossível renomear tipo de veículo ferroviário...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Força o veículo a deixar a carga na ordem selecionada
-STR_886F_TRANSFER :{BLACK}Transferir
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Força o veículo a deixar a carga na ordem selecionada
+STR_TRANSFER :{BLACK}Transferir
STR_CLEAR_TIME :{BLACK}Resetar horário
STR_RESET_LATENESS :{BLACK}Resetar contador de atraso
@@ -2860,8 +2860,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Renomear automóvel
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro ônibus chega a {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro caminhão chega a {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de passageiros chega a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de carga chega a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de passageiros chega a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de carga chega a {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Acidente Rodoviário!{} Condutor morre numa explosão após a colisão com um trem
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Acidente Rodoviário!{} {COMMA} mortos numa explosão após a colisão com um trem
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Impossível fazer o veículo dar a volta...
@@ -2870,7 +2870,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Renomear tipo do automóvel
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Renomear tipo do automóvel
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Impossível renomear tipo do automóvel...
-STR_9038_GO_TO_ROADVEH_DEPOT :Ir para a garagem de {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Ir para a garagem de {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Manutenção na garagem de {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Adaptar automóvel para carregar tipo de carga diferente
@@ -3246,6 +3246,9 @@
########### For showing numbers in widgets
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
########### String for New Landscape Generator
--- a/src/lang/bulgarian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/bulgarian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Трябва равна земя
STR_0008_WAITING :{BLACK}Чакане: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (на път от
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} на път от {STATION})
STR_000C_ACCEPTS :{BLACK}Приема: {WHITE}
STR_000D_ACCEPTS :{BLACK}Приема: {GOLD}
STR_000E :
@@ -276,9 +275,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Прекалено много имена
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Избраното име вече е в употреба
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :ОС Х
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :ОС Х
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -289,11 +288,11 @@
STR_013C_CARGO :{BLACK}Товар
STR_013D_INFORMATION :{BLACK}Информация
STR_013E_CAPACITIES :{BLACK}Вместимости
-STR_013E_TOTAL_CARGO :{BLACK}Общо товар
+STR_TOTAL_CARGO :{BLACK}Общо товар
STR_013F_CAPACITY :{BLACK}Вместимост: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Капацитет: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Обща товарна вместимост на влака:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Обща товарна вместимост на влака:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Нова игра
STR_0141_LOAD_GAME :{BLACK}Отвори игра
@@ -728,11 +727,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Постави предавател
STR_028F_DEFINE_DESERT_AREA :{BLACK}Избери пустинен терен.{}Задръж CTRL за да го премахнеш.
STR_CREATE_LAKE :{BLACK}Определи водна площ.{}Построи канал, освем когато CTRL е натиснат на морско ниво, когато ще наводни околната среда в замяна
+STR_CREATE_RIVER :{BLACK}Направи реки.
STR_0290_DELETE :{BLACK}Изтрий
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Премахни напълно града
STR_0292_SAVE_SCENARIO :Запис на сценарий
STR_0293_LOAD_SCENARIO :Зареждане на сценарий
-STR_LOAD_HEIGHTMAP :Отвори височинна карта
+STR_MENU_LOAD_HEIGHTMAP :Отвори височинна карта
STR_0294_QUIT_EDITOR :Изход от редактора
STR_0295 :
STR_0296_QUIT :Изход
@@ -772,9 +772,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Игрови опции
-STR_02C5_DIFFICULTY_SETTINGS :Опции за трудност
-STR_02C7_CONFIG_PATCHES :Конфигурирай патчове
+STR_02C4_GAME_OPTIONS :Игрови опции
+STR_02C6_DIFFICULTY_SETTINGS :Опции за трудност
+STR_MENU_CONFIG_PATCHES :Конфигурирай патчове
STR_NEWGRF_SETTINGS :Newgrf настройки
STR_TRANSPARENCY_OPTIONS :Опций на прозрачност
STR_GAMEOPTMENU_0A :
@@ -874,8 +874,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Записването продължава,{}моля изчакайте да сръши!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Избери програмата 'Ezy Street style music'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :английски (оригинални)
@@ -1650,42 +1650,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Първо махнете пътя
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Пътни ремонти в процес
STR_1802_ROAD_CONSTRUCTION :{WHITE}Пътно строителство
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Конструкциа на трамвайна линиа
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Конструкциа на трамвайна линиа
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Избор на асфалтов мост
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... еднопосочни пътища немогат да имат съединениа
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Пътя не може да се построи...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Трамвайна линиа неможе да бъде посроена тук...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Трамвайна линиа неможе да бъде посроена тук...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Пътя не може да се махне...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Трамвайната линиа неможе да бъде премахната от тук...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Трамвайната линиа неможе да бъде премахната от тук...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Ориентация на гараж
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Посока на Трамвайно Депо
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Посока на Трамвайно Депо
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Гаража не може да се построи...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Трамвайно депо неможе да бъде построено тук...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Трамвайно депо неможе да бъде построено тук...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Автогарата не може да се построи...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Товарната гара не може да се построи...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Пътническа трамвайна гара неможе да бъде построена...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Товарна трамвайна гара неможе да бъде построена...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Пътническа трамвайна гара неможе да бъде построена...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Товарна трамвайна гара неможе да бъде построена...
STR_180A_ROAD_CONSTRUCTION :Пътно строителство
-STR_180A_TRAMWAY_CONSTRUCTION :Конструкциа на трамвайна линиа
+STR_TRAMWAY_CONSTRUCTION :Конструкциа на трамвайна линиа
STR_180B_BUILD_ROAD_SECTION :{BLACK}Строене на път
STR_BUILD_AUTOROAD_TIP :{BLACK}Построи отсечка от шосе използвайки Афто-шосе методът
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Построи секциа от трамвайна линиа
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Построи секциа от трамвайна линиа
STR_BUILD_AUTOTRAM_TIP :{BLACK}Построи отсечка от железопътна линиа използвайки Афто-линиа методът
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Строене на гараж (за строене и сервиз на МПС-та)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Построи трамвайно депо (за стройтелни и сервизни коли)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Построи трамвайно депо (за стройтелни и сервизни коли)
STR_180D_BUILD_BUS_STATION :{BLACK}Строене на автогара
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Строене на товарна гара
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Построи пъгническа трамвайна гара
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Построи товарна трамвайна гара
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Построи пъгническа трамвайна гара
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Построи товарна трамвайна гара
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Построй мост
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Построи трамвайен мост
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Построи трамвайен мост
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Построй тунел
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Построи трамвайен тунел
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Построи трамвайен тунел
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Активирай/Деактивирай еднопосочни пътища
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Премахване на асфалтов път
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Превключване строене/разрушаване на трамвайни консктрукции
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Превключване строене/разрушаване на трамвайни консктрукции
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Ориентация на гараж
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Избери посоката на трамвайното депо
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Избери посоката на трамвайното депо
STR_1814_ROAD :път
STR_1815_ROAD_WITH_STREETLIGHTS :Асфалтов път с улични лампи
STR_1816_TREE_LINED_ROAD :Асфалтов път с дървета
@@ -1828,8 +1828,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Граничи с повече от една гара/товарна платформа
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Твърде много гари/товарни платформи в града
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Твърде много гари/товарни платформи
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Твърде много автобусни спирки
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Твърде много гари за камиони
+STR_TOO_MANY_BUS_STOPS :{WHITE}Твърде много автобусни спирки
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Твърде много гари за камиони
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Твърде близо до друга гара/товарна платформа
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Първо разрушете ЖП гарата
@@ -1860,12 +1860,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} вече приема {STRING} и {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Ориентация на автогара
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Ориент. товарна гара
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Посока на пътнически трамвай
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Посока на товарен трамвай
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Посока на пътнически трамвай
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Посока на товарен трамвай
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Първо разрушете автогарата
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Първо разрушете товарната гара
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Пътническата трамвайна гара трябва да бъде унищожена първо
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Товарната трамвайна гара трябва да бъде унищожена първо
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Пътническата трамвайна гара трябва да бъде унищожена първо
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Товарната трамвайна гара трябва да бъде унищожена първо
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Станци{P я и}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Николко -
@@ -1877,8 +1877,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Дължина на ЖП гарата
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Ориентация на автогарата
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Ориентация на товарната гара
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Избери посоката на пътническата трамвайна гара
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Избери посоката на товарната трамвайна гара
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Избери посоката на пътническата трамвайна гара
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Избери посоката на товарната трамвайна гара
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Центриране на главния прозорец върху станцията
STR_3054_SHOW_STATION_RATINGS :{BLACK}Покажи нивото на обслужване
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Промяна името на станцията
@@ -1900,7 +1900,7 @@
STR_3069_BUOY :Шамандура
STR_306A_BUOY_IN_THE_WAY :{WHITE}...шамандура на пътя
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...станцията е прекалено разпръсната
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...неправилните станции са изключени
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...неправилните станции са изключени
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Задържете CTRL за да изберете повече от един обект
STR_UNDEFINED :(неопределен текст)
@@ -1941,7 +1941,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Избери нов тип игра
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Избери на сценарии (зелено), предварително настроена игра (синьо), или произволна нова игра
STR_4010_GENERATE_RANDOM_NEW_GAME :Генерирай произволна нова игра
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Зареди височинна карта
+STR_LOAD_HEIGHTMAP :{WHITE}Зареди височинна карта
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} пречи
@@ -2145,10 +2145,10 @@
STR_6813_ECONOMY :{LTBLUE}Икономика: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Обръщане на влаковете: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Бедствия: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Отношение на градските власти към промяна на земята: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Отношение на градските власти към промяна на земята: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Николко
+STR_NONE :Николко
STR_NUM_VERY_LOW :Много ниско
STR_6816_LOW :малко
STR_6817_NORMAL :нормално
@@ -2186,9 +2186,9 @@
STR_6836_OFF :изключено
STR_6837_ON :включено
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Покажи класирането
-STR_6839_PERMISSIVE :разрешаващи
-STR_683A_TOLERANT :толерантни
-STR_683B_HOSTILE :враждебни
+STR_PERMISSIVE :разрешаващи
+STR_TOLERANT :толерантни
+STR_HOSTILE :враждебни
##id 0x7000
STR_7000 :
@@ -2325,7 +2325,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Не може да продадеш 25% от акциите на тази компания...
STR_707D_OWNED_BY :{WHITE}({COMMA}% е притежание на {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} бе закупена от {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Тази компания все още не е достатъчно стара да предлага акции...
+STR_PROTECTED :{WHITE}Тази компания все още не е достатъчно стара да предлага акции...
STR_LIVERY_DEFAULT :Стандартен Ливъри
STR_LIVERY_STEAM :Парен локомотив
@@ -2338,6 +2338,8 @@
STR_LIVERY_PASSENGER_WAGON_STEAM :Пътнически вагон (Парен)
STR_LIVERY_PASSENGER_WAGON_DIESEL :Пътнически вагон (Дизел)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Пътнически вагон (Електрически)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :Пътнически вагон (Monorail - еднорелсова железопътна линия)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :Пътнически вагон (Maglev - магнетично издигнат влак)
STR_LIVERY_FREIGHT_WAGON :Товарен вагон
STR_LIVERY_BUS :Автобус
STR_LIVERY_TRUCK :Камион
@@ -2632,17 +2634,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Отиди на {STATION}
-STR_8807_GO_TO_TRANSFER :Отиди на {STATION} (Обмени и вземи товар)
-STR_8808_GO_TO_UNLOAD :Отиди на {STATION} (Разтовари)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Отиди на {STATION} (Обмени и не взимай нов товар)
-STR_880A_GO_TO_LOAD :Отиди на {STATION} (Товари)
-STR_880B_GO_TO_TRANSFER_LOAD :Отиди на {STATION} (Обмени и изчакай до пълен товар)
-STR_880C_GO_NON_STOP_TO :Отиди без да спираш на {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Отиди без да спираш на {STATION} (Обмени и вземи товар)
-STR_880E_GO_NON_STOP_TO_UNLOAD :отиди без да спираш на {STATION} (Разтовари)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Отиди без да спираш на {STATION} (Обмени и не товари)
-STR_8810_GO_NON_STOP_TO_LOAD :Отиди без да спираш на {STATION} (Товари)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Отиди без да спираш на {STATION} (Обмени и изчакай до пълен товар)
+STR_GO_TO_TRANSFER :Отиди на {STATION} (Обмени и вземи товар)
+STR_8807_GO_TO_UNLOAD :Отиди на {STATION} (Разтовари)
+STR_GO_TO_TRANSFER_UNLOAD :Отиди на {STATION} (Обмени и не взимай нов товар)
+STR_8808_GO_TO_LOAD :Отиди на {STATION} (Товари)
+STR_GO_TO_TRANSFER_LOAD :Отиди на {STATION} (Обмени и изчакай до пълен товар)
+STR_880A_GO_NON_STOP_TO :Отиди без да спираш на {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Отиди без да спираш на {STATION} (Обмени и вземи товар)
+STR_880B_GO_NON_STOP_TO_UNLOAD :отиди без да спираш на {STATION} (Разтовари)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Отиди без да спираш на {STATION} (Обмени и не товари)
+STR_880C_GO_NON_STOP_TO_LOAD :Отиди без да спираш на {STATION} (Товари)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Отиди без да спираш на {STATION} (Обмени и изчакай до пълен товар)
STR_GO_TO_TRAIN_DEPOT :Отиди до Влаковото депо на {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Ремонт в {TOWN} влаково депо
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Отиди без да спираш на {TOWN} Влаково депо
@@ -2746,7 +2748,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Информация за превозвания товар
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Информация за влаковата композиция
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Капацитет на влаковата композиция
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Общ капацитет на влака, разбит по типове товар
+STR_SHOW_TOTAL_CARGO :{BLACK}Общ капацитет на влака, разбит по типове товар
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Пътен лист - натиснете върху назначение за маркиране. CTRL + натискане - центрира върху станцията
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Прескачане на настоящата заповед и започване на цледващата. CTRL + клик прескача до избраната заповед
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Изтриване на избраното назначение
@@ -2777,8 +2779,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Не може да обърне посоката на влак...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Преименуване на влак
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Не може да се преименува влак...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Изхвърляне на товара при достигане на избраното назначение
-STR_886F_TRANSFER :{BLACK}Транфер
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Изхвърляне на товара при достигане на избраното назначение
+STR_TRANSFER :{BLACK}Транфер
STR_CLEAR_TIME :{BLACK}Изчисти времето
STR_RESET_LATENESS :{BLACK}Преправи закъснялата бройка
@@ -2856,8 +2858,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Преименувай МПС-то
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първият автобус пристигнал в {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Хората празнуват . . .{}Първи камион пристигна на {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първиат пътнически трамвай пристига на {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първиат товарен трамвай пристига на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първиат пътнически трамвай пристига на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първиат товарен трамвай пристига на {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Пътно-транспортно Произшествие!{}Шофьор загина на място при екплозия на МПС след сблъсък с влак
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Пътно-транспортно Произшествие!{}{COMMA} загинаха на място при екплозия на МПС след сблъсък с влак
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Не може да обърнеш МПС-то...
@@ -2866,7 +2868,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Преименувай МПС-то
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Преименувай МПС-то
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Не може да преименуваш МПС-то...
-STR_9038_GO_TO_ROADVEH_DEPOT :Отиди в {TOWN} МПС-депото
+STR_GO_TO_ROADVEH_DEPOT :Отиди в {TOWN} МПС-депото
STR_SERVICE_AT_ROADVEH_DEPOT :Ремонт в {TOWN} гараж
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Преоборудване автомобила за друг товар
@@ -3240,6 +3242,12 @@
STR_PURCHASE_INFO_ALL_BUT :Всички освен {GOLD}
STR_PURCHASE_INFO_MAX_TE :{BLACK}Макс. теглеща сила: {GOLD}{FORCE}
+########### For showing numbers in widgets
+
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
########### String for New Landscape Generator
STR_GENERATE :{WHITE}Генериране
--- a/src/lang/catalan.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/catalan.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Es necessita un terreny pla
STR_0008_WAITING :{BLACK}Esperant: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (en ruta des de
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} en ruta des de {STATION})
STR_000C_ACCEPTS :{BLACK}Accepta: {WHITE}
STR_000D_ACCEPTS :{BLACK}Accepta: {GOLD}
STR_000E :
@@ -274,9 +273,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Massa noms definits
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Aquest nom ja es fa servir
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +286,11 @@
STR_013C_CARGO :{BLACK}Càrrega
STR_013D_INFORMATION :{BLACK}Informació
STR_013E_CAPACITIES :{BLACK}Capacitats
-STR_013E_TOTAL_CARGO :{BLACK}Càrrega Total
+STR_TOTAL_CARGO :{BLACK}Càrrega Total
STR_013F_CAPACITY :{BLACK}Capacitats: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capacitat: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Càrrega total (capacitat) d'aquest tren:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Càrrega total (capacitat) d'aquest tren:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Joc Nou
STR_0141_LOAD_GAME :{BLACK}Carrega un Joc
@@ -731,7 +730,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Esborra totalment aquesta població
STR_0292_SAVE_SCENARIO :Desa l'escenari
STR_0293_LOAD_SCENARIO :Carrega un escenari
-STR_LOAD_HEIGHTMAP :Carrega Mapa d'alçades
+STR_MENU_LOAD_HEIGHTMAP :Carrega Mapa d'alçades
STR_0294_QUIT_EDITOR :Surt de l'editor
STR_0295 :
STR_0296_QUIT :Surt
@@ -771,9 +770,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Opcions del Joc
-STR_02C5_DIFFICULTY_SETTINGS :Paràmetres de dificultat
-STR_02C7_CONFIG_PATCHES :Configura pedaços
+STR_02C4_GAME_OPTIONS :Opcions del Joc
+STR_02C6_DIFFICULTY_SETTINGS :Paràmetres de dificultat
+STR_MENU_CONFIG_PATCHES :Configura pedaços
STR_NEWGRF_SETTINGS :Extensions NewGRF
STR_TRANSPARENCY_OPTIONS :Opcions de transparència
STR_GAMEOPTMENU_0A :
@@ -873,8 +872,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}S'està desant el joc,{}espera a que acabi l'operació!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Selecciona el programa 'Ezy Street style music'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglès
@@ -1649,42 +1648,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}S'ha de treure la carretera primer
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Obres en progrés
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construcció de Carreteres
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Construcció de Tramvies
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Construcció de Tramvies
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Selecciona un Pont per Carretera
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... les carreteres de sentit únic no poden tenir encreuaments
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Aquí no es pot construir una carretera...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}No puc construir la via de tramvia aquí...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}No puc construir la via de tramvia aquí...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Aquí no es pot treure una carretera...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}No puc treure la via de tramvia d'aquí...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}No puc treure la via de tramvia d'aquí...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Cotxeres
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orientació de les cotxeres de tramvies
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orientació de les cotxeres de tramvies
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Aquí no es pot construir una cotxera...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Aquí no puc construir les cotxeres de tramvies...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Aquí no puc construir les cotxeres de tramvies...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}No es pot construir una parada d'autobús...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}No es pot construir estació de mercaderies...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}No puc construir l'estació de tramvies de passatgers
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}No puc construir l'estació de tramvies de càrrega
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}No puc construir l'estació de tramvies de passatgers
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}No puc construir l'estació de tramvies de càrrega
STR_180A_ROAD_CONSTRUCTION :Construcció de Carreteres
-STR_180A_TRAMWAY_CONSTRUCTION :Construcció de Tramvies
+STR_TRAMWAY_CONSTRUCTION :Construcció de Tramvies
STR_180B_BUILD_ROAD_SECTION :{BLACK}Construeix una secció de carretera
STR_BUILD_AUTOROAD_TIP :{BLACK}Construeix secció de carretera utilitzant el mode Autocarretera
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Construeix una secció de via de tramvia
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Construeix una secció de via de tramvia
STR_BUILD_AUTOTRAM_TIP :{BLACK}Construeix secció de tramvia utilitzant el mode Autotramvia
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Construeix una cotxera (per construir i mantenir vehicles)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construeix cotxeres de tramvies (per construir i revisar tramvies)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construeix cotxeres de tramvies (per construir i revisar tramvies)
STR_180D_BUILD_BUS_STATION :{BLACK}Constueix una parada d'autobús
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Construeix un moll de càrrega
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construeix una estació de tramvies de passatgers
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Construeix una estació de tramvies de mercaderies
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construeix una estació de tramvies de passatgers
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Construeix una estació de tramvies de mercaderies
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Construeix un pont per carretera
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Construeix pont per tramvies
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Construeix pont per tramvies
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Construeix un túnel per carretera
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Construeix túnel per tramvies
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Construeix túnel per tramvies
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Activa/Desactiva les carreteres d'un sentit
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Intercanvia funció construeix/treu per la construcció de carreteres
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Canvia construeix/treu de la construcció de vies de tramvia
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Canvia construeix/treu de la construcció de vies de tramvia
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Selecciona la orientació de les Cotxeres
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Selecciona l'orientació de les cotxeres de tramvies
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Selecciona l'orientació de les cotxeres de tramvies
STR_1814_ROAD :Carretera
STR_1815_ROAD_WITH_STREETLIGHTS :Carretera amb fanals
STR_1816_TREE_LINED_ROAD :Carretera de tres carrils
@@ -1827,8 +1826,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Fusiona més d'una estació/àrea de càrrega existent
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Hi ha massa estacions/àrees de càrrega en aquesta població
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Massa estacions/àrees de càrrega
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Massa parades d'autobús
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Masses estacions de càrrega
+STR_TOO_MANY_BUS_STOPS :{WHITE}Massa parades d'autobús
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Masses estacions de càrrega
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Massa a prop d'una altra estació/àrea de càrrega
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Primer has d'enderrocar l'estació de tren
@@ -1859,12 +1858,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} ara accepta {STRING} i {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Parada d'autobús
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Estació de Mercaderies
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientació estació passatgers
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientació estació mercaderies
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientació estació passatgers
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientació estació mercaderies
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Primer has d'enderrocar la parada d'autobús
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Primer has d'enderrocar l'estació de mercaderies
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Primer has de demolir l'estació de tramvies de passatgers
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Primer has de demolir l'estació de tramvies de mercaderies
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Primer has de demolir l'estació de tramvies de passatgers
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Primer has de demolir l'estació de tramvies de mercaderies
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Estacions/Parades
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Cap -
@@ -1876,8 +1875,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Selecciona la mida de les andanes de l'estació de tren
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Selecciona l'orientació de la parada d'autobús
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Selecciona l'orientació del moll de càrrega de camions
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Selecciona l'orientació de l'estació de tramvies de passatgers
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Selecciona l'orientació de l'estació de tramvies de mercaderies
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Selecciona l'orientació de l'estació de tramvies de passatgers
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Selecciona l'orientació de l'estació de tramvies de mercaderies
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centra la pantalla principal al lloc de l'estació
STR_3054_SHOW_STATION_RATINGS :{BLACK}Mostra els ratis de l'estació
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Canvia el nom de l'estació
@@ -1899,7 +1898,7 @@
STR_3069_BUOY :Boia
STR_306A_BUOY_IN_THE_WAY :{WHITE}...boia en el camí
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...estació massa extesa
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...estacions no uniformes desactivades
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...estacions no uniformes desactivades
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Mantin apretat CTRL per a seleccionar més de un item
STR_UNDEFINED :(cadena sense definir)
@@ -1940,7 +1939,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Selecciona el Nou Tipus de Joc
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Selecciona l'escenari (verd), joc pre-programat (blau), o el nou joc aleatori
STR_4010_GENERATE_RANDOM_NEW_GAME :Genera un nou joc aleatori
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Carrega un Mapa d'alçades
+STR_LOAD_HEIGHTMAP :{WHITE}Carrega un Mapa d'alçades
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} en el camí
@@ -2144,10 +2143,10 @@
STR_6813_ECONOMY :{LTBLUE}Economia: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Canvi de sentit dels trens: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Actitud de l'Ajuntament sobre reestructuracions d'àrees: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Actitud de l'Ajuntament sobre reestructuracions d'àrees: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Cap
+STR_NONE :Cap
STR_NUM_VERY_LOW :Molt baix
STR_6816_LOW :Baix
STR_6817_NORMAL :Normal
@@ -2185,9 +2184,9 @@
STR_6836_OFF :Desactivat
STR_6837_ON :Activat
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Veure la taula de les majors puntuacions
-STR_6839_PERMISSIVE :Permisiu
-STR_683A_TOLERANT :Tolerant
-STR_683B_HOSTILE :Hostil
+STR_PERMISSIVE :Permisiu
+STR_TOLERANT :Tolerant
+STR_HOSTILE :Hostil
##id 0x7000
STR_7000 :
@@ -2324,7 +2323,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}No pots vendre el 25% de participació en aquesta empresa...
STR_707D_OWNED_BY :{WHITE}({COMMA}% propietat de {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} ha estat absorbida per {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Aquesta empresa ja no negocia participacions...
+STR_PROTECTED :{WHITE}Aquesta empresa ja no negocia participacions...
STR_LIVERY_DEFAULT :Decoració estandard
STR_LIVERY_STEAM :Motor de vapor
@@ -2633,17 +2632,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Ves a {STATION}
-STR_8807_GO_TO_TRANSFER :Ves a {STATION} (Transfereix i agafa càrrega)
-STR_8808_GO_TO_UNLOAD :Ves a {STATION} (Descarrega)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Ves a {STATION} (Transfereix i deixa buit)
-STR_880A_GO_TO_LOAD :Ves a {STATION} (Carrega)
-STR_880B_GO_TO_TRANSFER_LOAD :Ves a {STATION} (Transfereix i espera càrrega completa)
-STR_880C_GO_NON_STOP_TO :Ves sense parar a {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Ves sense parar a {STATION} (Transfereix i agafa càrrega)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Ves sense parar a {STATION} (Descarrega)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ves sense parar a {STATION} (Transfereix i deixa buit)
-STR_8810_GO_NON_STOP_TO_LOAD :Ves sense parar a {STATION} (Carrega)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Ves sense parar a {STATION} (Transfereix i espera càrrega completa)
+STR_GO_TO_TRANSFER :Ves a {STATION} (Transfereix i agafa càrrega)
+STR_8807_GO_TO_UNLOAD :Ves a {STATION} (Descarrega)
+STR_GO_TO_TRANSFER_UNLOAD :Ves a {STATION} (Transfereix i deixa buit)
+STR_8808_GO_TO_LOAD :Ves a {STATION} (Carrega)
+STR_GO_TO_TRANSFER_LOAD :Ves a {STATION} (Transfereix i espera càrrega completa)
+STR_880A_GO_NON_STOP_TO :Ves sense parar a {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Ves sense parar a {STATION} (Transfereix i agafa càrrega)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Ves sense parar a {STATION} (Descarrega)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ves sense parar a {STATION} (Transfereix i deixa buit)
+STR_880C_GO_NON_STOP_TO_LOAD :Ves sense parar a {STATION} (Carrega)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ves sense parar a {STATION} (Transfereix i espera càrrega completa)
STR_GO_TO_TRAIN_DEPOT :Ves al Diposit {TOWN} de Tren
STR_SERVICE_AT_TRAIN_DEPOT :Manteniment a cotxeres de {TOWN}.
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ves sense parar a les cotxeres de {TOWN}.
@@ -2747,7 +2746,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Mostra els detalls de càrrega transportada
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Mostra els detalls d'elements del tren
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Mostra les capacitats de cada element
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Mostra la capacitat total del tren, separat per tipus de càrrega
+STR_SHOW_TOTAL_CARGO :{BLACK}Mostra la capacitat total del tren, separat per tipus de càrrega
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Llista d'ordres - clica en una per seleccionar-la
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Salta l'ordre actual, i comença la següent. CTRL + clic salta l'ordre seleccionada
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Esborra l'ordre seleccionada
@@ -2778,8 +2777,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}No es pot invertir la direcció del tren...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Reanomena el tipus d'element del tren
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}No es pot reanomenar el tipus d'element del tren...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fer que l'ordre marcada forci al vehicle a volcar la càrrega
-STR_886F_TRANSFER :{BLACK}Transf.
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fer que l'ordre marcada forci al vehicle a volcar la càrrega
+STR_TRANSFER :{BLACK}Transf.
STR_CLEAR_TIME :{BLACK}Esborra Temps
STR_RESET_LATENESS :{BLACK}Reset. control de retràs
@@ -2857,8 +2856,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Anomena automòbil
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Celebració popular . . .{}Primer autobús arriba a {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Celebració popular . . .{}Primer camió arriba a {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de passatgers arriba a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de mercaderies arriba a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de passatgers arriba a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de mercaderies arriba a {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Accident de Vehicle!{}El conductor mor en una bola de foc després de la colisió amb un tren
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Accident de Vehicle!{}{COMMA} moren en una bola de foc després d'una colisió amb un tren
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}No es pot fer que el vehicle torni...
@@ -2867,7 +2866,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Reanomena tipus d'automòbil
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Reanomena tipus d'automòbil
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}No es pot reanomenar tipus d'automòbil
-STR_9038_GO_TO_ROADVEH_DEPOT :Ves a la cotxera de {TOWN}.
+STR_GO_TO_ROADVEH_DEPOT :Ves a la cotxera de {TOWN}.
STR_SERVICE_AT_ROADVEH_DEPOT :Manteniment a la cotxera de {TOWN}.
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Remodela vehicle de carretera per dur un tipus diferent de càrrega
--- a/src/lang/croatian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/croatian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Potrebna ravna površina
STR_0008_WAITING :{BLACK}Čekanje: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (na putu od
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Prihvaća: {WHITE}
STR_000D_ACCEPTS :{BLACK}Prihvaća: {GOLD}
STR_000E :
@@ -276,9 +274,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Previše definiranih imena
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Odabrano ime već se koristi
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -289,11 +287,11 @@
STR_013C_CARGO :{BLACK}Teret
STR_013D_INFORMATION :{BLACK}Informacije
STR_013E_CAPACITIES :{BLACK}Nosivosti
-STR_013E_TOTAL_CARGO :{BLACK}Ukupni teret
+STR_TOTAL_CARGO :{BLACK}Ukupni teret
STR_013F_CAPACITY :{BLACK}Nosivost: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Nosivost: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Ukupna nosivost tereta ovog vlaka:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Ukupna nosivost tereta ovog vlaka:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nova igra
STR_0141_LOAD_GAME :{BLACK}Učitaj igru
@@ -732,7 +730,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Obriši ovaj grad u cjelosti
STR_0292_SAVE_SCENARIO :Spremi scenarij
STR_0293_LOAD_SCENARIO :Učitaj secenarij
-STR_LOAD_HEIGHTMAP :Učitaj visinsku kartu
+STR_MENU_LOAD_HEIGHTMAP :Učitaj visinsku kartu
STR_0294_QUIT_EDITOR :Završi s uređivanjem
STR_0295 :
STR_0296_QUIT :Završi
@@ -772,9 +770,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Postavke igre
-STR_02C5_DIFFICULTY_SETTINGS :Postavke težine
-STR_02C7_CONFIG_PATCHES :Konfiguriraj zakrpe
+STR_02C4_GAME_OPTIONS :Postavke igre
+STR_02C6_DIFFICULTY_SETTINGS :Postavke težine
+STR_MENU_CONFIG_PATCHES :Konfiguriraj zakrpe
STR_NEWGRF_SETTINGS :Postavke NewGRF-a
STR_TRANSPARENCY_OPTIONS :Postavke prozirnosti
STR_GAMEOPTMENU_0A :
@@ -874,8 +872,8 @@
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}Odaberi glazbeni program 'Ezy Street style'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engleski (original)
@@ -1650,42 +1648,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Najprije moraš ukloniti cestu
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Cestovni radovi u tijeku
STR_1802_ROAD_CONSTRUCTION :{WHITE}Izgradnja ceste
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Izgradnja tramvaja
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Izgradnja tramvaja
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Odaberi cestovni most
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}...jednosmjerne ceste ne mogu imati raskrižja
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Ovdje nije moguće izgraditi cestu...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Ovdje nije moguće izgraditi tramvaj...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Ovdje nije moguće izgraditi tramvaj...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Nije moguće ukloniti cestu odavdje...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nije moguće ukloniti tramvaj odavdje...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nije moguće ukloniti tramvaj odavdje...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Smjer cestovnog spremišta
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Smjer tramvajskog spremišta
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Smjer tramvajskog spremišta
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Ovdje nije moguće izgraditi spremište cestovnih vozila...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Ovdje nije moguće izgraditi tramvajsko spremište...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Ovdje nije moguće izgraditi tramvajsko spremište...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Nije moguće izgraditi autobusnu stanicu...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Nije moguće izgraditi kamionski terminal...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nije moguće izgraditi tramvajsku stanicu za putnike...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nije moguće izgraditi teretnu tramvajsku stanicu...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nije moguće izgraditi tramvajsku stanicu za putnike...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nije moguće izgraditi teretnu tramvajsku stanicu...
STR_180A_ROAD_CONSTRUCTION :Izgradnja ceste
-STR_180A_TRAMWAY_CONSTRUCTION :Izgradnja tramvaja
+STR_TRAMWAY_CONSTRUCTION :Izgradnja tramvaja
STR_180B_BUILD_ROAD_SECTION :{BLACK}Izgradi dio ceste
STR_BUILD_AUTOROAD_TIP :{BLACK}Izgradi cestu koristeći Autoroad način gradnje
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Izgradi tramvajski dio
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Izgradi tramvajski dio
STR_BUILD_AUTOTRAM_TIP :{BLACK}Izgradi tramvajsku prugu koristeći Autotram način gradnje
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Izgradi spremište cestovnih vozila (za izgradnju i servisiranje vozila)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Izgradi spremište tramvajskih vozila (za izgradnju i servisiranje vozila)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Izgradi spremište tramvajskih vozila (za izgradnju i servisiranje vozila)
STR_180D_BUILD_BUS_STATION :{BLACK}Izgradi autobusnu stanicu
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Izgradi pretovarni kamionski terminal
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Izgradi putničku tramvajsku stanicu
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Izgradi teretnu tramvajsku stanicu
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Izgradi putničku tramvajsku stanicu
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Izgradi teretnu tramvajsku stanicu
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Izgradi cestovni most
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Izgradi tramvajski most
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Izgradi tramvajski most
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Izgradi cestovni tunel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Izgradi tramvajski tunel
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Izgradi tramvajski tunel
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Aktiviraj/deaktiviraj jednosmjerne ceste
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Aktiviraj izgradnju/uklanjanje ceste
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Aktiviraj izgradnju/brisanje za izgradnju tramvaja
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Aktiviraj izgradnju/brisanje za izgradnju tramvaja
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Odaberi smjer spremišta cestovnih vozila
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Odaberi smjer tramvajskog spremišta
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Odaberi smjer tramvajskog spremišta
STR_1814_ROAD :Cesta
STR_1815_ROAD_WITH_STREETLIGHTS :Cesta sa semaforima
STR_1816_TREE_LINED_ROAD :Cesta s tri trake
@@ -1828,8 +1826,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Spaja više od jedne postojeće stanice/terminala
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}U ovom gradu ima previše stanica/terminala
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Previše stanica/terminala
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Previše autobusnih stanica
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Previše kamionskih stanica
+STR_TOO_MANY_BUS_STOPS :{WHITE}Previše autobusnih stanica
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Previše kamionskih stanica
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Preblizu drugoj stanici/terminalu
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Najprije moraš srušiti željezničku stanicu
@@ -1860,12 +1858,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} od sada prihvaća {STRING} i {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Smjer autobusne stanice
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Smjer kamionskog terminala
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orijentacija putničkog tramvaja
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Orijentacija teretnog tramvaja
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orijentacija putničkog tramvaja
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Orijentacija teretnog tramvaja
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Najprije moraš srušiti autobusnu stanicu
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Najprije moraš srušiti kamionski terminal
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Najprije moraš srušiti putničku tramvajsku stanicu
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Najprije moraš srušiti teretnu tramvajsku stanicu
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Najprije moraš srušiti putničku tramvajsku stanicu
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Najprije moraš srušiti teretnu tramvajsku stanicu
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} stanic{P a e a}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Ništa -
@@ -1877,8 +1875,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Odaberi dužinu željezničke stanice
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Odaberi smjer autobusne stanice
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Odaberi smjer kamionskog terminala
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Odaberi smjer putničke tramvajske stanice
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Odaberi smjer teretne tramvajske stanice
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Odaberi smjer putničke tramvajske stanice
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Odaberi smjer teretne tramvajske stanice
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centriraj glavni pogled na lokaciju stanice
STR_3054_SHOW_STATION_RATINGS :{BLACK}Pokaži ocjene stanice
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Promijeni ime stanice
@@ -1900,7 +1898,7 @@
STR_3069_BUOY :Plutača
STR_306A_BUOY_IN_THE_WAY :{WHITE}...plutača na putu
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...stanica previše proširena
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...neujednačene stanice onemogućene
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...neujednačene stanice onemogućene
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Drži CTRL kako bi odabrao više od jedne stavke
STR_UNDEFINED :(neodređen znakovni niz)
@@ -1941,7 +1939,7 @@
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 :Stvori nasumičnu novu igru
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Učitaj visinsku kartu
+STR_LOAD_HEIGHTMAP :{WHITE}Učitaj visinsku kartu
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} na putu
@@ -2145,10 +2143,10 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomija: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Promjena smjera vlaka: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Prirodne katastrofe: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Stav gradsko vijeća prema restrukturiranju područja: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Stav gradsko vijeća prema restrukturiranju područja: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Ništa
+STR_NONE :Ništa
STR_NUM_VERY_LOW :Vrlo nisko
STR_6816_LOW :Nisko
STR_6817_NORMAL :Normalno
@@ -2186,9 +2184,9 @@
STR_6836_OFF :Isključeno
STR_6837_ON :Uključeno
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Pokaži tablice najboljih rezultata
-STR_6839_PERMISSIVE :Dopustiv
-STR_683A_TOLERANT :Tolerantan
-STR_683B_HOSTILE :Agresivan
+STR_PERMISSIVE :Dopustiv
+STR_TOLERANT :Tolerantan
+STR_HOSTILE :Agresivan
##id 0x7000
STR_7000 :
@@ -2325,7 +2323,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Nije moguće prodati 25% udjela u ovoj tvrtci...
STR_707D_OWNED_BY :{WHITE}({COMMA}% u vlasništvu {COMPANY})
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_PROTECTED :{WHITE}Ova tvrka još nije dovoljno stara da bi trgovala udjelima...
STR_LIVERY_DEFAULT :Standardna boja
STR_LIVERY_STEAM :Parna lokomotiva
@@ -2632,17 +2630,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Idi do {STATION}
-STR_8807_GO_TO_TRANSFER :Idi do {STATION} (Transferiraj i preuzmi teret)
-STR_8808_GO_TO_UNLOAD :Idi do {STATION} (Istovar)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transferiraj i otiđi prazan)
-STR_880A_GO_TO_LOAD :Idi do{STATION} (Utovar)
-STR_880B_GO_TO_TRANSFER_LOAD :Idi do {STATION} (Transferiraj i pričekaj puni utovar)
-STR_880C_GO_NON_STOP_TO :Idi neprekidno do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Idi neprekidno do {STATION} (Transferiraj i preuzmi teret)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Idi neprekidno do {STATION} (Istovar)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Idi neprekidno do {STATION} (Transferiraj i otiđi prazan)
-STR_8810_GO_NON_STOP_TO_LOAD :Idi neprekidno do {STATION} (Utovar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Idi neprekidno do {STATION} (Transferiraj i pričekaj puni utovar)
+STR_GO_TO_TRANSFER :Idi do {STATION} (Transferiraj i preuzmi teret)
+STR_8807_GO_TO_UNLOAD :Idi do {STATION} (Istovar)
+STR_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transferiraj i otiđi prazan)
+STR_8808_GO_TO_LOAD :Idi do{STATION} (Utovar)
+STR_GO_TO_TRANSFER_LOAD :Idi do {STATION} (Transferiraj i pričekaj puni utovar)
+STR_880A_GO_NON_STOP_TO :Idi neprekidno do {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Idi neprekidno do {STATION} (Transferiraj i preuzmi teret)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Idi neprekidno do {STATION} (Istovar)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Idi neprekidno do {STATION} (Transferiraj i otiđi prazan)
+STR_880C_GO_NON_STOP_TO_LOAD :Idi neprekidno do {STATION} (Utovar)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Idi neprekidno do {STATION} (Transferiraj i pričekaj puni utovar)
STR_GO_TO_TRAIN_DEPOT :Idi u spremište vlakova grada {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Servisiranje u spremištu vlakova grada {TOWN}
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Idi neprekidno do spremišta vlakova grada {TOWN}
@@ -2746,7 +2744,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Pokaži detalje tereta koji se prevozi
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Pokaži detalje vagona
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Pokaži nosivosti svakog vagona
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Pokaži ukupnu nosivost vlaka podijeljenu prema vrsti tereta
+STR_SHOW_TOTAL_CARGO :{BLACK}Pokaži ukupnu nosivost vlaka podijeljenu prema vrsti tereta
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Popis naredbi - klikni na naredbu kako bi ju označio. CTRL + klik klizi na stanicu
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Preskoči trenutnu naredbu i pokreni slijedeću. CTRL + klik preskače na odabranu naredbu
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Obriši označenu naredbu
@@ -2777,8 +2775,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nije moguće promijeniti smjer vlaka...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Preimenuj vrstu vagona
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Nije moguće preimenovati vrstu vagona...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Napravi da označena naredba prisili vozilo da izbaci teret
-STR_886F_TRANSFER :{BLACK}Transfer
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Napravi da označena naredba prisili vozilo da izbaci teret
+STR_TRANSFER :{BLACK}Transfer
STR_CLEAR_TIME :{BLACK}Obriši vrijeme
STR_RESET_LATENESS :{BLACK}Poništi Brojač Kašnjenja
@@ -2856,8 +2854,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Imenuj cestovno vozilo
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 na {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Građani slave . . .{}Prvi putnički tramvaj je stigao na {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Građani slave . . .{}Prvi teretni tramvaj je stigao na {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}Nije moguće natjerati vozilo da se okrene...
@@ -2866,7 +2864,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Preimenuj vrstu cestovnog vozila
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Preimenuj vrstu cestovnog vozila
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Nije moguće preimenovati vrstu cestovnog vozila...
-STR_9038_GO_TO_ROADVEH_DEPOT :Idi prema spremištu cestovnih vozila grada {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Idi prema spremištu cestovnih vozila grada {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Servisiranje u spremištu cestovnih vozila grada {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Prenamijeni cestovno vozilo za prijevoz neke druge vrste tereta
--- a/src/lang/czech.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/czech.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Je potřeba plochá země
STR_0008_WAITING :{BLACK}Čeká tu: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (na cestě z
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} na cestě z{NBSP}{STATION})
STR_000C_ACCEPTS :{BLACK}Přijímá: {WHITE}
STR_000D_ACCEPTS :{BLACK}Přijímá: {GOLD}
STR_000E :
@@ -332,9 +331,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Definováno příliš mnoho jmen
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Zvolené jméno se už používá
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unixu
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unixu
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -345,11 +344,11 @@
STR_013C_CARGO :{BLACK}Náklad
STR_013D_INFORMATION :{BLACK}Informace
STR_013E_CAPACITIES :{BLACK}Kapacity
-STR_013E_TOTAL_CARGO :{BLACK}Celkový náklad
+STR_TOTAL_CARGO :{BLACK}Celkový náklad
STR_013F_CAPACITY :{BLACK}Kapacita: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapacita: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Celková kapacita tohoto vlaku:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Celková kapacita tohoto vlaku:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nová hra
STR_0141_LOAD_GAME :{BLACK}Nahrát hru
@@ -789,7 +788,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Smazat celé toto město
STR_0292_SAVE_SCENARIO :Uložit mapu
STR_0293_LOAD_SCENARIO :Otevřit mapu
-STR_LOAD_HEIGHTMAP :Použít výškovou mapu
+STR_MENU_LOAD_HEIGHTMAP :Použít výškovou mapu
STR_0294_QUIT_EDITOR :Ukončit editor
STR_0295 :
STR_0296_QUIT :Ukončit
@@ -829,9 +828,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Možnosti hry
-STR_02C5_DIFFICULTY_SETTINGS :Nastavení obtížnosti
-STR_02C7_CONFIG_PATCHES :Nastavení patchů
+STR_02C4_GAME_OPTIONS :Možnosti hry
+STR_02C6_DIFFICULTY_SETTINGS :Nastavení obtížnosti
+STR_MENU_CONFIG_PATCHES :Nastavení patchů
STR_NEWGRF_SETTINGS :Nastavení newgrf
STR_TRANSPARENCY_OPTIONS :Nastavení průhlednosti
STR_GAMEOPTMENU_0A :
@@ -931,8 +930,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Ukládání ještě běží,{}počkej prosím, než doběhne!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Zvolit 'Ezy Street style music' program
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglická (původní)
@@ -1707,42 +1706,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Musíš nejprve odstranit silnici
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Silnice je v rekonstrukci
STR_1802_ROAD_CONSTRUCTION :{WHITE}Výstavba silnic
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Výstavba tramvajové tratě
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Výstavba tramvajové tratě
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Zvolit silniční most
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... na jednosměrných silnicích nemůžou být křižovatky
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Zde nemohu postavit silnici...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Zde není možné postavit tramvajovou trať...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Zde není možné postavit tramvajovou trať...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Nemohu odsud odstranit silnici
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Není možné odsud odstranit tramvajovou trať...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Není možné odsud odstranit tramvajovou trať...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Orientace garáže
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orientace tramvajového depa
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orientace tramvajového depa
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Tady nejde postavit garáž
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Zde není možné postavit depo pro tramvaje...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Zde není možné postavit depo pro tramvaje...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Nemohu postavit autobusovou stanici...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Nemohu postavit nákladovou rampu...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Není možné postavit tramvajovou stanici pro cestující...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Není možné postavit tramvajovou stanici pro cestující...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Není možné postavit tramvajovou stanici pro cestující...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Není možné postavit tramvajovou stanici pro cestující...
STR_180A_ROAD_CONSTRUCTION :Výstavba silnic
-STR_180A_TRAMWAY_CONSTRUCTION :Výstavba tramvajové tratě
+STR_TRAMWAY_CONSTRUCTION :Výstavba tramvajové tratě
STR_180B_BUILD_ROAD_SECTION :{BLACK}Postavit silnici
STR_BUILD_AUTOROAD_TIP :{BLACK}Postavit úsek silnice pomocí módu Autoroad
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Položit kus kolejí pro tramvaje
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Položit kus kolejí pro tramvaje
STR_BUILD_AUTOTRAM_TIP :{BLACK}Postavit úsek tramvajové tratě pomocí módu Autoroad
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Postavit garáž (pro nákup a servis vozidel)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Vystavět tramvajové depo (na kupování a servis tramvají)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Vystavět tramvajové depo (na kupování a servis tramvají)
STR_180D_BUILD_BUS_STATION :{BLACK}Postavit autobusovou stanici
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Postavit nákladovou rampu
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Postavit tramvajovou stanici pro cestující
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Postavit nákladní tramvajovou stanici
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Postavit tramvajovou stanici pro cestující
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Postavit nákladní tramvajovou stanici
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Postavit silniční most
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Postavit tramvajový most
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Postavit tramvajový most
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Postavit silniční tunel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Postavit tramvajový tunel
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Postavit tramvajový tunel
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Povolit / zakázat jednosměrné silnice
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Přepnout stavba / odstranění silnice
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Přepínání mezi výstavbou a bouráním tramvajové tratě
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Přepínání mezi výstavbou a bouráním tramvajové tratě
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Výběr orientace garáže
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Zvol směr tramvajového depa
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Zvol směr tramvajového depa
STR_1814_ROAD :Silnice
STR_1815_ROAD_WITH_STREETLIGHTS :Silnice s pouličním osvětlením
STR_1816_TREE_LINED_ROAD :Silnice s alejí
@@ -1885,8 +1884,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Spojuje více jak jedno existující nádraží nebo nákladovou rampu...
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Příliš mnoho nádraží nebo nákladových ramp v tomto městě
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Příliš mnoho nádraží nebo nákladových ramp
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Příliš mnoho autobusových zastávek
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Příliš mnoho zastávek nákladních automobilů
+STR_TOO_MANY_BUS_STOPS :{WHITE}Příliš mnoho autobusových zastávek
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Příliš mnoho zastávek nákladních automobilů
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Příliš blízko k jinému nádraží nebo nákladové rampě
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Musíš nejprve zničit stanici
@@ -1917,12 +1916,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} nyní přijímá {STRING} a {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Orientace autobusové zastávky.
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Orientace nákladové rampy
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientace tramvajové stanice pro cestující
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientace nákladní tramvajové stanice
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientace tramvajové stanice pro cestující
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientace nákladní tramvajové stanice
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Musíš nejprve zničit autobusovou zastávku
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Musíš nejprve zničit nákladovou rampu
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Je nutné nejdříve zbourat tramvajovou stanici pro cestující
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Je nutné nejdříve zbourat nákladní tramvajovou stanici
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Je nutné nejdříve zbourat tramvajovou stanici pro cestující
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Je nutné nejdříve zbourat nákladní tramvajovou stanici
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} stanic{P e e ""}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Nic -
@@ -1934,8 +1933,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Zvolit délku nádraží
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Zvolit orientaci autobusové zastávky
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Zvolit orientaci nákladové rampy
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Vyber směr tramvajové stanice pro cestující
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Vyber směr nákladní tramvajové stanice
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Vyber směr tramvajové stanice pro cestující
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Vyber směr nákladní tramvajové stanice
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Vycentrovat pohled na stanici
STR_3054_SHOW_STATION_RATINGS :{BLACK}Ukázat hodnocení společností
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Změnit jméno stanice
@@ -1957,7 +1956,7 @@
STR_3069_BUOY :Bójka
STR_306A_BUOY_IN_THE_WAY :{WHITE}... bójka v cestě
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}... stanice je příliš rozložitá
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}... nejednolité stanice nejsou povoleny
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}... nejednolité stanice nejsou povoleny
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Podržením CTRL můžeš označit více položek
STR_UNDEFINED :(nedefinovaný řetězec)
@@ -1998,7 +1997,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Zvolit nový typ hry
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Zvolit scénář (zelená), přednastavenou hru (modrá), nebo novou náhodnou hru
STR_4010_GENERATE_RANDOM_NEW_GAME :Vytvořit novou náhodnou hru
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Nahrát výškovou mapu
+STR_LOAD_HEIGHTMAP :{WHITE}Nahrát výškovou mapu
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} v cestě
@@ -2202,10 +2201,10 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomika: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Otáčení vlaků: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katastrofy: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Postoj místní rady k (terénním) úpravám kolem města: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Postoj místní rady k (terénním) úpravám kolem města: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :žádný
+STR_NONE :žádný
STR_NUM_VERY_LOW :velmi nízké
STR_6816_LOW :nízké
STR_6817_NORMAL :střední
@@ -2243,9 +2242,9 @@
STR_6836_OFF :vypnuty
STR_6837_ON :zapnuty
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Zobraz tabulku nejlepších výsledků
-STR_6839_PERMISSIVE :nezaujatý
-STR_683A_TOLERANT :tolerantní
-STR_683B_HOSTILE :zaujatý
+STR_PERMISSIVE :nezaujatý
+STR_TOLERANT :tolerantní
+STR_HOSTILE :zaujatý
##id 0x7000
STR_7000 :
@@ -2382,7 +2381,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Nemohu prodat podíl v této společnosti...
STR_707D_OWNED_BY :{WHITE}({COMMA}% vlastněno {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} byla převzata {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Tato společnost zatím neobchoduje s akciemi...
+STR_PROTECTED :{WHITE}Tato společnost zatím neobchoduje s akciemi...
STR_LIVERY_DEFAULT :Výchozí barva
STR_LIVERY_STEAM :Parní lokomotiva
@@ -2697,17 +2696,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Jet do {STATION}
-STR_8807_GO_TO_TRANSFER :Jet do {STATION} (přeložit a naložit jiný náklad)
-STR_8808_GO_TO_UNLOAD :Jet do {STATION} (vyložit)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Jet do {STATION} (přeložit a nenakládat)
-STR_880A_GO_TO_LOAD :Jet do {STATION} (naložit)
-STR_880B_GO_TO_TRANSFER_LOAD :Jet do {STATION} (přeložit a plně naložit jiný náklad)
-STR_880C_GO_NON_STOP_TO :Jet bez zastavení do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Jet bez zastavení do {STATION} (přeložit a naložit jiný náklad)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Jet bez zastavení do {STATION} (vyložit)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Jet bez zastavení do {STATION} (přeložit a nenakládat)
-STR_8810_GO_NON_STOP_TO_LOAD :Jet bez zastavení do {STATION} (naložit)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Jet bez zastavení do {STATION} (přeložit a plně naložit jiný náklad)
+STR_GO_TO_TRANSFER :Jet do {STATION} (přeložit a naložit jiný náklad)
+STR_8807_GO_TO_UNLOAD :Jet do {STATION} (vyložit)
+STR_GO_TO_TRANSFER_UNLOAD :Jet do {STATION} (přeložit a nenakládat)
+STR_8808_GO_TO_LOAD :Jet do {STATION} (naložit)
+STR_GO_TO_TRANSFER_LOAD :Jet do {STATION} (přeložit a plně naložit jiný náklad)
+STR_880A_GO_NON_STOP_TO :Jet bez zastavení do {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Jet bez zastavení do {STATION} (přeložit a naložit jiný náklad)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Jet bez zastavení do {STATION} (vyložit)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Jet bez zastavení do {STATION} (přeložit a nenakládat)
+STR_880C_GO_NON_STOP_TO_LOAD :Jet bez zastavení do {STATION} (naložit)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Jet bez zastavení do {STATION} (přeložit a plně naložit jiný náklad)
STR_GO_TO_TRAIN_DEPOT :Jet do železničního depa v {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Údržba v železničním depu {TOWN}
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Jet bez zastavení do železničního depa {TOWN}
@@ -2811,7 +2810,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Ukázat detaily přepravovaného zboží
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Ukázat detaily jednotlivých vagonů
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Ukázat kapacity jednotlivých vagonů
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Ukázat celkovou kapacitu vlaku, rozdělenou dle nákladu
+STR_SHOW_TOTAL_CARGO :{BLACK}Ukázat celkovou kapacitu vlaku, rozdělenou dle nákladu
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Seznam příkazů - stiskni příkaz pro označení. Kliknutím na příkaz se stisknutým CTRL se nastaví pohled na stanici
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Přeskočit příkaz a jít na další. Pomocí CTRL + kliknutí se přeskočí na vybraný příkaz
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Smazat označený příkaz
@@ -2842,8 +2841,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nelze obrátit vlak...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Přejmenovat typ železničního vozidla
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Nemohu přejmenovat typ železničního vozidla...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}U označeného příkazu vozidlo musí vyložit náklad
-STR_886F_TRANSFER :{BLACK}Překládka
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}U označeného příkazu vozidlo musí vyložit náklad
+STR_TRANSFER :{BLACK}Překládka
STR_CLEAR_TIME :{BLACK}Smazat čas
STR_RESET_LATENESS :{BLACK}Smazat ukazatel zpoždění
@@ -2921,8 +2920,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Přejmenovat silniční vozidlo
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První autobus přijel do {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní vozidlo přijelo do {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První tramvaj pro cestující přijela do {STATION}
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní tramvaj přijíždí do {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První tramvaj pro cestující přijela do {STATION}
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní tramvaj přijíždí do {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Dopravní nehoda!{}Řidič zahynul v plamenech při srážce s vlakem
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Dopravní nehoda!{}{COMMA} {P člověk lidé lidí} zahynul{P "" i o} v plamenech při srážce s vlakem
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Nelze otočit vozidlo...
@@ -2931,7 +2930,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Přejmenovat typ silničního vozidla
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Přejmenovat typ silničního vozidla
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Nelze přejmenovat typ silničního vozidla...
-STR_9038_GO_TO_ROADVEH_DEPOT :Jet do garáže {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Jet do garáže {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Údržba v garáži {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Přestavět silniční vozidlo, aby mohlo vozit jiný druh nákladu
--- a/src/lang/danish.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/danish.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Landskabet skal være fladt
STR_0008_WAITING :{BLACK}Venter: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (på vej fra
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} undervejs fra {STATION})
STR_000C_ACCEPTS :{BLACK}Accepterer: {WHITE}
STR_000D_ACCEPTS :{BLACK}Accepterer: {GOLD}
STR_000E :
@@ -274,9 +273,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}For mange navne defineret
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Valgte navn bruges allerede
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +286,11 @@
STR_013C_CARGO :{BLACK}Last
STR_013D_INFORMATION :{BLACK}Information
STR_013E_CAPACITIES :{BLACK}Lasteevner
-STR_013E_TOTAL_CARGO :{BLACK}Samlet last
+STR_TOTAL_CARGO :{BLACK}Samlet last
STR_013F_CAPACITY :{BLACK}Lasteevne: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapacitet: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Samlet last (lasteevne) på dette tog:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Samlet last (lasteevne) på dette tog:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nyt spil
STR_0141_LOAD_GAME :{BLACK}Hent spil
@@ -726,11 +725,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Placér sender
STR_028F_DEFINE_DESERT_AREA :{BLACK}Definer ørkenområde.{}Hold CTRL nede for at fjerne det
STR_CREATE_LAKE :{BLACK}Definer vandområde.{}Lav en kanal, med mindre CTRL-tasten holdes ved havniveau, hvorved omgivelserne oversvømmes i stedet
+STR_CREATE_RIVER :{BLACK}Placér floder.
STR_0290_DELETE :{BLACK}Slet
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Slet denne by fuldstændigt
STR_0292_SAVE_SCENARIO :Gem scenarie
STR_0293_LOAD_SCENARIO :Hent scenarie
-STR_LOAD_HEIGHTMAP :Hent højdekort
+STR_MENU_LOAD_HEIGHTMAP :Hent højdekort
STR_0294_QUIT_EDITOR :Afslut editoren
STR_0295 :
STR_0296_QUIT :Afslut
@@ -770,9 +770,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Spilvalg
-STR_02C5_DIFFICULTY_SETTINGS :Sværhedsgrad
-STR_02C7_CONFIG_PATCHES :Indstil programrettelser
+STR_02C4_GAME_OPTIONS :Spilvalg
+STR_02C6_DIFFICULTY_SETTINGS :Sværhedsgrad
+STR_MENU_CONFIG_PATCHES :Indstil programrettelser
STR_NEWGRF_SETTINGS :NewGRF indstillinger
STR_TRANSPARENCY_OPTIONS :Gennemsigtighedsvalg
STR_GAMEOPTMENU_0A :
@@ -872,8 +872,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Gemmer stadig,{}vent venligst!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Vælg 'Ezy Street musik' program
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engelske
@@ -935,6 +935,7 @@
STR_OPTIONS_FULLSCREEN :{BLACK}Fuld skærm
STR_OPTIONS_FULLSCREEN_TIP :{BLACK}Afkryds for at spille OpenTTD i fuld skærm
+STR_FULLSCREEN_FAILED :{WHITE}Fuldskærmstilstand fejlede
STR_OPTIONS_RES :{BLACK}Skærmopløsning
STR_OPTIONS_RES_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1647,42 +1648,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Det er nødvendigt at fjerne vejen først
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Vejarbejde i gang
STR_1802_ROAD_CONSTRUCTION :{WHITE}Vejkonstruktion
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Sporvejskonstruktion
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Sporvejskonstruktion
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Vælg vejbro
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... ensrettede veje kan ikke have kryds
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Kan ikke bygge vej her...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan ikke bygge sporvej her...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan ikke bygge sporvej her...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Kan ikke fjerne vej herfra...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan ikke fjerne sporvej her...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan ikke fjerne sporvej her...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Retning af værksted
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Retning af sporvognsremise
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Retning af sporvognsremise
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Kan ikke bygge værksted her...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan ikke bygge sporvognsremise her...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan ikke bygge sporvognsremise her...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Kan ikke bygge rutebilstation...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Kan ikke bygge fragtcentral...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan ikke bygge passager-sporvognsstation...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan ikke bygge fragt-sporvognsstation...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan ikke bygge passager-sporvognsstation...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan ikke bygge fragt-sporvognsstation...
STR_180A_ROAD_CONSTRUCTION :Vejkonstruktion
-STR_180A_TRAMWAY_CONSTRUCTION :Sporvejskonstruktion
+STR_TRAMWAY_CONSTRUCTION :Sporvejskonstruktion
STR_180B_BUILD_ROAD_SECTION :{BLACK}Byg en sektion vej
STR_BUILD_AUTOROAD_TIP :{BLACK}Byg vejsektion ved hjælp af 'Auto-vej'
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Byg sporvejssektion
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Byg sporvejssektion
STR_BUILD_AUTOTRAM_TIP :{BLACK}Byg sporvejssektion ved hjælp af 'Auto-sporvej'
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Byg værksted (til bygning og servicering af vejkøretøjer)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Byg sporvognsremise (til konstruktion og service af vogne)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Byg sporvognsremise (til konstruktion og service af vogne)
STR_180D_BUILD_BUS_STATION :{BLACK}Byg rutebilstation
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Byg fragtcentral
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Byg passager-sporvognsstation
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Byg fragt-sporvognsstation
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Byg passager-sporvognsstation
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Byg fragt-sporvognsstation
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Byg bro
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Byg sporvejsbro
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Byg sporvejsbro
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Byg tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Byg sporvejstunnel
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Byg sporvejstunnel
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Aktiver/Deaktiver ensrettede veje
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Skift mellem bygning/fjernelse af veje
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Skift mellem bygning/fjernelse af sporveje
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Skift mellem bygning/fjernelse af sporveje
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Vælg retning for værksted
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Vælg retning af sporvognsremise
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Vælg retning af sporvognsremise
STR_1814_ROAD :Vej
STR_1815_ROAD_WITH_STREETLIGHTS :Vej med gadelygter
STR_1816_TREE_LINED_ROAD :Vej med vejtræer
@@ -1825,8 +1826,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Grænser op til mere end en eksisterende station/fragtcentral
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}For mange stationer/fragtcentraler i denne by
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}For mange stationer/fragtcentraler
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}For mange busterminaler
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}For mange fragtcentraler
+STR_TOO_MANY_BUS_STOPS :{WHITE}For mange busterminaler
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}For mange fragtcentraler
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}For tæt på en anden station/fragtcentral
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Det er nødvendigt at rive stationen ned først
@@ -1857,12 +1858,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} accepterer nu {STRING} og {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Retning af rutebilstation
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Retning af fragtcentral
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Retning af sporvognsstation
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Retning af sporvognsstation
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Retning af sporvognsstation
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Retning af sporvognsstation
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Det er nødvendigt at nedrive rutebilstationen først
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Det er nødvendigt at rive fragtcentralen ned først
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Passager-sporvognsstation skal fjernes først
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Fragt-sporvognsstation skal fjernes først
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Passager-sporvognsstation skal fjernes først
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Fragt-sporvognsstation skal fjernes først
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Stationer
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Ingen -
@@ -1874,8 +1875,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Vælg længde af banegård
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Vælg retning af rutebilstation
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Vælg retning af fragtcentral
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Vælg retning af sporvognsstation
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Vælg retning af sporvognsstation
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Vælg retning af sporvognsstation
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Vælg retning af sporvognsstation
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centrer skærmen over stationens lokalitet
STR_3054_SHOW_STATION_RATINGS :{BLACK}Vis stationens bedømmelse
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Ændre stationens navn
@@ -1897,7 +1898,7 @@
STR_3069_BUOY :Bøje
STR_306A_BUOY_IN_THE_WAY :{WHITE}...der er en bøje i vejen
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...stationen er for spredt
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ikke uniforme stationer er slået fra
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ikke uniforme stationer er slået fra
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Hold CTRL nede for at vælge mere end en ting
STR_UNDEFINED :(udefineret tekststring)
@@ -1938,7 +1939,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Vælg Spiltype til Nyt Spil
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Vælg scenarie (grøn), predefineret spil (blå), eller nyt tilfældigt spil
STR_4010_GENERATE_RANDOM_NEW_GAME :Generer nyt tilfældigt spil
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Hent højdekort
+STR_LOAD_HEIGHTMAP :{WHITE}Hent højdekort
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} i vejen
@@ -2142,10 +2143,10 @@
STR_6813_ECONOMY :{LTBLUE}Økonomi: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Tog vender: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katastrofer: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Byrådets holdning til ændring i landskabet: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Byrådets holdning til ændring i landskabet: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Ingen
+STR_NONE :Ingen
STR_NUM_VERY_LOW :Meget lav
STR_6816_LOW :Lav
STR_6817_NORMAL :Normal
@@ -2183,9 +2184,9 @@
STR_6836_OFF :Fra
STR_6837_ON :Til
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Vis higscoreliste
-STR_6839_PERMISSIVE :Passiv
-STR_683A_TOLERANT :Tolerant
-STR_683B_HOSTILE :Fjendtlig
+STR_PERMISSIVE :Passiv
+STR_TOLERANT :Tolerant
+STR_HOSTILE :Fjendtlig
##id 0x7000
STR_7000 :
@@ -2322,7 +2323,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan ikke sælge 25% aktier i dette selskab...
STR_707D_OWNED_BY :{WHITE}({COMMA}% ejes af {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} er blevet overtaget af {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Dette selskab sælger ikke aktier endnu...
+STR_PROTECTED :{WHITE}Dette selskab sælger ikke aktier endnu...
STR_LIVERY_DEFAULT :Standardfarver
STR_LIVERY_STEAM :Damplokomotiv
@@ -2335,6 +2336,8 @@
STR_LIVERY_PASSENGER_WAGON_STEAM :Passagervogn (damp)
STR_LIVERY_PASSENGER_WAGON_DIESEL :Passagervogn (diesel)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Passagervogn (elektrisk)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :Passagervogn (monorail)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :Passagervogn (magnetskinne)
STR_LIVERY_FREIGHT_WAGON :Godsvogn
STR_LIVERY_BUS :Bus
STR_LIVERY_TRUCK :Lastbil
@@ -2629,17 +2632,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Gå til {STATION}
-STR_8807_GO_TO_TRANSFER :Gå til {STATION} (Overfør og tag gods)
-STR_8808_GO_TO_UNLOAD :Gå til {STATION} (Aflæs)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Gå til {STATION} (Overfør og efterlad tom)
-STR_880A_GO_TO_LOAD :Gå til {STATION} (Fuld last)
-STR_880B_GO_TO_TRANSFER_LOAD :Gå til {STATION} (Overfør og vent på fuld last)
-STR_880C_GO_NON_STOP_TO :Gå uden stop til {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Gå uden stop til {STATION} (Overfør og tag gods)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Gå uden stop til {STATION} (Aflæs)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Gå uden stop til {STATION} (Overfør og efterlad tom)
-STR_8810_GO_NON_STOP_TO_LOAD :Gå uden stop til {STATION} (Fuld last)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Gå uden stop til {STATION} (Overfør og vent på fuld last)
+STR_GO_TO_TRANSFER :Gå til {STATION} (Overfør og tag gods)
+STR_8807_GO_TO_UNLOAD :Gå til {STATION} (Aflæs)
+STR_GO_TO_TRANSFER_UNLOAD :Gå til {STATION} (Overfør og efterlad tom)
+STR_8808_GO_TO_LOAD :Gå til {STATION} (Fuld last)
+STR_GO_TO_TRANSFER_LOAD :Gå til {STATION} (Overfør og vent på fuld last)
+STR_880A_GO_NON_STOP_TO :Gå uden stop til {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Gå uden stop til {STATION} (Overfør og tag gods)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Gå uden stop til {STATION} (Aflæs)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Gå uden stop til {STATION} (Overfør og efterlad tom)
+STR_880C_GO_NON_STOP_TO_LOAD :Gå uden stop til {STATION} (Fuld last)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Gå uden stop til {STATION} (Overfør og vent på fuld last)
STR_GO_TO_TRAIN_DEPOT :Gå til {TOWN} remise
STR_SERVICE_AT_TRAIN_DEPOT :Service i {TOWN} remise
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Gå uden stop til {TOWN} remise
@@ -2743,7 +2746,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Vis detaljer omkring den last der medbringes
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Vis detaljer omkring toget/vognene
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Vis kapaciteten af hver togvogn
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Vis total lasteevne på toget, fordelt på lasttyper
+STR_SHOW_TOTAL_CARGO :{BLACK}Vis total lasteevne på toget, fordelt på lasttyper
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Ordreliste - klik på en ordre for at markere den. CTRL-klik for at centrere skærmen over stationen
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Spring over nuværende ordre og start næste. CTRL + klik springer til den valgte ordre
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Slet den markerede ordre
@@ -2774,8 +2777,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan ikke vende retningen af toget...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Omdøb tog-/togvognstypen
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Kan ikke omdøbe tog-/togvognstypen...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den valgte ordre til at tvinge køretøjet til at smide lasten
-STR_886F_TRANSFER :{BLACK}Overfør
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den valgte ordre til at tvinge køretøjet til at smide lasten
+STR_TRANSFER :{BLACK}Overfør
STR_CLEAR_TIME :{BLACK}Nulstil tid
STR_RESET_LATENESS :{BLACK}Nulstil forsinkelse
@@ -2790,6 +2793,7 @@
STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ny {STRING} er nu tilgængelig! - {ENGINE}
STR_CAN_T_SELL_DESTROYED_VEHICLE :{WHITE}Kan ikke sælge ødelagt køretøj...
+STR_CAN_T_REFIT_DESTROYED_VEHICLE :{WHITE}Kan ikke ændre ødelagt køretøj...
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Kan ikke lave køreplan for transportmiddel...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Transportmidler kan kun vente ved stationer.
@@ -2852,8 +2856,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Giv køretøjet et navn
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første bus ankommer til {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første lastbil ankommer til {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første passager-sporvogn ankommer til {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første fragt-sporvogn ankommer til {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første passager-sporvogn ankommer til {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første fragt-sporvogn ankommer til {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Lastbil forulykket!{}Chauffør dør i flammerne efter sammenstød med tog
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Bus forulykket!{}{COMMA} dør i flammerne efter kollision med et tog
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Kan ikke få køretøjet til at vende...
@@ -2862,7 +2866,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Omdøb køretøjstypen
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Omdøb køretøjstypen
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Kan ikke omdøbe køretøjstypen...
-STR_9038_GO_TO_ROADVEH_DEPOT :Gå til {TOWN} værksted
+STR_GO_TO_ROADVEH_DEPOT :Gå til {TOWN} værksted
STR_SERVICE_AT_ROADVEH_DEPOT :Service i {TOWN} værksted
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Ombyg vejkøretøj til at laste en anden type last
@@ -3236,6 +3240,12 @@
STR_PURCHASE_INFO_ALL_BUT :Alle undtagen {GOLD}
STR_PURCHASE_INFO_MAX_TE :{BLACK}Maks. trækkraft: {GOLD}{FORCE}
+########### For showing numbers in widgets
+
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
########### String for New Landscape Generator
STR_GENERATE :{WHITE}Generer
--- a/src/lang/dutch.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/dutch.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Vlak land nodig
STR_0008_WAITING :{BLACK}Wachtend: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (onderweg uit
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} opweg van {STATION})
STR_000C_ACCEPTS :{BLACK}Accepteert: {WHITE}
STR_000D_ACCEPTS :{BLACK}Accepteert: {GOLD}
STR_000E :
@@ -274,9 +273,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Te veel namen in gebruik
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Deze naam is al in gebruik
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +286,11 @@
STR_013C_CARGO :{BLACK}Lading
STR_013D_INFORMATION :{BLACK}Informatie
STR_013E_CAPACITIES :{BLACK}Capaciteiten
-STR_013E_TOTAL_CARGO :{BLACK}Totale lading
+STR_TOTAL_CARGO :{BLACK}Totale lading
STR_013F_CAPACITY :{BLACK}Capaciteit: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capaciteit: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Totale lading (capaciteit) van deze trein:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Totale lading (capaciteit) van deze trein:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nieuw spel
STR_0141_LOAD_GAME :{BLACK}Laad spel
@@ -726,11 +725,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Plaats radiomast
STR_028F_DEFINE_DESERT_AREA :{BLACK}Definieer woestijn gebied.{}Gebruik CTRL om het te verwijderen
STR_CREATE_LAKE :{BLACK}Definiëer water gebied.{}Maak een kanaal, tenzij CTRL wordt vastgehouden op zee niveau, dan zal de omgeving overstromen
+STR_CREATE_RIVER :{BLACK}Maak rivier.
STR_0290_DELETE :{BLACK}Verwijder
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Verwijder deze hele stad
STR_0292_SAVE_SCENARIO :Scenario opslaan
STR_0293_LOAD_SCENARIO :Scenario openen
-STR_LOAD_HEIGHTMAP :Laad hoogtekaart
+STR_MENU_LOAD_HEIGHTMAP :Laad hoogtekaart
STR_0294_QUIT_EDITOR :Sluit editor
STR_0295 :
STR_0296_QUIT :Afsluiten
@@ -770,9 +770,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Spelopties
-STR_02C5_DIFFICULTY_SETTINGS :Moeilijkheidsgraad
-STR_02C7_CONFIG_PATCHES :Kies patches
+STR_02C4_GAME_OPTIONS :Spelopties
+STR_02C6_DIFFICULTY_SETTINGS :Moeilijkheidsgraad
+STR_MENU_CONFIG_PATCHES :Kies patches
STR_NEWGRF_SETTINGS :Newgrf instellingen
STR_TRANSPARENCY_OPTIONS :Doorzichtigheidsopties
STR_GAMEOPTMENU_0A :
@@ -872,8 +872,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Opslaan van spel is nog bezig,{}Wacht tot dit voltooid is!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Kies 'Ezy Street style music' programma
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engels (Origineel)
@@ -1648,42 +1648,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Moet weg eerst weghalen
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Er wordt aan de weg gewerkt
STR_1802_ROAD_CONSTRUCTION :{WHITE}Wegenbouw
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Bouw tramrails
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Bouw tramrails
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Kies brug
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... eenrichtingswegen kunnen geen kruisingen hebben
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Kan hier geen weg bouwen...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan geen tramrails bouwen hier...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan geen tramrails bouwen hier...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Kan hier geen weg weghalen...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan de tramrails hier niet verwijderen...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan de tramrails hier niet verwijderen...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Bouw wegvoertuigdepot
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Tram depot richting
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Tram depot richting
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Kan hier geen vrachtwagendepot bouwen...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan geen tram voertuig depot bouwen hier...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan geen tram voertuig depot bouwen hier...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Kan hier geen bushalte bouwen...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Kan hier geen laadstation bouwen...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan geen passagiers tram station bouwen...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan geen vracht tram station bouwen...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan geen passagiers tram station bouwen...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan geen vracht tram station bouwen...
STR_180A_ROAD_CONSTRUCTION :Wegenbouw
-STR_180A_TRAMWAY_CONSTRUCTION :Tramrails constructie
+STR_TRAMWAY_CONSTRUCTION :Tramrails constructie
STR_180B_BUILD_ROAD_SECTION :{BLACK}Bouw weg
STR_BUILD_AUTOROAD_TIP :{BLACK}Bouw weg met de Autoweg-methode
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Bouw tramrails onderdeel
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Bouw tramrails onderdeel
STR_BUILD_AUTOTRAM_TIP :{BLACK}Bouw tramrails met de Autotram-methode
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Bouw wegvoertuigdepot (om voertuigen te bouwen en te repareren)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Bouw tram voertuig depot (voor de bouw en onderhoud)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Bouw tram voertuig depot (voor de bouw en onderhoud)
STR_180D_BUILD_BUS_STATION :{BLACK}Bouw bushalte
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Bouw vrachtwagen laadhal
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Bouw passagiers tram station
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Bouw vracht tram station
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Bouw passagiers tram station
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Bouw vracht tram station
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Bouw brug voor wegvoertuigen
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Bouw tramrails brug
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Bouw tramrails brug
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Bouw wegtunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Bouw tramrails tunnel
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Bouw tramrails tunnel
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Activeer/Deactiveer eenrichtingsverkeer
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Schakel tussen bouwen en verwijderen voor wegbouw
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Schakelaar tussen bouwen/verwijderen van tramrails
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Schakelaar tussen bouwen/verwijderen van tramrails
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Selecteer richting van wegvoertuigdepot
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Selecteer tram voertuig depot richting
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Selecteer tram voertuig depot richting
STR_1814_ROAD :Weg
STR_1815_ROAD_WITH_STREETLIGHTS :Weg met straatlantaarns
STR_1816_TREE_LINED_ROAD :Weg met bomenrij
@@ -1826,8 +1826,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Voegt meer dan één bestaand (laad)station samen
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Teveel (laad)stations in de buurt van deze stad
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Teveel (laad)stations
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Te veel bushaltes
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Te veel vrachtwagenstations
+STR_TOO_MANY_BUS_STOPS :{WHITE}Te veel bushaltes
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Te veel vrachtwagenstations
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Te dicht bij een andere (laad)station
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Verwijder eerst treinstation
@@ -1858,12 +1858,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} accepteert voortaan {STRING} en {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Bouw bushalte
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Bouw Vrachtwagenstation
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passagiers tram richting
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Vracht tram richting
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passagiers tram richting
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Vracht tram richting
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Verwijder eerst bushalte
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Verwijder eerst vrachtwagenstation
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Verwijder eerst passagiers tram station
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Verwijder eerst vracht tram station
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Verwijder eerst passagiers tram station
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Verwijder eerst vracht tram station
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Stations
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Geen -
@@ -1875,8 +1875,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Selecteer lengte van station
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Selecteer richting van bushalte
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Selecteer richting van vrachtwagenstation
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Selecteer passagiers tram station richting
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Selecteer vracht tram station richting
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Selecteer passagiers tram station richting
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Selecteer vracht tram station richting
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centreer hoofdbeeld op locatie van station
STR_3054_SHOW_STATION_RATINGS :{BLACK}Bekijk stationsreputaties
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Hernoem station
@@ -1898,7 +1898,7 @@
STR_3069_BUOY :Boei
STR_306A_BUOY_IN_THE_WAY :{WHITE}...boei in de weg
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...station te verspreid
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...niet uniforme stations uit
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...niet uniforme stations uit
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Houd CTRL ingedrukt om meer items te kiezen
STR_UNDEFINED :(ongedefinieerde string)
@@ -1939,7 +1939,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Selecteer nieuw speltype
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Selecteer scenario (groen), vooraf ingesteld spel (blauw), or willekeurig nieuw spel
STR_4010_GENERATE_RANDOM_NEW_GAME :Genereer willekeurig nieuw spel
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Laad Hoogtekaart
+STR_LOAD_HEIGHTMAP :{WHITE}Laad Hoogtekaart
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} in de weg
@@ -2143,10 +2143,10 @@
STR_6813_ECONOMY :{LTBLUE}Economie: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Treinen draaien om: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Rampen: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Houding van gemeente mbt landschapsaanpassingen: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Houding van gemeente mbt landschapsaanpassingen: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Geen
+STR_NONE :Geen
STR_NUM_VERY_LOW :Erg laag
STR_6816_LOW :Laag
STR_6817_NORMAL :Normaal
@@ -2184,9 +2184,9 @@
STR_6836_OFF :Uit
STR_6837_ON :Aan
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Bekijk topscore lijst
-STR_6839_PERMISSIVE :Tolerant
-STR_683A_TOLERANT :Neutraal
-STR_683B_HOSTILE :Negatief
+STR_PERMISSIVE :Tolerant
+STR_TOLERANT :Neutraal
+STR_HOSTILE :Negatief
##id 0x7000
STR_7000 :
@@ -2323,7 +2323,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan geen 25% aandeel in dit bedrijf verkopen...
STR_707D_OWNED_BY :{WHITE}({COMMA}% eigendom van {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} is overgenomen door {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Dit bedrijf verhandelt nog geen aandelen...
+STR_PROTECTED :{WHITE}Dit bedrijf verhandelt nog geen aandelen...
STR_LIVERY_DEFAULT :Standaard Logo
STR_LIVERY_STEAM :Stoom Locomotief
@@ -2632,17 +2632,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Ga naar {STATION}
-STR_8807_GO_TO_TRANSFER :Ga naar {STATION} (Overladen en neem goederen)
-STR_8808_GO_TO_UNLOAD :Ga naar {STATION} (Uit laden)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Ga naar {STATION} (Overladen en leeg laten)
-STR_880A_GO_TO_LOAD :Ga naar {STATION} (Laden)
-STR_880B_GO_TO_TRANSFER_LOAD :Ga naar {STATION} (Overladen en wacht tot vol geladen)
-STR_880C_GO_NON_STOP_TO :Ga non-stop naar {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Ga non-stop naar {STATION} (Overladen en neem goederen)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Ga non-stop naar {STATION} (Uitladen)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ga non-stop naar {STATION} (Overladen en leeg laten)
-STR_8810_GO_NON_STOP_TO_LOAD :Ga non-stop naar {STATION} (Laden)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Ga non-stop naar {STATION} (Overladen en wacht tot vol geladen)
+STR_GO_TO_TRANSFER :Ga naar {STATION} (Overladen en neem goederen)
+STR_8807_GO_TO_UNLOAD :Ga naar {STATION} (Uit laden)
+STR_GO_TO_TRANSFER_UNLOAD :Ga naar {STATION} (Overladen en leeg laten)
+STR_8808_GO_TO_LOAD :Ga naar {STATION} (Laden)
+STR_GO_TO_TRANSFER_LOAD :Ga naar {STATION} (Overladen en wacht tot vol geladen)
+STR_880A_GO_NON_STOP_TO :Ga non-stop naar {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Ga non-stop naar {STATION} (Overladen en neem goederen)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Ga non-stop naar {STATION} (Uitladen)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ga non-stop naar {STATION} (Overladen en leeg laten)
+STR_880C_GO_NON_STOP_TO_LOAD :Ga non-stop naar {STATION} (Laden)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ga non-stop naar {STATION} (Overladen en wacht tot vol geladen)
STR_GO_TO_TRAIN_DEPOT :Ga naar {TOWN} Trein Depot
STR_SERVICE_AT_TRAIN_DEPOT :Reparatie in {TOWN} treindepot
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ga zonder tussenstop naar {TOWN} Treindepot
@@ -2746,7 +2746,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Laat details zien van vervoerde goederen
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Laat details zien van treinvoertuigen
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Laat de mogelijkheden van elk voertuig zien
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Laat totale capaciteit van trein zien, gescheiden door goederentype
+STR_SHOW_TOTAL_CARGO :{BLACK}Laat totale capaciteit van trein zien, gescheiden door goederentype
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Orderlijst - klik op een order om deze te selecteren. CTRL + klikken gaat naar het station
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Sla huidige order over, en begin met de volgende. CTRL + klik, begin direct met geselecteerde order
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Verwijder de geselecteerde order
@@ -2777,8 +2777,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan de richting van de trein niet omdraaien...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Hernoem trein voertuig type
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Kan het trein voertuig type niet hernoemen...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Forceer het voertuig goederen te dumpen bij geselecteerde order
-STR_886F_TRANSFER :{BLACK}Overladen
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Forceer het voertuig goederen te dumpen bij geselecteerde order
+STR_TRANSFER :{BLACK}Overladen
STR_CLEAR_TIME :{BLACK}Reset de tijd
STR_RESET_LATENESS :{BLACK}Reset teller
@@ -2856,8 +2856,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Benoem wegvoertuig
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Inwoners feesten...{}Eerste bus arriveert in {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Inwoners feesten...{}Eerste vrachtwagen arriveert in {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Inwoners feesten . . .{}Eerste passagiers tram arriveert in {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Inwoners feesten . . .{}Eerste vracht tram arriveert in {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Inwoners feesten . . .{}Eerste passagiers tram arriveert in {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Inwoners feesten . . .{}Eerste vracht tram arriveert in {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}Bestuurder verongelukt door treinbotsing
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}{COMMA} verongelukt door treinbotsing
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Kan voertuig niet omdraaien...
@@ -2866,7 +2866,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Hernoem wegvoertuigtype
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Hernoem wegvoertuigtype
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Kan wegvoertuigtype niet hernoemen...
-STR_9038_GO_TO_ROADVEH_DEPOT :Ga naar {TOWN} Wegvoertuig Depot
+STR_GO_TO_ROADVEH_DEPOT :Ga naar {TOWN} Wegvoertuig Depot
STR_SERVICE_AT_ROADVEH_DEPOT :Repareren in {TOWN} wagendepot
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Verbouw het wegvoertuig om een andere lading the vervoeren
@@ -3242,6 +3242,9 @@
########### For showing numbers in widgets
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
########### String for New Landscape Generator
--- a/src/lang/english.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/english.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Flat land required
STR_0008_WAITING :{BLACK}Waiting: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (en-route from
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} en-route from {STATION})
STR_000C_ACCEPTS :{BLACK}Accepts: {WHITE}
STR_000D_ACCEPTS :{BLACK}Accepts: {GOLD}
STR_000E :
@@ -168,7 +167,7 @@
STR_00C7_QUIT :{WHITE}Quit
STR_00C8_YES :{BLACK}Yes
STR_00C9_NO :{BLACK}No
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Are you sure you want to abandon this game and return to {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}?
STR_00CB_1 :{BLACK}1
STR_00CC_2 :{BLACK}2
STR_00CD_3 :{BLACK}3
@@ -274,9 +273,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Too many names defined
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Chosen name already in use
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +286,11 @@
STR_013C_CARGO :{BLACK}Cargo
STR_013D_INFORMATION :{BLACK}Information
STR_013E_CAPACITIES :{BLACK}Capacities
-STR_013E_TOTAL_CARGO :{BLACK}Total Cargo
+STR_TOTAL_CARGO :{BLACK}Total Cargo
STR_013F_CAPACITY :{BLACK}Capacity: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capacity: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Total cargo capacity of this train:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Total cargo capacity of this train:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}New Game
STR_0141_LOAD_GAME :{BLACK}Load Game
@@ -731,7 +730,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Delete this town completely
STR_0292_SAVE_SCENARIO :Save scenario
STR_0293_LOAD_SCENARIO :Load scenario
-STR_LOAD_HEIGHTMAP :Load heightmap
+STR_MENU_LOAD_HEIGHTMAP :Load heightmap
STR_0294_QUIT_EDITOR :Quit editor
STR_0295 :
STR_0296_QUIT :Quit
@@ -771,9 +770,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Game options
-STR_02C5_DIFFICULTY_SETTINGS :Difficulty settings
-STR_02C7_CONFIG_PATCHES :Configure patches
+STR_02C4_GAME_OPTIONS :Game options
+STR_02C6_DIFFICULTY_SETTINGS :Difficulty settings
+STR_MENU_CONFIG_PATCHES :Configure patches
STR_NEWGRF_SETTINGS :NewGRF settings
STR_TRANSPARENCY_OPTIONS :Transparency options
STR_GAMEOPTMENU_0A :
@@ -873,8 +872,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Saving still in progress,{}please wait until it is finished!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Select 'Ezy Street style music' programme
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :English (Original)
@@ -1069,7 +1068,7 @@
STR_CONFIG_PATCHES_AUTORENEW_MONEY :{LTBLUE}Autorenew minimum needed money for renew: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_ERRMSG_DURATION :{LTBLUE}Duration of error message: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_POPULATION_IN_LABEL :{LTBLUE}Show town population in the town name label: {ORANGE}{STRING1}
-STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Invisible trees (with transparent buildings): {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Invisible trees: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_LAND_GENERATOR :{LTBLUE}Land generator: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL :Original
@@ -1649,42 +1648,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Must remove road first
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Road works in progress
STR_1802_ROAD_CONSTRUCTION :{WHITE}Road Construction
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Tramway Construction
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Tramway Construction
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Select Road Bridge
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... one way roads can't have junctions
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Can't build road here...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Can't build tramway here...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Can't build tramway here...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Can't remove road from here...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Can't remove tramway from here...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Can't remove tramway from here...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Road Depot Orientation
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Tram Depot Orientation
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Tram Depot Orientation
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Can't build road vehicle depot here...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Can't build tram vehicle depot here...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Can't build tram vehicle depot here...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Can't build bus station...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Can't build lorry station...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Can't build passenger tram station...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Can't build freight tram station...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Can't build passenger tram station...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Can't build freight tram station...
STR_180A_ROAD_CONSTRUCTION :Road construction
-STR_180A_TRAMWAY_CONSTRUCTION :Tramway construction
+STR_TRAMWAY_CONSTRUCTION :Tramway construction
STR_180B_BUILD_ROAD_SECTION :{BLACK}Build road section
STR_BUILD_AUTOROAD_TIP :{BLACK}Build road section using the Autoroad mode
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Build tramway section
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Build tramway section
STR_BUILD_AUTOTRAM_TIP :{BLACK}Build tramway section using the Autotram mode
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Build road vehicle depot (for building and servicing vehicles)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Build tram vehicle depot (for building and servicing vehicles)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Build tram vehicle depot (for building and servicing vehicles)
STR_180D_BUILD_BUS_STATION :{BLACK}Build bus station
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Build lorry loading bay
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Build passenger tram station
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Build freight tram station
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Build passenger tram station
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Build freight tram station
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Build road bridge
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Build tramway bridge
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Build tramway bridge
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Build road tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Build tramway tunnel
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Build tramway tunnel
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Activate/Deactivate one way roads
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Toggle build/remove for road construction
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Toggle build/remove for tramway construction
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Toggle build/remove for tramway construction
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Select road vehicle depot orientation
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Select tram vehicle depot orientation
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Select tram vehicle depot orientation
STR_1814_ROAD :Road
STR_1815_ROAD_WITH_STREETLIGHTS :Road with streetlights
STR_1816_TREE_LINED_ROAD :Tree-lined road
@@ -1827,8 +1826,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Adjoins more than one existing station/loading area
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Too many stations/loading areas in this town
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Too many stations/loading areas
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Too many bus stops
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Too many lorry stations
+STR_TOO_MANY_BUS_STOPS :{WHITE}Too many bus stops
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Too many lorry stations
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Too close to another station/loading area
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Must demolish railway station first
@@ -1859,12 +1858,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} now accepts {STRING} and {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Bus Station Orientation
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Lorry Station Orientation
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passenger Tram Orientation
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Freight Tram Orientation
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passenger Tram Orientation
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Freight Tram Orientation
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Must demolish bus station first
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Must demolish lorry station first
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Must demolish passenger tram station first
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Must demolish freight tram station first
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Must demolish passenger tram station first
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Must demolish freight tram station first
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Station{P "" s}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- None -
@@ -1876,8 +1875,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Select length of railway station
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Select bus station orientation
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Select lorry loading bay orientation
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Select passenger tram station orientation
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Select freight tram station orientation
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Select passenger tram station orientation
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Select freight tram station orientation
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centre main view on station location
STR_3054_SHOW_STATION_RATINGS :{BLACK}Show station ratings
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Change name of station
@@ -1899,7 +1898,7 @@
STR_3069_BUOY :Buoy
STR_306A_BUOY_IN_THE_WAY :{WHITE}...buoy in the way
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...station too spread out
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...nonuniform stations disabled
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...nonuniform stations disabled
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Hold down CTRL to select more than one item
STR_UNDEFINED :(undefined string)
@@ -1940,7 +1939,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Select New Game Type
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Select scenario (green), pre-set game (blue), or random new game
STR_4010_GENERATE_RANDOM_NEW_GAME :Generate random new game
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Load Heightmap
+STR_LOAD_HEIGHTMAP :{WHITE}Load Heightmap
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} in the way
@@ -2144,10 +2143,10 @@
STR_6813_ECONOMY :{LTBLUE}Economy: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Train reversing: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Disasters: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}City council's attitude towards area restructuring: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}City council's attitude towards area restructuring: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :None
+STR_NONE :None
STR_NUM_VERY_LOW :Very low
STR_6816_LOW :Low
STR_6817_NORMAL :Normal
@@ -2185,9 +2184,9 @@
STR_6836_OFF :Off
STR_6837_ON :On
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Show hi-score chart
-STR_6839_PERMISSIVE :Permissive
-STR_683A_TOLERANT :Tolerant
-STR_683B_HOSTILE :Hostile
+STR_PERMISSIVE :Permissive
+STR_TOLERANT :Tolerant
+STR_HOSTILE :Hostile
##id 0x7000
STR_7000 :
@@ -2324,7 +2323,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Can't sell 25% share in this company...
STR_707D_OWNED_BY :{WHITE}({COMMA}% owned by {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}!
-STR_7080_PROTECTED :{WHITE}This company is not old enough to trade shares yet...
+STR_PROTECTED :{WHITE}This company is not old enough to trade shares yet...
STR_LIVERY_DEFAULT :Standard Livery
STR_LIVERY_STEAM :Steam Engine
@@ -2633,17 +2632,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING1} {STRING1}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1} {STRING1}
STR_8806_GO_TO :Go to {STATION}
-STR_8807_GO_TO_TRANSFER :Go to {STATION} (Transfer and take cargo)
-STR_8808_GO_TO_UNLOAD :Go to {STATION} (Unload)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transfer and leave empty)
-STR_880A_GO_TO_LOAD :Go to {STATION} (Load)
-STR_880B_GO_TO_TRANSFER_LOAD :Go to {STATION} (Transfer and wait for full load)
-STR_880C_GO_NON_STOP_TO :Go non-stop to {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Go non-stop to {STATION} (Transfer and take cargo)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Go non-stop to {STATION} (Unload)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Go non-stop to {STATION} (Transfer and leave empty)
-STR_8810_GO_NON_STOP_TO_LOAD :Go non-stop to {STATION} (Load)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Go non-stop to {STATION} (Transfer and wait for full load)
+STR_GO_TO_TRANSFER :Go to {STATION} (Transfer and take cargo)
+STR_8807_GO_TO_UNLOAD :Go to {STATION} (Unload)
+STR_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transfer and leave empty)
+STR_8808_GO_TO_LOAD :Go to {STATION} (Load)
+STR_GO_TO_TRANSFER_LOAD :Go to {STATION} (Transfer and wait for full load)
+STR_880A_GO_NON_STOP_TO :Go non-stop to {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Go non-stop to {STATION} (Transfer and take cargo)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Go non-stop to {STATION} (Unload)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Go non-stop to {STATION} (Transfer and leave empty)
+STR_880C_GO_NON_STOP_TO_LOAD :Go non-stop to {STATION} (Load)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Go non-stop to {STATION} (Transfer and wait for full load)
STR_GO_TO_TRAIN_DEPOT :Go to {TOWN} Train Depot
STR_SERVICE_AT_TRAIN_DEPOT :Service at {TOWN} Train Depot
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Go non-stop to {TOWN} Train Depot
@@ -2747,7 +2746,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Show details of cargo carried
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Show details of train vehicles
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Show capacities of each vehicle
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Show total capacity of train, split by cargo type
+STR_SHOW_TOTAL_CARGO :{BLACK}Show total capacity of train, split by cargo type
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Orders list - click on an order to highlight it. CTRL + click scrolls to the station
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Skip the current order, and start the next. CTRL + click skips to the selected order
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Delete the highlighted order
@@ -2778,8 +2777,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Can't reverse direction of train...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Rename train vehicle type
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Can't rename train vehicle type...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to dump cargo
-STR_886F_TRANSFER :{BLACK}Transfer
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to dump cargo
+STR_TRANSFER :{BLACK}Transfer
STR_CLEAR_TIME :{BLACK}Clear Time
STR_RESET_LATENESS :{BLACK}Reset Late Counter
@@ -2857,8 +2856,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Name road vehicle
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First bus arrives at {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First truck arrives at {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First passenger tram arrives at {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight tram arrives at {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First passenger tram arrives at {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight tram arrives at {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Can't make vehicle turn around...
@@ -2867,7 +2866,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Rename road vehicle type
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Rename road vehicle type
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Can't rename road vehicle type...
-STR_9038_GO_TO_ROADVEH_DEPOT :Go to {TOWN} Road Vehicle Depot
+STR_GO_TO_ROADVEH_DEPOT :Go to {TOWN} Road Vehicle Depot
STR_SERVICE_AT_ROADVEH_DEPOT :Service at {TOWN} Road Vehicle Depot
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Refit road vehicle to carry a different cargo type
--- a/src/lang/english_US.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/english_US.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Flat land required
STR_0008_WAITING :{BLACK}Waiting: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (en-route from
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Accepts: {WHITE}
STR_000D_ACCEPTS :{BLACK}Accepts: {GOLD}
STR_000E :
@@ -168,7 +166,7 @@
STR_00C7_QUIT :{WHITE}Quit
STR_00C8_YES :{BLACK}Yes
STR_00C9_NO :{BLACK}No
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Are you sure you want to abandon this game and return to {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Are you sure you want to quit OpenTTD and return to {STRING}?
STR_00CB_1 :{BLACK}1
STR_00CC_2 :{BLACK}2
STR_00CD_3 :{BLACK}3
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Too many names defined
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Chosen name already in use
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}Cargo
STR_013D_INFORMATION :{BLACK}Information
STR_013E_CAPACITIES :{BLACK}Capacities
-STR_013E_TOTAL_CARGO :{BLACK}Total Cargo
+STR_TOTAL_CARGO :{BLACK}Total Cargo
STR_013F_CAPACITY :{BLACK}Capacity: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capacity: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Total cargo (capacity) of this train:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Total cargo (capacity) of this train:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}New Game
STR_0141_LOAD_GAME :{BLACK}Load Game
@@ -730,7 +728,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Delete this town completely
STR_0292_SAVE_SCENARIO :Save scenario
STR_0293_LOAD_SCENARIO :Load scenario
-STR_LOAD_HEIGHTMAP :Load heightmap
+STR_MENU_LOAD_HEIGHTMAP :Load heightmap
STR_0294_QUIT_EDITOR :Quit editor
STR_0295 :
STR_0296_QUIT :Quit
@@ -770,9 +768,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Game options
-STR_02C5_DIFFICULTY_SETTINGS :Difficulty settings
-STR_02C7_CONFIG_PATCHES :Configure patches
+STR_02C4_GAME_OPTIONS :Game options
+STR_02C6_DIFFICULTY_SETTINGS :Difficulty settings
+STR_MENU_CONFIG_PATCHES :Configure patches
STR_NEWGRF_SETTINGS :Newgrf settings
STR_TRANSPARENCY_OPTIONS :Transparency options
STR_GAMEOPTMENU_0A :
@@ -872,8 +870,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Saving still in progress,{}please wait until it is finished!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Select 'Ezy Street style music' program
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :English (Original)
@@ -1647,42 +1645,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Must remove road first
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Road works in progress
STR_1802_ROAD_CONSTRUCTION :{WHITE}Road Construction
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Tramway Construction
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Tramway Construction
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Select Road Bridge
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... one way roads can't have junctions
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Can't build road here...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Can't build tramway here...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Can't build tramway here...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Can't remove road from here...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Can't remove tramway from here...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Can't remove tramway from here...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Road Depot Orientation
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Tram Depot Orientation
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Tram Depot Orientation
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Can't build road vehicle depot here...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Can't build tram vehicle depot here...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Can't build tram vehicle depot here...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Can't build bus station...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Can't build truck station...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Can't build passenger tram station...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Can't build freight tram station...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Can't build passenger tram station...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Can't build freight tram station...
STR_180A_ROAD_CONSTRUCTION :Road construction
-STR_180A_TRAMWAY_CONSTRUCTION :Tramway construction
+STR_TRAMWAY_CONSTRUCTION :Tramway construction
STR_180B_BUILD_ROAD_SECTION :{BLACK}Build road section
STR_BUILD_AUTOROAD_TIP :{BLACK}Build road section using the Autoroad mode
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Build tramway section
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Build tramway section
STR_BUILD_AUTOTRAM_TIP :{BLACK}Build tramway section using the Autotram mode
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Build road vehicle depot (for building and servicing vehicles)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Build tram vehicle depot (for building and servicing trams)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Build tram vehicle depot (for building and servicing trams)
STR_180D_BUILD_BUS_STATION :{BLACK}Build bus station
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Build truck loading bay
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Build passenger tram station
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Build freight tram station
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Build passenger tram station
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Build freight tram station
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Build road bridge
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Build tramway bridge
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Build tramway bridge
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Build road tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Build tramway tunnel
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Build tramway tunnel
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Activate/Deactivate one way roads
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Toggle build/remove for road construction
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Toggle build/remove for tramway construction
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Toggle build/remove for tramway construction
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Select road vehicle depot orientation
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Select tram vehicle depot orientation
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Select tram vehicle depot orientation
STR_1814_ROAD :Road
STR_1815_ROAD_WITH_STREETLIGHTS :Road with streetlights
STR_1816_TREE_LINED_ROAD :Tree-lined road
@@ -1825,8 +1823,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Adjoins more than one existing station/loading area
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Too many stations/loading areas in this town
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Too many stations/loading areas
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Too many bus stops
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Too many truck stations
+STR_TOO_MANY_BUS_STOPS :{WHITE}Too many bus stops
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Too many truck stations
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Too close to another station/loading area
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Must demolish railroad station first
@@ -1857,12 +1855,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} now accepts {STRING} and {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Bus Station Orientation
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Truck Station Orient.
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passenger Tram Orientation
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Freight Tram Orientation
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passenger Tram Orientation
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Freight Tram Orientation
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Must demolish bus station first
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Must demolish truck station first
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Must demolish passenger tram station first
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Must demolish freight tram station first
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Must demolish passenger tram station first
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Must demolish freight tram station first
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Station{P "" s}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- None -
@@ -1874,8 +1872,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Select length of railroad station
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Select bus station orientation
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Select truck loading bay orientation
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Select passenger tram station orientation
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Select freight tram station orientation
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Select passenger tram station orientation
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Select freight tram station orientation
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Center main view on station location
STR_3054_SHOW_STATION_RATINGS :{BLACK}Show station ratings
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Change name of station
@@ -1897,7 +1895,7 @@
STR_3069_BUOY :Buoy
STR_306A_BUOY_IN_THE_WAY :{WHITE}...buoy in the way
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...station too spread out
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...nonuniform stations disabled
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...nonuniform stations disabled
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Hold down CTRL to select more than one item
STR_UNDEFINED :(undefined string)
@@ -1938,7 +1936,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Select New Game Type
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Select scenario (green), pre-set game (blue), or random new game
STR_4010_GENERATE_RANDOM_NEW_GAME :Generate random new game
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Load Heightmap
+STR_LOAD_HEIGHTMAP :{WHITE}Load Heightmap
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} in the way
@@ -2142,10 +2140,10 @@
STR_6813_ECONOMY :{LTBLUE}Economy: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Train reversing: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Disasters: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}City council's attitude towards area restructuring: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}City council's attitude towards area restructuring: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :None
+STR_NONE :None
STR_NUM_VERY_LOW :Very low
STR_6816_LOW :Low
STR_6817_NORMAL :Normal
@@ -2183,9 +2181,9 @@
STR_6836_OFF :Off
STR_6837_ON :On
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Show hi-score chart
-STR_6839_PERMISSIVE :Permissive
-STR_683A_TOLERANT :Tolerant
-STR_683B_HOSTILE :Hostile
+STR_PERMISSIVE :Permissive
+STR_TOLERANT :Tolerant
+STR_HOSTILE :Hostile
##id 0x7000
STR_7000 :
@@ -2322,7 +2320,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Can't sell 25% share in this company...
STR_707D_OWNED_BY :{WHITE}({COMMA}% owned by {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}!
-STR_7080_PROTECTED :{WHITE}This company is not old enough to trade shares yet...
+STR_PROTECTED :{WHITE}This company is not old enough to trade shares yet...
STR_LIVERY_DEFAULT :Standard Livery
STR_LIVERY_STEAM :Steam Engine
@@ -2629,17 +2627,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Go to {STATION}
-STR_8807_GO_TO_TRANSFER :Go to {STATION} (Transfer and take cargo)
-STR_8808_GO_TO_UNLOAD :Go to {STATION} (Unload)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transfer and leave empty)
-STR_880A_GO_TO_LOAD :Go to {STATION} (Load)
-STR_880B_GO_TO_TRANSFER_LOAD :Go to {STATION} (Transfer and wait for full load)
-STR_880C_GO_NON_STOP_TO :Go non-stop to {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Go non-stop to {STATION} (Transfer and take cargo)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Go non-stop to {STATION} (Unload)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Go non-stop to {STATION} (Transfer and leave empty)
-STR_8810_GO_NON_STOP_TO_LOAD :Go non-stop to {STATION} (Load)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Go non-stop to {STATION} (Transfer and wait for full load)
+STR_GO_TO_TRANSFER :Go to {STATION} (Transfer and take cargo)
+STR_8807_GO_TO_UNLOAD :Go to {STATION} (Unload)
+STR_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transfer and leave empty)
+STR_8808_GO_TO_LOAD :Go to {STATION} (Load)
+STR_GO_TO_TRANSFER_LOAD :Go to {STATION} (Transfer and wait for full load)
+STR_880A_GO_NON_STOP_TO :Go non-stop to {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Go non-stop to {STATION} (Transfer and take cargo)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Go non-stop to {STATION} (Unload)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Go non-stop to {STATION} (Transfer and leave empty)
+STR_880C_GO_NON_STOP_TO_LOAD :Go non-stop to {STATION} (Load)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Go non-stop to {STATION} (Transfer and wait for full load)
STR_GO_TO_TRAIN_DEPOT :Go to {TOWN} Train Depot
STR_SERVICE_AT_TRAIN_DEPOT :Service at {TOWN} Train Depot
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Go non-stop to {TOWN} Train Depot
@@ -2743,7 +2741,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Show details of cargo carried
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Show details of train vehicles
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Show capacities of each vehicle
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Show total capacity of train, split by cargo type
+STR_SHOW_TOTAL_CARGO :{BLACK}Show total capacity of train, split by cargo type
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Orders list - click on order to highlight it
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Skip the current order, and start the next. CTRL + click skips to the selected order)
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Delete the highlighted order
@@ -2774,8 +2772,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Can't reverse direction of train...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Rename train vehicle type
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Can't rename train vehicle type...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to dump cargo
-STR_886F_TRANSFER :{BLACK}Transfer
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to dump cargo
+STR_TRANSFER :{BLACK}Transfer
STR_CLEAR_TIME :{BLACK}Clear Time
STR_RESET_LATENESS :{BLACK}Reset Late Counter
@@ -2852,8 +2850,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Name road vehicle
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First bus arrives at {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First truck arrives at {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First passenger tram arrives at {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight tram arrives at {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First passenger tram arrives at {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight tram arrives at {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Can't make vehicle turn around...
@@ -2862,7 +2860,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Rename road vehicle type
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Rename road vehicle type
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Can't rename road vehicle type...
-STR_9038_GO_TO_ROADVEH_DEPOT :Go to {TOWN} Road Vehicle Depot
+STR_GO_TO_ROADVEH_DEPOT :Go to {TOWN} Road Vehicle Depot
STR_SERVICE_AT_ROADVEH_DEPOT :Service at {TOWN} Road Vehicle Depot
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Refit road vehicle to carry a different cargo type
--- a/src/lang/esperanto.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/esperanto.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Necesas ebena lando
STR_0008_WAITING :{BLACK}Atendas: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (survoje de
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Akceptiĝas: {WHITE}
STR_000D_ACCEPTS :{BLACK}Akceptiĝas: {GOLD}
STR_000E :
@@ -275,9 +273,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Tro da nomoj difinitaj
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}La elektita nomo jam uziĝas
-STR_0133_WINDOWS :Vindozo
-STR_0134_UNIX :Unikso
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Vindozo
+STR_OSNAME_UNIX :Unikso
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -288,11 +286,11 @@
STR_013C_CARGO :{BLACK}Ŝarĝo
STR_013D_INFORMATION :{BLACK}Informoj
STR_013E_CAPACITIES :{BLACK}Kapabloj
-STR_013E_TOTAL_CARGO :{BLACK}Tuta Ŝarĝo
+STR_TOTAL_CARGO :{BLACK}Tuta Ŝarĝo
STR_013F_CAPACITY :{BLACK}Enhavkapablo: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapablo: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Tuta ŝarĝkapablo de ĉi tiu trajno:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Tuta ŝarĝkapablo de ĉi tiu trajno:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nova Ludo
STR_0141_LOAD_GAME :{BLACK}Ŝarĝu ludon
@@ -728,7 +726,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Plene forigu ĉi tiun urbon
STR_0292_SAVE_SCENARIO :Konservu scenaron
STR_0293_LOAD_SCENARIO :Ŝarĝu scenaron
-STR_LOAD_HEIGHTMAP :Ŝarĝu altecmapon
+STR_MENU_LOAD_HEIGHTMAP :Ŝarĝu altecmapon
STR_0294_QUIT_EDITOR :Fermu kreilon
STR_0295 :
STR_0296_QUIT :Fermu
@@ -768,9 +766,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Ludaj opcioj
-STR_02C5_DIFFICULTY_SETTINGS :Malfacilec-agordoj
-STR_02C7_CONFIG_PATCHES :Agordu flikojn
+STR_02C4_GAME_OPTIONS :Ludaj opcioj
+STR_02C6_DIFFICULTY_SETTINGS :Malfacilec-agordoj
+STR_MENU_CONFIG_PATCHES :Agordu flikojn
STR_NEWGRF_SETTINGS :Agordoj de NewGRF
STR_GAMEOPTMENU_0A :
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Urbonomoj montriĝas
@@ -869,8 +867,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Ankoraŭ konservas,{}bv atendi ĝis finiĝo!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Elektu programon de 'Facilvoja muziko'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Angle (Origine)
@@ -1725,8 +1723,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Alligas pli ol unu ekzistantan stacion/ŝarĝejon
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Tro da stacioj/ŝarĝejoj en la urbo
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Tro da stacioj/ŝarĝejoj
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Tro da bushaltejoj
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Tro da ŝarĝaŭtaj stacioj
+STR_TOO_MANY_BUS_STOPS :{WHITE}Tro da bushaltejoj
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Tro da ŝarĝaŭtaj stacioj
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Tro proksime al alia stacioj/ŝarĝejoj
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Antaŭe forigu stacidomon
@@ -1791,7 +1789,7 @@
STR_3069_BUOY :Buo
STR_306A_BUOY_IN_THE_WAY :{WHITE}...buo okupas la lokon
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...stacio tro vastas
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...nekonformaj stacioj neebligitaj
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...nekonformaj stacioj neebligitaj
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Tenu la CTRL-klavon por elekti pliajn erojn
STR_UNDEFINED :(nedifinita tekstero)
@@ -1826,7 +1824,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Elektu Novan Ludtipon
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Elektu scenaron (green), antaŭ-agorditan ludon (blue), aŭ hazardan novan ludon
STR_4010_GENERATE_RANDOM_NEW_GAME :Generu hazardan novan ludon
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Ŝarĝu Altecmapon
+STR_LOAD_HEIGHTMAP :{WHITE}Ŝarĝu Altecmapon
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} okupas la lokon
@@ -2021,10 +2019,10 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomio: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Trajna inversigo: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katastrofoj: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Urbestrara teniĝo al regiona strukturŝanĝiĝo: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Urbestrara teniĝo al regiona strukturŝanĝiĝo: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Neniu
+STR_NONE :Neniu
STR_NUM_VERY_LOW :Tre malalte
STR_6816_LOW :Malalte
STR_6817_NORMAL :Normale
@@ -2062,9 +2060,9 @@
STR_6836_OFF :Malaktiva
STR_6837_ON :Aktiva
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Montru plej bonajn ludantojn
-STR_6839_PERMISSIVE :Permeseme
-STR_683A_TOLERANT :Tolerante
-STR_683B_HOSTILE :Gastige
+STR_PERMISSIVE :Permeseme
+STR_TOLERANT :Tolerante
+STR_HOSTILE :Gastige
##id 0x7000
STR_7000 :
@@ -2196,7 +2194,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Ne povas vendi 25%-an dividaĵon...
STR_707D_OWNED_BY :{WHITE}({COMMA}% posedataj de {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} estas transprenita de {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Ĉi tiu kompanio ne sufiĉe aĝas por jam komerci dividaĵojn...
+STR_PROTECTED :{WHITE}Ĉi tiu kompanio ne sufiĉe aĝas por jam komerci dividaĵojn...
STR_LIVERY_DEFAULT :Normala Koloro
STR_LIVERY_STEAM :Vapormaŝino
@@ -2501,17 +2499,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Iru al {STATION}
-STR_8807_GO_TO_TRANSFER :Iru al {STATION} (Transigu kaj prenu ŝarĝon)
-STR_8808_GO_TO_UNLOAD :Iru al {STATION} (Deŝarĝu)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Iru al {STATION} (Transigu kaj lasu malplena)
-STR_880A_GO_TO_LOAD :Iru al {STATION} (Ŝarĝu)
-STR_880B_GO_TO_TRANSFER_LOAD :Iru al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo)
-STR_880C_GO_NON_STOP_TO :Iru senhalte al {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Iru senhalte al {STATION} (Transigu kaj prenu ŝarĝon)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Iru senhalte al {STATION} (Deŝarĝu)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Iru senhalte al {STATION} (Transigu kaj lasu malplena)
-STR_8810_GO_NON_STOP_TO_LOAD :Iru senhalte al {STATION} (Ŝarĝu)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Iru senhalte al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo)
+STR_GO_TO_TRANSFER :Iru al {STATION} (Transigu kaj prenu ŝarĝon)
+STR_8807_GO_TO_UNLOAD :Iru al {STATION} (Deŝarĝu)
+STR_GO_TO_TRANSFER_UNLOAD :Iru al {STATION} (Transigu kaj lasu malplena)
+STR_8808_GO_TO_LOAD :Iru al {STATION} (Ŝarĝu)
+STR_GO_TO_TRANSFER_LOAD :Iru al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo)
+STR_880A_GO_NON_STOP_TO :Iru senhalte al {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Iru senhalte al {STATION} (Transigu kaj prenu ŝarĝon)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Iru senhalte al {STATION} (Deŝarĝu)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Iru senhalte al {STATION} (Transigu kaj lasu malplena)
+STR_880C_GO_NON_STOP_TO_LOAD :Iru senhalte al {STATION} (Ŝarĝu)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Iru senhalte al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo)
STR_GO_TO_TRAIN_DEPOT :Iru al {TOWN} Trajndeponejo
STR_SERVICE_AT_TRAIN_DEPOT :Prizorgo ĉe {TOWN} Trajndeponejo
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Iru senhalte al {TOWN} Trajndeponejo
@@ -2603,7 +2601,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Montru detalojn de portata ŝarĝo
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Montru detalojn de trajnaj veturiloj
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Montru kapablojn de ĉiu veturilo
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Montru tutan kapablon de trajno, dividite laŭ ŝarĝtipo
+STR_SHOW_TOTAL_CARGO :{BLACK}Montru tutan kapablon de trajno, dividite laŭ ŝarĝtipo
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Ordena listo - alklaku ordenon por elekti. CTRL + klako skrolas al la stacio
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Forviŝu la elektitan ordenon
STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Senhaltigu elektitan ordenon
@@ -2629,8 +2627,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Ne povas inversigi direkton de trajno...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renomu trajnan veturiltipon
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Ne povas renomi trajnan veturiltipon...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}La elektita ordeno igu la veturilon demeti la ŝarĝon
-STR_886F_TRANSFER :{BLACK}Transigu
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}La elektita ordeno igu la veturilon demeti la ŝarĝon
+STR_TRANSFER :{BLACK}Transigu
STR_TRAIN_STOPPING :{RED}Haltiĝas
STR_TRAIN_STOPPING_VEL :{RED}Haltiĝas, {VELOCITY}
@@ -2697,7 +2695,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Renomu vojveturilan tipon
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Renomu vojveturilan tipon
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Ne povas renomi vojveturilan tipon...
-STR_9038_GO_TO_ROADVEH_DEPOT :Iru al {TOWN} Vojveturila Deponejo
+STR_GO_TO_ROADVEH_DEPOT :Iru al {TOWN} Vojveturila Deponejo
STR_SERVICE_AT_ROADVEH_DEPOT :Prizorgo ĉe {TOWN} Vojveturila Deponejo
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Transformu vojveturilon por porti alian ŝarĝon
--- a/src/lang/estonian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/estonian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Maapind peab olema tasane
STR_0008_WAITING :{BLACK}Ootel: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (tulnud jaamast
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} teel jaamast {STATION})
STR_000C_ACCEPTS :{BLACK}Võtab vastu: {WHITE}
STR_000D_ACCEPTS :{BLACK}Võtab vastu: {GOLD}
STR_000E :
@@ -374,9 +373,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Liiga palju määratletud nimesid
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Valitud nimi on juba kasutusel
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -387,11 +386,11 @@
STR_013C_CARGO :{BLACK}Laadung
STR_013D_INFORMATION :{BLACK}Andmed
STR_013E_CAPACITIES :{BLACK}Kandevõimed
-STR_013E_TOTAL_CARGO :{BLACK}Laadungit kokku
+STR_TOTAL_CARGO :{BLACK}Laadungit kokku
STR_013F_CAPACITY :{BLACK}Kandevõime: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kandevõime: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Selle rongi kandevõime:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Selle rongi kandevõime:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Uus mäng
STR_0141_LOAD_GAME :{BLACK}Mängu laadimine
@@ -729,7 +728,7 @@
STR_022E_LANDSCAPE_GENERATION :{BLACK}Maastiku loomine
STR_022F_TOWN_GENERATION :{BLACK}Linnade loomine
STR_0230_INDUSTRY_GENERATION :{BLACK}Tööstuste loomine
-STR_0231_ROAD_CONSTRUCTION :{BLACK}Tee-ehitus
+STR_0231_ROAD_CONSTRUCTION :{BLACK}Maanteede ehitamine
STR_0233_TOWN_GENERATION :{WHITE}Linnade loomine
STR_0234_NEW_TOWN :{BLACK}Uus linn
STR_0235_CONSTRUCT_NEW_TOWN :{BLACK}Ehita uus linn
@@ -826,11 +825,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Paigalda saatjamast
STR_028F_DEFINE_DESERT_AREA :{BLACK}Loo kõrbealad.{}Eemaldamiseks klõpsa hoides all CTRL nuppu
STR_CREATE_LAKE :{BLACK}Määratle veealad.{}Ehita kanal. CTRL-klahvi all hoides ujutab ümbruskonna üle.
+STR_CREATE_RIVER :{BLACK}Jõgede paigutamine.
STR_0290_DELETE :{BLACK}Kustuta
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Hävita see linn täielikult
STR_0292_SAVE_SCENARIO :Salvesta kaart
STR_0293_LOAD_SCENARIO :Laadi kaart
-STR_LOAD_HEIGHTMAP :Lae kõrguskaart
+STR_MENU_LOAD_HEIGHTMAP :Lae kõrguskaart
STR_0294_QUIT_EDITOR :Lahku redaktorist
STR_0295 :
STR_0296_QUIT :Välju
@@ -870,9 +870,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Mängu valikud
-STR_02C5_DIFFICULTY_SETTINGS :Raskusastme seadistused
-STR_02C7_CONFIG_PATCHES :Paikade seadistamine
+STR_02C4_GAME_OPTIONS :Mängu valikud
+STR_02C6_DIFFICULTY_SETTINGS :Raskusastme seadistused
+STR_MENU_CONFIG_PATCHES :Paikade seadistamine
STR_NEWGRF_SETTINGS :NewGRF seadistused
STR_TRANSPARENCY_OPTIONS :Läbipaistvuse valikud
STR_GAMEOPTMENU_0A :
@@ -972,8 +972,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Ikka salvestamisel,{}palun oota salvestuse lõpuni!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}'Ezy Street' stiilis muusikaprogrammi valimine
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglise (originaalne)
@@ -1226,7 +1226,7 @@
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL :Tavaline rööbastee
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL :Elektrifitseeritud rööbastee
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL :Monorelss
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MAGLEV :Maglev
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MAGLEV :Magnethõljukrong
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST :Esimene saadaval
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_LAST :Viimane saadaval
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MOST_USED :Enim kasutatud
@@ -1702,10 +1702,10 @@
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Sobiv rongitee puudub
STR_1007_ALREADY_BUILT :{WHITE}...juba ehitatud
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Rööbastee tuleb eelnevalt lammutada
-STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Rööbasteede ehitus
-STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Elektrifitseeritud rööbastee ehitus
+STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Rööbasteede ehitamine
+STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Elektrifitseeritud rööbasteede ehitamine
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Monorelsi ehitamine
-STR_100C_MAGLEV_CONSTRUCTION :{WHITE}Elektromageetilise rööbastee ehitamine
+STR_100C_MAGLEV_CONSTRUCTION :{WHITE}Magnethõljuktee ehitamine
STR_100D_SELECT_RAIL_BRIDGE :{WHITE}Vali raudteesild
STR_100E_CAN_T_BUILD_TRAIN_DEPOT :{WHITE}Siia ei saa depood ehitada...
STR_100F_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Siia ei saa raudteejaama ehitada...
@@ -1715,9 +1715,9 @@
STR_1013_CAN_T_REMOVE_SIGNALS_FROM :{WHITE}Siit ei saa signaale lammutada...
STR_1014_TRAIN_DEPOT_ORIENTATION :{WHITE}Depoo suund
STR_1015_RAILROAD_CONSTRUCTION :Rööbastee ehitamine
-STR_TOOLB_ELRAIL_CONSTRUCTION :Elektrifitseeritud rööbastee ehitus
+STR_TOOLB_ELRAIL_CONSTRUCTION :Elektrifitseeritud rööbasteede ehitamine
STR_1016_MONORAIL_CONSTRUCTION :Monorelsi ehitamine
-STR_1017_MAGLEV_CONSTRUCTION :Elektromagneetilise rööbastee ehitamine
+STR_1017_MAGLEV_CONSTRUCTION :Magnethõljuktee ehitamine
STR_1018_BUILD_RAILROAD_TRACK :{BLACK}Ehita rööbasteed
STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING :{BLACK}Ehita rongidepoo (rongide ehitamiseks ja hoolduseks)
STR_101A_BUILD_RAILROAD_STATION :{BLACK}Ehita raudteejaam
@@ -1747,43 +1747,43 @@
##id 0x1800
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Enne on vaja sõidutee lammutada
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Teede ehitamine
-STR_1802_ROAD_CONSTRUCTION :{WHITE}Sõiduteede ehitus
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Trammitee ehitamine
+STR_1802_ROAD_CONSTRUCTION :{WHITE}Sõiduteede ehitamine
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Trammiteede ehitamine
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Vali sillatüüp
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... ühesuunalised teed ei saa teedesõlmi omada
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Siia ei saa sõiduteed ehitada...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Trammiteed ei ole võimalik siia rajada...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Trammiteed ei ole võimalik siia rajada...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Siinset sõiduteed ei saa lammutada...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Siinset trammiteed ei saa lammutada...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Siinset trammiteed ei saa lammutada...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Depoo suund
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Trammidepoo suund
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Trammidepoo suund
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Siia ei saa depood ehitada...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Trammidepood ei saa siia rajada
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Trammidepood ei saa siia rajada
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Siia ei saa bussijaama ehitada...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Siia ei saa laadimisplatsi ehitada...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Siia ei saa reisitrammijaama rajada...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Siia ei saa kaubatrammijaama rajada...
-STR_180A_ROAD_CONSTRUCTION :Tee-ehitus
-STR_180A_TRAMWAY_CONSTRUCTION :Trammitee ehitamine
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Siia ei saa reisitrammijaama rajada...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Siia ei saa kaubatrammijaama rajada...
+STR_180A_ROAD_CONSTRUCTION :Maanteede ehitamine
+STR_TRAMWAY_CONSTRUCTION :Trammiteede ehitamine
STR_180B_BUILD_ROAD_SECTION :{BLACK}Ehita sõidutee blokk
STR_BUILD_AUTOROAD_TIP :{BLACK}Ehita autotee osa kasutades Autoroad režiimi
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Ehita trammitee blokk
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Ehita trammitee blokk
STR_BUILD_AUTOTRAM_TIP :{BLACK}Ehita trammitee osa kasutades Autotram režiimi
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Depoo ehitamine (veovahendite ehitamiseks ja hooldamiseks)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Ehita trammidepoo (veeremi ehitamiseks ja hoolduseks)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Ehita trammidepoo (veeremi ehitamiseks ja hoolduseks)
STR_180D_BUILD_BUS_STATION :{BLACK}Ehita bussijaam
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Ehita veokite laadimisplats
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Ehita reisitrammijaam
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Ehita kaubatrammijaam
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Ehita reisitrammijaam
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Ehita kaubatrammijaam
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Ehita sild
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Ehita trammisild
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Ehita trammisild
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Ehita tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Ehita trammitunnel
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Ehita trammitunnel
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Lülita ühesuunalised teed sisse/välja
-STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Tee-ehituse ja -lammutamise vahetamine
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Lülitu trammitee ehitamise ja lammutamise vahel
+STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Lülitu maanteede ehitamise ja lammutamise vahel
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Lülitu trammitee ehitamise ja lammutamise vahel
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Vali depoole suund
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Vali trammidepoo suund
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Vali trammidepoo suund
STR_1814_ROAD :Sõidutee
STR_1815_ROAD_WITH_STREETLIGHTS :Valgustatud sõidutee
STR_1816_TREE_LINED_ROAD :Puiestee
@@ -1926,8 +1926,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Mitme olemasoleva jaama ühendamine
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Selles linnas on juba liiga palju jaamasid
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Liiga palju jaamu
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Liiga palju bussipeatusi
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Liiga palju laadimisplatvorme
+STR_TOO_MANY_BUS_STOPS :{WHITE}Liiga palju bussipeatusi
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Liiga palju laadimisplatvorme
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Mõnele teisele jaamale liiga lähedal
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Raudteejaam tuleb eelnevalt lammutada
@@ -1958,12 +1958,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}Jaam {STATION} võtab nüüd vastu veoseid {STRING} ja {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Bussijaama suund
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Laadimisplatsi suund
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Reisitrammi suund
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Kaubatrammi suund
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Reisitrammi suund
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Kaubatrammi suund
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Bussijaam tuleb enne hävitada
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Enne pead laadimisplatsi hävitama
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Reisitrammijaam tuleb eelnevalt lammutada
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Kaubatrammijaam tuleb eelnevalt lammutada
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Reisitrammijaam tuleb eelnevalt lammutada
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Kaubatrammijaam tuleb eelnevalt lammutada
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} jaam{P "" a}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Puudub -
@@ -1975,8 +1975,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Vali raudteejaama pikkus
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Vali bussijaamale suund
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Vali laadimisplatsile suund
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Vali reisitrammijaama suund
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Vali kaubatrammijaama suund
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Vali reisitrammijaama suund
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Vali kaubatrammijaama suund
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Vaate viimine jaama juurde
STR_3054_SHOW_STATION_RATINGS :{BLACK}Näita jaamahinnangut
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Muuda jaama nime
@@ -1998,7 +1998,7 @@
STR_3069_BUOY :Poi
STR_306A_BUOY_IN_THE_WAY :{WHITE}...poi on ees
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...jaam on liiga laiaks venitatud
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...korrapäratud jaamad keelatud
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...korrapäratud jaamad keelatud
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Enam kui ühe eseme valimiseks hoia all CTRL klahvi
STR_UNDEFINED :(määratlemata väljend)
@@ -2039,7 +2039,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Vali uue mängu tüüp
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Vali valmis kaart (roheline), eelseadistatud mäng (sinine), või juhusliku kaardiga uus mäng
STR_4010_GENERATE_RANDOM_NEW_GAME :Tekita suvaline kaart
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Laadi kõrguskaart
+STR_LOAD_HEIGHTMAP :{WHITE}Laadi kõrguskaart
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} on ees
@@ -2243,10 +2243,10 @@
STR_6813_ECONOMY :{LTBLUE}Majandus: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Rongide ümberpööramine: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katastroofid: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Linnanõukogu suhtumine maastikukujundusse: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Linnanõukogu suhtumine maastikukujundusse: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Pole
+STR_NONE :Pole
STR_NUM_VERY_LOW :Väga madal
STR_6816_LOW :Madal
STR_6817_NORMAL :Harilik
@@ -2284,9 +2284,9 @@
STR_6836_OFF :Väljas
STR_6837_ON :Sees
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Näita mängijate edetabelit
-STR_6839_PERMISSIVE :Soodustav
-STR_683A_TOLERANT :Tolerantne
-STR_683B_HOSTILE :Vaenulik
+STR_PERMISSIVE :Soodustav
+STR_TOLERANT :Tolerantne
+STR_HOSTILE :Vaenulik
##id 0x7000
STR_7000 :
@@ -2423,19 +2423,21 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Selle ettevõtte aktsiatest ei saa 25% müüa...
STR_707D_OWNED_BY :{WHITE}({COMMA}% on ettevõtte {COMPANY} käes)
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} võeti üle ettevõtte {COMPANY} poolt!
-STR_7080_PROTECTED :{WHITE}See ettevõtte pole veel piisavalt vana, et aktsiaid vahetada...
+STR_PROTECTED :{WHITE}See ettevõtte pole veel piisavalt vana, et aktsiaid vahetada...
STR_LIVERY_DEFAULT :Firmavärv
STR_LIVERY_STEAM :Aurumootorvedur
STR_LIVERY_DIESEL :Diiselmootorvedur
STR_LIVERY_ELECTRIC :Elektrimootorvedur
STR_LIVERY_MONORAIL :Monorelssvedur
-STR_LIVERY_MAGLEV :Elektromagneetiline mootorvedur
+STR_LIVERY_MAGLEV :Magnethõljukvedur
STR_LIVERY_DMU :DMU
STR_LIVERY_EMU :EMU
STR_LIVERY_PASSENGER_WAGON_STEAM :Reisivagun (auru)
STR_LIVERY_PASSENGER_WAGON_DIESEL :Reisivagun (diisel)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Reisivagun (elektri)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :Reisivagun (monorelss)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :Reisivagun (magnethõljukrong)
STR_LIVERY_FREIGHT_WAGON :Kaubavagun
STR_LIVERY_BUS :Buss
STR_LIVERY_TRUCK :Veoauto
@@ -2720,7 +2722,7 @@
STR_8104_AIRCRAFT :lennuk
STR_8105_SHIP :laev
STR_8106_MONORAIL_LOCOMOTIVE :monorelssvedur
-STR_8107_MAGLEV_LOCOMOTIVE :maglevivedur
+STR_8107_MAGLEV_LOCOMOTIVE :magnethõljukvedur
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}Linna {TOWN} rongidepoo
@@ -2730,17 +2732,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} (laadi ümber ja võta laadung peale)
-STR_8808_GO_TO_UNLOAD :Mine {STATION} (laadi maha)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Mine {STATION} (laadi ümber ja jäta tühjaks)
-STR_880A_GO_TO_LOAD :Mine {STATION} (laadi)
-STR_880B_GO_TO_TRANSFER_LOAD :Mine {STATION} (laadi ümber 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} (laadi ümber 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} (laadi ümber 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} (laadi ümber ja oota täislaadungit)
+STR_GO_TO_TRANSFER :Mine {STATION} (laadi ümber ja võta laadung peale)
+STR_8807_GO_TO_UNLOAD :Mine {STATION} (laadi maha)
+STR_GO_TO_TRANSFER_UNLOAD :Mine {STATION} (laadi ümber ja jäta tühjaks)
+STR_8808_GO_TO_LOAD :Mine {STATION} (laadi)
+STR_GO_TO_TRANSFER_LOAD :Mine {STATION} (laadi ümber ja oota täislaadungit)
+STR_880A_GO_NON_STOP_TO :Sõida läbi {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Sõida läbi {STATION} (laadi ümber ja oota täislaadungit)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Sõida läbi {STATION} (laadi maha)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Sõida läbi {STATION} (laadi ümber ja jäta tühjaks)
+STR_880C_GO_NON_STOP_TO_LOAD :Sõida läbi {STATION} (laadi)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Sõida läbi {STATION} (laadi ümber 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
@@ -2764,17 +2766,17 @@
STR_8812_EMPTY :{LTBLUE}Tühi
STR_8813_FROM :{LTBLUE}{CARGO} jaamast {STATION}
STR_FROM_MULT :{LTBLUE}{CARGO} jaamast {STATION} (x{NUM})
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT :{WHITE}Rong {COMMA} ootab depoos
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT :{WHITE}Rong {COMMA} on depoos ootel
STR_8815_NEW_VEHICLES :{BLACK}Uus rong
STR_8816 :{BLACK}-
STR_8819_TRAIN_TOO_LONG :{WHITE}Rong on liiga pikk
-STR_881A_TRAINS_CAN_ONLY_BE_ALTERED :{WHITE}Ronge saab ainult siis muuta kui nad on peatatud depoo sees
+STR_881A_TRAINS_CAN_ONLY_BE_ALTERED :{WHITE}Ainult depoos peatunud ronge saab muuta
STR_881B_TRAINS :{WHITE}{COMPANY} - {COMMA} rong{P "" i}
STR_881C_NEW_RAIL_VEHICLES :{WHITE}Uued rööbassõidukid
STR_NEW_ELRAIL_VEHICLES :{WHITE}Uus elektriraudteeveerem
-STR_881D_NEW_MONORAIL_VEHICLES :{WHITE}Uued monorelsi sõidukid
-STR_881E_NEW_MAGLEV_VEHICLES :{WHITE}Uus maglevi sõiduk
+STR_881D_NEW_MONORAIL_VEHICLES :{WHITE}Uus monorelssveerem
+STR_881E_NEW_MAGLEV_VEHICLES :{WHITE}Uus magnethõljukveerem
STR_ALL_AVAIL_RAIL_VEHICLES :{WHITE}Rööbassõidukid
STR_881F_BUILD_VEHICLE :{BLACK}Ehita veovahend
@@ -2797,7 +2799,7 @@
STR_TIMETABLE_VIEW :{BLACK}Sõiduplaan
STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Näita sõiduplaani
STR_8829_ORDERS :{WHITE}{VEHICLE} (käsud)
-STR_882A_END_OF_ORDERS :{SETX 10}- - Käskude Lõpp - -
+STR_882A_END_OF_ORDERS :{SETX 10}- - Sihtpunktide lõpp - -
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}Hooldus
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Rööbassõidukit ei saa ehitada...
@@ -2844,7 +2846,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Näita detaile viidud kauba kohta
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Näita täpsemat infot rongivagunite kohta
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Näita iga rongivaguni kandevõimet
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Näita kogu rongi mahtu, jagatud kauba tüübi järgi
+STR_SHOW_TOTAL_CARGO :{BLACK}Näita kogu rongi mahtu, jagatud kauba tüübi järgi
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Sihtpunktide nimekiri - vajuta käsul et see valida. CTRL + klik kerib jaama juurde
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Jäta praegune järjestus vahele ja alusta järgmisega. CTRL + klõps jätab vahele kuni valitud järjestuseni
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Kustuta valitud käsk
@@ -2875,8 +2877,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Ei saa rongi ümber pöörata.
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Muuda rongivaguni tüübinime
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Raudteesõiduki tüübinime ei saa muuta...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Käsi valitud sihtpunktis sõiduki laadung kõrvaldada
-STR_886F_TRANSFER :{BLACK}Laadi ümber
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Käsi valitud sihtpunktis sõiduki laadung kõrvaldada
+STR_TRANSFER :{BLACK}Laadi ümber
STR_CLEAR_TIME :{BLACK}Tühista aeg
STR_RESET_LATENESS :{BLACK}Tühista hilinemisloendur
@@ -2954,8 +2956,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Nimeta mootorsõidukit
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}{STATION} jaama saabus esimene buss!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{} esimene veok saabus {STATION} jaama!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene reisitramm saabus trammijaama {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene kaubatramm saabus trammijaama {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene reisitramm saabus trammijaama {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene kaubatramm saabus trammijaama {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Rongikokkupõrge!{}Juht suri peale õnnetust tules
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Mootorsõiduki kokkupõrge rongiga!{}{COMMA} inimest suri õnnetuses
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Transpordivahendit ei saa ümber pöörata...
@@ -2964,7 +2966,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Muuda mootorsõiduki tüübinime
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Muuda mootorsõiduki tüübinime
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Mootorsõiduki tüübinime ei saa muuta...
-STR_9038_GO_TO_ROADVEH_DEPOT :Mine linna {TOWN} garaaži
+STR_GO_TO_ROADVEH_DEPOT :Mine linna {TOWN} garaaži
STR_SERVICE_AT_ROADVEH_DEPOT :Hoolda linna {TOWN} mootorsõidukidepoos
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Seadista mootorsõidukit kandmaks teist tüüpi veost
@@ -2974,7 +2976,7 @@
STR_ROAD_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Vali, millist tüüpi laadungit veovahend veab
##id 0x9800
-STR_9800_DOCK_CONSTRUCTION :Sadamaehitus
+STR_9800_DOCK_CONSTRUCTION :Sadamate ehitamine
STR_9801_DOCK_CONSTRUCTION :{WHITE}Sadama ehitus
STR_9802_CAN_T_BUILD_DOCK_HERE :{WHITE}Siia ei saa sadamat ehitada
STR_9803_SHIP_DEPOT :{WHITE}{TOWN} Laevaangaar
@@ -3077,7 +3079,7 @@
STR_A01A_CAPACITY :{BLACK}Kandevõime: {LTBLUE}{CARGO}
STR_A01B_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Lennuk peab olema peatatud angaari sees
STR_A01C_CAN_T_SELL_AIRCRAFT :{WHITE}Ei saa lennukit müüa...
-STR_A01D_AIRPORT_CONSTRUCTION :Lennuvälja ehitamine
+STR_A01D_AIRPORT_CONSTRUCTION :Lennuväljade ehitamine
STR_A01E_BUILD_AIRPORT :{BLACK}Ehita lennuväli
STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT :{BLACK}Lennuk - info saamiseks vajuta lennukile
STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES :{BLACK}Ehita uus lennuk (vajab angaariga lennujaama)
@@ -3314,8 +3316,8 @@
STR_RAIL_VEHICLES :Raudteesõidukid
STR_ELRAIL_VEHICLES :Elektrirongid
-STR_MONORAIL_VEHICLES :Monorelss-sõidukid
-STR_MAGLEV_VEHICLES :Maglevi Sõidukid
+STR_MONORAIL_VEHICLES :Monorelssveerem
+STR_MAGLEV_VEHICLES :Magnethõljukveerem
############ End of list of rail types
@@ -3338,6 +3340,12 @@
STR_PURCHASE_INFO_ALL_BUT :Kõik, välja arvatud {GOLD}
STR_PURCHASE_INFO_MAX_TE :{BLACK}Suurim veojõud: {GOLD}{FORCE}
+########### For showing numbers in widgets
+
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
########### String for New Landscape Generator
STR_GENERATE :{WHITE}Tekita
--- a/src/lang/finnish.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/finnish.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Tarvitaan tasaista maata.
STR_0008_WAITING :{BLACK}Lähdössä: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (matkalla:
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Vastaanottaa: {WHITE}
STR_000D_ACCEPTS :{BLACK}Vastaanottaa: {GOLD}
STR_000E :
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Liian monta nimeä määritelty
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Nimi on jo käytössä
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS{NBSP}X{NBSP}
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS{NBSP}X{NBSP}
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}Rahti
STR_013D_INFORMATION :{BLACK}Tietoa
STR_013E_CAPACITIES :{BLACK}Kapasiteetit
-STR_013E_TOTAL_CARGO :{BLACK}Rahtia yhteensä
+STR_TOTAL_CARGO :{BLACK}Rahtia yhteensä
STR_013F_CAPACITY :{BLACK}Kapaisteetti: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapasiteetti: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Kokonaisrahtikapasiteetti:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Kokonaisrahtikapasiteetti:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Uusi peli
STR_0141_LOAD_GAME :{BLACK}Lataa peli
@@ -727,7 +725,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Poista tämä kaupunki kokonaan.
STR_0292_SAVE_SCENARIO :Tallenna skenaario
STR_0293_LOAD_SCENARIO :Lataa skenaario
-STR_LOAD_HEIGHTMAP :Lataa korkeuskartta
+STR_MENU_LOAD_HEIGHTMAP :Lataa korkeuskartta
STR_0294_QUIT_EDITOR :Sulje muokkain
STR_0295 :
STR_0296_QUIT :Sulje
@@ -767,9 +765,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Pelin asetukset
-STR_02C5_DIFFICULTY_SETTINGS :Vaikeusasetukset
-STR_02C7_CONFIG_PATCHES :Muokkaa paikkauksia
+STR_02C4_GAME_OPTIONS :Pelin asetukset
+STR_02C6_DIFFICULTY_SETTINGS :Vaikeusasetukset
+STR_MENU_CONFIG_PATCHES :Muokkaa paikkauksia
STR_NEWGRF_SETTINGS :Newgrf-asetukset
STR_TRANSPARENCY_OPTIONS :Läpinäkyvyysvalinnat
STR_GAMEOPTMENU_0A :
@@ -868,8 +866,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Tallentaminen käynnissä,{}odota, kunnes se päättyy!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Valitse 'Ezy Street'.
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Englantilainen
@@ -1638,39 +1636,39 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Tie pitää siirtää ensin.
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Tietyöt ovat käynnissä.
STR_1802_ROAD_CONSTRUCTION :{WHITE}Tien rakentaminen
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Raitiotien rakentaminen
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Raitiotien rakentaminen
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Valitse maantiesilta
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... yksisuuntaisella kadulla ei voi olla risteystä
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Tietä ei voi rakentaa.
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Tähän ei voi rakentaa raitiotietä.
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Tähän ei voi rakentaa raitiotietä.
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Tietä ei voi poistaa.
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Tästä ei voi poistaa raitiotietä.
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Tästä ei voi poistaa raitiotietä.
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Autovarikon suunta
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Varikon suunta
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Varikon suunta
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Autovarikkoa ei voi rakentaa.
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Tähän ei voi rakentaa varikkoa.
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Tähän ei voi rakentaa varikkoa.
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Linja-autoasemaa ei voi rakentaa.
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Lastauslaituria ei voi rakentaa.
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Ei voi rakentaa asemaa.
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Ei voi rakentaa rahtiasemaa.
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Ei voi rakentaa asemaa.
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Ei voi rakentaa rahtiasemaa.
STR_180A_ROAD_CONSTRUCTION :Tien rakentaminen
-STR_180A_TRAMWAY_CONSTRUCTION :Raitiotien rakentaminen
+STR_TRAMWAY_CONSTRUCTION :Raitiotien rakentaminen
STR_180B_BUILD_ROAD_SECTION :{BLACK}Rakenna tieosuus.
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Rakenna raitiotietä
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Rakenna raitiotietä
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Rakenna autovarikko (ajoneuvojen rakentamista ja huoltoa varten)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Rakenna raitiotievarikko (vaunujen rakentamiseen ja korjaamiseen)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Rakenna raitiotievarikko (vaunujen rakentamiseen ja korjaamiseen)
STR_180D_BUILD_BUS_STATION :{BLACK}Rakenna linja-autoasema
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Rakenna lastauslaituri
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Rakenna asema
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Rakenna rahtiasema
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Rakenna asema
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Rakenna rahtiasema
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Rakenna maantiesilta
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Rakenna raitiotiesilta
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Rakenna raitiotiesilta
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Rakenna maantietunneli
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Rakenna raitiotietunneli
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Rakenna raitiotietunneli
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Tien rakentaminen/siirtäminen päälle/pois
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Vaihda rakentamisen ja purkamisen välillä
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Vaihda rakentamisen ja purkamisen välillä
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Valitse autovarikon suunta.
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Valitse varikon suunta
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Valitse varikon suunta
STR_1814_ROAD :Tie
STR_1815_ROAD_WITH_STREETLIGHTS :Tie katuvaloilla
STR_1816_TREE_LINED_ROAD :Puilla reunustettu tie
@@ -1812,8 +1810,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Liitä yhteen useampi asema/lastausalue.
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Liian monta asemaa ja lastausaluetta kaupungissa.
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Liian monta asemaa ja lastausaluetta.
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Liian monta linja-autopysäkkiä.
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Liian monta lastauslaituria.
+STR_TOO_MANY_BUS_STOPS :{WHITE}Liian monta linja-autopysäkkiä.
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Liian monta lastauslaituria.
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Liian lähellä toista asemaa tai lastausaluetta.
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Rautatieasema pitää tuhota ensin.
@@ -1844,12 +1842,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} ottaa nyt vastaan {STRING} ja {STRING}.
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Linja-autoaseman suunta
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Lastauslaiturin suunta
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Aseman suunta
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Rahtiaseman suunta
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Aseman suunta
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Rahtiaseman suunta
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Linja-autoasema pitää purkaa ensin.
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Lastauslaituri pitää purkaa ensin.
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Asema täytyy purkaa ensin
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Rahtiasema täytyy purkaa ensin
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Asema täytyy purkaa ensin
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Rahtiasema täytyy purkaa ensin
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} asema{P "" a}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Ei mitään -
@@ -1861,8 +1859,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Valitse rautatieaseman pituus.
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Valitse linja-autoaseman suunta.
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Valitse lastauslaiturin suunta.
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Valitse aseman suunta
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Valitse rahtiaseman suunta
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Valitse aseman suunta
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Valitse rahtiaseman suunta
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Keskitä näkymä aseman sijaintiin.
STR_3054_SHOW_STATION_RATINGS :{BLACK}Näytä aseman arviot.
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Muuta aseman nimi.
@@ -1884,7 +1882,7 @@
STR_3069_BUOY :Poiju
STR_306A_BUOY_IN_THE_WAY :{WHITE}...poiju on tiellä.
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...asema liian levittäytynyt.
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...epäsymmetriset asemat poissa käytöstä.
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...epäsymmetriset asemat poissa käytöstä.
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Pidä CTRL painettuna valitaksesi enemmän kuin yhden tavaran
STR_UNDEFINED :(määrittelemätön)
@@ -1925,7 +1923,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Valitse uusi pelityyppi
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Valitse skenaario (vihreä), alkuasetettu peli (sininen) tai satunnainen peli.
STR_4010_GENERATE_RANDOM_NEW_GAME :Luo uusi satunnainen peli
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Lataa korkeuskartta
+STR_LOAD_HEIGHTMAP :{WHITE}Lataa korkeuskartta
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} on tiellä.
@@ -2127,10 +2125,10 @@
STR_6813_ECONOMY :{LTBLUE}Talous: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Junien peruutus: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Onnettomuudet: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Kaupunginvaltuuston asenne alueen uudelleenjärjestelyyn: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Kaupunginvaltuuston asenne alueen uudelleenjärjestelyyn: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Ei mitään
+STR_NONE :Ei mitään
STR_NUM_VERY_LOW :Erittäin alhainen
STR_6816_LOW :Matala
STR_6817_NORMAL :Normaali
@@ -2168,9 +2166,9 @@
STR_6836_OFF :Pois
STR_6837_ON :Päällä
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Näytä pistetaulukko
-STR_6839_PERMISSIVE :Salliva
-STR_683A_TOLERANT :Suvaitseva
-STR_683B_HOSTILE :Vihamielinen
+STR_PERMISSIVE :Salliva
+STR_TOLERANT :Suvaitseva
+STR_HOSTILE :Vihamielinen
##id 0x7000
STR_7000 :
@@ -2302,7 +2300,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Tästä yhtiöstä ei voi myydä 25{NBSP}%:n osuutta...
STR_707D_OWNED_BY :{WHITE}({COMMA}{NBSP}%:n omistus: {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}Yhtiön {COMPANY} on ottanut haltuun {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita...
+STR_PROTECTED :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita...
STR_LIVERY_DEFAULT :Normaalit tunnusvärit
STR_LIVERY_STEAM :Höyryveturi
@@ -2609,17 +2607,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Asemalle {STATION}
-STR_8807_GO_TO_TRANSFER :Mene asemalle {STATION} (Siirrä ja ota rahti)
-STR_8808_GO_TO_UNLOAD :Mene asemalle {STATION} (Pura rahti)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Mene asemalle {STATION} (Siirrä ja jätä tyhjäksi)
-STR_880A_GO_TO_LOAD :Mene asemalle {STATION} (Lastaa)
-STR_880B_GO_TO_TRANSFER_LOAD :Mene asemalle {STATION} (Siirrä ja odota täyttä rahtia)
-STR_880C_GO_NON_STOP_TO :Mene tauotta asemalle {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Mene tauotta asemalle {STATION} (Siirrä ja ota rahti)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Mene tauotta asemalle {STATION} (Pura rahti)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Mene tauotta asemalle {STATION} (Siirrä ja jätä tyhjäksi)
-STR_8810_GO_NON_STOP_TO_LOAD :Mene tauotta asemalle {STATION} (Lastaa)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Mene tauotta asemalle {STATION} (Siirrä ja odota täyttä rahtia)
+STR_GO_TO_TRANSFER :Mene asemalle {STATION} (Siirrä ja ota rahti)
+STR_8807_GO_TO_UNLOAD :Mene asemalle {STATION} (Pura rahti)
+STR_GO_TO_TRANSFER_UNLOAD :Mene asemalle {STATION} (Siirrä ja jätä tyhjäksi)
+STR_8808_GO_TO_LOAD :Mene asemalle {STATION} (Lastaa)
+STR_GO_TO_TRANSFER_LOAD :Mene asemalle {STATION} (Siirrä ja odota täyttä rahtia)
+STR_880A_GO_NON_STOP_TO :Mene tauotta asemalle {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Mene tauotta asemalle {STATION} (Siirrä ja ota rahti)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Mene tauotta asemalle {STATION} (Pura rahti)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Mene tauotta asemalle {STATION} (Siirrä ja jätä tyhjäksi)
+STR_880C_GO_NON_STOP_TO_LOAD :Mene tauotta asemalle {STATION} (Lastaa)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Mene tauotta asemalle {STATION} (Siirrä ja odota täyttä rahtia)
STR_GO_TO_TRAIN_DEPOT :Mene kaupungin {TOWN} veturitalliin
STR_SERVICE_AT_TRAIN_DEPOT :Huolto veturitallilla ({TOWN})
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Mene pysähtymättä veturitalliin ({TOWN})
@@ -2723,7 +2721,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Näytä kuljetettavan rahdin tiedot.
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Näytä yksikön tiedot.
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Näytä kunkin ajoneuvon kapasiteetti.
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Näytä junan kokonaiskapasiteetti, eritelty rahtityypin mukaan.
+STR_SHOW_TOTAL_CARGO :{BLACK}Näytä junan kokonaiskapasiteetti, eritelty rahtityypin mukaan.
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Aikataulu - napsauta määräystä korostaaksesi.
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Ohita nykyinen pysähdys ja aloita seuraava.
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Poista korostettu määräys.
@@ -2754,8 +2752,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Junan suuntaa ei voi kääntää...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Nimeä juna(vaunu)n tyyppi uudelleen.
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Juna(vaunu)n tyyppiä ei voi uudelleennimetä...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Pakottaa tyhjentämään rahdin valitulla pysäkillä
-STR_886F_TRANSFER :{BLACK}Siirrä
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Pakottaa tyhjentämään rahdin valitulla pysäkillä
+STR_TRANSFER :{BLACK}Siirrä
STR_CLEAR_TIME :{BLACK}Nollaa aika
STR_RESET_LATENESS :{BLACK}Nollaa myöhästymislaskuri
@@ -2830,8 +2828,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Nimeä ajoneuvo
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen linja-auto saapuu asemalle {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen kuorma-auto saapuu asemalle {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen raitiovaunu saapuu asemalle {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen rahtiraitiovaunu saapuu asemalle {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen raitiovaunu saapuu asemalle {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen rahtiraitiovaunu saapuu asemalle {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Ajoneuvokolari!{}Kuljettaja kuolee junaan törmäyksen jälkeisessä tulipallossa
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Ajoneuvokolari!{}{COMMA} kuolee junaan törmäyksen jälkeisessä tulipallossa
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Ajoneuvoa ei voi pakottaa kääntymään ympäri...
@@ -2840,7 +2838,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Nimeä ajoneuvon tyyppi uudelleen
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Nimeä ajoneuvon tyyppi uudelleen
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Ajoneuvotyyppiä ei voi uudelleennimetä...
-STR_9038_GO_TO_ROADVEH_DEPOT :Aseta kohteeksi huoltoasema, {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Aseta kohteeksi huoltoasema, {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Huolto, kohteena huoltoasema, {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Muuta ajoneuvo rahtaamaan muuta rahtityyppiä.
--- a/src/lang/french.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/french.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Terrain plat requis
STR_0008_WAITING :{BLACK}En attente: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (venant de
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} venant de {STATION})
STR_000C_ACCEPTS :{BLACK}Accepte: {WHITE}
STR_000D_ACCEPTS :{BLACK}Accepte: {GOLD}
STR_000E :
@@ -169,7 +168,7 @@
STR_00C7_QUIT :{WHITE}Quitter
STR_00C8_YES :{BLACK}Oui
STR_00C9_NO :{BLACK}Non
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Êtes vous sur de vouloir abandonner cette partie et retourner à {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Êtes vous sur de vouloir quitter OpenTTD et retourner à {STRING}?
STR_00CB_1 :{BLACK}1
STR_00CC_2 :{BLACK}2
STR_00CD_3 :{BLACK}3
@@ -275,9 +274,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Trop de noms déjà définis
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Ce nom est déjà utilisé
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -288,11 +287,11 @@
STR_013C_CARGO :{BLACK}Cargaison
STR_013D_INFORMATION :{BLACK}Information
STR_013E_CAPACITIES :{BLACK}Capacités
-STR_013E_TOTAL_CARGO :{BLACK}Charge totale
+STR_TOTAL_CARGO :{BLACK}Charge totale
STR_013F_CAPACITY :{BLACK}Capacité: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capacité: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Capacité totale de ce train:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Capacité totale de ce train:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nouvelle Partie
STR_0141_LOAD_GAME :{BLACK}Charger une Partie
@@ -732,7 +731,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Supprimer complètement cette ville
STR_0292_SAVE_SCENARIO :Sauvegarder scénario
STR_0293_LOAD_SCENARIO :Charger scénario
-STR_LOAD_HEIGHTMAP :Charger une carte d'altitude
+STR_MENU_LOAD_HEIGHTMAP :Charger une carte d'altitude
STR_0294_QUIT_EDITOR :Quitter éditeur
STR_0295 :
STR_0296_QUIT :Quitter
@@ -772,9 +771,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Options du Jeu
-STR_02C5_DIFFICULTY_SETTINGS :Niveau de Difficulté
-STR_02C7_CONFIG_PATCHES :Configuration Avancée
+STR_02C4_GAME_OPTIONS :Options du Jeu
+STR_02C6_DIFFICULTY_SETTINGS :Niveau de Difficulté
+STR_MENU_CONFIG_PATCHES :Configuration Avancée
STR_NEWGRF_SETTINGS :Paramètres Newgrf
STR_TRANSPARENCY_OPTIONS :Options de transparence
STR_GAMEOPTMENU_0A :
@@ -874,8 +873,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Sauvegarde en cours,{}Veuillez attendre la fin du processus!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Sélectionner programme de musique 'Ezy Street'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglais (Originaux)
@@ -1070,7 +1069,7 @@
STR_CONFIG_PATCHES_AUTORENEW_MONEY :{LTBLUE}Argent nécessaire pour l'auto-renouvelement : {ORANGE}{STRING}
STR_CONFIG_PATCHES_ERRMSG_DURATION :{LTBLUE}Temps d'affichage des messages d'erreur: {ORANGE}{STRING}
STR_CONFIG_PATCHES_POPULATION_IN_LABEL :{LTBLUE}Afficher la population d'une ville dans son label : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Arbres invisibles (quand les bâtiments sont transparents) : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Arbres invisibles: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LAND_GENERATOR :{LTBLUE}Générateur de terrain : {ORANGE}{STRING}
STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL :Original
@@ -1650,42 +1649,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Vous devez d'abord retirer la route
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Route en travaux
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construction routière
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Construction de tramway
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Construction de tramway
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Choisir Pont Routier
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... les routes à sens unique ne peuvent pas avoir de jonctions
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Impossible de construire la route ici...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Impossible de construire une section de tramway ici...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Impossible de construire une section de tramway ici...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Impossible de retirer la route ici...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Impossible de retirer la section de tramway d'ici...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Impossible de retirer la section de tramway d'ici...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Orientation du dépôt
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orientation du dépôt
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orientation du dépôt
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Impossible de construire un dépôt routier ici...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Impossible de construire un dépôt de tramway ici...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Impossible de construire un dépôt de tramway ici...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Impossible de construire un arrêt d'autobus...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Impossible de construire une aire de chargement...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Impossible de construire une station de tramway pour passagers...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Impossible de construire une station de tramway pour fret...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Impossible de construire une station de tramway pour passagers...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Impossible de construire une station de tramway pour fret...
STR_180A_ROAD_CONSTRUCTION :Construction routière
-STR_180A_TRAMWAY_CONSTRUCTION :Construction de tramway
+STR_TRAMWAY_CONSTRUCTION :Construction de tramway
STR_180B_BUILD_ROAD_SECTION :{BLACK}Construire une section de route
STR_BUILD_AUTOROAD_TIP :{BLACK}Construire une route avec le mode Auto-route
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Construire une section de tramway
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Construire une section de tramway
STR_BUILD_AUTOTRAM_TIP :{BLACK}Construire une section de tramway avec le mode Auto-tram
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Construire un dépôt routier (pour construire et entretenir les véhicules routiers)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construire un dépôt de tramway (pour la construction et l'entretien des véhicules)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construire un dépôt de tramway (pour la construction et l'entretien des véhicules)
STR_180D_BUILD_BUS_STATION :{BLACK}Construire un arrêt d'autobus
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Construire une aire de chargement
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construire une station de tramway pour passagers
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Construire une station de tramway pour fret
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construire une station de tramway pour passagers
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Construire une station de tramway pour fret
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Construire un pont routier
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Construire un pont
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Construire un pont
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Construire un tunnel routier
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Construire un tunnel
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Construire un tunnel
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Activer/Désactiver les routes à sens unique
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Basculer construire/détruire routes
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Basculer construire/retirer pour tramways
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Basculer construire/retirer pour tramways
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Choisir orientation du dépôt routier
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Choisir l'orientation du dépôt de tramway
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Choisir l'orientation du dépôt de tramway
STR_1814_ROAD :Route
STR_1815_ROAD_WITH_STREETLIGHTS :Route avec lampadaires
STR_1816_TREE_LINED_ROAD :Route avec lignée d'arbustres
@@ -1828,8 +1827,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Adjacent à plus d'une gare à la fois
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Trop de gares dans cette ville
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Trop de gares
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Trop d'arrêts d'autobus
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Trop d'aires de chargement
+STR_TOO_MANY_BUS_STOPS :{WHITE}Trop d'arrêts d'autobus
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Trop d'aires de chargement
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Trop près d'une autre gare
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Vous devez d'abord détruire la gare
@@ -1860,12 +1859,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} accepte désormais: {STRING} et {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Arrêt d'autobus
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Aire de chargement
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Tramway pour passagers
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Tramway pour fret
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Tramway pour passagers
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Tramway pour fret
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Vous devez d'abord détruire l'arrêt d'autobus
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Vous devez d'abord détruire l'aire de chargement
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Vous devez d'abord démolir la station de tramway pour passagers
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Vous devez d'abord démolir la station de tramway pour fret
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Vous devez d'abord démolir la station de tramway pour passagers
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Vous devez d'abord démolir la station de tramway pour fret
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Station{P 2 "" s}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Aucun -
@@ -1877,8 +1876,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Choisir la longueur de la gare
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Choisir l'orientation de l'arrêt d'autobus
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Choix de l'orientation de l'aire de chargement
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Choisir l'orientation de la station de tramway pour passagers
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Choisir l'orientation de la station de tramway pour fret
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Choisir l'orientation de la station de tramway pour passagers
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Choisir l'orientation de la station de tramway pour fret
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centrer la vue sur la station
STR_3054_SHOW_STATION_RATINGS :{BLACK}Afficher la notation de la station
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Renommer la station
@@ -1900,7 +1899,7 @@
STR_3069_BUOY :Bouée
STR_306A_BUOY_IN_THE_WAY :{WHITE}...bouée présente
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...gare trop étendue
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...stations non-uniformes désactivées
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...stations non-uniformes désactivées
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Cliquer avec Ctrl pour sélectionner plus d'un élément
STR_UNDEFINED :(chaîne non définie)
@@ -1941,7 +1940,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Choix du type de partie
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Choisir un scénario (vert), une partie préparée (bleu), ou une partie aléatoire
STR_4010_GENERATE_RANDOM_NEW_GAME :Créer une partie aléatoirement
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Charger une carte d'altitude
+STR_LOAD_HEIGHTMAP :{WHITE}Charger une carte d'altitude
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} présente
@@ -2145,10 +2144,10 @@
STR_6813_ECONOMY :{LTBLUE}Economie: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Demi-tour des trains: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Désastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Attitude de la municipalité face au repaysagement : {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Attitude de la municipalité face au repaysagement : {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Aucune
+STR_NONE :Aucune
STR_NUM_VERY_LOW :Très bas
STR_6816_LOW :Bas
STR_6817_NORMAL :Normal
@@ -2186,9 +2185,9 @@
STR_6836_OFF :Désactivé
STR_6837_ON :Activé
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Afficher le tableau des scores
-STR_6839_PERMISSIVE :Laxiste
-STR_683A_TOLERANT :Tolérant
-STR_683B_HOSTILE :Hostile
+STR_PERMISSIVE :Laxiste
+STR_TOLERANT :Tolérant
+STR_HOSTILE :Hostile
##id 0x7000
STR_7000 :
@@ -2325,7 +2324,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Impossible de vendre des parts...
STR_707D_OWNED_BY :{WHITE}({COMMA}% détenus par {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} a été rachetée par {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Cette compagnie ne vend pas d'actions pour le moment...
+STR_PROTECTED :{WHITE}Cette compagnie ne vend pas d'actions pour le moment...
STR_LIVERY_DEFAULT :Livrée standard
STR_LIVERY_STEAM :Locomotive à vapeur
@@ -2634,17 +2633,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Aller à {STATION}
-STR_8807_GO_TO_TRANSFER :Aller à {STATION} (Transférer et charger)
-STR_8808_GO_TO_UNLOAD :Aller à {STATION} (Décharger)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Aller à {STATION} (Transférer et laisser vide)
-STR_880A_GO_TO_LOAD :Aller à {STATION} (Charger)
-STR_880B_GO_TO_TRANSFER_LOAD :Aller à {STATION} (Transférer et attendre pleine charge)
-STR_880C_GO_NON_STOP_TO :Aller sans s'arrêter à {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Aller sans s'arrêter à {STATION} (Transférer et charger)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Aller sans s'arrêter à {STATION} (Décharger)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Aller sans s'arrêter à {STATION} (Transférer et laisser vide)
-STR_8810_GO_NON_STOP_TO_LOAD :Aller sans s'arrêter à {STATION} (Charger)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Aller sans s'arrêter à {STATION} (Transférer et attendre pleine charge)
+STR_GO_TO_TRANSFER :Aller à {STATION} (Transférer et charger)
+STR_8807_GO_TO_UNLOAD :Aller à {STATION} (Décharger)
+STR_GO_TO_TRANSFER_UNLOAD :Aller à {STATION} (Transférer et laisser vide)
+STR_8808_GO_TO_LOAD :Aller à {STATION} (Charger)
+STR_GO_TO_TRANSFER_LOAD :Aller à {STATION} (Transférer et attendre pleine charge)
+STR_880A_GO_NON_STOP_TO :Aller sans s'arrêter à {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Aller sans s'arrêter à {STATION} (Transférer et charger)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Aller sans s'arrêter à {STATION} (Décharger)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Aller sans s'arrêter à {STATION} (Transférer et laisser vide)
+STR_880C_GO_NON_STOP_TO_LOAD :Aller sans s'arrêter à {STATION} (Charger)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Aller sans s'arrêter à {STATION} (Transférer et attendre pleine charge)
STR_GO_TO_TRAIN_DEPOT :Aller au dépot de {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Entretien au dépôt de {TOWN}
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Aller sans s'arrêter au dépôt de {TOWN}
@@ -2748,7 +2747,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Afficher des informations sur les marchandises transportées
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Afficher des informations sur les wagons
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Afficher la capacité de chaque wagon
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Afficher la capacité totale du train, par type de cargaison
+STR_SHOW_TOTAL_CARGO :{BLACK}Afficher la capacité totale du train, par type de cargaison
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Liste des ordres - Cliquer sur un ordre pour le sélectionner. Cliquer avec Ctrl déplace la vue sur la station
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Sauter l'ordre courant, et enchaîner sur le suivant. Ctrl-clic pour sauter l'ordre sélectionné
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Supprime l'ordre sélectionné
@@ -2779,8 +2778,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Impossible de faire faire demi-tour...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renommer le type de train
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Impossible de renommer le type de train...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Forcer le véhicule à vider sa cargaison pour l'ordre sélectionné
-STR_886F_TRANSFER :{BLACK}Transfert
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Forcer le véhicule à vider sa cargaison pour l'ordre sélectionné
+STR_TRANSFER :{BLACK}Transfert
STR_CLEAR_TIME :{BLACK}Annuler durée
STR_RESET_LATENESS :{BLACK}RAZ compteur de retard
@@ -2858,8 +2857,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Renommer le véhicule
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier bus arrive à {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier camion arrive à {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier tramway arrive à {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier tramway arrive à {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier tramway arrive à {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier tramway arrive à {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Accident routier!{}Un automobiliste meurt brûlé vif lors d'une collision avec un train
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Accident routier!{}{COMMA} mort{P "" s} lors d'une collision avec un train
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Impossible de faire faire demi-tour au véhicule...
@@ -2868,7 +2867,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Renommer type de véhicule routier
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Renommer type de véhicule routier
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Impossible de renommer type de véhicule routier...
-STR_9038_GO_TO_ROADVEH_DEPOT :Aller à {TOWN} Dépôt Routier
+STR_GO_TO_ROADVEH_DEPOT :Aller à {TOWN} Dépôt Routier
STR_SERVICE_AT_ROADVEH_DEPOT :Entretien au dépôt de {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Réaménager le véhicule routier pour transporter une cargaison différente
--- a/src/lang/galician.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/galician.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Necesitas terreo chan
STR_0008_WAITING :{BLACK}Esperando: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (en ruta dende
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Acepta: {WHITE}
STR_000D_ACCEPTS :{BLACK}Acepta: {GOLD}
STR_000E :
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Hay demasiados nomes definidos
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}O nome elixido xa está en uso
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}Carga
STR_013D_INFORMATION :{BLACK}Información
STR_013E_CAPACITIES :{BLACK}Capacidades
-STR_013E_TOTAL_CARGO :{BLACK}Carga Total
+STR_TOTAL_CARGO :{BLACK}Carga Total
STR_013F_CAPACITY :{BLACK}Capacidade: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capacidade: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Carga total (capacidade) deste tren:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Carga total (capacidade) deste tren:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nova Partida
STR_0141_LOAD_GAME :{BLACK}Cargar Partida
@@ -746,9 +744,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-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_02C4_GAME_OPTIONS :Opcións da Partida
+STR_02C6_DIFFICULTY_SETTINGS :Configuración de Dificultade
+STR_MENU_CONFIG_PATCHES :Configuración dos Parches
STR_NEWGRF_SETTINGS :Configuración NewGRF
STR_GAMEOPTMENU_0A :
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Amosar nomes de cidades
@@ -845,8 +843,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}¡Grabación en progreso,{}por favor espera ata que termine!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Selecciona-lo programa 'Música Estilo Ezy Street'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglés
@@ -1668,8 +1666,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Xunta máis dunha estación/área de carga existente
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Hay demasiadas estacións/áreas de carga nesta cidade
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Hay demasiadas estacións/áreas de carga
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Demasiadas paradas de bus
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Demasiadas estacions de camións
+STR_TOO_MANY_BUS_STOPS :{WHITE}Demasiadas paradas de bus
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Demasiadas estacions de camións
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Demasiado cerca doutra estación ou área de carga
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Debes demole-la estación de ferrocarril primeiro
@@ -1734,7 +1732,7 @@
STR_3069_BUOY :Boia
STR_306A_BUOY_IN_THE_WAY :{WHITE}...boia no camiño
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...a estación ocupa demasiado
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...estacións non uniformes deshabilitadas
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...estacións non uniformes deshabilitadas
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Presiona CTRL para seleccionar máis dun ítem
STR_UNDEFINED :(cadea indefinida)
@@ -1968,10 +1966,10 @@
STR_6813_ECONOMY :{LTBLUE}Economía: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Inverti-lo sentido do tren: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Actitude do consello sobre a reestructuración de áreas: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Actitude do consello sobre a reestructuración de áreas: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Ningún
+STR_NONE :Ningún
STR_6816_LOW :Baixo
STR_6817_NORMAL :Normal
STR_6818_HIGH :Alto
@@ -2008,9 +2006,9 @@
STR_6836_OFF :Off
STR_6837_ON :On
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Mostra-la lista das mellores puntuacións
-STR_6839_PERMISSIVE :Permisivo
-STR_683A_TOLERANT :Tolerante
-STR_683B_HOSTILE :Hostil
+STR_PERMISSIVE :Permisivo
+STR_TOLERANT :Tolerante
+STR_HOSTILE :Hostil
##id 0x7000
STR_7000 :
@@ -2141,7 +2139,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Non se pode vender un 25% das accións desta compañía...
STR_707D_OWNED_BY :{WHITE}({COMMA}% propiedade de {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} comprada por {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Esta compañía todavía non comercia con accións...
+STR_PROTECTED :{WHITE}Esta compañía todavía non comercia con accións...
STR_LIVERY_STEAM :Máquina de Vapor
STR_LIVERY_DIESEL :Máquina Diésel
@@ -2437,17 +2435,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Ir a {STATION}
-STR_8807_GO_TO_TRANSFER :Ir a {STATION} (Transferir e coller carga)
-STR_8808_GO_TO_UNLOAD :Ir a {STATION} (Descargar)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Ir a {STATION} (Transferir e sair valeiro)
-STR_880A_GO_TO_LOAD :Ir a {STATION} (Cargar)
-STR_880B_GO_TO_TRANSFER_LOAD :Ir a {STATION} (Transferir e esperar a cargar)
-STR_880C_GO_NON_STOP_TO :Ir sen parar a {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Ir sen parar a {STATION} (Transferir e coller carga)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Ir sen parar a {STATION} (Descargar)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sen parar a {STATION} (Descargar e saír baleiro)
-STR_8810_GO_NON_STOP_TO_LOAD :Ir sen parar a {STATION} (Cargar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sen parar a {STATION} (Transferir e esperar a cargar)
+STR_GO_TO_TRANSFER :Ir a {STATION} (Transferir e coller carga)
+STR_8807_GO_TO_UNLOAD :Ir a {STATION} (Descargar)
+STR_GO_TO_TRANSFER_UNLOAD :Ir a {STATION} (Transferir e sair valeiro)
+STR_8808_GO_TO_LOAD :Ir a {STATION} (Cargar)
+STR_GO_TO_TRANSFER_LOAD :Ir a {STATION} (Transferir e esperar a cargar)
+STR_880A_GO_NON_STOP_TO :Ir sen parar a {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Ir sen parar a {STATION} (Transferir e coller carga)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Ir sen parar a {STATION} (Descargar)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sen parar a {STATION} (Descargar e saír baleiro)
+STR_880C_GO_NON_STOP_TO_LOAD :Ir sen parar a {STATION} (Cargar)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sen parar a {STATION} (Transferir e esperar a cargar)
STR_GO_TO_TRAIN_DEPOT :Ir o Depósito De Trens de {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Face-lo servicio no Depósito de Trens de {TOWN}
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ir sen paradas o Depósito de Trens de {TOWN}
@@ -2535,7 +2533,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Mostra-los detalles das mercadorías transportadas
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Mostra-los detalles dos vehículos do tren
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Mostra-la capacidade de cada vehículo
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Mostra-la capacidade total do tren, dividida por tipos de carga
+STR_SHOW_TOTAL_CARGO :{BLACK}Mostra-la capacidade total do tren, dividida por tipos de carga
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista de Ordes - Pincha nunha orde para seleccionala
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Borra-la orde seleccionada
STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Facer que a orde seleccionada sexa de Non Parar
@@ -2561,7 +2559,7 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}No se pode cambia-lo sentido do tren...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renomea-lo tipo de vehículo de ferrocarril
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Non se pode renome-lo tipo de vehículo de ferrocarril...
-STR_886F_TRANSFER :{BLACK}Transferir
+STR_TRANSFER :{BLACK}Transferir
STR_TRAIN_STOPPING :{RED}Parando
STR_TRAIN_STOPPING_VEL :{RED}Parando, {VELOCITY}
@@ -2634,7 +2632,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Renomea-lo tipo de vehículo de estrada
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Renomea-lo tipo de vehículo de estrada
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Non se pode renomea-lo tipo de vehículo de estrada...
-STR_9038_GO_TO_ROADVEH_DEPOT :Ir ó Depósito de Vehículos de Estrada de {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Ir ó Depósito de Vehículos de Estrada de {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Servicio no Depósito de Vehículos de Estrada de {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Reaxustar vehículo para levar un tipo diferente de carga
--- a/src/lang/german.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/german.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Ebenes Land erforderlich
STR_0008_WAITING :{BLACK}Im Wartezustand: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (unterwegs von
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Akzeptiert: {WHITE}
STR_000D_ACCEPTS :{BLACK}Akzeptiert: {GOLD}
STR_000E :
@@ -275,9 +273,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Zu viele Namen definiert
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Gewählter Name existiert bereits
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -288,11 +286,11 @@
STR_013C_CARGO :{BLACK}Fracht
STR_013D_INFORMATION :{BLACK}Information
STR_013E_CAPACITIES :{BLACK}Kapazitäten
-STR_013E_TOTAL_CARGO :{BLACK}Frachtübersicht
+STR_TOTAL_CARGO :{BLACK}Frachtübersicht
STR_013F_CAPACITY :{BLACK}Kapazität: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapazität: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Frachtkapazität dieses Zuges:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}{CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Frachtkapazität dieses Zuges:
+STR_TOTAL_CAPACITY :{LTBLUE}{CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Neues Spiel
STR_0141_LOAD_GAME :{BLACK}Spiel laden
@@ -727,11 +725,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Sender errichten
STR_028F_DEFINE_DESERT_AREA :{BLACK}Lege Wüstengebiet an.{}STRG drücken zum entfernen
STR_CREATE_LAKE :{BLACK}Wasser erzeugen.{}Baut einen Kanal. Bei gedrückter Strg.-Taste wird ein Wasserfeld erzeugt, das umliegendes Land flutet.
+STR_CREATE_RIVER :{BLACK}Flüsse platzieren.
STR_0290_DELETE :{BLACK}Löschen
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Diese Stadt vollständig löschen
STR_0292_SAVE_SCENARIO :Szenario speichern
STR_0293_LOAD_SCENARIO :Szenario laden
-STR_LOAD_HEIGHTMAP :Reliefkarte laden
+STR_MENU_LOAD_HEIGHTMAP :Reliefkarte laden
STR_0294_QUIT_EDITOR :Editor verlassen
STR_0295 :
STR_0296_QUIT :Beenden
@@ -771,9 +770,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Spieleinstellungen
-STR_02C5_DIFFICULTY_SETTINGS :Schwierigkeitsgrad
-STR_02C7_CONFIG_PATCHES :Einstellungen der Patches
+STR_02C4_GAME_OPTIONS :Spieleinstellungen
+STR_02C6_DIFFICULTY_SETTINGS :Schwierigkeitsgrad
+STR_MENU_CONFIG_PATCHES :Einstellungen der Patches
STR_NEWGRF_SETTINGS :Newgrf-Einstellungen
STR_TRANSPARENCY_OPTIONS :Transparenzeinstellungen
STR_GAMEOPTMENU_0A :
@@ -873,8 +872,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Speichern läuft,{}bitte warten bis beendet!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Wähle 'Ezy Street style music'-Programm
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Englisch
@@ -1649,42 +1648,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Straße muss erst entfernt werden
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Straßenarbeiten sind im Gange
STR_1802_ROAD_CONSTRUCTION :{WHITE}Straßenbau
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Straßenbahnbau
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Straßenbahnbau
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Brücke wählen
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... Einbahnstraßen können keine Abzweigung haben
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Straße kann hier nicht gebaut werden...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Straßenbahn kann hier nicht gebaut werden...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Straßenbahn kann hier nicht gebaut werden...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Diese Straße kann nicht entfernt werden...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Straßenbahn kann hier nicht entfernt werden...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Straßenbahn kann hier nicht entfernt werden...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Fahrzeugdepot-Ausr.
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Ausrichtung des Straßenbahndepots
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Ausrichtung des Straßenbahndepots
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Fahrzeugdepot kann hier nicht gebaut werden...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Straßenbahndepot kann hier nicht gebaut werden...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Straßenbahndepot kann hier nicht gebaut werden...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Busbahnhof kann nicht gebaut werden...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Lkw-Ladeplatz kann nicht gebaut werden...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Straßenbahnhaltestelle kann hier nicht gebaut werden...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Güterverladestelle kann hier nicht gebaut werden...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Straßenbahnhaltestelle kann hier nicht gebaut werden...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Güterverladestelle kann hier nicht gebaut werden...
STR_180A_ROAD_CONSTRUCTION :Straßenbau
-STR_180A_TRAMWAY_CONSTRUCTION :Straßenbahnbau
+STR_TRAMWAY_CONSTRUCTION :Straßenbahnbau
STR_180B_BUILD_ROAD_SECTION :{BLACK}Straße bauen
STR_BUILD_AUTOROAD_TIP :{BLACK}Werkzeug zum automatischen Bauen von Straßen
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Straßenbahnabschnitt bauen
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Straßenbahnabschnitt bauen
STR_BUILD_AUTOTRAM_TIP :{BLACK}Werkzeug zum automatischen Bauen von Schienen
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Fahrzeugdepot bauen (zum Bau und zur Wartung von Fahrzeugen)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Straßenbahndepot bauen (zum Erstellen und Warten von Straßenbahnen)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Straßenbahndepot bauen (zum Erstellen und Warten von Straßenbahnen)
STR_180D_BUILD_BUS_STATION :{BLACK}Busbahnhof bauen
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Lkw-Ladeplatz bauen
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Straßenbahnhaltestelle bauen
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Güterverladestelle bauen
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Straßenbahnhaltestelle bauen
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Güterverladestelle bauen
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Straßenbrücke bauen
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Straßenbahnbrücke bauen
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Straßenbahnbrücke bauen
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Straßentunnel bauen
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Straßenbahntunnel bauen
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Straßenbahntunnel bauen
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Aktiviere/Deaktiviere Einbahnstraßen
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Zwischen Bau/Abriss der Straße umschalten
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Umschalten zwischen Bauen/Entfernen für Straßenbahnbau
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Umschalten zwischen Bauen/Entfernen für Straßenbahnbau
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Ausrichtung des Fahrzeugdepots wählen
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Ausrichtung des Straßenbahndepots wählen
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Ausrichtung des Straßenbahndepots wählen
STR_1814_ROAD :Straße
STR_1815_ROAD_WITH_STREETLIGHTS :Straße mit Laternen
STR_1816_TREE_LINED_ROAD :Straße mit Bäumen
@@ -1827,8 +1826,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Grenzt an mehr als eine vorhandene Station/Ladeplatz
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Zu viele Stationen/Ladeplätze im Stadtgebiet
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Zu viele Stationen/Ladeplätze im Umkreis
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Zu viele Busbahnhöfe
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Zu viele Lkw-Ladeplätze
+STR_TOO_MANY_BUS_STOPS :{WHITE}Zu viele Busbahnhöfe
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Zu viele Lkw-Ladeplätze
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Stationen/Ladeplätze liegen zu dicht beisammen
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Bahnhof muss erst abgerissen werden
@@ -1859,12 +1858,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} akzeptiert jetzt auch {STRING} und {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Busbahnhof-Ausr.
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Lkw-Ladeplatz-Ausr.
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Ausrichtung der Straßenbahnhaltestelle
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Ausrichtung der Güterverladestelle
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Ausrichtung der Straßenbahnhaltestelle
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Ausrichtung der Güterverladestelle
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Der Busbahnhof muss erst abgerissen werden
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Der Lkw-Ladeplatz muss erst abgerissen werden
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Straßenbahnhaltestelle muss vorher abgerissen werden
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Güterverladestelle muss vorher abgerissen werden
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Straßenbahnhaltestelle muss vorher abgerissen werden
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Güterverladestelle muss vorher abgerissen werden
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Haltestelle{P "" n}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Keine -
@@ -1876,8 +1875,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Bahnsteiglänge wählen
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Busbahnhofsausrichtung wählen
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Ladeplatzausrichtung wählen
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Ausrichtung für die Straßenbahnhaltestelle wählen
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Ausrichtung für die Güterverladestelle wählen
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Ausrichtung für die Straßenbahnhaltestelle wählen
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Ausrichtung für die Güterverladestelle wählen
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Hauptansicht zur Station scrollen
STR_3054_SHOW_STATION_RATINGS :{BLACK}Stationsbewertung anzeigen
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Name der Station ändern
@@ -1899,7 +1898,7 @@
STR_3069_BUOY :Boje
STR_306A_BUOY_IN_THE_WAY :{WHITE}...Boje ist im Weg
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...Bahnhof ist zu groß
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ungleichförmige Stationen deaktiviert
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ungleichförmige Stationen deaktiviert
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}STRG gedrückt halten um mehrere Einträge auszuwählen
STR_UNDEFINED :(nicht definierter Wert)
@@ -1940,7 +1939,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Neues Spiel auswählen
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Wähle Szenario (grün), vorgegebens Spiel (blau), oder ein Spiel nach dem Zufallsprinzip
STR_4010_GENERATE_RANDOM_NEW_GAME :Spiel nach Zufallsprinzip erstellen
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Reliefkarte laden
+STR_LOAD_HEIGHTMAP :{WHITE}Reliefkarte laden
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} im Weg
@@ -2144,10 +2143,10 @@
STR_6813_ECONOMY :{LTBLUE}Wirtschaft: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Zug umkehren: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katastrophen: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Haltung der Stadtverwaltung zum Landschaftsbau: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Haltung der Stadtverwaltung zum Landschaftsbau: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Keine
+STR_NONE :Keine
STR_NUM_VERY_LOW :Sehr niedrig
STR_6816_LOW :Niedrig
STR_6817_NORMAL :Normal
@@ -2185,9 +2184,9 @@
STR_6836_OFF :Aus
STR_6837_ON :An
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Highscoretabelle zeigen
-STR_6839_PERMISSIVE :Zustimmend
-STR_683A_TOLERANT :Akzeptierend
-STR_683B_HOSTILE :Feindlich
+STR_PERMISSIVE :Zustimmend
+STR_TOLERANT :Akzeptierend
+STR_HOSTILE :Feindlich
##id 0x7000
STR_7000 :
@@ -2324,7 +2323,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Verkauf von 25% der Aktien dieser Firma nicht möglich...
STR_707D_OWNED_BY :{WHITE}({COMMA}% Eigentum von {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} wurde von {COMPANY} übernommen!
-STR_7080_PROTECTED :{WHITE}Dieses Unternehmen ist noch nicht an der Börse...
+STR_PROTECTED :{WHITE}Dieses Unternehmen ist noch nicht an der Börse...
STR_LIVERY_DEFAULT :Standardlackierung
STR_LIVERY_STEAM :Dampflok
@@ -2337,6 +2336,8 @@
STR_LIVERY_PASSENGER_WAGON_STEAM :Passagierwagen (Dampf)
STR_LIVERY_PASSENGER_WAGON_DIESEL :Passagierwagen (Diesel)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Passagierwagen (elektrisch)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :Reisezugwagen (Einschienenbahn)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :Reisezugwagen (Magnetschwebebahn)
STR_LIVERY_FREIGHT_WAGON :Güterwaggon
STR_LIVERY_BUS :Bus
STR_LIVERY_TRUCK :Lastwagen
@@ -2631,17 +2632,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Fahre nach {STATION}
-STR_8807_GO_TO_TRANSFER :Fahre nach {STATION} (Umladen und beladen)
-STR_8808_GO_TO_UNLOAD :Fahre nach {STATION} (Entladen)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Fahre nach {STATION} (Umladen und leer verlassen)
-STR_880A_GO_TO_LOAD :Fahre nach {STATION} (Beladen)
-STR_880B_GO_TO_TRANSFER_LOAD :Fahre nach {STATION} (Umladen und voll beladen)
-STR_880C_GO_NON_STOP_TO :Fahre ohne Halt nach {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Fahre ohne Halt nach {STATION} (Umladen und beladen)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Fahre ohne Halt nach {STATION} (Entladen)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Fahre nach {STATION} (Umladen und leer verlassen)
-STR_8810_GO_NON_STOP_TO_LOAD :Fahre ohne Halt nach {STATION} (Beladen)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Fahre ohne Halt nach {STATION} (Umladen und voll beladen)
+STR_GO_TO_TRANSFER :Fahre nach {STATION} (Umladen und beladen)
+STR_8807_GO_TO_UNLOAD :Fahre nach {STATION} (Entladen)
+STR_GO_TO_TRANSFER_UNLOAD :Fahre nach {STATION} (Umladen und leer verlassen)
+STR_8808_GO_TO_LOAD :Fahre nach {STATION} (Beladen)
+STR_GO_TO_TRANSFER_LOAD :Fahre nach {STATION} (Umladen und voll beladen)
+STR_880A_GO_NON_STOP_TO :Fahre ohne Halt nach {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Fahre ohne Halt nach {STATION} (Umladen und beladen)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Fahre ohne Halt nach {STATION} (Entladen)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Fahre nach {STATION} (Umladen und leer verlassen)
+STR_880C_GO_NON_STOP_TO_LOAD :Fahre ohne Halt nach {STATION} (Beladen)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Fahre ohne Halt nach {STATION} (Umladen und voll beladen)
STR_GO_TO_TRAIN_DEPOT :Fahre zum {TOWN} Zugdepot
STR_SERVICE_AT_TRAIN_DEPOT :Wartung bei {TOWN} Zugdepot
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Fahre ohne Halt zu {TOWN} Zugdepot
@@ -2745,7 +2746,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Zeige Einzelheiten zur geladenen Fracht
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Zeige Einzelheiten zu den Schienenfahrzeugen
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Zeige Kapazität jedes Fahrzeugs
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Frachtübersicht des Zuges anzeigen, aufgeteilt nach Frachttyp
+STR_SHOW_TOTAL_CARGO :{BLACK}Frachtübersicht des Zuges anzeigen, aufgeteilt nach Frachttyp
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Auftragsliste - zum Markieren hier anklicken
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Übergehe den laufenden Auftrag, und starte den nächsten
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Lösche den markierten Auftrag
@@ -2776,8 +2777,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Die Zugbewegung kann nicht umgekehrt werden...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Zugtyp umbenennen
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Zugtyp kann nicht umbenannt werden...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Beim markierten Eintrag wird die Ladung in den Bahnhof entladen (für späteren Weitertransport)
-STR_886F_TRANSFER :{BLACK}Umladen
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Beim markierten Eintrag wird die Ladung in den Bahnhof entladen (für späteren Weitertransport)
+STR_TRANSFER :{BLACK}Umladen
STR_CLEAR_TIME :{BLACK}Zeit löschen
STR_RESET_LATENESS :{BLACK}Verspätungszähler zurücksetzen
@@ -2855,8 +2856,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Name des Fahrzeuges
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Der erste Bus erreicht {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Der erste Lkw erreicht {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Die erste Straßenbahn erreicht {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Die erste Frachtstraßenbahn erreicht {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Die erste Straßenbahn erreicht {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Die erste Frachtstraßenbahn erreicht {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Fahrzeug verunglückt!{}Fahrer stirbt in Inferno nach Zusammenstoß mit Zug
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Fahrzeug verunglückt!{}{COMMA} sterben in Inferno nach Zusammenstoß mit Zug
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Das Fahrzeug kann nicht wenden...
@@ -2865,7 +2866,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Fahrzeug umbenennen
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Fahrzeug umbenennen
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Fahrzeug kann nicht umbenannt werden...
-STR_9038_GO_TO_ROADVEH_DEPOT :Fahre zum Fahrzeugdepot {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Fahre zum Fahrzeugdepot {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Wartung im Fahrzeugdepot {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Straßenfahrzeug für den Transport anderer Güter umrüsten
@@ -3239,6 +3240,12 @@
STR_PURCHASE_INFO_ALL_BUT :Alles außer {GOLD}
STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Zugkraft: {GOLD}{FORCE}
+########### For showing numbers in widgets
+
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
########### String for New Landscape Generator
STR_GENERATE :{WHITE}Erzeugen
--- a/src/lang/hungarian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/hungarian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Sima talaj szükséges
STR_0008_WAITING :{BLACK}Várakozik: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (elvitelre
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Elfogad:{WHITE}
STR_000D_ACCEPTS :{BLACK}Elfogad:{GOLD}
STR_000E :
@@ -340,9 +338,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Túl sok név van megadva
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}A megadott név már használatban van
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -353,11 +351,11 @@
STR_013C_CARGO :{BLACK}Rakomány
STR_013D_INFORMATION :{BLACK}Információ
STR_013E_CAPACITIES :{BLACK}Kapacitás
-STR_013E_TOTAL_CARGO :{BLACK}Teljes rakomány
+STR_TOTAL_CARGO :{BLACK}Teljes rakomány
STR_013F_CAPACITY :{BLACK}Kapacitás: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapacitás: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Teljes rakománya (kapacitása) ennek a vonatnak:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Teljes rakománya (kapacitása) ennek a vonatnak:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Új játék
STR_0141_LOAD_GAME :{BLACK}Játék betöltése
@@ -797,7 +795,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}A város teljes eltüntetése
STR_0292_SAVE_SCENARIO :Pálya mentése
STR_0293_LOAD_SCENARIO :Pálya betöltése
-STR_LOAD_HEIGHTMAP :Magasságtérkép betöltése
+STR_MENU_LOAD_HEIGHTMAP :Magasságtérkép betöltése
STR_0294_QUIT_EDITOR :Kilépés a szerkesztőből
STR_0295 :
STR_0296_QUIT :Kilépés
@@ -837,9 +835,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Beállítások
-STR_02C5_DIFFICULTY_SETTINGS :Nehézségi beállítások
-STR_02C7_CONFIG_PATCHES :Foltok beállítása
+STR_02C4_GAME_OPTIONS :Beállítások
+STR_02C6_DIFFICULTY_SETTINGS :Nehézségi beállítások
+STR_MENU_CONFIG_PATCHES :Foltok beállítása
STR_NEWGRF_SETTINGS :Newgrf beállítások
STR_TRANSPARENCY_OPTIONS :Átlátszósági beállítások
STR_GAMEOPTMENU_0A :
@@ -939,8 +937,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}A mentés még tart,{}kérlek várd meg a végét!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}A 'szép az élet' zenei műsor kiválasztása
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Angol (Eredeti)
@@ -1715,42 +1713,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Előbb le kell rombolnod az utat
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Útkarbantartás folyamatban
STR_1802_ROAD_CONSTRUCTION :{WHITE}Útépítés
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Villamospálya építés
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Villamospálya építés
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Közúti híd építése
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... egy irányú utaknak nem lehetnek kereszteződéseik...
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Nem építhetsz ide utat...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Nem lehet villamossínt építeni itt...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Nem lehet villamossínt építeni itt...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Nem rombolhatod le innen az utat...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nem lehet villamossínt eltávolítani innen...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nem lehet villamossínt eltávolítani innen...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Garázs helyzete
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Villamos-depó iránya
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Villamos-depó iránya
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Nem építhetsz ide garázst...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Nem lehet villamos-depót építeni ide...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Nem lehet villamos-depót építeni ide...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Nem építhetsz ide buszmegállót...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Nem építhetsz ide teherautó-rakodóhelyet...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nem lehet villamos utasvárót építeni...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nem lehet tehervillamos-állomást építeni...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nem lehet villamos utasvárót építeni...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nem lehet tehervillamos-állomást építeni...
STR_180A_ROAD_CONSTRUCTION :Útépítés
-STR_180A_TRAMWAY_CONSTRUCTION :Villamospálya építés
+STR_TRAMWAY_CONSTRUCTION :Villamospálya építés
STR_180B_BUILD_ROAD_SECTION :{BLACK}Út építése
STR_BUILD_AUTOROAD_TIP :{BLACK}Közút-szakasz megépítése automata módon
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Villamos-sín építése
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Villamos-sín építése
STR_BUILD_AUTOTRAM_TIP :{BLACK}Villamos-sín szakasz megépítése automata módon
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Garázs építése (járművek vételére és karbantartására)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Villamos-depó építése (járművek megépítésére és szervizelésére)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Villamos-depó építése (járművek megépítésére és szervizelésére)
STR_180D_BUILD_BUS_STATION :{BLACK}Buszmegálló építése
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Teherautó-rakodóhely építése
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Villamos utasváró építése
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Tehervillamos-állomás építése
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Villamos utasváró építése
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Tehervillamos-állomás építése
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Közúti híd építése
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Villamos-híd építése
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Villamos-híd építése
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Közúti alagút építése
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Villamos-alagút építése
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Villamos-alagút építése
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Egyirányú utak ki/be kapcsolása
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Építés/felszedés közötti váltás utaknál
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Építő/bontó üzemmód váltása a villamospályákhoz
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Építő/bontó üzemmód váltása a villamospályákhoz
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Válaszd ki a garázs helyzetét
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Válassz villamos-depó irányt
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Válassz villamos-depó irányt
STR_1814_ROAD :Út
STR_1815_ROAD_WITH_STREETLIGHTS :Út lámpákkal
STR_1816_TREE_LINED_ROAD :Fával szegélyezett út
@@ -1893,8 +1891,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Több állomással/rakodóhellyel érintkezik
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Túl sok állomás/rakodóhely van ebben a városban
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Túl sok az állomás/rakodóhely
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Túl sok buszmegálló
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Túl sok kamion megálló
+STR_TOO_MANY_BUS_STOPS :{WHITE}Túl sok buszmegálló
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Túl sok kamion megálló
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Túl közel van egy másik állomáshoz/rakodóhelyhez
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Előbb le kell rombolnod a vasútállomást
@@ -1925,12 +1923,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} most már elfogad {STRING} és {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Buszmegálló helyzete
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Rakodóhely helyzete
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Utasszállító villamos irány
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Teherszállító-villamos irány
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Utasszállító villamos irány
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Teherszállító-villamos irány
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Előbb le kell rombolnod a buszmegállót
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Előbb le kell rombolnod a teherautó-rakodóhelyet
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Előbb le kell rombolni a villamos utasvárót
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Előbb le kell rombolni a tehervillamos-állomást
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Előbb le kell rombolni a villamos utasvárót
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Előbb le kell rombolni a tehervillamos-állomást
STR_3048_STATIONS :{WHITE}{COMPANY} állomásai - {COMMA}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Nincs -
@@ -1942,8 +1940,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}A vasútállomás hossza
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Buszmegálló helyzetének kiválasztása
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Teherautó-rakodó helyzetének kiválasztása
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Válassz villamos utasváró irányt
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Válassz tehervillamos-állomás irányt
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Válassz villamos utasváró irányt
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Válassz tehervillamos-állomás irányt
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}A fő nézetet az állomásra állítja
STR_3054_SHOW_STATION_RATINGS :{BLACK}Vélemény megmutatása az állomásról
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Az állomás nevének megváltoztatása
@@ -1965,7 +1963,7 @@
STR_3069_BUOY :Bója
STR_306A_BUOY_IN_THE_WAY :{WHITE}...bója van az útban
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...az állomás túl kiterjedt
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...csak egyféle vágánytípusú állomások lehetnek
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...csak egyféle vágánytípusú állomások lehetnek
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Több elem kiválasztásához tartsd lenyomva a CTRL-t
STR_UNDEFINED :(nem definiált string)
@@ -2006,7 +2004,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Az új játék típusa
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Válassz egy pályát (zöld), előre beállított játékot (kék) vagy véletlenszerű új játékot
STR_4010_GENERATE_RANDOM_NEW_GAME :Véletlenszerű új játék
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Magasságtérkép betöltése
+STR_LOAD_HEIGHTMAP :{WHITE}Magasságtérkép betöltése
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}...{STRING} van az útban
@@ -2247,10 +2245,10 @@
STR_6813_ECONOMY :{LTBLUE}Gazdasági élet: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Vonatok fordítása: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katasztrófák: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}A városi tanács hozzáállása a területrendezéshez: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}A városi tanács hozzáállása a területrendezéshez: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Egyiksem
+STR_NONE :Egyiksem
STR_NUM_VERY_LOW :Nagyon kevés
STR_6816_LOW :Kevés
STR_6817_NORMAL :Normál
@@ -2288,9 +2286,9 @@
STR_6836_OFF :Ki
STR_6837_ON :Be
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Legjobb pontok
-STR_6839_PERMISSIVE :Engedékeny
-STR_683A_TOLERANT :Toleráns
-STR_683B_HOSTILE :Ellenséges
+STR_PERMISSIVE :Engedékeny
+STR_TOLERANT :Toleráns
+STR_HOSTILE :Ellenséges
##id 0x7000
STR_7000 :
@@ -2427,7 +2425,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Nem adhatsz el 25%-ot ebből a cégből...
STR_707D_OWNED_BY :{WHITE}({COMMA}% {COMPANY} tulajdona)
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} céget felvásárolta {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Ez a cég egyelőre még nem rendelkezik részvényekkel...
+STR_PROTECTED :{WHITE}Ez a cég egyelőre még nem rendelkezik részvényekkel...
STR_LIVERY_DEFAULT :Alapértelmezett
STR_LIVERY_STEAM :Gőzmozdony
@@ -2736,17 +2734,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING}{STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING}
STR_8806_GO_TO :Menj {STATION} állomásra
-STR_8807_GO_TO_TRANSFER :Menj {STATION} (odaszállít és felvesz rakományt)
-STR_8808_GO_TO_UNLOAD :Menj {STATION} (lepakol)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Menj {STATION} (odaszállít és üresen továbbmegy)
-STR_880A_GO_TO_LOAD :Menj {STATION} (felpakol)
-STR_880B_GO_TO_TRANSFER_LOAD :Menj {STATION} (odaszállít és teljes rakományra vár)
-STR_880C_GO_NON_STOP_TO :Megállás nélkül menj {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Megállás nélkül menj {STATION} (odaszállít és felvesz rakományt)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Megállás nélkül menj {STATION} (lepakol)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Megállás nélkül menj {STATION} (odaszállít és üresen távozik)
-STR_8810_GO_NON_STOP_TO_LOAD :Megállás nélkül menj {STATION} (felpakol)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Megállás nélkül menj {STATION} (odaszállít és teljes rakományra vár)
+STR_GO_TO_TRANSFER :Menj {STATION} (odaszállít és felvesz rakományt)
+STR_8807_GO_TO_UNLOAD :Menj {STATION} (lepakol)
+STR_GO_TO_TRANSFER_UNLOAD :Menj {STATION} (odaszállít és üresen továbbmegy)
+STR_8808_GO_TO_LOAD :Menj {STATION} (felpakol)
+STR_GO_TO_TRANSFER_LOAD :Menj {STATION} (odaszállít és teljes rakományra vár)
+STR_880A_GO_NON_STOP_TO :Megállás nélkül menj {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Megállás nélkül menj {STATION} (odaszállít és felvesz rakományt)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Megállás nélkül menj {STATION} (lepakol)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Megállás nélkül menj {STATION} (odaszállít és üresen távozik)
+STR_880C_GO_NON_STOP_TO_LOAD :Megállás nélkül menj {STATION} (felpakol)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Megállás nélkül menj {STATION} (odaszállít és teljes rakományra vár)
STR_GO_TO_TRAIN_DEPOT :Menj {TOWN} jármütelepre
STR_SERVICE_AT_TRAIN_DEPOT :Javítsd a vonatot a {TOWN}i járműtelepen
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Menj megállás nélkül {TOWN}i járműtelepre
@@ -2850,7 +2848,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}A szállított rakomány részletei
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}A vonat kocsiainak részletei
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}A kocsik kapacitása
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Megmutatja a vonat teljes kapacitását, rakománytípusokra lebontva
+STR_SHOW_TOTAL_CARGO :{BLACK}Megmutatja a vonat teljes kapacitását, rakománytípusokra lebontva
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Menetrend - kattints egy célpontra a kijelöléséhez
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Jelenlegi úticél átugrása, és a következő aktiválása. CTRL + kattintásra a kiválasztott úticélra ugrik
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}A kijelölt célpont törlése
@@ -2881,8 +2879,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nem fordíthatod meg a vonatot...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Márkanév megváltoztatása
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Nem változtathatod meg a márkanevet...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A kiválasztott állomásnál a jármű a rakományt leteszi
-STR_886F_TRANSFER :{BLACK}Elszállít
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A kiválasztott állomásnál a jármű a rakományt leteszi
+STR_TRANSFER :{BLACK}Elszállít
STR_CLEAR_TIME :{BLACK}Idő törlése
STR_RESET_LATENESS :{BLACK}Késés nullázása
@@ -2960,8 +2958,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Közúti jármű átnevezése
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az első busz {STATION} állomásra!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az első teherautó {STATION} állomásra!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}A lakosság ünnepel . . .{}Első utasszállító villamos megérkezett {STATION} állomásra!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}A lakosság ünnepel . . .{}Első teherszállító-villamos megérkezett {STATION} állomásra!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}A lakosság ünnepel . . .{}Első utasszállító villamos megérkezett {STATION} állomásra!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}A lakosság ünnepel . . .{}Első teherszállító-villamos megérkezett {STATION} állomásra!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Közúti baleset!{}A vezető meghalt a vonattal való ütközéskor
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Közúti baleset!{}{COMMA} ember meghalt a vonattal való ütközéskor
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Nem fordíthatod vissza a járművet...
@@ -2970,7 +2968,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}A közúti jármű márkanevének megváltoztatása
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Márkanév megváltoztatása
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Nem változtathatod meg a márkanevet...
-STR_9038_GO_TO_ROADVEH_DEPOT :Menj a {TOWN}i garázsba
+STR_GO_TO_ROADVEH_DEPOT :Menj a {TOWN}i garázsba
STR_SERVICE_AT_ROADVEH_DEPOT :Javítsd a járművet a {TOWN}i garázsban
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Teherautó átalakítása hogy mást is tudjon szállítani
--- a/src/lang/icelandic.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/icelandic.txt Sun Feb 03 20:34:26 2008 +0000
@@ -14,8 +14,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Sléttlendi nauðsynlegt
STR_0008_WAITING :{BLACK}Bíður: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (á leið frá
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Tekur við: {WHITE}
STR_000D_ACCEPTS :{BLACK}Tekur við: {GOLD}
STR_000E :
@@ -273,9 +271,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Of mörg nöfn skilgreint
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Valið nafn er þegar í notkun
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -285,11 +283,11 @@
STR_013C_CARGO :{BLACK}Farmur
STR_013D_INFORMATION :{BLACK}Upplýsingar
STR_013E_CAPACITIES :{BLACK}Burðargeta
-STR_013E_TOTAL_CARGO :{BLACK}Heildarfarmur
+STR_TOTAL_CARGO :{BLACK}Heildarfarmur
STR_013F_CAPACITY :{BLACK}Burðargeta: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Burðargeta: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Farmur alls (burðargeta) þessarar lestar:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Farmur alls (burðargeta) þessarar lestar:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nýr leikur
STR_0141_LOAD_GAME :{BLACK}Opna leik
@@ -723,7 +721,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Eyða þessum bæ algjörlega
STR_0292_SAVE_SCENARIO :Vista kort
STR_0293_LOAD_SCENARIO :Opna kort
-STR_LOAD_HEIGHTMAP :Hlaða hæðarkorti
+STR_MENU_LOAD_HEIGHTMAP :Hlaða hæðarkorti
STR_0294_QUIT_EDITOR :Hætta í kortagerð
STR_0295 :
STR_0296_QUIT :Hætta
@@ -762,9 +760,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Stillingar
-STR_02C5_DIFFICULTY_SETTINGS :Erfiðleikastig
-STR_02C7_CONFIG_PATCHES :Viðbætur
+STR_02C4_GAME_OPTIONS :Stillingar
+STR_02C6_DIFFICULTY_SETTINGS :Erfiðleikastig
+STR_MENU_CONFIG_PATCHES :Viðbætur
STR_NEWGRF_SETTINGS :NewGRF stillingar
STR_GAMEOPTMENU_0A :
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Bæjarnöfn sýnd
@@ -862,8 +860,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Vistun er enn í gangi,{}vinsamlegast bíddu á meðan hún klárst!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Velja 'Ezy gata' listann
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Ensk (Upphafleg)
@@ -1692,8 +1690,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Tengist fleiri en einni annarri stöð
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Of margar stöðvar/lestunarsvæði í þessum bæ
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Of margar stöðvar/lestunarsvæði
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Of margar strætisvagnastöðvar
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Of margar vörubílastöðvar
+STR_TOO_MANY_BUS_STOPS :{WHITE}Of margar strætisvagnastöðvar
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Of margar vörubílastöðvar
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Of nálægt annarri stöð/lestunarsvæði
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Þarf fyrst að rífa lestarstöð
@@ -1758,7 +1756,7 @@
STR_3069_BUOY :Bauja
STR_306A_BUOY_IN_THE_WAY :{WHITE}...bauja fyrir
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...stöð of dreyfð
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...óregluleg lögun lestarstöðva bönnuð
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...óregluleg lögun lestarstöðva bönnuð
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Haltu CTRL inni til að velja fleiri en eitt
STR_UNDEFINED :(óskilgreindur strengur)
@@ -1793,7 +1791,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Velja tegund leiks
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Velja landslag (grænt), forstilltan leik (blátt) eða handahófskenndan leik
STR_4010_GENERATE_RANDOM_NEW_GAME :Búa til nýjan leik
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Hlaða hæðakorti
+STR_LOAD_HEIGHTMAP :{WHITE}Hlaða hæðakorti
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} er fyrir
@@ -1987,10 +1985,10 @@
STR_6813_ECONOMY :{LTBLUE}Efnahagur: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Snúningur lestar: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Hrakföll: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Afstaða borgaryfirvalda til landmótunar: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Afstaða borgaryfirvalda til landmótunar: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Engin
+STR_NONE :Engin
STR_6816_LOW :Fáir
STR_6817_NORMAL :Miðlungs
STR_6818_HIGH :Margir
@@ -2027,9 +2025,9 @@
STR_6836_OFF :Ekki á
STR_6837_ON :Á
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Sýna topplistann
-STR_6839_PERMISSIVE :Eftirgefin
-STR_683A_TOLERANT :Umburðarlynd
-STR_683B_HOSTILE :Fjandsamleg
+STR_PERMISSIVE :Eftirgefin
+STR_TOLERANT :Umburðarlynd
+STR_HOSTILE :Fjandsamleg
##id 0x7000
STR_7000 :
@@ -2161,7 +2159,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Get ekki selt 25% hlut í þessu fyrirtæki...
STR_707D_OWNED_BY :{WHITE}({COMMA}% í eigu {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} hefur verið yfirtekið af {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Þetta fyrirtæki er ekki nógu gamalt til að versla með hluti ...
+STR_PROTECTED :{WHITE}Þetta fyrirtæki er ekki nógu gamalt til að versla með hluti ...
STR_LIVERY_DEFAULT :Aðal litaskema
STR_LIVERY_STEAM :Gufuvagnar
@@ -2466,17 +2464,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Fer til {STATION}
-STR_8807_GO_TO_TRANSFER :Fer til {STATION} (Yfirfæra og ferma)
-STR_8808_GO_TO_UNLOAD :Fer til {STATION} (Afferma)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Fer til {STATION} (Yfirfæra og yfirgefa tóm)
-STR_880A_GO_TO_LOAD :Fer til {STATION} (Fullferma)
-STR_880B_GO_TO_TRANSFER_LOAD :Fer til {STATION} (Yfirfæra og fullferma)
-STR_880C_GO_NON_STOP_TO :Fer viðstöðulaust til {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Fer viðstöðulaust til {STATION} (Yfirfæra og ferma)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Fer viðstöðulaust til {STATION} (Afferma)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Fer viðstöðulaust til {STATION} (Yfirfæra og yfirgefa tóm)
-STR_8810_GO_NON_STOP_TO_LOAD :Fer viðstöðulaust til {STATION} (Fullferma)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Fer viðstöðulaust til {STATION} (Yfirfæra og fullferma)
+STR_GO_TO_TRANSFER :Fer til {STATION} (Yfirfæra og ferma)
+STR_8807_GO_TO_UNLOAD :Fer til {STATION} (Afferma)
+STR_GO_TO_TRANSFER_UNLOAD :Fer til {STATION} (Yfirfæra og yfirgefa tóm)
+STR_8808_GO_TO_LOAD :Fer til {STATION} (Fullferma)
+STR_GO_TO_TRANSFER_LOAD :Fer til {STATION} (Yfirfæra og fullferma)
+STR_880A_GO_NON_STOP_TO :Fer viðstöðulaust til {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Fer viðstöðulaust til {STATION} (Yfirfæra og ferma)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Fer viðstöðulaust til {STATION} (Afferma)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Fer viðstöðulaust til {STATION} (Yfirfæra og yfirgefa tóm)
+STR_880C_GO_NON_STOP_TO_LOAD :Fer viðstöðulaust til {STATION} (Fullferma)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Fer viðstöðulaust til {STATION} (Yfirfæra og fullferma)
STR_GO_TO_TRAIN_DEPOT :Fer til {TOWN} Lestaskýli
STR_SERVICE_AT_TRAIN_DEPOT :Viðgerð í {TOWN} Lestar Byggingu
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Fer viðstöðulaust til {TOWN} Lestar Byggingar
@@ -2568,7 +2566,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Sýna nánari upplýsingar um núverandi farm
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Sýna nánari upplýsingar um lestir
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Sýna burðargetu hvers farartækis
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Sýna heildar burðargetu lestar, raðar eftir tegund farms
+STR_SHOW_TOTAL_CARGO :{BLACK}Sýna heildar burðargetu lestar, raðar eftir tegund farms
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Áætlun - smelltu til að velja stöð. CTRL + músartakki færir sjónarhorn að stöðinni
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Eyða valdri skipun
STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gera valda skipun viðstöðulausa
@@ -2594,8 +2592,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Get ekki snúið lest við...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Endurskíra lestargerð
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Get ekki endurskírt lestargerð...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Lætur lestina losa farminn á valinni skipun
-STR_886F_TRANSFER :{BLACK}Yfirfæra
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Lætur lestina losa farminn á valinni skipun
+STR_TRANSFER :{BLACK}Yfirfæra
STR_TRAIN_STOPPING :{RED}Stöðva
STR_TRAIN_STOPPING_VEL :{RED}Stöðva, {VELOCITY}
@@ -2658,7 +2656,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Endurnefna tegund bifreiðar
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Endurnefna tegund bifreiðar
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE} Get ekki endurnefnat tegund bifreiðar...
-STR_9038_GO_TO_ROADVEH_DEPOT :Fara í {TOWN} bifreiðaskýli
+STR_GO_TO_ROADVEH_DEPOT :Fara í {TOWN} bifreiðaskýli
STR_SERVICE_AT_ROADVEH_DEPOT :Skoða í {TOWN} bifreiðaskýli
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Breyta bifreið svo hún flytji annan farm
--- a/src/lang/italian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/italian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Richiesto terreno pianeggiante
STR_0008_WAITING :{BLACK}In attesa: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (in viaggio da
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} in viaggio da {STATION})
STR_000C_ACCEPTS :{BLACK}Accetta: {WHITE}
STR_000D_ACCEPTS :{BLACK}Accetta: {GOLD}
STR_000E :
@@ -170,7 +169,7 @@
STR_00C7_QUIT :{WHITE}Esci
STR_00C8_YES :{BLACK}Sì
STR_00C9_NO :{BLACK}No
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Si è sicuri di voler abbandonare la partita e tornare a {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Si è sicuri di voler uscire da OpenTTD e tornare a {STRING}?
STR_00CB_1 :{BLACK}1
STR_00CC_2 :{BLACK}2
STR_00CD_3 :{BLACK}3
@@ -276,9 +275,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Troppi nomi definiti
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Il nome scelto è già in uso
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -289,11 +288,11 @@
STR_013C_CARGO :{BLACK}Carico
STR_013D_INFORMATION :{BLACK}Informazioni
STR_013E_CAPACITIES :{BLACK}Capienza
-STR_013E_TOTAL_CARGO :{BLACK}Carico totale
+STR_TOTAL_CARGO :{BLACK}Carico totale
STR_013F_CAPACITY :{BLACK}Capacità: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capacità: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Capacità di carico totale di questo treno:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Capacità di carico totale di questo treno:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nuova partita
STR_0141_LOAD_GAME :{BLACK}Carica partita
@@ -733,7 +732,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Elimina completamente questa città
STR_0292_SAVE_SCENARIO :Salva scenario
STR_0293_LOAD_SCENARIO :Carica scenario
-STR_LOAD_HEIGHTMAP :Carica heightmap
+STR_MENU_LOAD_HEIGHTMAP :Carica heightmap
STR_0294_QUIT_EDITOR :Esci dall'editor
STR_0295 :
STR_0296_QUIT :Esci
@@ -773,9 +772,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Opzioni gioco
-STR_02C5_DIFFICULTY_SETTINGS :Impostazioni difficoltà
-STR_02C7_CONFIG_PATCHES :Configura patch
+STR_02C4_GAME_OPTIONS :Opzioni gioco
+STR_02C6_DIFFICULTY_SETTINGS :Impostazioni difficoltà
+STR_MENU_CONFIG_PATCHES :Configura patch
STR_NEWGRF_SETTINGS :Impostazioni NewGRF
STR_TRANSPARENCY_OPTIONS :Opzioni trasparenza
STR_GAMEOPTMENU_0A :
@@ -875,8 +874,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Salvataggio in corso,{}prego attenderne la fine!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Seleziona il programma 'Musica ezy street'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglesi (originali)
@@ -1071,7 +1070,7 @@
STR_CONFIG_PATCHES_AUTORENEW_MONEY :{LTBLUE}Rinnova solo se disponibile il fondo minimo di {ORANGE}{STRING}
STR_CONFIG_PATCHES_ERRMSG_DURATION :{LTBLUE}Durata dei messaggi d'errore: {ORANGE}{STRING}
STR_CONFIG_PATCHES_POPULATION_IN_LABEL :{LTBLUE}Mostra la popolazione di una città nell'etichetta del nome: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Alberi invisibili (con edifici trasparenti attivati): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Alberi invisibili: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LAND_GENERATOR :{LTBLUE}Generatore terreno: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL :Originale
@@ -1651,42 +1650,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Bisogna rimuovere la strada prima
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Lavori stradali in corso
STR_1802_ROAD_CONSTRUCTION :{WHITE}Costruzione strade
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Costruzione tranvie
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Costruzione tranvie
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Seleziona ponte stradale
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}...le strade a senso unico non possono avere raccordi
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Impossibile costruire la strada qui...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Impossibile costruire la tranvia qui...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Impossibile costruire la tranvia qui...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Impossibile rimuovere la strada da qui...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Impossibile rimuovere la tranvia da qui...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Impossibile rimuovere la tranvia da qui...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Orientamento deposito
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orientamento deposito
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orientamento deposito
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Impossibile costruire il deposito qui...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Impossibile costruire il deposito qui...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Impossibile costruire il deposito qui...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Impossibile costruire la stazione degli autobus qui...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Impossibile costruire la stazione dei camion qui...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Impossibile costruire la stazione tram passeggeri...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Impossibile costruire la stazione tram merci...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Impossibile costruire la stazione tram passeggeri...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Impossibile costruire la stazione tram merci...
STR_180A_ROAD_CONSTRUCTION :Costruzione strade
-STR_180A_TRAMWAY_CONSTRUCTION :Costruzione tranvie
+STR_TRAMWAY_CONSTRUCTION :Costruzione tranvie
STR_180B_BUILD_ROAD_SECTION :{BLACK}Costruisce una sezione di strada
STR_BUILD_AUTOROAD_TIP :{BLACK}Costruisce sezioni di strada usando la modalità automatica
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Costruisce una sezione di tranvia
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Costruisce una sezione di tranvia
STR_BUILD_AUTOTRAM_TIP :{BLACK}Costruisce sezioni di tranvia usando la modalità automatica
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Costruisce un deposito automezzi (per costruire e manutenere i veicoli)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Costruisce un deposito tranviario (per costruire e manutenere i veicoli)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Costruisce un deposito tranviario (per costruire e manutenere i veicoli)
STR_180D_BUILD_BUS_STATION :{BLACK}Costruisce una stazione degli autobus
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Costruisce un'area di carico per camion
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Costruisce una stazione tram passeggeri
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Costruisce una stazione tram merci
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Costruisce una stazione tram passeggeri
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Costruisce una stazione tram merci
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Costruisce un ponte stradale
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Costruisce un ponte tranviario
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Costruisce un ponte tranviario
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Costruisce un tunnel stradale
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Costruisce un tunnel tranviario
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Costruisce un tunnel tranviario
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Attiva/disattiva strade a senso unico
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Seleziona fra costruzione/rimozione di strade
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Seleziona fra costruzione/rimozione di tranvie
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Seleziona fra costruzione/rimozione di tranvie
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Seleziona l'orientamento del deposito automezzi
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Seleziona l'orientamento del deposito tranviario
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Seleziona l'orientamento del deposito tranviario
STR_1814_ROAD :Strada
STR_1815_ROAD_WITH_STREETLIGHTS :Strada con lampioni
STR_1816_TREE_LINED_ROAD :Strada alberata
@@ -1829,8 +1828,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Farebbe parte di due o più stazioni/aree di carico
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Troppe stazioni/aree di carico in questa città
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Troppe stazioni/aree di carico
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Troppe stazioni degli autobus
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Troppe aree di carico per camion
+STR_TOO_MANY_BUS_STOPS :{WHITE}Troppe stazioni degli autobus
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Troppe aree di carico per camion
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Troppo vicino ad un'altra stazione/area di carico
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Bisogna demolire la stazione ferroviaria prima
@@ -1861,12 +1860,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} adesso accetta {STRING} e {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Orientamento stazione
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Orient. area carico
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orient. stazione tram passeggeri
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Orient. stazione tram merci
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orient. stazione tram passeggeri
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Orient. stazione tram merci
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Bisogna demolire la stazione degli autobus prima
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Bisogna demolire l'area di carico per camion prima
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Bisogna demolire la stazione tram passeggeri prima
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Bisogna demolire la stazione tram merci prima
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Bisogna demolire la stazione tram passeggeri prima
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Bisogna demolire la stazione tram merci prima
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} stazion{P 2 e i}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Nessuna -
@@ -1878,8 +1877,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Seleziona la lunghezza della stazione ferroviaria
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Seleziona l'orientamento della stazione degli autobus
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Seleziona l'orientamento dell'area di carico per camion
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Seleziona l'orientamento della stazione tram passeggeri
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Seleziona l'orientamento della stazione tram merci
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Seleziona l'orientamento della stazione tram passeggeri
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Seleziona l'orientamento della stazione tram merci
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centra la visuale principale sulla posizione della stazione
STR_3054_SHOW_STATION_RATINGS :{BLACK}Mostra la valutazione della stazione
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Cambia il nome della stazione
@@ -1901,7 +1900,7 @@
STR_3069_BUOY :Boa
STR_306A_BUOY_IN_THE_WAY :{WHITE}...boa di mezzo
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...stazione troppo estesa
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...stazioni non uniformi disabilitate
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...stazioni non uniformi disabilitate
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Tenere premuto CTRL per scegliere più di un oggetto
STR_UNDEFINED :(stringa non definita)
@@ -1942,7 +1941,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Seleziona tipo partita
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Seleziona uno scenario (verde), una partita pre-impostata (blu), o una nuova partita casuale
STR_4010_GENERATE_RANDOM_NEW_GAME :Crea partita casuale
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Carica heightmap
+STR_LOAD_HEIGHTMAP :{WHITE}Carica heightmap
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} di mezzo
@@ -2146,10 +2145,10 @@
STR_6813_ECONOMY :{LTBLUE}Economia: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Inversione treni: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Disastri: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Atteggiamento della città in merito alle modifiche: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Atteggiamento della città in merito alle modifiche: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Nessuno
+STR_NONE :Nessuno
STR_NUM_VERY_LOW :Molto basso
STR_6816_LOW :Basso
STR_6817_NORMAL :Normale
@@ -2187,9 +2186,9 @@
STR_6836_OFF :No
STR_6837_ON :Si
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Mostra punteggi migliori
-STR_6839_PERMISSIVE :Permissivo
-STR_683A_TOLERANT :Tollerante
-STR_683B_HOSTILE :Ostile
+STR_PERMISSIVE :Permissivo
+STR_TOLERANT :Tollerante
+STR_HOSTILE :Ostile
##id 0x7000
STR_7000 :
@@ -2326,7 +2325,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Impossibile vendere il 25% delle azioni...
STR_707D_OWNED_BY :{WHITE}({COMMA}% posseduto dalla {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}La {COMPANY} è stata rilevata dalla {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Questa compagnia non è abbastanza vecchia per scambiare azioni...
+STR_PROTECTED :{WHITE}Questa compagnia non è abbastanza vecchia per scambiare azioni...
STR_LIVERY_DEFAULT :Livrea standard
STR_LIVERY_STEAM :Locomotiva a vapore
@@ -2635,17 +2634,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Vai a {STATION}
-STR_8807_GO_TO_TRANSFER :Vai a {STATION} (Trasferisci e carica merce)
-STR_8808_GO_TO_UNLOAD :Vai a {STATION} (Scarica)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Vai a {STATION} (Trasferisci e parti vuoto)
-STR_880A_GO_TO_LOAD :Vai a {STATION} (Carica)
-STR_880B_GO_TO_TRANSFER_LOAD :Vai a {STATION} (Trasferisci e aspetta carico completo)
-STR_880C_GO_NON_STOP_TO :Vai non-stop a {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Vai non-stop a {STATION} (Trasferisci e carica merce)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Vai non-stop a {STATION} (Scarica)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Vai non-stop a {STATION} (Trasferisci e parti vuoto)
-STR_8810_GO_NON_STOP_TO_LOAD :Vai non-stop a {STATION} (Carica)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Vai non-stop a {STATION} (Trasferisci e aspetta carico completo)
+STR_GO_TO_TRANSFER :Vai a {STATION} (Trasferisci e carica merce)
+STR_8807_GO_TO_UNLOAD :Vai a {STATION} (Scarica)
+STR_GO_TO_TRANSFER_UNLOAD :Vai a {STATION} (Trasferisci e parti vuoto)
+STR_8808_GO_TO_LOAD :Vai a {STATION} (Carica)
+STR_GO_TO_TRANSFER_LOAD :Vai a {STATION} (Trasferisci e aspetta carico completo)
+STR_880A_GO_NON_STOP_TO :Vai non-stop a {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Vai non-stop a {STATION} (Trasferisci e carica merce)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Vai non-stop a {STATION} (Scarica)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Vai non-stop a {STATION} (Trasferisci e parti vuoto)
+STR_880C_GO_NON_STOP_TO_LOAD :Vai non-stop a {STATION} (Carica)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Vai non-stop a {STATION} (Trasferisci e aspetta carico completo)
STR_GO_TO_TRAIN_DEPOT :Vai al Deposito ferroviario di {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Manutenzione al Deposito di {TOWN}
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Vai non-stop al Deposito ferroviario di {TOWN}
@@ -2749,7 +2748,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Mostra i dettagli sul carico trasportato
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Mostra i dettagli sui veicoli che compongono il treno
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Mostra la capienza di ogni veicolo
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Mostra la capacità totale del treno, suddivisa per tipo di carico
+STR_SHOW_TOTAL_CARGO :{BLACK}Mostra la capacità totale del treno, suddivisa per tipo di carico
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista degli ordini - fare clic su un ordine per selezionarlo e CTRL+clic per portarsi sulla stazione corrispondente
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Salta l'ordine corrente e inizia il successivo. Tenere premuto CTRL per saltare all'ordine selezionato
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Elimina l'ordine selezionato
@@ -2780,8 +2779,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Impossibile invertire la direzione del treno...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Rinomina tipo di veicolo ferroviario
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Impossibile rinominare il tipo di veicolo ferroviario...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fa in modo che l'ordine selezionato forzi il veicolo a trasferire il carico
-STR_886F_TRANSFER :{BLACK}Trasferisci
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fa in modo che l'ordine selezionato forzi il veicolo a trasferire il carico
+STR_TRANSFER :{BLACK}Trasferisci
STR_CLEAR_TIME :{BLACK}Elimina tempo
STR_RESET_LATENESS :{BLACK}Azzera ritardo
@@ -2859,8 +2858,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Rinomina l'automezzo
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo autobus arriva a {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo camion arriva a {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo tram passeggeri arriva a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo tram merci arriva a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo tram passeggeri arriva a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo tram merci arriva a {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Incidente stradale!{}Il conducente muore nell'incendio seguito alla collisione con un treno
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Incidente stradale!{}In {COMMA} muoiono nell'incendio seguito alla collisione con un treno
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Impossibile far girare il veicolo...
@@ -2869,7 +2868,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Rinomina il tipo di automezzo
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Rinomina tipo automezzo
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Impossibile rinominare il tipo di automezzo...
-STR_9038_GO_TO_ROADVEH_DEPOT :Vai al Deposito automezzi di {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Vai al Deposito automezzi di {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Manutenzione al Deposito di {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Riadatta l'automezzo per trasportare un tipo di carico differente
--- a/src/lang/japanese.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/japanese.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}平地が必要です
STR_0008_WAITING :{BLACK}到着待ち：{WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW}（原点：
-STR_000B :{YELLOW}{STATION}）
+STR_EN_ROUTE_FROM :{YELLOW}（{1:STATION}から運送途中の{0:SHORTCARGO}）
STR_000C_ACCEPTS :{BLACK}受入れ貨物：{WHITE}
STR_000D_ACCEPTS :{BLACK}受入れ貨物：{GOLD}
STR_000E :
@@ -274,9 +273,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}名称定義数の制限を超えています
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}指定した名称はすでに使用中です
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +286,11 @@
STR_013C_CARGO :{BLACK}貨物
STR_013D_INFORMATION :{BLACK}情報
STR_013E_CAPACITIES :{BLACK}容量
-STR_013E_TOTAL_CARGO :{BLACK}合計貨物
+STR_TOTAL_CARGO :{BLACK}合計貨物
STR_013F_CAPACITY :{BLACK}容量：{LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}容量：{LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}この列車の貨物最大容量：
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}この列車の貨物最大容量：
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}新しいゲーム
STR_0141_LOAD_GAME :{BLACK}ゲームを開く
@@ -726,11 +725,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}送信機を建設します
STR_028F_DEFINE_DESERT_AREA :{BLACK}砂漠を作成します。{}Control+クリックすると消去します
STR_CREATE_LAKE :{BLACK}。水を作成します。{}通常の使用時に運河を建設します。Controlをクリックすると、海水位にある地域が浸水できます。
+STR_CREATE_RIVER :{BLACK}川を造る
STR_0290_DELETE :{BLACK}破壊
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}この町を完全に破壊します
STR_0292_SAVE_SCENARIO :シナリオを保存
STR_0293_LOAD_SCENARIO :シナリオを開く
-STR_LOAD_HEIGHTMAP :ハイトマップを開く
+STR_MENU_LOAD_HEIGHTMAP :ハイトマップを開く
STR_0294_QUIT_EDITOR :エディタを終了
STR_0295 :
STR_0296_QUIT :終了
@@ -770,9 +770,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :ゲームの設定
-STR_02C5_DIFFICULTY_SETTINGS :難易度の設定
-STR_02C7_CONFIG_PATCHES :パッチの設定
+STR_02C4_GAME_OPTIONS :ゲームの設定
+STR_02C6_DIFFICULTY_SETTINGS :難易度の設定
+STR_MENU_CONFIG_PATCHES :パッチの設定
STR_NEWGRF_SETTINGS :NewGRFの設定
STR_TRANSPARENCY_OPTIONS :半透明設定
STR_GAMEOPTMENU_0A :
@@ -872,8 +872,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}ゲームを保存しています{}完了してからしばらくお待ちください！
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}'Ezy Street 式の音楽'のプレイリストを選択します
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :イギリス
@@ -1648,42 +1648,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}先に道路を破壊しなければなりません
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}道路工事中
STR_1802_ROAD_CONSTRUCTION :{WHITE}道路の建設
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}路面電車線の建設
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}路面電車線の建設
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}道路橋を選択
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}...一方通行路上にジャンクションが建設できません
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}ここに道路が建設できません...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}ここに路面電車線が建設できません...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}ここに路面電車線が建設できません...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}ここから道路が破壊できません...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}ここから路面電車線が破壊できません...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}ここから路面電車線が破壊できません...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}車庫の配置
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}路面電車庫の配置
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}路面電車庫の配置
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}ここに車庫が建設できません...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}ここに路面電車庫が建設できません...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}ここに路面電車庫が建設できません...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}バス停が建設できません...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}荷役所が建設できません...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}乗客用路面電車駅が建設できません...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}貨物用路面電車駅が建設できません...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}乗客用路面電車駅が建設できません...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}貨物用路面電車駅が建設できません...
STR_180A_ROAD_CONSTRUCTION :道路の建設
-STR_180A_TRAMWAY_CONSTRUCTION :路面電車線の建設
+STR_TRAMWAY_CONSTRUCTION :路面電車線の建設
STR_180B_BUILD_ROAD_SECTION :{BLACK}道路の部分を建設します
STR_BUILD_AUTOROAD_TIP :{BLACK}自動道路建設モードを用いて道路を建設
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}路面電車線を建設します
+STR_BUILD_TRAMWAY_SECTION :{BLACK}路面電車線を建設します
STR_BUILD_AUTOTRAM_TIP :{BLACK}自動路面電車線建設モードを用いて路面電車線を建設
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}（バス、トラックの建設、整備のための）車庫を建設します
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}（路面電車の購入や修理のため）路面電車庫を建設します
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}（路面電車の購入や修理のため）路面電車庫を建設します
STR_180D_BUILD_BUS_STATION :{BLACK}バス停を建設します
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}荷役所を建設します
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}乗客用路面電車駅を建設
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}貨物用路面電車駅を建設
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}乗客用路面電車駅を建設
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}貨物用路面電車駅を建設
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}道路の端を建設します
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}路面電車用橋を建設
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}路面電車用橋を建設
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}道路のトンネルを建設します
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}路面電車用トンネルを建設
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}路面電車用トンネルを建設
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}一方通行の道路を入／切
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}道路の建設／破壊を切り替えます
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}路面電車線の建設／破壊を切り替えます
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}路面電車線の建設／破壊を切り替えます
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}車庫の配置の選択
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}路面電車庫の配置を選択
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}路面電車庫の配置を選択
STR_1814_ROAD :道路
STR_1815_ROAD_WITH_STREETLIGHTS :街路照明のある道路
STR_1816_TREE_LINED_ROAD :並木道
@@ -1826,8 +1826,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}複数のすでに存在している駅／バス停／荷役所に接しています
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}町内に駅／バス停／荷役所が多すぎます
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}駅／バス停／荷役所が多すぎます
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}バス停が多すぎます
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}荷役所が多すぎます
+STR_TOO_MANY_BUS_STOPS :{WHITE}バス停が多すぎます
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}荷役所が多すぎます
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}他の駅／荷役所に近すぎます
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}先に駅を破壊しなければなりません
@@ -1858,12 +1858,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION}は今後{STRING}と{STRING}が受入れます
STR_3042_BUS_STATION_ORIENTATION :{WHITE}バス停の配置
STR_3043_TRUCK_STATION_ORIENT :{WHITE}荷役所の配置
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}乗客用路面電車駅の配置
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}貨物用路面電車駅の配置
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}乗客用路面電車駅の配置
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}貨物用路面電車駅の配置
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}先にバス停を破壊しなければなりません
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}先にバス停を破壊しなければなりません
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}先に乗客用路面電車駅を破壊しなければなりません
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}先に貨物用路面電車駅を破壊しなければなりません
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}先に乗客用路面電車駅を破壊しなければなりません
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}先に貨物用路面電車駅を破壊しなければなりません
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA}軒の駅
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- なし -
@@ -1875,8 +1875,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}駅のホームの長さを選択します
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}バス停の配置を選択します
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}荷役所の配置を選択します
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}乗客用路面電車駅の配置を選択
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}貨物用路面電車駅の配置を選択
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}乗客用路面電車駅の配置を選択
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}貨物用路面電車駅の配置を選択
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}主の画面を駅の場所に移動します
STR_3054_SHOW_STATION_RATINGS :{BLACK}駅の評価を表示します
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}駅名を変更します
@@ -1898,7 +1898,7 @@
STR_3069_BUOY :ブイ
STR_306A_BUOY_IN_THE_WAY :{WHITE}...ブイがあります
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...駅が広すぎます
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...不統一の駅が建設できません
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...不統一の駅が建設できません
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}複数の項目を選択するにはcontrolを押します
STR_UNDEFINED :（不定義）
@@ -1939,7 +1939,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}新規ゲーム種類の選択
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}シナリオ（緑）、プリセットゲーム（青）もしくは新規ランダムゲームを選択します
STR_4010_GENERATE_RANDOM_NEW_GAME :新規ランダムゲームを作成
-STR_4011_LOAD_HEIGHTMAP :{WHITE}ハイトマップを開く
+STR_LOAD_HEIGHTMAP :{WHITE}ハイトマップを開く
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING}があります
@@ -2143,10 +2143,10 @@
STR_6813_ECONOMY :{LTBLUE}経済の傾向：{ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}列車の反転：{ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}災害：{ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}町議会の地域の再構築に関わる姿勢：{ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}町議会の地域の再構築に関わる姿勢：{ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :なし
+STR_NONE :なし
STR_NUM_VERY_LOW :特に低い
STR_6816_LOW :低い
STR_6817_NORMAL :通常
@@ -2184,9 +2184,9 @@
STR_6836_OFF :切
STR_6837_ON :入
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}ハイスコアを表示
-STR_6839_PERMISSIVE :寛大
-STR_683A_TOLERANT :寛容
-STR_683B_HOSTILE :対立
+STR_PERMISSIVE :寛大
+STR_TOLERANT :寛容
+STR_HOSTILE :対立
##id 0x7000
STR_7000 :
@@ -2323,7 +2323,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}この会社の２５％の株が販売できません...
STR_707D_OWNED_BY :{WHITE}（{1:COMPANY}が{0:COMMA}％株式保有）
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY}が{COMPANY}に買収！
-STR_7080_PROTECTED :{WHITE}まだ早いため、この会社は株式取引できません...
+STR_PROTECTED :{WHITE}まだ早いため、この会社は株式取引できません...
STR_LIVERY_DEFAULT :通常のカラースキーム
STR_LIVERY_STEAM :蒸気機関車
@@ -2336,6 +2336,8 @@
STR_LIVERY_PASSENGER_WAGON_STEAM :客車（蒸気動）
STR_LIVERY_PASSENGER_WAGON_DIESEL :客車（ディーゼル動）
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :客車（電動）
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :モノレール用乗客車
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :次期浮上式電車用乗客車
STR_LIVERY_FREIGHT_WAGON :貨車
STR_LIVERY_BUS :バス
STR_LIVERY_TRUCK :トラック
@@ -2630,17 +2632,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :{STATION}へ行く
-STR_8807_GO_TO_TRANSFER :{STATION}へ行く（運搬して貨物を積む）
-STR_8808_GO_TO_UNLOAD :{STATION}へ行く（貨物を降ろす）
-STR_8809_GO_TO_TRANSFER_UNLOAD :{STATION}へ行く（運搬して空そのまま次へ行く）
-STR_880A_GO_TO_LOAD :{STATION}へ行く（全負荷）
-STR_880B_GO_TO_TRANSFER_LOAD :{STATION}へ行く（運搬して全負荷まで待つ）
-STR_880C_GO_NON_STOP_TO :{STATION}へ直行で行く
-STR_880D_GO_TO_NON_STOP_TRANSFER :{STATION}へ直行で行く（運搬して貨物を積む）
-STR_880E_GO_NON_STOP_TO_UNLOAD :{STATION}へ直行で行く（貨物を降ろす）
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :{STATION}へ直行で行く（運搬して空そのまま次へ行く）
-STR_8810_GO_NON_STOP_TO_LOAD :{STATION}へ直行で行く（全負荷）
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :{STATION}へ直行で行く（運搬して全負荷まで待つ）
+STR_GO_TO_TRANSFER :{STATION}へ行く（運搬して貨物を積む）
+STR_8807_GO_TO_UNLOAD :{STATION}へ行く（貨物を降ろす）
+STR_GO_TO_TRANSFER_UNLOAD :{STATION}へ行く（運搬して空そのまま次へ行く）
+STR_8808_GO_TO_LOAD :{STATION}へ行く（全負荷）
+STR_GO_TO_TRANSFER_LOAD :{STATION}へ行く（運搬して全負荷まで待つ）
+STR_880A_GO_NON_STOP_TO :{STATION}へ直行で行く
+STR_GO_TO_NON_STOP_TRANSFER :{STATION}へ直行で行く（運搬して貨物を積む）
+STR_880B_GO_NON_STOP_TO_UNLOAD :{STATION}へ直行で行く（貨物を降ろす）
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :{STATION}へ直行で行く（運搬して空そのまま次へ行く）
+STR_880C_GO_NON_STOP_TO_LOAD :{STATION}へ直行で行く（全負荷）
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :{STATION}へ直行で行く（運搬して全負荷まで待つ）
STR_GO_TO_TRAIN_DEPOT :{TOWN}電車庫へ回送
STR_SERVICE_AT_TRAIN_DEPOT :{TOWN}電車庫で修理
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :{TOWN}電車庫へ直行で回送
@@ -2744,7 +2746,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}運送している貨物の情報を表示します
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}鉄道車両の情報を表示します
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}各車両の容量を表示します
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}貨物種類に並べ替えて列車の合計容量を表示します
+STR_SHOW_TOTAL_CARGO :{BLACK}貨物種類に並べ替えて列車の合計容量を表示します
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}指令リスト - 指令を選択するにはクリックします
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}実行中の指令をスキップして、次へ移動します。Control クリックすると、選択した指令へ移動します。
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}選択した指令を削除します
@@ -2775,8 +2777,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}列車が逆転されられません...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}鉄道車両の名称を変更
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}鉄道車両の名称が変更できません...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}選択した指令に貨物の降ろすことを含みます
-STR_886F_TRANSFER :{BLACK}運搬
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}選択した指令に貨物の降ろすことを含みます
+STR_TRANSFER :{BLACK}運搬
STR_CLEAR_TIME :{BLACK}時間を消去
STR_RESET_LATENESS :{BLACK}遅刻回数をリセット
@@ -2854,8 +2856,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}道路車両を名付ける
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}町民の祝賀！{}初バスが{STATION}バス停に到着！
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}町民の祝賀！{}初トラックが{STATION}荷役所に到着！
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}町民の祝賀{}初乗客用路面電車が{STATION}駅に到着！
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}町民の祝賀{}初貨物用路面電車が{STATION}駅に到着！
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}町民の祝賀{}初乗客用路面電車が{STATION}駅に到着！
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}町民の祝賀{}初貨物用路面電車が{STATION}駅に到着！
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}交通事故！{}列車に衝突、運転者が死亡
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}交通事故！{}列車に衝突、{COMMA}人が死亡
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}車両が逆転させられません...
@@ -2864,7 +2866,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}道路車両の名称を変更
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}道路車両の名称を変更
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}道路車両の名称が変更できません...
-STR_9038_GO_TO_ROADVEH_DEPOT :{TOWN}車庫へ回送
+STR_GO_TO_ROADVEH_DEPOT :{TOWN}車庫へ回送
STR_SERVICE_AT_ROADVEH_DEPOT :{TOWN}車庫で修理
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}他の貨物の種類を運送するに道路車両を再装備します
@@ -3238,6 +3240,12 @@
STR_PURCHASE_INFO_ALL_BUT :{GOLD}を除いてすべて
STR_PURCHASE_INFO_MAX_TE :{BLACK}最大牽引力：{GOLD}{FORCE}
+########### For showing numbers in widgets
+
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
########### String for New Landscape Generator
STR_GENERATE :{WHITE}作成
--- a/src/lang/korean.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/korean.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}평지가 필요합니다!
STR_0008_WAITING :{BLACK}대기: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (이것은
-STR_000B :{YELLOW}{STATION}에서 옴)
STR_000C_ACCEPTS :{BLACK}받음: {WHITE}
STR_000D_ACCEPTS :{BLACK}받음: {GOLD}
STR_000E :
@@ -275,9 +273,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}더이상 이름을 설정할 수 없습니다!
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}이미 사용중인 이름입니다!
-STR_0133_WINDOWS :윈도우
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :윈도우
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -288,11 +286,11 @@
STR_013C_CARGO :{BLACK}화물
STR_013D_INFORMATION :{BLACK}정보
STR_013E_CAPACITIES :{BLACK}수용량
-STR_013E_TOTAL_CARGO :{BLACK}총 화물량
+STR_TOTAL_CARGO :{BLACK}총 화물량
STR_013F_CAPACITY :{BLACK}수용량: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}수용량: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}이 열차의 총 수용량:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}이 열차의 총 수용량:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}새로운 게임
STR_0141_LOAD_GAME :{BLACK}불러오기
@@ -348,7 +346,7 @@
STR_0157_PERFORMANCE_HISTORY_GRAPH :성취도 그래프
STR_0158_COMPANY_VALUE_GRAPH :회사가치 그래프
STR_0159_CARGO_PAYMENT_RATES :화물 지불량 그래프
-STR_015A_COMPANY_LEAGUE_TABLE :회사 리그 순위
+STR_015A_COMPANY_LEAGUE_TABLE :회사 성취도 순위
STR_PERFORMANCE_DETAIL_MENU :상세 성취도
############ range for menu ends
@@ -433,7 +431,7 @@
STR_0177_DISPLAY_COMPANY_FINANCES :{BLACK}회사 재정 정보 보여주기
STR_0178_DISPLAY_COMPANY_GENERAL :{BLACK}회사 기본 정보 보여주기
STR_0179_DISPLAY_GRAPHS :{BLACK}그래프 표시
-STR_017A_DISPLAY_COMPANY_LEAGUE :{BLACK}회사의 리그 순위 표시
+STR_017A_DISPLAY_COMPANY_LEAGUE :{BLACK}회사의 성취도 순위 표시
STR_017B_DISPLAY_LIST_OF_COMPANY :{BLACK}회사의 열차 목록 표시
STR_017C_DISPLAY_LIST_OF_COMPANY :{BLACK}회사의 자동차 목록 표시
STR_017D_DISPLAY_LIST_OF_COMPANY :{BLACK}회사의 선박 목록 표시
@@ -601,7 +599,7 @@
STR_MESSAGE_SOUND :{YELLOW}요약된 메시지와 함께 소리를 들려줍니다
STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO :{WHITE}...이전의 목적지로부터 너무 멉니다
STR_0211_TOP_COMPANIES_WHO_REACHED :{BIGFONT}{BLACK}{NUM}에 달성한 최고의 회사 ({STRING} 난이도)
-STR_TOP_COMPANIES_NETWORK_GAME :{BIGFONT}{BLACK}{NUM}의 회사 리그 목록
+STR_TOP_COMPANIES_NETWORK_GAME :{BIGFONT}{BLACK}{NUM}의 회사 성취도 목록
STR_0212 :{BIGFONT}{COMMA}.
STR_0213_BUSINESSMAN :초보자
STR_0214_ENTREPRENEUR :사업주
@@ -727,11 +725,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}송신기를 놓습니다.
STR_028F_DEFINE_DESERT_AREA :{BLACK}사막 지역을 지정합니다.{}CTRL키를 누른채로 지우십시오.
STR_CREATE_LAKE :{BLACK}수면 지역을 정의하세요.{}바다 높이에서 CTRL이 눌려 있지 않으면, 운하를 만들때 침수할 것입니다.
+STR_CREATE_RIVER :{BLACK}강을 만듦.
STR_0290_DELETE :{BLACK}삭제
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}이 도시를 완전히 삭제
STR_0292_SAVE_SCENARIO :시나리오 저장
STR_0293_LOAD_SCENARIO :시나리오 불러오기
-STR_LOAD_HEIGHTMAP :DEM지형 불러오기
+STR_MENU_LOAD_HEIGHTMAP :DEM지형 불러오기
STR_0294_QUIT_EDITOR :에디터 종료
STR_0295 :
STR_0296_QUIT :게임 종료
@@ -771,9 +770,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :게임 옵션
-STR_02C5_DIFFICULTY_SETTINGS :난이도 설정
-STR_02C7_CONFIG_PATCHES :패치 구성
+STR_02C4_GAME_OPTIONS :게임 옵션
+STR_02C6_DIFFICULTY_SETTINGS :난이도 설정
+STR_MENU_CONFIG_PATCHES :패치 구성
STR_NEWGRF_SETTINGS :NewGRF 설정
STR_TRANSPARENCY_OPTIONS :투명 옵션
STR_GAMEOPTMENU_0A :
@@ -801,15 +800,15 @@
STR_02DC_DISPLAY_SUBSIDIES :{BLACK}보조금 표시
STR_02DD_SUBSIDIES :보조금
STR_02DE_MAP_OF_WORLD :전체 지도 보기
-STR_EXTRA_VIEW_PORT :추가 뷰포인트
+STR_EXTRA_VIEW_PORT :추가 보임창
STR_SIGN_LIST :팻말 목록
STR_02DF_TOWN_DIRECTORY :도시 목록
STR_TOWN_POPULATION :{BLACK}세계 인구: {COMMA}
-STR_EXTRA_VIEW_PORT_TITLE :{WHITE}뷰포인트 {COMMA}
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}뷰포인트로 복사
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}이 지역의 풍경을 이 뷰포인트로 복사합니다
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}뷰포인트에서 붙여넣기
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}뷰포인트를 이 지역의 풍경으로 붙여넣습니다
+STR_EXTRA_VIEW_PORT_TITLE :{WHITE}보임창 {COMMA}
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}보임창으로 복사
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}이 지역의 풍경을 이 보임창으로 복사합니다
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}보임창에서 붙여넣기
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}이 지역의 풍경을 이 보임창에 붙여넣습니다
STR_02E0_CURRENCY_UNITS :{BLACK}화폐 단위
STR_02E1 :{BLACK}{SKIP}{STRING}
@@ -873,8 +872,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}저장중입니다,{}끝날때까지 기다려주세요
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}'Ezy Street 스타일 음악' 프로그램 선택
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :영어 (기본)
@@ -1094,7 +1093,7 @@
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}헬리콥터를 발착장에서 자동으로 점검 : {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}철도/도로/항만/공항 툴바에 지형 정보 링크 : {ORANGE}{STRING}
STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}스크롤 방향 뒤집기 : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SMOOTH_SCROLLING :{LTBLUE}부드러운 뷰포인트 스크롤: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMOOTH_SCROLLING :{LTBLUE}부드러운 보임창 스크롤: {ORANGE}{STRING}
STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}건설도구 사용시 거리측정 툴팁 표시 : {ORANGE}{STRING}
STR_CONFIG_PATCHES_LIVERIES :{LTBLUE}회사 조합원 표시 : {ORANGE}{STRING}
STR_CONFIG_PATCHES_LIVERIES_NONE :없음
@@ -1649,42 +1648,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}도로를 먼저 제거하십시오
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}도로 작업이 진행중입니다
STR_1802_ROAD_CONSTRUCTION :{WHITE}도로 건설
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}전찻길 건설
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}전찻길 건설
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}교량을 선택하십시오
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... 일방통행 도로는 교차로를 만들 수 없습니다
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}도로를 건설할 수 없습니다...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}여기에 전찻길을 건설할 수 없습니다...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}여기에 전찻길을 건설할 수 없습니다...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}도로를 제거할 수 없습니다...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}이곳의 전찻길을 제거할 수 없습니다...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}이곳의 전찻길을 제거할 수 없습니다...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}차고 방향
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}차량기지 방향
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}차량기지 방향
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}여기에 차고를 지을 수 없습니다...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}여기에 차량기지를 건설할 수 없습니다...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}여기에 차량기지를 건설할 수 없습니다...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}버스 정류장을 지을 수 없습니다...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}트럭 적하장을 지을 수 없습니다...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}여기에 승객 전차 정거장을 건설할 수 없습니다...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}여기에 화물 전차 정거장을 건설할 수 없습니다...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}여기에 승객 전차 정거장을 건설할 수 없습니다...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}여기에 화물 전차 정거장을 건설할 수 없습니다...
STR_180A_ROAD_CONSTRUCTION :도로 건설
-STR_180A_TRAMWAY_CONSTRUCTION :전찻길 건설
+STR_TRAMWAY_CONSTRUCTION :전찻길 건설
STR_180B_BUILD_ROAD_SECTION :{BLACK}도로 섹션 건설
STR_BUILD_AUTOROAD_TIP :{BLACK}자동건설 모드로 도로 섹션 건설
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}전찻길 섹션 건설
+STR_BUILD_TRAMWAY_SECTION :{BLACK}전찻길 섹션 건설
STR_BUILD_AUTOTRAM_TIP :{BLACK}자동건설 모드로 전차 섹션 건설
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}차고 건설 (차량의 제작/점검용)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}차량기지 건설 (차량 건설/점검용)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}차량기지 건설 (차량 건설/점검용)
STR_180D_BUILD_BUS_STATION :{BLACK}버스 정류장 건설
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}트럭 적하장 건설
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}승객 전차 정거장 건설
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}화물 전차 전거장 건설
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}승객 전차 정거장 건설
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}화물 전차 전거장 건설
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}교량 건설
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}철교 건설
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}철교 건설
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}터널 건설
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}터널 건설
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}터널 건설
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}일방통행 활성/비활성화
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}도로 제거툴 켜기/끄기
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}전찻길/신호등 제거툴 켜기/끄기
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}전찻길/신호등 제거툴 켜기/끄기
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}차고의 방향을 선택하십시오
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}차량기지의 방향을 선택하세요
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}차량기지의 방향을 선택하세요
STR_1814_ROAD :도로
STR_1815_ROAD_WITH_STREETLIGHTS :신호등이 있는 도로
STR_1816_TREE_LINED_ROAD :가로수가 있는 도로
@@ -1827,8 +1826,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}1개 이상의 역을 인접시키십시오
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}이 도시에 너무 많은 역이 있습니다
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}역이 너무 많습니다
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}버스 정류장이 너무 많습니다
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}트럭 적하장이 너무 많습니다
+STR_TOO_MANY_BUS_STOPS :{WHITE}버스 정류장이 너무 많습니다
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}트럭 적하장이 너무 많습니다
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}다른 역과 너무 가깝습니다!
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}기차역을 먼저 제거하십시오!
@@ -1859,12 +1858,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION}에서 {STRING}/{STRING}을/를 받습니다.
STR_3042_BUS_STATION_ORIENTATION :{WHITE}버스 정류장 방향
STR_3043_TRUCK_STATION_ORIENT :{WHITE}트럭 적하장 방향
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}승객 전차 정거장 방향
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}화물 전차 정거장 방향
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}승객 전차 정거장 방향
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}화물 전차 정거장 방향
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}버스 정류장을 먼저 제거하십시오.
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}트럭 적하장을 먼저 제거하십시오.
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}승객 전차 정거장을 먼저 제거하십시오.
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}화물 전차 정거장을 먼저 제거하십시오.
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}승객 전차 정거장을 먼저 제거하십시오.
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}화물 전차 정거장을 먼저 제거하십시오.
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA}개 역사
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- 없음 -
@@ -1876,8 +1875,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}기차역의 길이를 선택합니다.
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}버스 정류장의 방향을 선택합니다.
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}트럭 적하장의 방향을 선택합니다.
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}승객 전차 정거장의 방향을 선택하세요.
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}화물 전차 정거장의 방향을 선택하세요.
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}승객 전차 정거장의 방향을 선택하세요.
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}화물 전차 정거장의 방향을 선택하세요.
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}이 역이 있는 곳으로 이동합니다.
STR_3054_SHOW_STATION_RATINGS :{BLACK}역의 등급 표시
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}역 이름 변경
@@ -1899,7 +1898,7 @@
STR_3069_BUOY :부이
STR_306A_BUOY_IN_THE_WAY :{WHITE}...도중에 부이가 있습니다.
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...역이 너무 큽니다.
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...역을 결합할 수 없습니다! (패치 구성 참고)
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...역을 결합할 수 없습니다! (패치 구성 참고)
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}1개 이상의 아이템을 선택하려면 CTRL키를 누르고 계십시오.
STR_UNDEFINED :(정의되지 않은 문자열)
@@ -1940,7 +1939,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}새로운 게임 종류를 선택
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}시나리오(녹색), 프리셋 게임(파랑), 무작위 게임 선택
STR_4010_GENERATE_RANDOM_NEW_GAME :신규 무작위 게임 생성
-STR_4011_LOAD_HEIGHTMAP :{WHITE}DEM지형 로드
+STR_LOAD_HEIGHTMAP :{WHITE}DEM지형 로드
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}중간에 {STRING}이/가 있습니다
@@ -2144,10 +2143,10 @@
STR_6813_ECONOMY :{LTBLUE}경제: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}열차 회차: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}재앙: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}도시 당국의 지역 재건설에 대한 태도: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}도시 당국의 지역 재건설에 대한 태도: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :없음
+STR_NONE :없음
STR_NUM_VERY_LOW :매우 적음
STR_6816_LOW :낮음
STR_6817_NORMAL :보통
@@ -2185,9 +2184,9 @@
STR_6836_OFF :끔
STR_6837_ON :켬
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}고득점 차트 보이기
-STR_6839_PERMISSIVE :허용적
-STR_683A_TOLERANT :관대함
-STR_683B_HOSTILE :적대적
+STR_PERMISSIVE :허용적
+STR_TOLERANT :관대함
+STR_HOSTILE :적대적
##id 0x7000
STR_7000 :
@@ -2324,7 +2323,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}이 회사 주식의 25%를 매도할 수 없습니다...
STR_707D_OWNED_BY :{WHITE}({COMMA}% {COMPANY}의 소유)
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY}의 관리권이 {COMPANY}(으)로 넘어갔습니다!
-STR_7080_PROTECTED :{WHITE}이 회사는 주식을 거래할 만큼 오래되지 않았습니다...
+STR_PROTECTED :{WHITE}이 회사는 주식을 거래할 만큼 오래되지 않았습니다...
STR_LIVERY_DEFAULT :기본 색상
STR_LIVERY_STEAM :증기 기관차
@@ -2337,6 +2336,8 @@
STR_LIVERY_PASSENGER_WAGON_STEAM :객차 (증기)
STR_LIVERY_PASSENGER_WAGON_DIESEL :객차 (디젤)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :객차 (전기)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :승객 객차 (모노레일)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :승객 객차 (자기부상열차)
STR_LIVERY_FREIGHT_WAGON :화물차
STR_LIVERY_BUS :버스
STR_LIVERY_TRUCK :트럭
@@ -2631,17 +2632,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :{STATION} 행
-STR_8807_GO_TO_TRANSFER :{STATION} 행 (환승시키고 화물 싣기)
-STR_8808_GO_TO_UNLOAD :{STATION} 행 (모두 내림)
-STR_8809_GO_TO_TRANSFER_UNLOAD :{STATION} 행 (환승시키고 화물을 모두 내림)
-STR_880A_GO_TO_LOAD :{STATION} 행 (모두 싣기)
-STR_880B_GO_TO_TRANSFER_LOAD :{STATION} 행 (환승시키고 화물을 가득 실음)
-STR_880C_GO_NON_STOP_TO :{STATION} 급행
-STR_880D_GO_TO_NON_STOP_TRANSFER :{STATION} 급행 (환승시키고 화물 싣기)
-STR_880E_GO_NON_STOP_TO_UNLOAD :{STATION} 급행 (모두 내림)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :{STATION} 급행 (환승시키고 화물을 모두 내림)
-STR_8810_GO_NON_STOP_TO_LOAD :{STATION} 급행 (모두 싣기)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :{STATION} 급행 (환승시키고 화물을 가득 실음)
+STR_GO_TO_TRANSFER :{STATION} 행 (환승시키고 화물 싣기)
+STR_8807_GO_TO_UNLOAD :{STATION} 행 (모두 내림)
+STR_GO_TO_TRANSFER_UNLOAD :{STATION} 행 (환승시키고 화물을 모두 내림)
+STR_8808_GO_TO_LOAD :{STATION} 행 (모두 싣기)
+STR_GO_TO_TRANSFER_LOAD :{STATION} 행 (환승시키고 화물을 가득 실음)
+STR_880A_GO_NON_STOP_TO :{STATION} 급행
+STR_GO_TO_NON_STOP_TRANSFER :{STATION} 급행 (환승시키고 화물 싣기)
+STR_880B_GO_NON_STOP_TO_UNLOAD :{STATION} 급행 (모두 내림)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :{STATION} 급행 (환승시키고 화물을 모두 내림)
+STR_880C_GO_NON_STOP_TO_LOAD :{STATION} 급행 (모두 싣기)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :{STATION} 급행 (환승시키고 화물을 가득 실음)
STR_GO_TO_TRAIN_DEPOT :{TOWN} 차량기지행
STR_SERVICE_AT_TRAIN_DEPOT :{TOWN} 차량기지행 (점검)
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :{TOWN} 차량기지 급행
@@ -2745,7 +2746,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}현재 싣고있는 화물 정보를 보여줌
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}각 차량의 상세 정보를 보여줌
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}각 차량의 수송량 정보를 보여줌
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}각 화물 종류에 따른 총 수송량 보여줌
+STR_SHOW_TOTAL_CARGO :{BLACK}각 화물 종류에 따른 총 수송량 보여줌
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}이 열차의 경로 - 선택하려면 클릭하세요. CTRL+클릭하시면 그 역이 있는 장소로 이동합니다.
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}현재 경로를 건너 뜁니다, 그리고 다음 경로를 시작합니다. Ctrl + 클릭은 선택된 경로로 건너 뜁니다.
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}선택된 경로를 삭제합니다.
@@ -2776,8 +2777,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}열차를 회차시킬 수 없습니다...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}열차 차량 타입 이름 재지정
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}차량 타입의 이름을 다시 지정할 수 없습니다...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}선택된 경로에서 모든 화물을 내려서 쌓아놓도록 변경합니다.
-STR_886F_TRANSFER :{BLACK}환승
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}선택된 경로에서 모든 화물을 내려서 쌓아놓도록 변경합니다.
+STR_TRANSFER :{BLACK}환승
STR_CLEAR_TIME :{BLACK}시간 초기화
STR_RESET_LATENESS :{BLACK}지연 카운터 초기화
@@ -2855,8 +2856,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}자동차 이름 지정
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}첫 버스가 {STATION} 정류장에 도착했습니다!{}시민들이 환호하고 있습니다!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}첫 트럭이 {STATION} 정류장에 도착했습니다!{}시민들이 환호하고 있습니다!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}{STATION}에 처음으로 승객 전차가 도착했습니다!{}사람들이 환호성을 지릅니다!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}{STATION}에 처음으로 화물 전차가 도착했습니다!{}사람들이 환호성을 지릅니다!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}{STATION}에 처음으로 승객 전차가 도착했습니다!{}사람들이 환호성을 지릅니다!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}{STATION}에 처음으로 화물 전차가 도착했습니다!{}사람들이 환호성을 지릅니다!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}자동차 충돌!{}열차와의 충돌로 운전사가 사망했습니다!
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}자동차 충돌!{}열차와의 충돌로 {COMMA}명이 사망했습니다!
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}자동차를 회차시킬 수 없습니다...
@@ -2865,7 +2866,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}자동차 타입의 이름 지정
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}자동차 타입의 이름 지정
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}자동차 타입의 이름을 지정할 수 없습니다...
-STR_9038_GO_TO_ROADVEH_DEPOT :{TOWN} 차고로 가는 중
+STR_GO_TO_ROADVEH_DEPOT :{TOWN} 차고로 가는 중
STR_SERVICE_AT_ROADVEH_DEPOT :{TOWN} 차고로 점검하러 가는 중
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}자동차가 다른 종류의 화물을 싣도록 개조
@@ -3239,6 +3240,12 @@
STR_PURCHASE_INFO_ALL_BUT :모든 화물 / 제외: {GOLD}
STR_PURCHASE_INFO_MAX_TE :{BLACK}최고 견인 효과: {GOLD}{FORCE}
+########### For showing numbers in widgets
+
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
########### String for New Landscape Generator
STR_GENERATE :{WHITE}생성
@@ -3327,7 +3334,7 @@
STR_FEEDER_CARGO_VALUE :{BLACK}환승 단위: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...여기는 마을 소유의 도로 입니다
-STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...도로가 잘못된 반향을 향하고 있습니다
+STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...도로가 잘못된 방향을 향하고 있습니다
STR_TRANSPARENCY_TOOLB :{WHITE}투명 옵션
STR_TRANSPARENT_SIGNS_DESC :{BLACK}역이름 팻말 투명 전환
@@ -3409,7 +3416,7 @@
STR_FACE_LOAD :{BLACK}불러오기
STR_FACE_LOAD_TIP :{BLACK}즐겨찾는 얼굴 불러오기
STR_FACE_LOAD_DONE :{WHITE}당신이 즐겨찾는 얼굴을 OpenTTD 설정 파일로부터 불러왔습니다.
-STR_FACE_FACECODE :{BLACK}플레이어 얼굴 없음.
+STR_FACE_FACECODE :{BLACK}플레이어 얼굴 번호
STR_FACE_FACECODE_TIP :{BLACK}플레이어 얼굴 번호 보기/설정
STR_FACE_FACECODE_CAPTION :{WHITE}플레이어 얼굴 번호 보기/설정
STR_FACE_FACECODE_SET :{WHITE}새 얼굴 번호 코드가 설정되었습니다.
--- a/src/lang/lithuanian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/lithuanian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Paviršius turi būti lygus
STR_0008_WAITING :{BLACK}Laukia: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (maršrutas iš
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Priima: {WHITE}
STR_000D_ACCEPTS :{BLACK}Priima: {GOLD}
STR_000E :
@@ -308,9 +306,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Per daug vardų
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Pasirinktas vardas jau naudojamas
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -321,11 +319,11 @@
STR_013C_CARGO :{BLACK}Keliamoji galia
STR_013D_INFORMATION :{BLACK}Informacija
STR_013E_CAPACITIES :{BLACK}Talpumas
-STR_013E_TOTAL_CARGO :{BLACK}Visa keliamoji galia
+STR_TOTAL_CARGO :{BLACK}Visa keliamoji galia
STR_013F_CAPACITY :{BLACK}Talpa: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Talpa: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Visa traukinio keliamoji galia:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Visa traukinio keliamoji galia:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Naujas žaidimas
STR_0141_LOAD_GAME :{BLACK}Atverti žaidimą
@@ -759,7 +757,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Šalinti šį miestą
STR_0292_SAVE_SCENARIO :Išsaugoti scenarijų
STR_0293_LOAD_SCENARIO :Atverti scenarijų
-STR_LOAD_HEIGHTMAP :Atverti aukščių žemėlapį
+STR_MENU_LOAD_HEIGHTMAP :Atverti aukščių žemėlapį
STR_0294_QUIT_EDITOR :Uždaryti redaktoriu
STR_0295 :
STR_0296_QUIT :Išeiti
@@ -799,9 +797,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Žaidimo nustatymai
-STR_02C5_DIFFICULTY_SETTINGS :Sunkumo lygio nustatymai
-STR_02C7_CONFIG_PATCHES :Papildomi nustatymai
+STR_02C4_GAME_OPTIONS :Žaidimo nustatymai
+STR_02C6_DIFFICULTY_SETTINGS :Sunkumo lygio nustatymai
+STR_MENU_CONFIG_PATCHES :Papildomi nustatymai
STR_NEWGRF_SETTINGS :Papild. grafikos nustatymai (NewGRF)
STR_TRANSPARENCY_OPTIONS :Permatomumo nustatymai
STR_GAMEOPTMENU_0A :
@@ -900,8 +898,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Vyksta išsaugojimas,{}palaukite kol baigsis!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Pasirink „Ezy Street“ muzikos stiliaus programą
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglų (Oginalus)
@@ -1732,8 +1730,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Ribojasi su daugiau nei viena stotele/pakrovimo aikštele
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Per daug stotelių/pakrovimo aikstelių šiame mieste
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Per daug stotelių
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Per daug autobusų stotelių
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Per daug sunkvežimių pakrovimo aikstelių
+STR_TOO_MANY_BUS_STOPS :{WHITE}Per daug autobusų stotelių
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Per daug sunkvežimių pakrovimo aikstelių
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Per arti kitos stotelės
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Pirmiausia reikia nugriauti geležinkelio stotį
@@ -1798,7 +1796,7 @@
STR_3069_BUOY :Pluduras
STR_306A_BUOY_IN_THE_WAY :{WHITE}...pluduras pakeliui
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...stotis per daug issipletusi
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...nestandartines stoteles atjungtos
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...nestandartines stoteles atjungtos
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Laikant nuspaustą VALD (CTRL) galima pažymėti daugiau nei vieną
STR_UNDEFINED :(neapibrėžta eilutė)
@@ -1833,7 +1831,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Pasirink zaujo zaidimo tipa
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Pasirinkite scenariju (zalia spalva), nustatyta zaidima (melyna), ar atsitiktini nauja zaidima
STR_4010_GENERATE_RANDOM_NEW_GAME :Sukurti atsitiktinį naują žaidimą
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Atverti aukščių žemėlapį
+STR_LOAD_HEIGHTMAP :{WHITE}Atverti aukščių žemėlapį
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} kelyje
@@ -2030,10 +2028,10 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomika: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Traukiniai apsisuka: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Nelaimes, katastrofos: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Miesto valdžios požiūris į aplinkos pertvarkymą: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Miesto valdžios požiūris į aplinkos pertvarkymą: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Nėra
+STR_NONE :Nėra
STR_6816_LOW :Žemas
STR_6817_NORMAL :Vidutinis
STR_6818_HIGH :Aukštas
@@ -2070,9 +2068,9 @@
STR_6836_OFF :Išjungta
STR_6837_ON :Įjungta
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Rodyti rezultatų lentelę
-STR_6839_PERMISSIVE :Atlaidus
-STR_683A_TOLERANT :Tolerantiskas
-STR_683B_HOSTILE :Priešiškas
+STR_PERMISSIVE :Atlaidus
+STR_TOLERANT :Tolerantiskas
+STR_HOSTILE :Priešiškas
##id 0x7000
STR_7000 :
@@ -2204,7 +2202,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Negalima parduoti 25% sios kompanijos akciju...
STR_707D_OWNED_BY :{WHITE}({COMMA}% priklauso {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} buvo perimta {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Si kompanija dar pernelyg jauna, kad galetu pardavineti savo akcijas...
+STR_PROTECTED :{WHITE}Si kompanija dar pernelyg jauna, kad galetu pardavineti savo akcijas...
STR_LIVERY_DEFAULT :Standartinis Livery
STR_LIVERY_STEAM :Garo Variklis
@@ -2509,17 +2507,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Vaziuoja i {STATION}
-STR_8807_GO_TO_TRANSFER :Vykti i {STATION} (Perkelti ir pakrauti krovinius)
-STR_8808_GO_TO_UNLOAD :Vykti i {STATION} (Issikrauti)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Vykti i {STATION} (Perkrauti ir palikti tuscia)
-STR_880A_GO_TO_LOAD :Vykti i {STATION} (Pasikrauti)
-STR_880B_GO_TO_TRANSFER_LOAD :Vykti i {STATION} (Perkrauti ir palaukti pilno pakrovimo)
-STR_880C_GO_NON_STOP_TO :Vykti be sustojimo i {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Vykti be sustojimo i {STATION} (Perkrauti ir paimti krovini)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Vykti be sustojimo i {STATION} (Issikrauti)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Vykti be sustojimo i {STATION} (Perkrauti ir palikti tuscia)
-STR_8810_GO_NON_STOP_TO_LOAD :Vykti be sustojimo i {STATION} (Pasikrauti)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Vykti be sustojimo i {STATION} (Perkrauti ir palaukti pilno pakrovimo)
+STR_GO_TO_TRANSFER :Vykti i {STATION} (Perkelti ir pakrauti krovinius)
+STR_8807_GO_TO_UNLOAD :Vykti i {STATION} (Issikrauti)
+STR_GO_TO_TRANSFER_UNLOAD :Vykti i {STATION} (Perkrauti ir palikti tuscia)
+STR_8808_GO_TO_LOAD :Vykti i {STATION} (Pasikrauti)
+STR_GO_TO_TRANSFER_LOAD :Vykti i {STATION} (Perkrauti ir palaukti pilno pakrovimo)
+STR_880A_GO_NON_STOP_TO :Vykti be sustojimo i {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Vykti be sustojimo i {STATION} (Perkrauti ir paimti krovini)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Vykti be sustojimo i {STATION} (Issikrauti)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Vykti be sustojimo i {STATION} (Perkrauti ir palikti tuscia)
+STR_880C_GO_NON_STOP_TO_LOAD :Vykti be sustojimo i {STATION} (Pasikrauti)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Vykti be sustojimo i {STATION} (Perkrauti ir palaukti pilno pakrovimo)
STR_GO_TO_TRAIN_DEPOT :Vaziuoti i {TOWN} Traukinio Depa
STR_SERVICE_AT_TRAIN_DEPOT :Remontas {TOWN} traukiniu depe
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Važiuoti nestojant į {TOWN} traukinių depą
@@ -2612,7 +2610,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Rodyti detalia kroviniu informacija
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Rodyti detalia vagonu informacija
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Rodyti detalia vagonu talpos informacija
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Rodyti bendra traukinio talpos informacija pagal kroviniu tipa
+STR_SHOW_TOTAL_CARGO :{BLACK}Rodyti bendra traukinio talpos informacija pagal kroviniu tipa
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Nurodymų sąrašas - nurodymas pažymimas ant jo spragtelėjus. Spregtelėjimas laikant VALD (CTRL) nukelia į stotį
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Istrinti pazymeta uzduoti
STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Nestoti pazymetoje stoteleje
@@ -2638,8 +2636,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Traukinio vaziavimo krypties pakeisti negalima...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Pervardinti traukinio tipa
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Neimanoma pervardinti traukinio tipo...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Priversti iškrauti krovinius pažymėta tvarka
-STR_886F_TRANSFER :{BLACK}Perkelti
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Priversti iškrauti krovinius pažymėta tvarka
+STR_TRANSFER :{BLACK}Perkelti
STR_TRAIN_STOPPING :{RED}Stabdoma
STR_TRAIN_STOPPING_VEL :{RED}Stabdomas, {VELOCITY}
@@ -2705,7 +2703,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Pervardinti automobiliu tipa
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Pervardinti automobiliu tipa
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Negali pervardinti automobliu tipo...
-STR_9038_GO_TO_ROADVEH_DEPOT :Kursas: {TOWN} automobiliu garazas
+STR_GO_TO_ROADVEH_DEPOT :Kursas: {TOWN} automobiliu garazas
STR_SERVICE_AT_ROADVEH_DEPOT :Remontas: {TOWN} garaze
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti kitoki krovinio tipa
--- a/src/lang/norwegian_bokmal.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/norwegian_bokmal.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Flatt land er nødvendig
STR_0008_WAITING :{BLACK}Venter: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (på vei fra
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Godtar: {WHITE}
STR_000D_ACCEPTS :{BLACK}Godtar: {GOLD}
STR_000E :
@@ -275,9 +273,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}For mange navn oppgitt
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Navnet er allerede i bruk
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -288,11 +286,11 @@
STR_013C_CARGO :{BLACK}Last
STR_013D_INFORMATION :{BLACK}Informasjon
STR_013E_CAPACITIES :{BLACK}Kapasitet
-STR_013E_TOTAL_CARGO :{BLACK}Total last
+STR_TOTAL_CARGO :{BLACK}Total last
STR_013F_CAPACITY :{BLACK}Kapasitet: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapasitet: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Total kapasitet på dette toget:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Total kapasitet på dette toget:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nytt spill
STR_0141_LOAD_GAME :{BLACK}Last inn spill
@@ -731,7 +729,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Slett denne byen fullstendig
STR_0292_SAVE_SCENARIO :Lagre scenario
STR_0293_LOAD_SCENARIO :Last inn scenario
-STR_LOAD_HEIGHTMAP :Last høydekart
+STR_MENU_LOAD_HEIGHTMAP :Last høydekart
STR_0294_QUIT_EDITOR :Avslutt redigeringsprogram
STR_0295 :
STR_0296_QUIT :Avslutt
@@ -771,9 +769,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Spillinnstillinger
-STR_02C5_DIFFICULTY_SETTINGS :Vanskelighetsgrad
-STR_02C7_CONFIG_PATCHES :Konfigurer patcher
+STR_02C4_GAME_OPTIONS :Spillinnstillinger
+STR_02C6_DIFFICULTY_SETTINGS :Vanskelighetsgrad
+STR_MENU_CONFIG_PATCHES :Konfigurer patcher
STR_NEWGRF_SETTINGS :Innstillinger for ny grafikk
STR_TRANSPARENCY_OPTIONS :Instillinger for gjennomsiktighet
STR_GAMEOPTMENU_0A :
@@ -873,8 +871,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Lagring foregår enda,{}vennligst vent til det er ferdig!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Velg 'Ezy style music'-program
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engelsk
@@ -1649,42 +1647,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Må fjerne vei først
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Veiarbeid i gang
STR_1802_ROAD_CONSTRUCTION :{WHITE}Bygg vei
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Trikkekonstruksjon
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Trikkekonstruksjon
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Velg brotype
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... enveiskjørte veier kan ikke ha kryss
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Kan ikke bygge vei her
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan ikke bygge trikkespor her...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan ikke bygge trikkespor her...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Kan ikke fjerne vei herfra...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan ikke fjerne trikkespor herfra...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan ikke fjerne trikkespor herfra...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Retning for garasje
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Trikkestallretning
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Trikkestallretning
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Kan ikke bygge garasje her...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan ikke bygge trikkestall her...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan ikke bygge trikkestall her...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Kan ikke bygge busstasjon...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Kan ikke bygge lasteterminal...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan ikke bygge trikkestasjon for passasjerer...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan ikke bygge trikkestasjon for frakt...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan ikke bygge trikkestasjon for passasjerer...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan ikke bygge trikkestasjon for frakt...
STR_180A_ROAD_CONSTRUCTION :Bygg vei
-STR_180A_TRAMWAY_CONSTRUCTION :Trikkesporkonstruksjon
+STR_TRAMWAY_CONSTRUCTION :Trikkesporkonstruksjon
STR_180B_BUILD_ROAD_SECTION :{BLACK}Bygg vei
STR_BUILD_AUTOROAD_TIP :{BLACK}Bygg veiseksjon ved bruk av autovei-modusen
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Bygg trikkestasjon
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Bygg trikkestasjon
STR_BUILD_AUTOTRAM_TIP :{BLACK}Bygg trikkespor ved bruk av autotrikkespor-modusen
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Bygg garasje (trengs for bygging og vedlikehold av kjøretøy)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Bygg trikkevognstall (for kjøp og vedlikehold av kjøretøy)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Bygg trikkevognstall (for kjøp og vedlikehold av kjøretøy)
STR_180D_BUILD_BUS_STATION :{BLACK}Bygg bussstasjon
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Bygg lasteterminal
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Bygg trikkestasjon for passasjerer
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Bygg trikkestasjon for frakt
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Bygg trikkestasjon for passasjerer
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Bygg trikkestasjon for frakt
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Bygg bro
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Bygg bro for trikkespor
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Bygg bro for trikkespor
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Bygg tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Bygg tunnel for trikkespor
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Bygg tunnel for trikkespor
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Aktiver/deaktiver énveiskjørte veier
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Velg mellom bygging/fjerning for veibygging
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Velg mellom bygging/fjerning for trikkesporkonstruksjon
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Velg mellom bygging/fjerning for trikkesporkonstruksjon
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Velg garasjens retning
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Velg trikkestallens retning
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Velg trikkestallens retning
STR_1814_ROAD :Vei
STR_1815_ROAD_WITH_STREETLIGHTS :Vei med gatelykter
STR_1816_TREE_LINED_ROAD :Aveny
@@ -1827,8 +1825,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Grenser til mer enn én eksiterende stasjon/lasteterminal
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}For mange stasjoner/lasteterminaler i byen
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}For mange stasjoner/lasteterminaler
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}For mange bussholdeplasser
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}For mange lasteterminaler
+STR_TOO_MANY_BUS_STOPS :{WHITE}For mange bussholdeplasser
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}For mange lasteterminaler
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}For nær en annen jernbanestasjon/lasteterminal
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Må rive eksiterende jernbanestasjon først
@@ -1859,12 +1857,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} godtar nå {STRING} og {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Retning på bussterminal
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Retning på lasteterminal
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Retning for passasjertrikk
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Retning for frakttrikk
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Retning for passasjertrikk
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Retning for frakttrikk
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Må rive bussterminal først
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Må rive lasteterminal først
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Må fjerne trikkestasjon for passasjerer først
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Må fjerne trikkestasjon for frakt først
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Må fjerne trikkestasjon for passasjerer først
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Må fjerne trikkestasjon for frakt først
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Stasjoner
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Ingen -
@@ -1876,8 +1874,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Velg hvor lang stasjonen skal være
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Velg retning på bussterminal
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Velg retning på lasteterminal
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Velg retning på trikkestasjon for passasjerer
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Velg retning på trikkestasjon for frakt
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Velg retning på trikkestasjon for passasjerer
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Velg retning på trikkestasjon for frakt
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Sentrer bildet på stasjonen
STR_3054_SHOW_STATION_RATINGS :{BLACK}Vis stasjonsvurdering
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Endre navnet til stasjonen
@@ -1899,7 +1897,7 @@
STR_3069_BUOY :Bøye
STR_306A_BUOY_IN_THE_WAY :{WHITE}...bøyen er i veien
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...stasjonen er spredd for mye
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...uensartede stasjoner deaktivert
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...uensartede stasjoner deaktivert
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Hold nede CTRL for å velge mer en en ting
STR_UNDEFINED :(udefinert streng)
@@ -1940,7 +1938,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Velg ny spilltype
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Velg scenario (grønn), forhåndsatte spill (blått), eller nytt tilfeldig spill
STR_4010_GENERATE_RANDOM_NEW_GAME :Lag et tilfeldig spill
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Last høydekart
+STR_LOAD_HEIGHTMAP :{WHITE}Last høydekart
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} er i veien
@@ -2144,10 +2142,10 @@
STR_6813_ECONOMY :{LTBLUE}Økonomi: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Togreversering: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katastrofer: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Bystyrets holdning mot ombygging av felt: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Bystyrets holdning mot ombygging av felt: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Ingen
+STR_NONE :Ingen
STR_NUM_VERY_LOW :Veldig lav
STR_6816_LOW :Lite
STR_6817_NORMAL :Normal
@@ -2185,9 +2183,9 @@
STR_6836_OFF :Av
STR_6837_ON :På
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Vis rekorder
-STR_6839_PERMISSIVE :Tillatende
-STR_683A_TOLERANT :Tolerant
-STR_683B_HOSTILE :Fientlig
+STR_PERMISSIVE :Tillatende
+STR_TOLERANT :Tolerant
+STR_HOSTILE :Fientlig
##id 0x7000
STR_7000 :
@@ -2324,7 +2322,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan ikke selge 25{NBSP}% av aksjene...
STR_707D_OWNED_BY :{WHITE}({COMMA}{NBSP}% eies av {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} har blitt kjøpt opp av {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Dette selskapet selger ikke aksjer enda...
+STR_PROTECTED :{WHITE}Dette selskapet selger ikke aksjer enda...
STR_LIVERY_DEFAULT :Standardovertakelse
STR_LIVERY_STEAM :Damplokomotiv
@@ -2631,17 +2629,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Kjør til {STATION}
-STR_8807_GO_TO_TRANSFER :Gå til {STATION} (overfør og ta last)
-STR_8808_GO_TO_UNLOAD :Gå til {STATION} (last av)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Gå til {STATION} (overfør og forlat som tom)
-STR_880A_GO_TO_LOAD :Gå til {STATION} (last)
-STR_880B_GO_TO_TRANSFER_LOAD :Gå til {STATION} (overfør og vent på full last)
-STR_880C_GO_NON_STOP_TO :Gå uten stopp til {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Gå uten stopp til {STATION} (overfør og ta last)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Gå uten stopp til {STATION} (last av)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Gå uten stopp {STATION} (overfør og forlat som tom)
-STR_8810_GO_NON_STOP_TO_LOAD :Gå uten stopp til {STATION} (last)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Gå uten stopp til {STATION} (overfør og vent på full last)
+STR_GO_TO_TRANSFER :Gå til {STATION} (overfør og ta last)
+STR_8807_GO_TO_UNLOAD :Gå til {STATION} (last av)
+STR_GO_TO_TRANSFER_UNLOAD :Gå til {STATION} (overfør og forlat som tom)
+STR_8808_GO_TO_LOAD :Gå til {STATION} (last)
+STR_GO_TO_TRANSFER_LOAD :Gå til {STATION} (overfør og vent på full last)
+STR_880A_GO_NON_STOP_TO :Gå uten stopp til {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Gå uten stopp til {STATION} (overfør og ta last)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Gå uten stopp til {STATION} (last av)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Gå uten stopp {STATION} (overfør og forlat som tom)
+STR_880C_GO_NON_STOP_TO_LOAD :Gå uten stopp til {STATION} (last)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Gå uten stopp til {STATION} (overfør og vent på full last)
STR_GO_TO_TRAIN_DEPOT :Gå til {TOWN} togdepot
STR_SERVICE_AT_TRAIN_DEPOT :Velikehold ved {TOWN} togstall
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Kjør uten å stoppe til {TOWN} togstall
@@ -2745,7 +2743,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Vis detaljer om innholdet i vognene
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Vis detaljer om tog/vogner
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Vis kapasiteten til vognene
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Vis en total kapasitet på togene oppdelt etter godstype
+STR_SHOW_TOTAL_CARGO :{BLACK}Vis en total kapasitet på togene oppdelt etter godstype
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Ordreliste - trykk på en ordre for å velge den
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Hopp over den nåværende ordren og begynn på neste. CTRL + klikk hopper fram til valgte ordre
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Slett den valgte ordren
@@ -2776,8 +2774,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan ikke snu toget...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Gi tog/vogn nytt navn
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Kan ikke gi tog/vogn nytt navn...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den merkede ordren til å tvinge kjøretøyet til å dumpe lasten
-STR_886F_TRANSFER :{BLACK}Overfør
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den merkede ordren til å tvinge kjøretøyet til å dumpe lasten
+STR_TRANSFER :{BLACK}Overfør
STR_CLEAR_TIME :{BLACK}Nullstill tid
STR_RESET_LATENESS :{BLACK}Nullstill senhetsteller
@@ -2855,8 +2853,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Navngi kjøretøy
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første buss ankommer {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første lastebil ankommer {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Borgerne jubler . . .{}Første passasjertrikk ankommer {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Borgerne jubler . . .{}Første frakttrikk ankommer {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Borgerne jubler . . .{}Første passasjertrikk ankommer {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Borgerne jubler . . .{}Første frakttrikk ankommer {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Kollisjon!{}Sjåfør dør etter kollisjon med tog
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Kollisjon!{}{COMMA} dør etter kollisjon med tog
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Kan ikke snu...
@@ -2865,7 +2863,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Endre navnet til kjøretøytypen
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Endre navnet til kjøretøytypen
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Kan ikke endre navnet til kjøretøytypen...
-STR_9038_GO_TO_ROADVEH_DEPOT :Kjør til {TOWN} garasje
+STR_GO_TO_ROADVEH_DEPOT :Kjør til {TOWN} garasje
STR_SERVICE_AT_ROADVEH_DEPOT :Vedlikehold ved {TOWN} garasje
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Bygg om kjøretøyet til å ta en annen type last
--- a/src/lang/norwegian_nynorsk.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/norwegian_nynorsk.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Flatt land er naudsynt
STR_0008_WAITING :{BLACK}Ventar: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (på veg frå
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Godtek: {WHITE}
STR_000D_ACCEPTS :{BLACK}Godtek: {GOLD}
STR_000E :
@@ -275,9 +273,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}For mange namn oppgjeve
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Namnet er allereie i i bruk
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -288,11 +286,11 @@
STR_013C_CARGO :{BLACK}Last
STR_013D_INFORMATION :{BLACK}Informasjon
STR_013E_CAPACITIES :{BLACK}Kapasitet
-STR_013E_TOTAL_CARGO :{BLACK}Total last
+STR_TOTAL_CARGO :{BLACK}Total last
STR_013F_CAPACITY :{BLACK}Kapasitet: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapasitet: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Total kapasitet for dette toget:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Total kapasitet for dette toget:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nytt spel
STR_0141_LOAD_GAME :{BLACK}Last inn spel
@@ -731,7 +729,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Slett byen heilt
STR_0292_SAVE_SCENARIO :Lagre scenario
STR_0293_LOAD_SCENARIO :Last inn scenario
-STR_LOAD_HEIGHTMAP :Last inn høgdekart
+STR_MENU_LOAD_HEIGHTMAP :Last inn høgdekart
STR_0294_QUIT_EDITOR :Avslutt redigeringsprogram
STR_0295 :
STR_0296_QUIT :Avslutt
@@ -771,9 +769,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Spelinstillingar
-STR_02C5_DIFFICULTY_SETTINGS :Vanskegrad
-STR_02C7_CONFIG_PATCHES :Konfigurer patcher
+STR_02C4_GAME_OPTIONS :Spelinstillingar
+STR_02C6_DIFFICULTY_SETTINGS :Vanskegrad
+STR_MENU_CONFIG_PATCHES :Konfigurer patcher
STR_NEWGRF_SETTINGS :Instillingar for ny grafikk
STR_TRANSPARENCY_OPTIONS :Gjennomsiktigheitsinnstillingar
STR_GAMEOPTMENU_0A :
@@ -873,8 +871,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Lagring foregår framleis,{}ver venleg å vente til det er ferdig!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Vel 'Ezy Street style music'-program
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engelsk
@@ -1648,42 +1646,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Må fjerne veg først
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Vegarbeid pågår
STR_1802_ROAD_CONSTRUCTION :{WHITE}Bygg veg
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Trikkekonstruksjon
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Trikkekonstruksjon
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Vel type bru
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... einvegskøyrde vegar kan ikkje ha kryss
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Kan ikkje byggje veg her...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan ikkje byggje trikk her
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan ikkje byggje trikk her
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Kan ikkje fjerne veg her...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan ikkje fjerna trikk
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan ikkje fjerna trikk
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Retning for garasje
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Retning for trikkedepot
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Retning for trikkedepot
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Kan ikkje byggje garasje her...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan ikkje byggje trikkedepot her
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan ikkje byggje trikkedepot her
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Kan ikkje byggje busstasjon...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Kan ikkje byggje lasteterminal...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan ikkje byggje trikkestasjon for passasjerer...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan ikkje byggje trikkestasjon for frakt...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan ikkje byggje trikkestasjon for passasjerer...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan ikkje byggje trikkestasjon for frakt...
STR_180A_ROAD_CONSTRUCTION :Bygg veg
-STR_180A_TRAMWAY_CONSTRUCTION :Trikkekonstruksjon
+STR_TRAMWAY_CONSTRUCTION :Trikkekonstruksjon
STR_180B_BUILD_ROAD_SECTION :{BLACK}Bygg veg
STR_BUILD_AUTOROAD_TIP :{BLACK}Bygg vegseksjon med automatisk vegmodus
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Bygg trikkeseksjon
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Bygg trikkeseksjon
STR_BUILD_AUTOTRAM_TIP :{BLACK}Bygg trikkestasjon med automatisk trikkemodus
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Bygg garasje (trengst for bygging og vedlikehald av køyretøy)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Bygg trikkedepot ( for å bygge og vedlikeholde køyretøy)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Bygg trikkedepot ( for å bygge og vedlikeholde køyretøy)
STR_180D_BUILD_BUS_STATION :{BLACK}Bygg busstasjon
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Bygg lasteterminal
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Bygg trikkestasjon for passasjerer
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Bygg trikkestasjon for frakt
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Bygg trikkestasjon for passasjerer
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Bygg trikkestasjon for frakt
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Bygg bru
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Bygg bro for trikk
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Bygg bro for trikk
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Bygg tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Bygg tunell for trikk
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Bygg tunell for trikk
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Aktiver / Deaktiver envegskøyrde vegar
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Vel mellom bygging/fjerning for vegbygging
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Byt mellom bygge / fjerne for trikk
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Byt mellom bygge / fjerne for trikk
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Vel retninga på garasjen
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Vel retning for trikkedepot
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Vel retning for trikkedepot
STR_1814_ROAD :Veg
STR_1815_ROAD_WITH_STREETLIGHTS :Veg med gatelykter
STR_1816_TREE_LINED_ROAD :Aveny
@@ -1826,8 +1824,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Grensar til meir enn éin eksisterande stasjon/lasteterminal
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}For mange stasjonar/lasteterminalar i byen
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}For mange stasjonar/lasteterminalar
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}For mange busshaldeplassar
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}For mange lasteterminalar
+STR_TOO_MANY_BUS_STOPS :{WHITE}For mange busshaldeplassar
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}For mange lasteterminalar
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}For nær ein annan jernbanestasjon/lasteterminal
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Må rive eksisterande jernbanestasjon først
@@ -1858,12 +1856,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} godtek no {STRING} og {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Retning på bussterminal
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Retning på lasteterminal
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Retning på trikkestajon
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Retning på trikkestasjon
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Retning på trikkestajon
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Retning på trikkestasjon
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Må rive bussterminal først
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Må rive lasteterminal først
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Må fjerne trikkestasjon først
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Må fjerne trikkestajon først
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Må fjerne trikkestasjon først
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Må fjerne trikkestajon først
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Stasjon{P "" ar}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Ingen -
@@ -1875,8 +1873,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Vel kor lang stasjonen skal vere
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Vel retning på bussterminal
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Vel retning på lasteterminal
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Velg retning på trikkestajon
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Velg retning på trikkestajon
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Velg retning på trikkestajon
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Velg retning på trikkestajon
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Sentrer biletet på stasjonen
STR_3054_SHOW_STATION_RATINGS :{BLACK}Vis stasjonsvurdering
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Endre namnet på stasjonen
@@ -1898,7 +1896,7 @@
STR_3069_BUOY :Bøye
STR_306A_BUOY_IN_THE_WAY :{WHITE}...bøya er i vegen
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...stasjonen er spreidd for mykje
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ikkje-einsarta stasjonar er deaktiverte
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ikkje-einsarta stasjonar er deaktiverte
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Hald nede CTRL for å velje meir enn éin ting
STR_UNDEFINED :(udefinert streng)
@@ -1939,7 +1937,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Vel ny speltype
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Vel scenario (grønn), førehandssette spel (blått), eller nytt tilfeldig spel
STR_4010_GENERATE_RANDOM_NEW_GAME :Lag eit tilfeldig spel
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Last høgdekart
+STR_LOAD_HEIGHTMAP :{WHITE}Last høgdekart
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} er i vegen
@@ -2143,10 +2141,10 @@
STR_6813_ECONOMY :{LTBLUE}Økonomi: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Togreversering: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katastrofar: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Haldninga til bystyret til ombygging av felt: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Haldninga til bystyret til ombygging av felt: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Ingen
+STR_NONE :Ingen
STR_NUM_VERY_LOW :Særs låg
STR_6816_LOW :Lite
STR_6817_NORMAL :Normal
@@ -2184,9 +2182,9 @@
STR_6836_OFF :Av
STR_6837_ON :På
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Vis rekordar
-STR_6839_PERMISSIVE :Tillatande
-STR_683A_TOLERANT :Tolerant
-STR_683B_HOSTILE :Fiendsleg
+STR_PERMISSIVE :Tillatande
+STR_TOLERANT :Tolerant
+STR_HOSTILE :Fiendsleg
##id 0x7000
STR_7000 :
@@ -2323,7 +2321,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan ikkje selje 25 % av aksjane...
STR_707D_OWNED_BY :{WHITE}({COMMA} % eigast av {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} har vorte kjøpt opp av {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Dette selskapet sel ikkje aksjer enno...
+STR_PROTECTED :{WHITE}Dette selskapet sel ikkje aksjer enno...
STR_LIVERY_DEFAULT :Standardovertaking
STR_LIVERY_STEAM :Damplokomotiv
@@ -2630,17 +2628,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Køyr til {STATION}
-STR_8807_GO_TO_TRANSFER :Køyr til {STATION} (overfør og ta last)
-STR_8808_GO_TO_UNLOAD :Køyr til {STATION} (last av)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Køyr til {STATION} (overfør og forlat som tom)
-STR_880A_GO_TO_LOAD :Køyr til {STATION} (last)
-STR_880B_GO_TO_TRANSFER_LOAD :Køyr til {STATION} (overfør og vent på full last)
-STR_880C_GO_NON_STOP_TO :Køyr utan stopp til {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Køyr utan stopp til {STATION} (overfør og ta last)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Køyr utan stopp til {STATION} (last av)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Køyr utan stopp til {STATION} (overfør og forlat som tom)
-STR_8810_GO_NON_STOP_TO_LOAD :Køyr utan stopp til {STATION} (last)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Køyr utan stopp til {STATION} (overfør og vent på full last)
+STR_GO_TO_TRANSFER :Køyr til {STATION} (overfør og ta last)
+STR_8807_GO_TO_UNLOAD :Køyr til {STATION} (last av)
+STR_GO_TO_TRANSFER_UNLOAD :Køyr til {STATION} (overfør og forlat som tom)
+STR_8808_GO_TO_LOAD :Køyr til {STATION} (last)
+STR_GO_TO_TRANSFER_LOAD :Køyr til {STATION} (overfør og vent på full last)
+STR_880A_GO_NON_STOP_TO :Køyr utan stopp til {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Køyr utan stopp til {STATION} (overfør og ta last)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Køyr utan stopp til {STATION} (last av)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Køyr utan stopp til {STATION} (overfør og forlat som tom)
+STR_880C_GO_NON_STOP_TO_LOAD :Køyr utan stopp til {STATION} (last)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Køyr utan stopp til {STATION} (overfør og vent på full last)
STR_GO_TO_TRAIN_DEPOT :Køyr til {TOWN} togstall
STR_SERVICE_AT_TRAIN_DEPOT :Velikehald ved {TOWN} togstall
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Køyr utan stopp til togstallen i {TOWN}
@@ -2744,7 +2742,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Vis detaljar om innhaldet i vognene
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Vis detaljar om tog/vogner
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Vis kapasiteten til vognene
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Vis total kapasitet på vognene, sortert etter type vare
+STR_SHOW_TOTAL_CARGO :{BLACK}Vis total kapasitet på vognene, sortert etter type vare
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Ordreliste - trykk på ein ordre for å velje han
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Hopp over gjedande ordre, og start neste. CTRL + klikk hopper til valde ordre
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Slett den valde ordren
@@ -2775,8 +2773,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan ikkje snu toget...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Gje tog/vogn nytt namn
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Kan ikkje gje tog/vogn nytt namn...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den merka ordren til å tvinge køyretøyet til å dumpe lasta
-STR_886F_TRANSFER :{BLACK}Overfør
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den merka ordren til å tvinge køyretøyet til å dumpe lasta
+STR_TRANSFER :{BLACK}Overfør
STR_CLEAR_TIME :{BLACK}Fjern Tid
STR_RESET_LATENESS :{BLACK}Still attende teljaren for forseining
@@ -2853,8 +2851,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Namngje køyretøy
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første buss kjem til {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første lastebil kjem til {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første passasjertrikk kjem til{STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første fraktetrikk kjem til {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første passasjertrikk kjem til{STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første fraktetrikk kjem til {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Kollisjon!{}Sjåfør døyr etter kollisjon med tog
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Kollisjon!{}{COMMA} døyr etter kollisjon med tog
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Kan ikkje snu...
@@ -2863,7 +2861,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Endre namnet til køyretøytypen
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Endre namnet til køyretøytypen
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Kan ikkje endre namnet til køyretøytypen...
-STR_9038_GO_TO_ROADVEH_DEPOT :Køyr til {TOWN} garasje
+STR_GO_TO_ROADVEH_DEPOT :Køyr til {TOWN} garasje
STR_SERVICE_AT_ROADVEH_DEPOT :Vedlikehald ved {TOWN} garasje
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Bygg om køyretøyet til å ta ein annan type last
--- a/src/lang/piglatin.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/piglatin.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Atflay andlay equiredray
STR_0008_WAITING :{BLACK}Aitingway: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (enway-outeray omfray
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Acceptsway: {WHITE}
STR_000D_ACCEPTS :{BLACK}Acceptsway: {GOLD}
STR_000E :
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Ootay anymay amesnay efinedday
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Osenchay amenay alreadyway inway useway
-STR_0133_WINDOWS :Indowsway
-STR_0134_UNIX :Unixway
-STR_0135_OSX :OSWAY Xay
+STR_OSNAME_WINDOWS :Indowsway
+STR_OSNAME_UNIX :Unixway
+STR_OSNAME_OSX :OSWAY Xay
STR_OSNAME_BEOS :EOSbay
STR_OSNAME_MORPHOS :OrphOSmay
STR_OSNAME_AMIGAOS :AmigaOSWAY
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}Argocay
STR_013D_INFORMATION :{BLACK}Informationway
STR_013E_CAPACITIES :{BLACK}Apacitiescay
-STR_013E_TOTAL_CARGO :{BLACK}Otaltay Argocay
+STR_TOTAL_CARGO :{BLACK}Otaltay Argocay
STR_013F_CAPACITY :{BLACK}Apacitycay: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Apacitycay: {LTBLUE}{CARGO} (xay{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Otaltay argocay apacitycay ofway isthay aintray:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Otaltay argocay apacitycay ofway isthay aintray:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (xay{NUM})
STR_0140_NEW_GAME :{BLACK}Ewnay Amegay
STR_0141_LOAD_GAME :{BLACK}Oadlay Amegay
@@ -727,7 +725,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Eleteday isthay owntay ompletelycay
STR_0292_SAVE_SCENARIO :Avesay enarioscay
STR_0293_LOAD_SCENARIO :Oadlay enarioscay
-STR_LOAD_HEIGHTMAP :Oadlay eightmaphay
+STR_MENU_LOAD_HEIGHTMAP :Oadlay eightmaphay
STR_0294_QUIT_EDITOR :Itquay editorway
STR_0295 :
STR_0296_QUIT :Itquay
@@ -767,9 +765,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Amegay optionsway
-STR_02C5_DIFFICULTY_SETTINGS :Ifficultyday ettingssay
-STR_02C7_CONFIG_PATCHES :Onfigurecay atchespay
+STR_02C4_GAME_OPTIONS :Amegay optionsway
+STR_02C6_DIFFICULTY_SETTINGS :Ifficultyday ettingssay
+STR_MENU_CONFIG_PATCHES :Onfigurecay atchespay
STR_NEWGRF_SETTINGS :EwGRFnay ettingssay
STR_TRANSPARENCY_OPTIONS :Ansparencytray optionsway
STR_GAMEOPTMENU_0A :
@@ -868,8 +866,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Avingsay illstay inway ogresspray,{}easeplay aitway untilway itway isway inishedfay!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Electsay 'Ezyway Eetstray ylestay usic'may ogrammepray
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Englishway (Originalway)
@@ -1638,42 +1636,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Ustmay emoveray oadray irstfay
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Oadray orksway inway ogresspray
STR_1802_ROAD_CONSTRUCTION :{WHITE}Oadray Onstructioncay
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Amwaytray Onstructioncay
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Amwaytray Onstructioncay
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Electsay Oadray Idgebray
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... oneway ayway oadsray an'tcay avehay unctionsjay
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}An'tcay uildbay oadray erehay...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}An'tcay uildbay amwaytray erehay...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}An'tcay uildbay amwaytray erehay...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}An'tcay emoveray oadray omfray erehay...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}An'tcay emoveray amwaytray omfray erehay...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}An'tcay emoveray amwaytray omfray erehay...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Oadray Epotday Orientationway
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Amtray Epotday Orientationway
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Amtray Epotday Orientationway
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}An'tcay uildbay oadray ehiclevay epotday erehay...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}An'tcay uildbay amtray ehiclevay epotday erehay...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}An'tcay uildbay amtray ehiclevay epotday erehay...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}An'tcay uildbay usbay ationstay...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}An'tcay uildbay orrylay ationstay...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}An'tcay uildbay assengerpay amtray ationstay...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}An'tcay uildbay eightfray amtray ationstay...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}An'tcay uildbay assengerpay amtray ationstay...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}An'tcay uildbay eightfray amtray ationstay...
STR_180A_ROAD_CONSTRUCTION :Oadray onstructioncay
-STR_180A_TRAMWAY_CONSTRUCTION :Amwaytray onstructioncay
+STR_TRAMWAY_CONSTRUCTION :Amwaytray onstructioncay
STR_180B_BUILD_ROAD_SECTION :{BLACK}Uildbay oadray ectionsay
STR_BUILD_AUTOROAD_TIP :{BLACK}Uildbay oadray ectionsay usingway ethay Autoroadway odemay
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Uildbay amwaytray ectionsay
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Uildbay amwaytray ectionsay
STR_BUILD_AUTOTRAM_TIP :{BLACK}Uildbay amwaytray ectionsay usingway ethay Autotramway odemay
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Uildbay oadray ehiclevay epotday (orfay uildingbay andway ervicingsay ehiclesvay)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Uildbay amtray ehiclevay epotday (orfay uildingbay andway ervicingsay ehiclesvay)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Uildbay amtray ehiclevay epotday (orfay uildingbay andway ervicingsay ehiclesvay)
STR_180D_BUILD_BUS_STATION :{BLACK}Uildbay usbay ationstay
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Uildbay orrylay oadinglay aybay
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Uildbay assengerpay amtray ationstay
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Uildbay eightfray amtray ationstay
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Uildbay assengerpay amtray ationstay
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Uildbay eightfray amtray ationstay
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Uildbay oadray idgebray
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Uildbay amwaytray idgebray
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Uildbay amwaytray idgebray
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Uildbay oadray unneltay
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Uildbay amwaytray unneltay
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Uildbay amwaytray unneltay
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Activateway/Eactivateday oneway ayway oadsray
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Oggletay uildbay/emoveray orfay oadray onstructioncay
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Oggletay uildbay/emoveray orfay amwaytray onstructioncay
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Oggletay uildbay/emoveray orfay amwaytray onstructioncay
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Electsay oadray ehiclevay epotday orientationway
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Electsay amtray ehiclevay epotday orientationway
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Electsay amtray ehiclevay epotday orientationway
STR_1814_ROAD :Oadray
STR_1815_ROAD_WITH_STREETLIGHTS :Oadray ithway eetlightsstray
STR_1816_TREE_LINED_ROAD :Eetray-inedlay oadray
@@ -1816,8 +1814,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Adjoinsway oremay anthay oneway existingway ationstay/oadinglay areaway
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Ootay anymay ationsstay/oadinglay areasway inway isthay owntay
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Ootay anymay ationsstay/oadinglay areasway
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Ootay anymay usbay opsstay
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Ootay anymay orrylay ationsstay
+STR_TOO_MANY_BUS_STOPS :{WHITE}Ootay anymay usbay opsstay
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Ootay anymay orrylay ationsstay
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Ootay oseclay otay anotherway ationstay/oadinglay areaway
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Ustmay emolishday ailwayray ationstay irstfay
@@ -1848,12 +1846,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} ownay acceptsway {STRING} andway {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Usbay Ationstay Orientationway
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Orrylay Ationstay Orientationway
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Assengerpay Amtray Orientationway
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Eightfray Amtray Orientationway
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Assengerpay Amtray Orientationway
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Eightfray Amtray Orientationway
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Ustmay emolishday usbay ationstay irstfay
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Ustmay emolishday orrylay ationstay irstfay
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Ustmay emolishday assengerpay amtray ationstay irstfay
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Ustmay emolishday eightfray amtray ationstay irstfay
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Ustmay emolishday assengerpay amtray ationstay irstfay
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Ustmay emolishday eightfray amtray ationstay irstfay
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Ation{P "" s}stay
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Onenay -
@@ -1865,8 +1863,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Electsay engthlay ofway ailwayray ationstay
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Electsay usbay ationstay orientationway
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Electsay orrylay oadinglay aybay orientationway
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Electsay assengerpay amtray ationstay orientationway
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Electsay eightfray amtray ationstay orientationway
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Electsay assengerpay amtray ationstay orientationway
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Electsay eightfray amtray ationstay orientationway
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Entrecay ainmay iewvay onway ationstay ocationlay
STR_3054_SHOW_STATION_RATINGS :{BLACK}Owshay ationstay atingsray
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Angechay amenay ofway ationstay
@@ -1888,7 +1886,7 @@
STR_3069_BUOY :Uoybay
STR_306A_BUOY_IN_THE_WAY :{WHITE}...uoybay inway ethay ayway
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...ationstay ootay eadspray outway
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...onuniformnay ationsstay isabledday
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...onuniformnay ationsstay isabledday
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Oldhay ownday CTRLay otay electsay oremay anthay oneway itemway
STR_UNDEFINED :(undefinedway ingstray)
@@ -1929,7 +1927,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Electsay Ewnay Amegay Ypetay
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Electsay enarioscay (eengray), epray-etsay amegay (ueblay), orway andomray ewnay amegay
STR_4010_GENERATE_RANDOM_NEW_GAME :Enerategay andomray ewnay amegay
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Oadlay Eightmaphay
+STR_LOAD_HEIGHTMAP :{WHITE}Oadlay Eightmaphay
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} inway ethay ayway
@@ -2133,10 +2131,10 @@
STR_6813_ECONOMY :{LTBLUE}Economyway: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Aintray eversingray: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Isastersday: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Itycay ouncil'scay attitudeway owardstay areaway estructuringray: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Itycay ouncil'scay attitudeway owardstay areaway estructuringray: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Onenay
+STR_NONE :Onenay
STR_NUM_VERY_LOW :Eryvay owlay
STR_6816_LOW :Owlay
STR_6817_NORMAL :Ormalnay
@@ -2174,9 +2172,9 @@
STR_6836_OFF :Offway
STR_6837_ON :Onway
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Owshay ihay-orescay artchay
-STR_6839_PERMISSIVE :Ermissivepay
-STR_683A_TOLERANT :Oleranttay
-STR_683B_HOSTILE :Ostilehay
+STR_PERMISSIVE :Ermissivepay
+STR_TOLERANT :Oleranttay
+STR_HOSTILE :Ostilehay
##id 0x7000
STR_7000 :
@@ -2313,7 +2311,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}An'tcay ellsay 25% areshay inway isthay ompanycay...
STR_707D_OWNED_BY :{WHITE}({COMMA}% ownedway ybay {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} ashay eenbay akentay overway ybay {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Isthay ompanycay isway otnay oldway enoughway otay adetray aresshay etyay...
+STR_PROTECTED :{WHITE}Isthay ompanycay isway otnay oldway enoughway otay adetray aresshay etyay...
STR_LIVERY_DEFAULT :Andardstay Iverylay
STR_LIVERY_STEAM :Eamstay Engineway
@@ -2620,17 +2618,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Ogay otay {STATION}
-STR_8807_GO_TO_TRANSFER :Ogay otay {STATION} (Ansfertray andway aketay argocay)
-STR_8808_GO_TO_UNLOAD :Ogay otay {STATION} (Unloadway)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Ogay otay {STATION} (Ansfertray andway eavelay emptyway)
-STR_880A_GO_TO_LOAD :Ogay otay {STATION} (Oadlay)
-STR_880B_GO_TO_TRANSFER_LOAD :Ogay otay {STATION} (Ansfertray andway aitway orfay ullfay oadlay)
-STR_880C_GO_NON_STOP_TO :Ogay onnay-opstay otay {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Ogay onnay-opstay otay {STATION} (Ansfertray andway aketay argocay)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Ogay onnay-opstay otay {STATION} (Unloadway)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ogay onnay-opstay otay {STATION} (Ansfertray andway eavelay emptyway)
-STR_8810_GO_NON_STOP_TO_LOAD :Ogay onnay-opstay otay {STATION} (Oadlay)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Ogay onnay-opstay otay {STATION} (Ansfertray andway aitway orfay ullfay oadlay)
+STR_GO_TO_TRANSFER :Ogay otay {STATION} (Ansfertray andway aketay argocay)
+STR_8807_GO_TO_UNLOAD :Ogay otay {STATION} (Unloadway)
+STR_GO_TO_TRANSFER_UNLOAD :Ogay otay {STATION} (Ansfertray andway eavelay emptyway)
+STR_8808_GO_TO_LOAD :Ogay otay {STATION} (Oadlay)
+STR_GO_TO_TRANSFER_LOAD :Ogay otay {STATION} (Ansfertray andway aitway orfay ullfay oadlay)
+STR_880A_GO_NON_STOP_TO :Ogay onnay-opstay otay {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Ogay onnay-opstay otay {STATION} (Ansfertray andway aketay argocay)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Ogay onnay-opstay otay {STATION} (Unloadway)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ogay onnay-opstay otay {STATION} (Ansfertray andway eavelay emptyway)
+STR_880C_GO_NON_STOP_TO_LOAD :Ogay onnay-opstay otay {STATION} (Oadlay)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ogay onnay-opstay otay {STATION} (Ansfertray andway aitway orfay ullfay oadlay)
STR_GO_TO_TRAIN_DEPOT :Ogay otay {TOWN} Aintray Epotday
STR_SERVICE_AT_TRAIN_DEPOT :Ervicesay atway {TOWN} Aintray Epotday
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ogay onnay-opstay otay {TOWN} Aintray Epotday
@@ -2734,7 +2732,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Owshay etailsday ofway argocay arriedcay
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Owshay etailsday ofway aintray ehiclesvay
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Owshay apacitiescay ofway eachway ehiclevay
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Owshay otaltay apacitycay ofway aintray, itsplay ybay argocay ypetay
+STR_SHOW_TOTAL_CARGO :{BLACK}Owshay otaltay apacitycay ofway aintray, itsplay ybay argocay ypetay
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Ordersway istlay - ickclay onway anway orderway otay ighlighthay itway. CTRLay + ickclay ollsscray otay ethay ationstay
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Ipskay ethay urrentcay orderway, andway artstay ethay extnay. CTRLay + ickclay ipsskay otay ethay electedsay orderway
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Eleteday ethay ighlightedhay orderway
@@ -2765,8 +2763,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}An'tcay everseray irectionday ofway aintray...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Enameray aintray ehiclevay ypetay
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}An'tcay enameray aintray ehiclevay ypetay...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Akemay ethay ighlightedhay orderway orcefay ethay ehiclevay otay umpday argocay
-STR_886F_TRANSFER :{BLACK}Ansfertray
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Akemay ethay ighlightedhay orderway orcefay ethay ehiclevay otay umpday argocay
+STR_TRANSFER :{BLACK}Ansfertray
STR_CLEAR_TIME :{BLACK}Angechay Imetay
STR_RESET_LATENESS :{BLACK}Esetray Atelay Ountercay
@@ -2844,8 +2842,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Amenay oadray ehiclevay
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay usbay arrivesway atway {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay ucktray arrivesway atway {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay assengerpay amtray arrivesway atway {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay eightfray amtray arrivesway atway {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay assengerpay amtray arrivesway atway {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay eightfray amtray arrivesway atway {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Oadray Ehiclevay Ashcray!{}Iverdray iesday inway ireballfay afterway ollisioncay ithway aintray
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Oadray Ehiclevay Ashcray!{}{COMMA} ieday inway ireballfay afterway ollisioncay ithway aintray
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}An'tcay akemay ehiclevay urntay aroundway...
@@ -2854,7 +2852,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Enameray oadray ehiclevay ypetay
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Enameray oadray ehiclevay ypetay
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}An'tcay enameray oadray ehiclevay ypetay...
-STR_9038_GO_TO_ROADVEH_DEPOT :Ogay otay {TOWN} Oadray Ehiclevay Epotday
+STR_GO_TO_ROADVEH_DEPOT :Ogay otay {TOWN} Oadray Ehiclevay Epotday
STR_SERVICE_AT_ROADVEH_DEPOT :Ervicesay atway {TOWN} Oadray Ehiclevay Epotday
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Efitray oadray ehiclevay otay arrycay away ifferentday argocay ypetay
--- a/src/lang/polish.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/polish.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Wymagany płaski teren
STR_0008_WAITING :{BLACK}Czeka: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (w drodze z
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Akceptuje: {WHITE}
STR_000D_ACCEPTS :{BLACK}Akceptuje: {GOLD}
STR_000E :
@@ -327,9 +325,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Za dużo zdefiniowanych nazw
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Nazwa jest już używana
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -340,11 +338,11 @@
STR_013C_CARGO :{BLACK}Ładunek
STR_013D_INFORMATION :{BLACK}Informacja
STR_013E_CAPACITIES :{BLACK}Pojemność
-STR_013E_TOTAL_CARGO :{BLACK}Całkowity ładunek
+STR_TOTAL_CARGO :{BLACK}Całkowity ładunek
STR_013F_CAPACITY :{BLACK}Pojemność: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Pojemność: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Calkowita pojemność tego pociągu:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Calkowita pojemność tego pociągu:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nowa Gra
STR_0141_LOAD_GAME :{BLACK}Wczytaj Grę
@@ -817,7 +815,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Skasuj to miasto
STR_0292_SAVE_SCENARIO :Zapisz scenariusz
STR_0293_LOAD_SCENARIO :Wczytaj scenariusz
-STR_LOAD_HEIGHTMAP :Wczytaj mapę wysokości
+STR_MENU_LOAD_HEIGHTMAP :Wczytaj mapę wysokości
STR_0294_QUIT_EDITOR :Wyjdź z edytora
STR_0295 :
STR_0296_QUIT :Wyjście
@@ -857,9 +855,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Opcje gry
-STR_02C5_DIFFICULTY_SETTINGS :Ustawienia trudności
-STR_02C7_CONFIG_PATCHES :Konfiguracja wtyczek
+STR_02C4_GAME_OPTIONS :Opcje gry
+STR_02C6_DIFFICULTY_SETTINGS :Ustawienia trudności
+STR_MENU_CONFIG_PATCHES :Konfiguracja wtyczek
STR_NEWGRF_SETTINGS :Ustawienia newgrf
STR_TRANSPARENCY_OPTIONS :Opcje przeźroczystości
STR_GAMEOPTMENU_0A :
@@ -959,8 +957,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Zapisywanie trwa,{}proszę zaczekać do zakończenia!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Wybierz program 'Ezy Street'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Angielskie (Oryginalne)
@@ -1734,42 +1732,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Należy najpierw usunąć drogę
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Trwają roboty drogowe
STR_1802_ROAD_CONSTRUCTION :{WHITE}Tworzenie dróg
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Budowa torowiska tramwajowego
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Budowa torowiska tramwajowego
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Wybierz most drogowy
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... drogi jednokierunkowe nie mogą mieć skrzyżowań
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Nie można tutaj zbudować drogi...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Nie można tutaj zbudować torowiska...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Nie można tutaj zbudować torowiska...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Nie można usunąć drogi z tego miejsca...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nie można torowiska z tego miejsca...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nie można torowiska z tego miejsca...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Ukierunkowanie zajezdni samochodowej
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orientacja zajezdni
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orientacja zajezdni
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Nie można tutaj zbudować zajezdni...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Nie można tutaj zbudować zajezdni...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Nie można tutaj zbudować zajezdni...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Nie można zbudować przystanku...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Nie można zbudować stacji ciężarówek...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nie można zbudować przystanku tramwajowego...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nie można zbudować tramwajowej stacji załadunkowej...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nie można zbudować przystanku tramwajowego...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nie można zbudować tramwajowej stacji załadunkowej...
STR_180A_ROAD_CONSTRUCTION :Budowa drogi
-STR_180A_TRAMWAY_CONSTRUCTION :Budowa torowiska tramwajowego
+STR_TRAMWAY_CONSTRUCTION :Budowa torowiska tramwajowego
STR_180B_BUILD_ROAD_SECTION :{BLACK}Budowa dróg
STR_BUILD_AUTOROAD_TIP :{BLACK}Budowa drogi używając trybu Autoroad
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Zbuduj fragment torowiska tramwajowego
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Zbuduj fragment torowiska tramwajowego
STR_BUILD_AUTOTRAM_TIP :{BLACK}Budowa torów tramwajowych używając trybu Autotram
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Zbuduj zajezdnię samochodową (do budowania i serwisowania pojazdów)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Zbuduj zajezdnię tramwajową (do budowania i serwisowania pojazdów)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Zbuduj zajezdnię tramwajową (do budowania i serwisowania pojazdów)
STR_180D_BUILD_BUS_STATION :{BLACK}Budowa przystanku
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Zbuduj stację załadunku ciężarówek
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Zbuduj przystanek tramwajowy
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Zbuduj tramwajową stację załadunkową
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Zbuduj przystanek tramwajowy
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Zbuduj tramwajową stację załadunkową
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Budowa mostu drogowego
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Zbuduj most tramwajowy
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Zbuduj most tramwajowy
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Budowa tunelu drogowego
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Zbuduj tunel tramwajowy
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Zbuduj tunel tramwajowy
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Włącz/Wyłącz drogi jednokierunkowe
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Przełącz buduj/usuń dla konstrukcji dróg
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Przełącz buduj/usuń dla konstrukcji torowiska tramwajowego
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Przełącz buduj/usuń dla konstrukcji torowiska tramwajowego
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Wybierz umiejscowienie zajezdni samochodowej
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Wybierz ukierunkowanie zajezdni tramwajowej
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Wybierz ukierunkowanie zajezdni tramwajowej
STR_1814_ROAD :Droga
STR_1815_ROAD_WITH_STREETLIGHTS :Droga z oświetleniem ulicznym
STR_1816_TREE_LINED_ROAD :Droga z drzewami
@@ -1912,8 +1910,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Przylega do więcej niż jednej stacji
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Za dużo stacji w tym mieście
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Za duzo stacji
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Za dużo przystankow autobusowych
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Za dużo wiele stacji załadunku ciężarówek
+STR_TOO_MANY_BUS_STOPS :{WHITE}Za dużo przystankow autobusowych
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Za dużo wiele stacji załadunku ciężarówek
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Zbyt blisko innej stacji
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Należy najpierw usunąc stację
@@ -1944,12 +1942,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} już akceptuje {STRING} i {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Ukierunkowanie przystanku
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Ukierunkowanie st. załadunku
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Ukierunkowanie przystanku tramwajowego
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Ukierunkowanie tramwajowej stacji załadunkowej
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Ukierunkowanie przystanku tramwajowego
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Ukierunkowanie tramwajowej stacji załadunkowej
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Należy najpierw usunąć przystanek
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Należy najpierw usunąć stację załadunku ciężarówek
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Najpierw musisz zniszczyć przystanek tramwajowy
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Najpierw musisz zniszczyć tramwajową stację załadunkową
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Najpierw musisz zniszczyć przystanek tramwajowy
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Najpierw musisz zniszczyć tramwajową stację załadunkową
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Nic -
@@ -1961,8 +1959,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Wybierz długość stacji
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Wybierz ukierunkowanie przystanku
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Ukierunkowanie stacji załadunku ciężarówek
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Wybierz ukierunkowanie przystanku tramwajowego
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Wybierz ukierunkowanie tramwajowej stacji załadunkowej
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Wybierz ukierunkowanie przystanku tramwajowego
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Wybierz ukierunkowanie tramwajowej stacji załadunkowej
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centruj główny widok na stacji
STR_3054_SHOW_STATION_RATINGS :{BLACK}Pokaż ocenę stacji
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Zmień nazwę stacji
@@ -1984,7 +1982,7 @@
STR_3069_BUOY :Boja
STR_306A_BUOY_IN_THE_WAY :{WHITE}...boja na drodze
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...stacja zbyt rozległa
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...niejednorodne są niedostępne
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...niejednorodne są niedostępne
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Przytrzymaj CTRL aby zaznaczyć więcej niż jedną opcję
STR_UNDEFINED :(nieokreślony tekst)
@@ -2025,7 +2023,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Wybierz nowy typ gry
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Wybierz scenariusz (zielony), ustawioną grę (niebieski), lub losową nową grę
STR_4010_GENERATE_RANDOM_NEW_GAME :Tworzenie losowej nowej gry
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Wczytaj mapę wysokości
+STR_LOAD_HEIGHTMAP :{WHITE}Wczytaj mapę wysokości
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} na drodze
@@ -2265,10 +2263,10 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomia: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Zawracanie pociągów: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katastrofy: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Nastawienie władz do zmian okolicznych terenów: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Nastawienie władz do zmian okolicznych terenów: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Brak
+STR_NONE :Brak
STR_NUM_VERY_LOW :Bardzo mało
STR_6816_LOW :Mało
STR_6817_NORMAL :Średnio
@@ -2306,9 +2304,9 @@
STR_6836_OFF :Wyłączone
STR_6837_ON :Włączone
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Pokaż Najlepsze Wyniki
-STR_6839_PERMISSIVE :Przyjazne
-STR_683A_TOLERANT :Tolerancyjne
-STR_683B_HOSTILE :Wrogie
+STR_PERMISSIVE :Przyjazne
+STR_TOLERANT :Tolerancyjne
+STR_HOSTILE :Wrogie
##id 0x7000
STR_7000 :
@@ -2445,7 +2443,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}nie można sprzedać 25% udziałów tej firmy...
STR_707D_OWNED_BY :{WHITE}({COMMA}% w posiadaniu przez {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} zostało przejęte przez {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Ta firma jeszcze nie sprzedaje akcji...
+STR_PROTECTED :{WHITE}Ta firma jeszcze nie sprzedaje akcji...
STR_LIVERY_DEFAULT :Standardowy wygląd
STR_LIVERY_STEAM :Parowóz
@@ -2758,17 +2756,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Idź do {STATION}
-STR_8807_GO_TO_TRANSFER :Idź do {STATION} (Przewieź i weź ładunek)
-STR_8808_GO_TO_UNLOAD :Idź do {STATION} (Wyładunek)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Idź do {STATION} (Przewieź i nie bierz ładunku)
-STR_880A_GO_TO_LOAD :Idź do {STATION} (Załadunek)
-STR_880B_GO_TO_TRANSFER_LOAD :Idź do {STATION} (Przewieź i czekaj na pełen załadunek)
-STR_880C_GO_NON_STOP_TO :Idź bez zatrzymywania do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Idź bez zatrzymywania do {STATION} (Przewieź i weź ładunek)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Idź bez zatrzymywania do {STATION} (Wyładunek)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Idź bez zatrzymywania do {STATION} (Przewieź i nie bierz ładunku)
-STR_8810_GO_NON_STOP_TO_LOAD :Idź bez zatrzymywania do {STATION} (Załadunek)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Idź bez zatrzymywania do {STATION} (Przewieź i czekaj na pełen załadunek)
+STR_GO_TO_TRANSFER :Idź do {STATION} (Przewieź i weź ładunek)
+STR_8807_GO_TO_UNLOAD :Idź do {STATION} (Wyładunek)
+STR_GO_TO_TRANSFER_UNLOAD :Idź do {STATION} (Przewieź i nie bierz ładunku)
+STR_8808_GO_TO_LOAD :Idź do {STATION} (Załadunek)
+STR_GO_TO_TRANSFER_LOAD :Idź do {STATION} (Przewieź i czekaj na pełen załadunek)
+STR_880A_GO_NON_STOP_TO :Idź bez zatrzymywania do {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Idź bez zatrzymywania do {STATION} (Przewieź i weź ładunek)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Idź bez zatrzymywania do {STATION} (Wyładunek)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Idź bez zatrzymywania do {STATION} (Przewieź i nie bierz ładunku)
+STR_880C_GO_NON_STOP_TO_LOAD :Idź bez zatrzymywania do {STATION} (Załadunek)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Idź bez zatrzymywania do {STATION} (Przewieź i czekaj na pełen załadunek)
STR_GO_TO_TRAIN_DEPOT :Idź do zajezdni w {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Serwisuj w zajezdni w {TOWN}
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Idź bez zatrzymywania do zajezdni w {TOWN}
@@ -2872,7 +2870,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Pokaż szczegóły przewożonych ładunków
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Pokaż szczegóły pociągu
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Pokaż pojemność każdego wagonu
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Pokaż całkowitą pojemność pociągu, według typu ładunku
+STR_SHOW_TOTAL_CARGO :{BLACK}Pokaż całkowitą pojemność pociągu, według typu ładunku
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista poleceń - klik na poleceniu aby zaznaczyć. CTRL + klik przenosi do stacji
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Pomiń obecne zadanie, i rozpocznij kolejne. CTRL + klik pomija aż do zaznaczonego zadania
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Usuń podświetlone polecenie
@@ -2903,8 +2901,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nie można odwrócić kierunku jazdy pociągu...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Zmiana nazwy typu pociągu
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Nie można zmienić nazwy typu pojazdu...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Spraw by w zaznaczonym poleceniu pojazd był zmuszony do pozostawienia ładunku dla kolejnego pojazdu
-STR_886F_TRANSFER :{BLACK}Przewieź
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Spraw by w zaznaczonym poleceniu pojazd był zmuszony do pozostawienia ładunku dla kolejnego pojazdu
+STR_TRANSFER :{BLACK}Przewieź
STR_CLEAR_TIME :{BLACK}Usuń czas
STR_RESET_LATENESS :{BLACK}Wyzeruj spóźnienia
@@ -2982,8 +2980,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Nazwij samochód
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy autobus przybył do {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwsza ciężarówka przybyła do {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy tramwaj pasażerski przybył do {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy tramwaj towarowy przybył do {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy tramwaj pasażerski przybył do {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy tramwaj towarowy przybył do {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Wypadek samochodowy!{}Kierowca zginął w zderzeniu z pociągiem
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Wypadek samochodowy!{}{COMMA} ofiar{P a y ""} zderzenia z pociągiem
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Nie można zawrócić samochodu...
@@ -2992,7 +2990,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Zmień nazwę typu samochodu
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Zmień nazwę typu samochodu
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Nie można zmienić nazwy typu samochodu...
-STR_9038_GO_TO_ROADVEH_DEPOT :Idź do zajezdni sam. w {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Idź do zajezdni sam. w {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Serwisuj w zajezdni sam. w {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Przebudowa samochodu do przewozu innego typu ładunku
--- a/src/lang/portuguese.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/portuguese.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}É necessário terreno plano
STR_0008_WAITING :{BLACK}Em espera: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (em rota de
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Aceita: {WHITE}
STR_000D_ACCEPTS :{BLACK}Aceita: {GOLD}
STR_000E :
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Demasiados nomes definidos
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}O nome escolhido já está a ser usado
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}Carga
STR_013D_INFORMATION :{BLACK}Informação
STR_013E_CAPACITIES :{BLACK}Capacidades
-STR_013E_TOTAL_CARGO :{BLACK}Carga Total
+STR_TOTAL_CARGO :{BLACK}Carga Total
STR_013F_CAPACITY :{BLACK}Capacidade: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capacidade: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Carga total (capacidade) deste comboio:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Carga total (capacidade) deste comboio:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Novo Jogo
STR_0141_LOAD_GAME :{BLACK}Abrir Jogo
@@ -730,7 +728,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Apagar completamente esta cidade
STR_0292_SAVE_SCENARIO :Guardar cenário
STR_0293_LOAD_SCENARIO :Abrir cenário
-STR_LOAD_HEIGHTMAP :Carregar mapa de alturas
+STR_MENU_LOAD_HEIGHTMAP :Carregar mapa de alturas
STR_0294_QUIT_EDITOR :Sair do editor
STR_0295 :
STR_0296_QUIT :Sair
@@ -770,9 +768,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Opções do Jogo
-STR_02C5_DIFFICULTY_SETTINGS :Configurações de dificuldade
-STR_02C7_CONFIG_PATCHES :Configurar correcções
+STR_02C4_GAME_OPTIONS :Opções do Jogo
+STR_02C6_DIFFICULTY_SETTINGS :Configurações de dificuldade
+STR_MENU_CONFIG_PATCHES :Configurar correcções
STR_NEWGRF_SETTINGS :Definições Newgrf
STR_TRANSPARENCY_OPTIONS :Opções de Transparência
STR_GAMEOPTMENU_0A :
@@ -872,8 +870,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Gravação ainda em curso,{}por favor aguarde!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Seleccionar programa 'Ezy Street'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglês
@@ -1648,42 +1646,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Deverá remover a estrada primeiro
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Trabalhos na estrada em curso
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construir Estradas
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Construção de eléctricos
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Construção de eléctricos
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Seleccionar Ponte de Estrada
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... estradas de um sentido não podem ter junções
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Não é possível construir estrada aqui...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Não é possível construir carris para eléctricos neste local...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Não é possível construir carris para eléctricos neste local...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Não é possível remover estrada daqui...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Não é possível remover carris para eléctricos deste local...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Não é possível remover carris para eléctricos deste local...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Orientação do Depósito
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orientação do depósito para eléctricos
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orientação do depósito para eléctricos
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Não é possível construir depósito de veículos de estrada aqui...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Não é possível construir depósito para eléctricos neste local...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Não é possível construir depósito para eléctricos neste local...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Não é possível construir estação de autocarros...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Não é possível construir estação de carregamento de camiões...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Não é possível construir estação de passageiros para eléctricos...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Não é possível construir estação de carga para eléctricos...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Não é possível construir estação de passageiros para eléctricos...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Não é possível construir estação de carga para eléctricos...
STR_180A_ROAD_CONSTRUCTION :Construir estradas
-STR_180A_TRAMWAY_CONSTRUCTION :Construção de carris para eléctricos
+STR_TRAMWAY_CONSTRUCTION :Construção de carris para eléctricos
STR_180B_BUILD_ROAD_SECTION :{BLACK}Construir estradas
STR_BUILD_AUTOROAD_TIP :{BLACK}Construir estradas usando o modo automático
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Construir secção de carris para eléctricos
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Construir secção de carris para eléctricos
STR_BUILD_AUTOTRAM_TIP :{BLACK}Construir carris para eléctricos usando o modo automático
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Construir depósito (para criação e manutenção de veículos de estrada)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construir depósito de eléctricos (para construção e manutenção)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construir depósito de eléctricos (para construção e manutenção)
STR_180D_BUILD_BUS_STATION :{BLACK}Construir estação de autocarros
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Construir área de carregamento de camiões
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construir paragem de eléctricos para passageiros
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Construir paragem de eléctricos para carga
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construir paragem de eléctricos para passageiros
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Construir paragem de eléctricos para carga
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Construir ponte de estrada
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Construir ponte para eléctricos
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Construir ponte para eléctricos
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Construir túnel de estrada
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Construir túnel para eléctricos
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Construir túnel para eléctricos
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Activar/Desactivar estradas de sentido único
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Alternar entre construir/remover estradas
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Alternar construir/remover linhas de eléctricos e sinais
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Alternar construir/remover linhas de eléctricos e sinais
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Seleccionar a orientação do depósito
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Escolher a orientação do depósito de eléctricos
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Escolher a orientação do depósito de eléctricos
STR_1814_ROAD :Estrada
STR_1815_ROAD_WITH_STREETLIGHTS :Estrada com iluminação
STR_1816_TREE_LINED_ROAD :Estrada com árvores
@@ -1826,8 +1824,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Muito junto de uma estação/local de carga já existente
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Demasiadas estações/locais de carga nesta cidade
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Demasiadas estações/locais de carga
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Demasiadas paragens de autocarro
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Demasiadas estações de carga
+STR_TOO_MANY_BUS_STOPS :{WHITE}Demasiadas paragens de autocarro
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Demasiadas estações de carga
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Muito junto de uma estação/local de carga
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Precisa de demolir a estação primeiro
@@ -1858,12 +1856,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} agora aceita {STRING} e {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Orientação da estação de autocarros
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Orientação da estação de carga
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientação da Estação de Eléctricos
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientação da Estação de Eléctricos
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientação da Estação de Eléctricos
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientação da Estação de Eléctricos
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Precisa de demolir a estação de autocarros primeiro
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Precisa de demolir a estação de carga primeiro
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Precisa demolir estação de eléctricos primeiro
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Precisa demolir estação de eléctricos primeiro
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Precisa demolir estação de eléctricos primeiro
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Precisa demolir estação de eléctricos primeiro
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Estações
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Nenhuma -
@@ -1875,8 +1873,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Seleccionar o tamanho da estação ferroviária
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Seleccionar a orientação da estação de autocarros
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Seleccionar a orientação da estação de carregamento de camiões
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Selecionar orientação da estação de eléctricos
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Selecionar orientação da estação de eléctricos
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Selecionar orientação da estação de eléctricos
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Selecionar orientação da estação de eléctricos
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centrar visualização no local estação
STR_3054_SHOW_STATION_RATINGS :{BLACK}Mostrar avaliações da estação
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Alterar o nome da estação
@@ -1898,7 +1896,7 @@
STR_3069_BUOY :Bóia
STR_306A_BUOY_IN_THE_WAY :{WHITE}...bóia no caminho
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...estação muito extensa
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...estações não-uniformes desactivadas
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...estações não-uniformes desactivadas
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Manter CTRL premido para seleccionar mais do que um item
STR_UNDEFINED :(frase indefinida)
@@ -1939,7 +1937,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Seleccionar Novo Tipo de Jogo
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Seleccionar cenário (verde), jogo pré-programado (azul), ou novo jogo aleatório
STR_4010_GENERATE_RANDOM_NEW_GAME :Gerar novo jogo aleatório
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Carregar mapa de alturas
+STR_LOAD_HEIGHTMAP :{WHITE}Carregar mapa de alturas
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} no caminho
@@ -2143,10 +2141,10 @@
STR_6813_ECONOMY :{LTBLUE}Economia: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Inverter comboio: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Atitude das autoridades sobre reestruturamentos: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Atitude das autoridades sobre reestruturamentos: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Nenhum
+STR_NONE :Nenhum
STR_NUM_VERY_LOW :Muito baixo
STR_6816_LOW :Baixo
STR_6817_NORMAL :Normal
@@ -2184,9 +2182,9 @@
STR_6836_OFF :Off
STR_6837_ON :On
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Mostrar melhores pontuações
-STR_6839_PERMISSIVE :Permissivo
-STR_683A_TOLERANT :Tolerante
-STR_683B_HOSTILE :Hostil
+STR_PERMISSIVE :Permissivo
+STR_TOLERANT :Tolerante
+STR_HOSTILE :Hostil
##id 0x7000
STR_7000 :
@@ -2323,7 +2321,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Não é possível vender 25% de acções nesta empresa...
STR_707D_OWNED_BY :{WHITE}({COMMA}% propriedade de {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} foi comprada por {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Esta empresa ainda não troca acções...
+STR_PROTECTED :{WHITE}Esta empresa ainda não troca acções...
STR_LIVERY_DEFAULT :Estampagem Padrão
STR_LIVERY_STEAM :Motor a Vapor
@@ -2632,17 +2630,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Ir para {STATION}
-STR_8807_GO_TO_TRANSFER :Ir para {STATION} (Transferir e levar carga)
-STR_8808_GO_TO_UNLOAD :Ir para {STATION} (Descarregar)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Ir para {STATION} (Transferir e deixar vazio)
-STR_880A_GO_TO_LOAD :Ir para {STATION} (Carregar)
-STR_880B_GO_TO_TRANSFER_LOAD :Ir para {STATION} (Transferir e aguardar carga completa)
-STR_880C_GO_NON_STOP_TO :Ir sem parar para {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Ir sem parar para {STATION} (Transfer ir e levar carga)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Ir sem parar para {STATION} (Descarregar)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sem parar para {STATION} (Transferir e deixar vazio)
-STR_8810_GO_NON_STOP_TO_LOAD :Ir sem parar para {STATION} (Carregar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sem parar para {STATION} (Transferir e aguardar carga completa)
+STR_GO_TO_TRANSFER :Ir para {STATION} (Transferir e levar carga)
+STR_8807_GO_TO_UNLOAD :Ir para {STATION} (Descarregar)
+STR_GO_TO_TRANSFER_UNLOAD :Ir para {STATION} (Transferir e deixar vazio)
+STR_8808_GO_TO_LOAD :Ir para {STATION} (Carregar)
+STR_GO_TO_TRANSFER_LOAD :Ir para {STATION} (Transferir e aguardar carga completa)
+STR_880A_GO_NON_STOP_TO :Ir sem parar para {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Ir sem parar para {STATION} (Transfer ir e levar carga)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Ir sem parar para {STATION} (Descarregar)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sem parar para {STATION} (Transferir e deixar vazio)
+STR_880C_GO_NON_STOP_TO_LOAD :Ir sem parar para {STATION} (Carregar)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sem parar para {STATION} (Transferir e aguardar carga completa)
STR_GO_TO_TRAIN_DEPOT :Ir para o depósito de {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Manutenção no depósito de {TOWN}
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ir sem parar para o depósito de {TOWN}
@@ -2746,7 +2744,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Mostrar detalhes da carga transportada
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Mostrar detalhes dos veículos
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Mostrar capacidades de cada veículo
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Mostrar capacidade total do comboio, dividir por tipo de carga
+STR_SHOW_TOTAL_CARGO :{BLACK}Mostrar capacidade total do comboio, dividir por tipo de carga
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista de ordens - clique numa ordem para a seleccionar
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Salta a ordem actual, e inicia a próxima. CTRL + clique salta para a ordem seleccionada
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Eliminar a ordem seleccionada
@@ -2777,8 +2775,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Não é possível inverter a direcção do comboio...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renomear tipo de veículo ferroviário
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Não é possível renomear tipo de veículo ferroviário...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A ordem seleccionada forçará o veículo a largar a carga
-STR_886F_TRANSFER :{BLACK}Transferir
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A ordem seleccionada forçará o veículo a largar a carga
+STR_TRANSFER :{BLACK}Transferir
STR_CLEAR_TIME :{BLACK}Apagar Tempo
STR_RESET_LATENESS :{BLACK}Apagar Contad. Atraso
@@ -2856,8 +2854,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Renomear veículo de estrada
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro autocarro chega a {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro camião chega a {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro eléctrico de passageiros chega a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro eléctrico de mercadorias chega a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro eléctrico de passageiros chega a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro eléctrico de mercadorias chega a {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}Condutor morre na explosão após a colisão com um comboio
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}{COMMA} morrem na explosão após a colisão com um comboio
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Não é possível fazer o veículo dar a volta...
@@ -2866,7 +2864,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Renomear tipo de veículo de estrada
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Renomear tipo de veículo de estrada
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Não é possível renomear tipo de veículo de estrada...
-STR_9038_GO_TO_ROADVEH_DEPOT :Ir para o depósito de {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Ir para o depósito de {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Manutenção no depósito de {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Reconverter veículo para transportar outro tipo de carga
--- a/src/lang/romanian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/romanian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Necesită teren plat
STR_0008_WAITING :{BLACK}În aşteptare: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (plecat de la
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Acceptă: {WHITE}
STR_000D_ACCEPTS :{BLACK}Acceptă: {GOLD}
STR_000E :
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Prea multe nume definite
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Numele ales este deja folosit
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}Încãrcãturã
STR_013D_INFORMATION :{BLACK}Informatii
STR_013E_CAPACITIES :{BLACK}Capacitãti
-STR_013E_TOTAL_CARGO :{BLACK}Încãrcãturi
+STR_TOTAL_CARGO :{BLACK}Încãrcãturi
STR_013F_CAPACITY :{BLACK}Capacitate: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capacitate: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Încãrcãtura totalã (capacitatea) acestui tren:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Încãrcãtura totalã (capacitatea) acestui tren:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Joc nou
STR_0141_LOAD_GAME :{BLACK}Încarcã joc
@@ -730,7 +728,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Şterge acest oraş
STR_0292_SAVE_SCENARIO :Salvează scenariul
STR_0293_LOAD_SCENARIO :Încarcă scenariu
-STR_LOAD_HEIGHTMAP :Incarca harta de inaltimi
+STR_MENU_LOAD_HEIGHTMAP :Incarca harta de inaltimi
STR_0294_QUIT_EDITOR :Ieşire din editor
STR_0295 :
STR_0296_QUIT :Ieşire din joc
@@ -770,9 +768,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Opţiunile jocului (F2)
-STR_02C5_DIFFICULTY_SETTINGS :Setări dificultate
-STR_02C7_CONFIG_PATCHES :Configurare patch
+STR_02C4_GAME_OPTIONS :Opţiunile jocului (F2)
+STR_02C6_DIFFICULTY_SETTINGS :Setări dificultate
+STR_MENU_CONFIG_PATCHES :Configurare patch
STR_NEWGRF_SETTINGS :Setari Newgrf
STR_TRANSPARENCY_OPTIONS :Optiuni transparenta
STR_GAMEOPTMENU_0A :
@@ -872,8 +870,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Salvarea se efectueaza încã,{}vã rugãm asteptati pânã se încheie!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Selectează programul muzical 'Ezy Street'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engleza (Original)
@@ -1648,42 +1646,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Mai întâi trebuie înlăturată şoseaua
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Lucrari la drum in curs de desfasurare
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construcţii rutiere
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Construcţie Tramvai
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Construcţie Tramvai
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Alege pod rutier
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... drumurile cu sens unic nu pot avea bifurcatii
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Nu pot construi şosea aici...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Nu pot construi şină de tramvai aici...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Nu pot construi şină de tramvai aici...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Nu pot înlătura şoseaua...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nu pot înlătura şina de tramvai de aici...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nu pot înlătura şina de tramvai de aici...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Orientarea autobazei
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orientarea Depoului de Tramvaie
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orientarea Depoului de Tramvaie
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Nu pot construi autobază aici...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Nu pot construi depou de tramvaie aici...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Nu pot construi depou de tramvaie aici...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Nu pot construi staţie de autobuz...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Nu pot construi platformă pentru camioane...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nu pot construi staţie de tramvai aici...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nu pot construi staţie de tramvai aici...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nu pot construi staţie de tramvai aici...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nu pot construi staţie de tramvai aici...
STR_180A_ROAD_CONSTRUCTION :Construcţii rutiere
-STR_180A_TRAMWAY_CONSTRUCTION :Construcţie tramvai
+STR_TRAMWAY_CONSTRUCTION :Construcţie tramvai
STR_180B_BUILD_ROAD_SECTION :{BLACK}Construieşte secţiune de şosea
STR_BUILD_AUTOROAD_TIP :{BLACK}Construieste sectiune de sosea folosind modul Auto-sosea
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Construcieşte şină de tramvai
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Construcieşte şină de tramvai
STR_BUILD_AUTOTRAM_TIP :{BLACK}Construieste sectiune de sina de tramvai folosind modul Auto-tramvai
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Construieşte o autobază (pentru construire şi întreţinere de autovehicule)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construieste depou tramvaie (pentru constructii si reparatii vehicule)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construieste depou tramvaie (pentru constructii si reparatii vehicule)
STR_180D_BUILD_BUS_STATION :{BLACK}Plasează staţie de autobuz
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Construieşte platformă pentru camioane
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construieste statie de tramvai pentru calatori
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Construieste statie de transport marfar
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construieste statie de tramvai pentru calatori
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Construieste statie de transport marfar
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Construieşte pod rutier
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Construieşte pod pentru tramvaie
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Construieşte pod pentru tramvaie
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Construieşte tunel rutier
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Construieşte tunel pentru tramvaie
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Construieşte tunel pentru tramvaie
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Activare/Dezactivare sensuri unice
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Comutator pentru construcţie/înlăturare şosele
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Comuta constructie/stergere pentru constructia de linii de tramvaie
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Comuta constructie/stergere pentru constructia de linii de tramvaie
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Alege orientarea autobazei
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Alege orientarea depoului de tramvaie
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Alege orientarea depoului de tramvaie
STR_1814_ROAD :Şosea
STR_1815_ROAD_WITH_STREETLIGHTS :Stradă iluminată
STR_1816_TREE_LINED_ROAD :Stradă cu copaci pe margine
@@ -1826,8 +1824,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Este adiacentă mai multor staţii
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Prea multe staţii în acest oraş
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Prea multe staţii
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Prea multe staţii de autobuz
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Prea multe staţii de camion
+STR_TOO_MANY_BUS_STOPS :{WHITE}Prea multe staţii de autobuz
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Prea multe staţii de camion
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Prea aproape de altă staţie
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Mai întâi trebuie demolată gara
@@ -1858,12 +1856,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} acceptă acum {STRING} si {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Orientarea staţiei
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Orientarea platformei de camioane
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientarea staţiei de tramvai pentru călători
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientarea staţiei de tramvai pentru marfă
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientarea staţiei de tramvai pentru călători
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientarea staţiei de tramvai pentru marfă
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Mai întâi trebuie demolată staţia de autobuz
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Mai întâi trebuie demolată platforma pentru camioane
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Mai întâi trebuie demolată staţia de tramvai
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Mai întâi trebuie demolată staţia de tramvai
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Mai întâi trebuie demolată staţia de tramvai
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Mai întâi trebuie demolată staţia de tramvai
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Staţi{P e i}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Nici una -
@@ -1875,8 +1873,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Alege lungimea liniilor gării
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Alege orientarea staţiei de autobuz
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Alege orientarea platformei pentru camioane
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Alege orientarea staţiei de tramvai
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Alege orientarea staţiei de tramvai
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Alege orientarea staţiei de tramvai
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Alege orientarea staţiei de tramvai
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centrează imaginea pe locaţia staţiei
STR_3054_SHOW_STATION_RATINGS :{BLACK}Afişează evaluările staţiei
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Schimbă numele staţiei
@@ -1898,7 +1896,7 @@
STR_3069_BUOY :Baliză
STR_306A_BUOY_IN_THE_WAY :{WHITE}...baliză în cale
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...staţie prea mare
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...staţiile neuniforme nu sunt permise
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...staţiile neuniforme nu sunt permise
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Tine apãsat CTRL pentru a alege mai mult decât un obiect
STR_UNDEFINED :(sir nedefinit)
@@ -1939,7 +1937,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Alege tipul noului joc
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Alege un scenariu (verde), un joc predefinit (albastru) sau o hartă aleatoare
STR_4010_GENERATE_RANDOM_NEW_GAME :Generează o hartă aleatoare
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Încarcă harta înălţimilor
+STR_LOAD_HEIGHTMAP :{WHITE}Încarcă harta înălţimilor
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} în cale
@@ -2143,10 +2141,10 @@
STR_6813_ECONOMY :{LTBLUE}Economie: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Trenurile întorc: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Dezastre: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Reacţia autorităţilor la modificarea mediului: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Reacţia autorităţilor la modificarea mediului: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :zero
+STR_NONE :zero
STR_NUM_VERY_LOW :Foarte putine
STR_6816_LOW :scăzut
STR_6817_NORMAL :normal
@@ -2184,9 +2182,9 @@
STR_6836_OFF :inactiv
STR_6837_ON :activ
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Afişează clasamentul celor mai bune punctaje
-STR_6839_PERMISSIVE :permisivă
-STR_683A_TOLERANT :tolerantă
-STR_683B_HOSTILE :ostilă
+STR_PERMISSIVE :permisivă
+STR_TOLERANT :tolerantă
+STR_HOSTILE :ostilă
##id 0x7000
STR_7000 :
@@ -2323,7 +2321,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Nu pot vinde 25% din acţiunile acestei companii...
STR_707D_OWNED_BY :{WHITE}({COMMA}% deţinute de {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} a fost preluată de {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Această companie încă nu vinde acţiuni...
+STR_PROTECTED :{WHITE}Această companie încă nu vinde acţiuni...
STR_LIVERY_DEFAULT :Uniforma standard
STR_LIVERY_STEAM :Motor cu abur
@@ -2630,17 +2628,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Mergi la {STATION}
-STR_8807_GO_TO_TRANSFER :Mergi la {STATION} (Preia încărcătura pentru transfer)
-STR_8808_GO_TO_UNLOAD :Mergi la {STATION} (Descarcă)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Mergi la {STATION} (Descarcă încărcătura pentru transfer)
-STR_880A_GO_TO_LOAD :Mergi la {STATION} (Încarcă)
-STR_880B_GO_TO_TRANSFER_LOAD :Mergi la {STATION} (Aşteaptă 100% încărcătură pentru transfer)
-STR_880C_GO_NON_STOP_TO :Mergi fără oprire la {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Mergi fără oprire la {STATION} (Preia încărcătura pentru transfer)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Mergi fără oprire la {STATION} (Descarcă)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Mergi fără oprire la {STATION} (Descarcă încărcătura pentru transfer)
-STR_8810_GO_NON_STOP_TO_LOAD :Mergi fără oprire la {STATION} (Încarcă)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Mergi fără oprire la {STATION} (Aşteaptă 100% încărcătură pentru transfer)
+STR_GO_TO_TRANSFER :Mergi la {STATION} (Preia încărcătura pentru transfer)
+STR_8807_GO_TO_UNLOAD :Mergi la {STATION} (Descarcă)
+STR_GO_TO_TRANSFER_UNLOAD :Mergi la {STATION} (Descarcă încărcătura pentru transfer)
+STR_8808_GO_TO_LOAD :Mergi la {STATION} (Încarcă)
+STR_GO_TO_TRANSFER_LOAD :Mergi la {STATION} (Aşteaptă 100% încărcătură pentru transfer)
+STR_880A_GO_NON_STOP_TO :Mergi fără oprire la {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Mergi fără oprire la {STATION} (Preia încărcătura pentru transfer)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Mergi fără oprire la {STATION} (Descarcă)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Mergi fără oprire la {STATION} (Descarcă încărcătura pentru transfer)
+STR_880C_GO_NON_STOP_TO_LOAD :Mergi fără oprire la {STATION} (Încarcă)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Mergi fără oprire la {STATION} (Aşteaptă 100% încărcătură pentru transfer)
STR_GO_TO_TRAIN_DEPOT :Mergi la depoul {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Service la Depoul {TOWN}
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Mergi fără oprire la Depoul {TOWN}
@@ -2744,7 +2742,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Afiseazã detalii despre încãrcãtura transportatã
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Afiseazã detalii despre componentele trenului
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Afiseazã capacitãtile componentelor trenului
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Afiseazã capacitãtile totale ale trenului, diferentiate pe tip de încãrcãturã
+STR_SHOW_TOTAL_CARGO :{BLACK}Afiseazã capacitãtile totale ale trenului, diferentiate pe tip de încãrcãturã
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista de comenzi - clic pe comandã pentru a o selecta
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Renunta la comanta acruala si preia-o pe urmatoarea. CTRL + click face salt la comanda selectata
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Sterge comanda selectatã
@@ -2775,8 +2773,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nu pot schimba sensul de mers al trenului...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Redenumeste modelul vehiculului feroviar
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Nu pot redenumi modelul acestui vehicul...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Comanda selectatã forteazã vehiculul sã arunce încãrcãtura
-STR_886F_TRANSFER :{BLACK}Transferă
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Comanda selectatã forteazã vehiculul sã arunce încãrcãtura
+STR_TRANSFER :{BLACK}Transferă
STR_CLEAR_TIME :{BLACK}Curata timp
STR_RESET_LATENESS :{BLACK}Reinitializeaza contorul de intarziere
@@ -2854,8 +2852,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Numele autovehiculului
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc{}sosirea primului autobuz la {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc{}sosirea primului camion la {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru călători la {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru marfă la {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru călători la {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru marfă la {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Accident rutier!{}Soferul decedat in urma coliziunii cu un tren
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Accident rutier!{}{COMMA} victime in urma coliziunii cu un tren
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Nu pot schimba întoarce autvehiculul...
@@ -2864,7 +2862,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Redenumeste modelul de autovehicul
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Redenumeste modelul autovehiculului
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Nu pot redenumi modelul acestui autovehicul...
-STR_9038_GO_TO_ROADVEH_DEPOT :Mergi la Autobaza {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Mergi la Autobaza {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Service la Autobaza {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Adapteaza autovehiculul pentru o incarcatura diferita
--- a/src/lang/russian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/russian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Необходимо ровное место
STR_0008_WAITING :{BLACK}Ожидает: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (привезено из
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} транзитом из {STATION})
STR_000C_ACCEPTS :{BLACK}Принимаются: {WHITE}
STR_000D_ACCEPTS :{BLACK}Принимаются: {GOLD}
STR_000E :
@@ -276,9 +275,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Слишком много имен определено
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Выбранное имя уже используется
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix/Linux
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix/Linux
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -289,11 +288,11 @@
STR_013C_CARGO :{BLACK}Груз
STR_013D_INFORMATION :{BLACK}Информация
STR_013E_CAPACITIES :{BLACK}Вместимость
-STR_013E_TOTAL_CARGO :{BLACK}Общий груз
+STR_TOTAL_CARGO :{BLACK}Общий груз
STR_013F_CAPACITY :{BLACK}Вместимость: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Емкость: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Общая загруженность этого транспорта:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} (Всего: {SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Общая загруженность этого транспорта:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} (Всего: {SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Новая игра
STR_0141_LOAD_GAME :{BLACK}Загрузить игру
@@ -728,11 +727,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Поставить передатчик
STR_028F_DEFINE_DESERT_AREA :{BLACK}Задать площадь пустыни.{}Нажмите и держите CTRL для удаления
STR_CREATE_LAKE :{BLACK}Создать воду:{}При отжатом CTRL создаётся канал.{}При зажатом CTRL клетка на уровне моря наполняется водой.
+STR_CREATE_RIVER :{BLACK}Разместить реки.
STR_0290_DELETE :{BLACK}Уничтожить
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Полностью уничтожить этот город
STR_0292_SAVE_SCENARIO :Сохранить сценарий
STR_0293_LOAD_SCENARIO :Загрузить сценарий
-STR_LOAD_HEIGHTMAP :Загрузить карту высот
+STR_MENU_LOAD_HEIGHTMAP :Загрузить карту высот
STR_0294_QUIT_EDITOR :Выйти из редактора
STR_0295 :
STR_0296_QUIT :Выход
@@ -772,9 +772,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Настройки игры
-STR_02C5_DIFFICULTY_SETTINGS :Настройки сложности
-STR_02C7_CONFIG_PATCHES :Настройки патчей
+STR_02C4_GAME_OPTIONS :Настройки игры
+STR_02C6_DIFFICULTY_SETTINGS :Настройки сложности
+STR_MENU_CONFIG_PATCHES :Настройки патчей
STR_NEWGRF_SETTINGS :Настройки NewGRF
STR_TRANSPARENCY_OPTIONS :Настройки прозрачности
STR_GAMEOPTMENU_0A :
@@ -874,8 +874,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Сохранение все еще идет,{}пожалуйста, дождитесь завершения!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Выбрать музыкальную программу
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Английские
@@ -937,6 +937,7 @@
STR_OPTIONS_FULLSCREEN :{BLACK}Полноэкранный режим
STR_OPTIONS_FULLSCREEN_TIP :{BLACK}Включить/выключить полноэкранный режим
+STR_FULLSCREEN_FAILED :{WHITE}Сбой полноэкранного режима
STR_OPTIONS_RES :{BLACK}Разрешение экрана
STR_OPTIONS_RES_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1649,42 +1650,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Сначала удалите дорогу
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Идут дорожные работы...
STR_1802_ROAD_CONSTRUCTION :{WHITE}Строительство дорог
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Трамваи
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Трамваи
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Выберите тип моста
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... односторонние дороги не могут иметь такое пересечение
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Не могу проложить дорогу здесь...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Нельзя построить здесь трамвай...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Нельзя построить здесь трамвай...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Не могу удалить дорогу...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Не могу удалить этот трамвай...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Не могу удалить этот трамвай...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Направление гаража
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Ориентация трамвайного депо
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Ориентация трамвайного депо
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Не могу построить гараж здесь...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Не могу построить здесь трамвайное депо...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Не могу построить здесь трамвайное депо...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Не могу построить остановку здесь...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Не могу построить грузовую станцию...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Не могу построить пассажирскую трамвайную остановку...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Не могу построить грузовую трамвайную остановку...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Не могу построить пассажирскую трамвайную остановку...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Не могу построить грузовую трамвайную остановку...
STR_180A_ROAD_CONSTRUCTION :Строительство дорог
-STR_180A_TRAMWAY_CONSTRUCTION :Трамваи
+STR_TRAMWAY_CONSTRUCTION :Трамваи
STR_180B_BUILD_ROAD_SECTION :{BLACK}Проложить дорогу
STR_BUILD_AUTOROAD_TIP :{BLACK}Строить автотрассу, используя авто-режим
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Проложить трамвайные пути
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Проложить трамвайные пути
STR_BUILD_AUTOTRAM_TIP :{BLACK}Строить трамвайный путь, используя авто-режим
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Построить гараж (для закупки и обслуживания машин)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Построить трамвайное депо (для закупки и обслуживания трамваев)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Построить трамвайное депо (для закупки и обслуживания трамваев)
STR_180D_BUILD_BUS_STATION :{BLACK}Построить автобусную остановку
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Построить погрузочную станцию
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Построить пассажирскую трамвайную остановку
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Построить грузовую трамвайную остановку
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Построить пассажирскую трамвайную остановку
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Построить грузовую трамвайную остановку
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Построить мост (авто)
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Построить трамвайный мост
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Построить трамвайный мост
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Построить туннель (авто)
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Построить трамвайный туннель
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Построить трамвайный туннель
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Включить/Отключить односторонние дороги
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Переключение строительства/удаления автомобильной инфраструктуры
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Переключение строительства/удаления трамвайной инфраструктуры
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Переключение строительства/удаления трамвайной инфраструктуры
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Выбор ориентации гаража
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Выбор ориентации трамвайного депо
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Выбор ориентации трамвайного депо
STR_1814_ROAD :Дорога
STR_1815_ROAD_WITH_STREETLIGHTS :Дорога с уличным освещением
STR_1816_TREE_LINED_ROAD :Шоссе
@@ -1827,8 +1828,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Присоединяется более чем к одной существующей станции
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Слишком много станций и остановок в этом городе. Переименуйте существующие.
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Слишком много станций и остановок
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Слишком много автобусных остановок
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Слишком много погрузочных станций
+STR_TOO_MANY_BUS_STOPS :{WHITE}Слишком много автобусных остановок
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Слишком много погрузочных станций
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Слишком близко к другой станции
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Сначала нужно удалить ж/д станцию
@@ -1859,12 +1860,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} теперь принимает {STRING} и {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Направление остановки
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Ориентация станции
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Направление пассажирской трамвайной остановки
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Направление грузовой трамвайной остановки
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Направление пассажирской трамвайной остановки
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Направление грузовой трамвайной остановки
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Сначала удалите автобусную остановку
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Сначала удалите грузовой терминал
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Сначала надо уничтожить пассажирскую трамвайную остановку
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Сначала надо уничтожить грузовую трамвайную остановку
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Сначала надо уничтожить пассажирскую трамвайную остановку
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Сначала надо уничтожить грузовую трамвайную остановку
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Станц{P 2 ия ии ий}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Нет -
@@ -1876,8 +1877,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Выберите длину ж/д станции
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Выберите направление автобусной остановки
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Выберите направление погрузочной станции
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Выберите направление пассажирской трамвайной остановки
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Выберите направление грузовой трамвайной остановки
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Выберите направление пассажирской трамвайной остановки
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Выберите направление грузовой трамвайной остановки
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Показать станцию в основном окне
STR_3054_SHOW_STATION_RATINGS :{BLACK}Показать рейтинг станции
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Переименовать станцию
@@ -1899,7 +1900,7 @@
STR_3069_BUOY :Буй
STR_306A_BUOY_IN_THE_WAY :{WHITE}...буй на пути
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...станция слишком большая
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...использование непрямоугольных станций запрещено
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...использование непрямоугольных станций запрещено
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Нажмите и держите CTRL для выбора более одного варианта
STR_UNDEFINED :(неопределено)
@@ -1940,7 +1941,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Выбрать тип новой игры
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Выбрать сценарий(зеленый), предустановленную новую игру (синий) или случайную новую игру
STR_4010_GENERATE_RANDOM_NEW_GAME :Сгенерировать случайную карту
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Загруз. ЛАНДШАФТ
+STR_LOAD_HEIGHTMAP :{WHITE}Загруз. ЛАНДШАФТ
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} на пути
@@ -2148,10 +2149,10 @@
STR_6813_ECONOMY :{LTBLUE}Экономика: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Разворот поездов: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Катастрофы: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Отношение властей к изменению территорий: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Отношение властей к изменению территорий: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Нет
+STR_NONE :Нет
STR_NUM_VERY_LOW :Очень низкое
STR_6816_LOW :Низкое
STR_6817_NORMAL :Среднее
@@ -2196,9 +2197,9 @@
STR_6836_OFF :Выключены
STR_6837_ON :Включены
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Показать таблицу рекордов
-STR_6839_PERMISSIVE :Дозволяющее
-STR_683A_TOLERANT :Терпимое
-STR_683B_HOSTILE :Враждебное
+STR_PERMISSIVE :Дозволяющее
+STR_TOLERANT :Терпимое
+STR_HOSTILE :Враждебное
##id 0x7000
STR_7000 :
@@ -2335,7 +2336,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Не могу продать 25% акций этой компании...
STR_707D_OWNED_BY :{WHITE}({COMMA}% владеет {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} выкуплена {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Эта компания еще не может торговать акциями...
+STR_PROTECTED :{WHITE}Эта компания еще не может торговать акциями...
STR_LIVERY_DEFAULT :Стандарт. раскраска
STR_LIVERY_STEAM :Паровоз
@@ -2348,6 +2349,8 @@
STR_LIVERY_PASSENGER_WAGON_STEAM :Пассаж. вагон (паровоз)
STR_LIVERY_PASSENGER_WAGON_DIESEL :Пассаж. вагон (дизель)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Пассаж. вагон (электро)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :Пассажирский вагон (монорельс)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :Пассажирский вагон (Маглев)
STR_LIVERY_FREIGHT_WAGON :Грузовой вагон
STR_LIVERY_BUS :Автобус
STR_LIVERY_TRUCK :Грузовое авто
@@ -2642,17 +2645,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Ехать к ст. {STATION}
-STR_8807_GO_TO_TRANSFER :Ехать к ст. {STATION} (Трансфер)
-STR_8808_GO_TO_UNLOAD :Ехать к ст. {STATION} (Не грузиться)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Ехать к ст. {STATION} (Трансфер и не грузиться)
-STR_880A_GO_TO_LOAD :Ехать к ст. {STATION} (Полная загрузка)
-STR_880B_GO_TO_TRANSFER_LOAD :Ехать к ст. {STATION} (Трансфер и полная загрузка)
-STR_880C_GO_NON_STOP_TO :Ехать к ст. {STATION} без остановки
-STR_880D_GO_TO_NON_STOP_TRANSFER :Ехать к ст. {STATION} без остановки (Трансфер)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Ехать к ст. {STATION} без остановки (Не грузиться)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ехать к ст. {STATION} без остановки (Трансфер и не грузиться)
-STR_8810_GO_NON_STOP_TO_LOAD :Ехать к ст. {STATION} без остановки (Полная загрузка)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Ехать к ст. {STATION} без остановки (Трансфер и полная загрузка)
+STR_GO_TO_TRANSFER :Ехать к ст. {STATION} (Трансфер)
+STR_8807_GO_TO_UNLOAD :Ехать к ст. {STATION} (Не грузиться)
+STR_GO_TO_TRANSFER_UNLOAD :Ехать к ст. {STATION} (Трансфер и не грузиться)
+STR_8808_GO_TO_LOAD :Ехать к ст. {STATION} (Полная загрузка)
+STR_GO_TO_TRANSFER_LOAD :Ехать к ст. {STATION} (Трансфер и полная загрузка)
+STR_880A_GO_NON_STOP_TO :Ехать к ст. {STATION} без остановки
+STR_GO_TO_NON_STOP_TRANSFER :Ехать к ст. {STATION} без остановки (Трансфер)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Ехать к ст. {STATION} без остановки (Не грузиться)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ехать к ст. {STATION} без остановки (Трансфер и не грузиться)
+STR_880C_GO_NON_STOP_TO_LOAD :Ехать к ст. {STATION} без остановки (Полная загрузка)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ехать к ст. {STATION} без остановки (Трансфер и полная загрузка)
STR_GO_TO_TRAIN_DEPOT :Ехать в депо {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Обслужиться в депо {TOWN}
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ехать в депо {TOWN} без остановки
@@ -2756,7 +2759,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Показать сведения о перевозимых грузах
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Показать сведения о вагонах
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Показать вместимость вагонов
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Показать общую вместимость поезда по типам грузов
+STR_SHOW_TOTAL_CARGO :{BLACK}Показать общую вместимость поезда по типам грузов
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Показ списка заданий - щелкните для выделения. Если зажать CTRL - обзор станции.
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Пропустить данное задание и начать следующее. CTRL + клик пропускает выделенное задание.
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Удалить выделенное задание
@@ -2787,8 +2790,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Невозможно развернуть поезд...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Переименовать тип вагона
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Невозможно переименовать тип вагона ...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}По выделенному приказу произойдет принудительная разгрузка транспортного средства
-STR_886F_TRANSFER :{BLACK}Трансфер
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}По выделенному приказу произойдет принудительная разгрузка транспортного средства
+STR_TRANSFER :{BLACK}Трансфер
STR_CLEAR_TIME :{BLACK}Сбросить Время
STR_RESET_LATENESS :{BLACK}Сброс счетчика
@@ -2803,6 +2806,7 @@
STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Появился новый {STRING}! - {ENGINE}
STR_CAN_T_SELL_DESTROYED_VEHICLE :{WHITE}Не могу продать разбитый транспорт ...
+STR_CAN_T_REFIT_DESTROYED_VEHICLE :{WHITE}Не могу сменить тип груза для удаленного транспорта...
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Не могу составить расписание для этого транспорта...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Транспорт может только ждать на станции.
@@ -2865,8 +2869,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Назвать автотранспорт
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Жители празднуют!{}Первый автобус прибыл на остановку {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Жители празднуют!{}Первый грузовик прибыл на станцию {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Жители празднуют . . .{}Первый трамвай прибыл на {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Жители празднуют . . .{}Первый грузовой трамвай прибыл на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Жители празднуют . . .{}Первый трамвай прибыл на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Жители празднуют . . .{}Первый грузовой трамвай прибыл на {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}АВАРИЯ!{}Водитель погиб при столкновении с поездом
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}АВАРИЯ!{}{COMMA} человек{P "" а ""} погиб{P "" ло ли} в столкновении с поездом!
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Невозможно развернуть автомобиль...
@@ -2875,7 +2879,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Переименовать автомобиль
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Переименовать автомобиль
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Невозможно переименовать автомобиль...
-STR_9038_GO_TO_ROADVEH_DEPOT :Ехать в гараж {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Ехать в гараж {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Обслуж. в гараже {TOWN}
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Переоборуд. авто для доставки разных видов грузов.
@@ -3251,6 +3255,9 @@
########### For showing numbers in widgets
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
########### String for New Landscape Generator
--- a/src/lang/simplified_chinese.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/simplified_chinese.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}需要平坦的地面
STR_0008_WAITING :{BLACK}等待：{WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (运自
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}接受：{WHITE}
STR_000D_ACCEPTS :{BLACK}接受：{GOLD}
STR_000E :
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}自定义的名字过多
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}选定的名字已经被用了
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}货物
STR_013D_INFORMATION :{BLACK}信息
STR_013E_CAPACITIES :{BLACK}装载能力
-STR_013E_TOTAL_CARGO :{BLACK}全部货物
+STR_TOTAL_CARGO :{BLACK}全部货物
STR_013F_CAPACITY :{BLACK}装载能力：{LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}装载能力：{LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}全车的装载能力为：
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}全车的装载能力为：
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}新游戏
STR_0141_LOAD_GAME :{BLACK}读取存档
@@ -727,7 +725,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}完全删除这座城镇
STR_0292_SAVE_SCENARIO :保存场景
STR_0293_LOAD_SCENARIO :读取场景
-STR_LOAD_HEIGHTMAP :读取高度图
+STR_MENU_LOAD_HEIGHTMAP :读取高度图
STR_0294_QUIT_EDITOR :退出编辑器
STR_0295 :
STR_0296_QUIT :退出
@@ -767,9 +765,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :游戏选项
-STR_02C5_DIFFICULTY_SETTINGS :难度设定
-STR_02C7_CONFIG_PATCHES :配置补丁
+STR_02C4_GAME_OPTIONS :游戏选项
+STR_02C6_DIFFICULTY_SETTINGS :难度设定
+STR_MENU_CONFIG_PATCHES :配置补丁
STR_NEWGRF_SETTINGS :NewGRF 设置
STR_TRANSPARENCY_OPTIONS :透明选项
STR_GAMEOPTMENU_0A :
@@ -868,8 +866,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}保存仍在继续，{}请耐心等待……
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}选择 'Ezy 大街' 风格的音乐
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :英国 (原始的)
@@ -1715,8 +1713,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}与另一车站相连
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}这个城镇中的车站过多
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}车站过多
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}公共汽车站过多
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}汽车货场过多
+STR_TOO_MANY_BUS_STOPS :{WHITE}公共汽车站过多
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}汽车货场过多
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}距离另一车站过近
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}必须先拆除火车站
@@ -1781,7 +1779,7 @@
STR_3069_BUOY :浮标
STR_306A_BUOY_IN_THE_WAY :{WHITE}指定的位置有浮标……
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}站区太大了……
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}已禁用了异形站台……
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}已禁用了异形站台……
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}摁住 CTRL 可以选择多个项目
STR_UNDEFINED :(未定义字符串)
@@ -1816,7 +1814,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}选择新游戏类型
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}选择场景(绿色)，预设游戏(蓝色)或随机开始新游戏
STR_4010_GENERATE_RANDOM_NEW_GAME :随机生成新游戏
-STR_4011_LOAD_HEIGHTMAP :{WHITE}读取地形图
+STR_LOAD_HEIGHTMAP :{WHITE}读取地形图
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}目标位置有 {STRING}
@@ -2010,10 +2008,10 @@
STR_6813_ECONOMY :{LTBLUE}经济：{ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}列车调头：{ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}灾难：{ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}市政厅对辖区内建设的态度：{ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}市政厅对辖区内建设的态度：{ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :没有
+STR_NONE :没有
STR_6816_LOW :低
STR_6817_NORMAL :一般
STR_6818_HIGH :高
@@ -2050,9 +2048,9 @@
STR_6836_OFF :关闭
STR_6837_ON :开启
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}查看高分榜
-STR_6839_PERMISSIVE :宽容
-STR_683A_TOLERANT :隐忍
-STR_683B_HOSTILE :对立
+STR_PERMISSIVE :宽容
+STR_TOLERANT :隐忍
+STR_HOSTILE :对立
##id 0x7000
STR_7000 :
@@ -2184,7 +2182,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}不能出售此公司的股份……
STR_707D_OWNED_BY :{WHITE}({COMMA}% 由 {COMPANY} 所有)
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} 被 {COMPANY} 收购！
-STR_7080_PROTECTED :{WHITE}这个公司刚刚开业，还不能进行股权交易……
+STR_PROTECTED :{WHITE}这个公司刚刚开业，还不能进行股权交易……
STR_LIVERY_DEFAULT :标准外观
STR_LIVERY_STEAM :蒸汽引擎
@@ -2489,17 +2487,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :前往 {STATION}
-STR_8807_GO_TO_TRANSFER :前往 {STATION} (转运并装货)
-STR_8808_GO_TO_UNLOAD :前往 {STATION} (全部卸货)
-STR_8809_GO_TO_TRANSFER_UNLOAD :前往 {STATION} (转运且不装货)
-STR_880A_GO_TO_LOAD :前往 {STATION} (等待装满)
-STR_880B_GO_TO_TRANSFER_LOAD :前往 {STATION} (转运并等待装满)
-STR_880C_GO_NON_STOP_TO :前往(不停) {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :前往(不停) {STATION} (转运并装货)
-STR_880E_GO_NON_STOP_TO_UNLOAD :前往(不停) {STATION} (全部卸货)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :前往(不停) {STATION} (转运且不装货)
-STR_8810_GO_NON_STOP_TO_LOAD :前往(不停) {STATION} (等待装满)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :前往(不停) {STATION} (转运并等待装满)
+STR_GO_TO_TRANSFER :前往 {STATION} (转运并装货)
+STR_8807_GO_TO_UNLOAD :前往 {STATION} (全部卸货)
+STR_GO_TO_TRANSFER_UNLOAD :前往 {STATION} (转运且不装货)
+STR_8808_GO_TO_LOAD :前往 {STATION} (等待装满)
+STR_GO_TO_TRANSFER_LOAD :前往 {STATION} (转运并等待装满)
+STR_880A_GO_NON_STOP_TO :前往(不停) {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :前往(不停) {STATION} (转运并装货)
+STR_880B_GO_NON_STOP_TO_UNLOAD :前往(不停) {STATION} (全部卸货)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :前往(不停) {STATION} (转运且不装货)
+STR_880C_GO_NON_STOP_TO_LOAD :前往(不停) {STATION} (等待装满)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :前往(不停) {STATION} (转运并等待装满)
STR_GO_TO_TRAIN_DEPOT :前往 {TOWN} 车库
STR_SERVICE_AT_TRAIN_DEPOT :在 {TOWN} 车库保养
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :前往(不停) {TOWN} 车库
@@ -2603,7 +2601,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}显示运载货物的详情
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}显示列车的性能参数
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}显示列车的运载能力
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}根据不同的挂车种类显示相应的总运力
+STR_SHOW_TOTAL_CARGO :{BLACK}根据不同的挂车种类显示相应的总运力
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}调度列表 - 单击一个调度指令可以使之高亮化. CTRL + 单击可以将视点移动到相应的车站
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}跳过当前命令并执行下一条命令。CTRL并单击可以跳过选定的命令
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}删除高亮的调度命令
@@ -2634,8 +2632,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}不能命令列车调头...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}重命名车辆的类型
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}不能重命名车辆的类型...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}命令列车在高亮指令对应的车站寄存货物
-STR_886F_TRANSFER :{BLACK}联运
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}命令列车在高亮指令对应的车站寄存货物
+STR_TRANSFER :{BLACK}联运
STR_CLEAR_TIME :{BLACK}清除时间
STR_RESET_LATENESS :{BLACK}清除晚点计数器
@@ -2717,7 +2715,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}重命名汽车型号
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}重命名汽车型号
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}不能重命名汽车型号……
-STR_9038_GO_TO_ROADVEH_DEPOT :前往 {TOWN} 车库
+STR_GO_TO_ROADVEH_DEPOT :前往 {TOWN} 车库
STR_SERVICE_AT_ROADVEH_DEPOT :在 {TOWN} 车库进行保养
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}改装汽车以装载其他货物
--- a/src/lang/slovak.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/slovak.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Potrebný rovný terén
STR_0008_WAITING :{BLACK}Caka: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (na ceste z
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} na ceste z {STATION})
STR_000C_ACCEPTS :{BLACK}Prijíma: {WHITE}
STR_000D_ACCEPTS :{BLACK}Prijíma: {GOLD}
STR_000E :
@@ -338,9 +337,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Použitých príliš vela mien
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Vybrané meno je už použité
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -351,11 +350,11 @@
STR_013C_CARGO :{BLACK}Náklad
STR_013D_INFORMATION :{BLACK}Informácie
STR_013E_CAPACITIES :{BLACK}Kapacita
-STR_013E_TOTAL_CARGO :{BLACK}Celkový náklad
+STR_TOTAL_CARGO :{BLACK}Celkový náklad
STR_013F_CAPACITY :{BLACK}Kapacita: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapacita: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Celkový náklad (kapacita) tohto vlaku:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Celkový náklad (kapacita) tohto vlaku:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nová hra
STR_0141_LOAD_GAME :{BLACK}Nahrat hru
@@ -790,11 +789,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Umiestnit vysielac
STR_028F_DEFINE_DESERT_AREA :{BLACK}Vytvorit oblast puste.{}Drzanim CTRL ju odstranite
STR_CREATE_LAKE :{BLACK}Definovat oblast vody.{}Vytvorí kanál, pri stlacení CTRL na úrovni mora zaplaví okolie
+STR_CREATE_RIVER :{BLACK}Vytvorit rieky.
STR_0290_DELETE :{BLACK}Vymazat
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Kompletne vymazat toto mesto
STR_0292_SAVE_SCENARIO :Ulozit scenár
STR_0293_LOAD_SCENARIO :Nahrat scenár
-STR_LOAD_HEIGHTMAP :Nahrat výškovú mapu
+STR_MENU_LOAD_HEIGHTMAP :Nahrat výškovú mapu
STR_0294_QUIT_EDITOR :Ukoncit editor
STR_0295 :
STR_0296_QUIT :Ukoncit OpenTTD
@@ -834,9 +834,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Nastavenia hry
-STR_02C5_DIFFICULTY_SETTINGS :Nastavenia obtiaznosti
-STR_02C7_CONFIG_PATCHES :Nastavenia patchov
+STR_02C4_GAME_OPTIONS :Nastavenia hry
+STR_02C6_DIFFICULTY_SETTINGS :Nastavenia obtiaznosti
+STR_MENU_CONFIG_PATCHES :Nastavenia patchov
STR_NEWGRF_SETTINGS :Nastavenie newgrf
STR_TRANSPARENCY_OPTIONS :Nastavenia priehladnosti
STR_GAMEOPTMENU_0A :
@@ -936,8 +936,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Ukladanie hry este bezi,{}pockajte prosim na dokoncenie!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Vyber 'Ezy Street style music' program
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglicke
@@ -1712,42 +1712,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Cesta musi byt najskor odstranena
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Prebiehaju cestne prace
STR_1802_ROAD_CONSTRUCTION :{WHITE}Výstavba cesty
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Výstavba elektrickovej trate
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Výstavba elektrickovej trate
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Vyber cestny most
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... na jednosmerných cestách nie sú dovolené križovatky
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Tu sa neda postavit cesta ...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Nie je možné postavit elektrickovú trat ...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Nie je možné postavit elektrickovú trat ...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Tu sa neda odstranit cesta ...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nie je možné odstránit elektrickovú trat ...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nie je možné odstránit elektrickovú trat ...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Orientacia garaze
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orientácia elektrickového depa
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orientácia elektrickového depa
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Tu sa neda postavit garaz ...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Nie je možné postavit elektrickové depo ...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Nie je možné postavit elektrickové depo ...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Nemozno postavit autobusovu zastavku ...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Nemozno postavit vykladku ...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nie je možné postavit elektrickovú osobnú stanicu ...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nie je možné postavit elektrickovú nákladnú stanicu ...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nie je možné postavit elektrickovú osobnú stanicu ...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nie je možné postavit elektrickovú nákladnú stanicu ...
STR_180A_ROAD_CONSTRUCTION :Výstavba cesty
-STR_180A_TRAMWAY_CONSTRUCTION :Výstavba elektrickovej dráhy
+STR_TRAMWAY_CONSTRUCTION :Výstavba elektrickovej dráhy
STR_180B_BUILD_ROAD_SECTION :{BLACK}Postavit cast cesty
STR_BUILD_AUTOROAD_TIP :{BLACK}Stavat casti ciest použitím automatického módu
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Postavit cast elektrickovej dráhy
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Postavit cast elektrickovej dráhy
STR_BUILD_AUTOTRAM_TIP :{BLACK}Stavat casti elektrickovej trate použitím automatického módu
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Postavit garaz (na vyroby a opravy automobilov)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Postavit elektrickové depo
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Postavit elektrickové depo
STR_180D_BUILD_BUS_STATION :{BLACK}Postavit autobusovu zastavku
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Postavit vykladku
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Postavit osobnú elektrickovú stanicu
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Postavit nákladnú elektrickovú stanicu
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Postavit osobnú elektrickovú stanicu
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Postavit nákladnú elektrickovú stanicu
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Postavit cestny most
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Postavit most s elektrickovou dráhou
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Postavit most s elektrickovou dráhou
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Postavit cestny tunel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Postavit tunel s elektrickovou dráhou
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Postavit tunel s elektrickovou dráhou
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Prepnút stavbu jednosmerných ciest
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Prepnut stavbu/odstranovanie cesty
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Prepnút stavbu/odstranovanie elektrickovej dráhy
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Prepnút stavbu/odstranovanie elektrickovej dráhy
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Vybrat orientaciu garaze
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Vybrat orientáciu elektrickového depa
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Vybrat orientáciu elektrickového depa
STR_1814_ROAD :Cesta
STR_1815_ROAD_WITH_STREETLIGHTS :Cesta s lampami
STR_1816_TREE_LINED_ROAD :Cesta v aleji
@@ -1890,8 +1890,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Susedi z viacerymi stanicami/vykladkami
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Prilis vela stanic/vykladok v tomto meste
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Prilis vela stanic/vykladok
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Prilis vela autobusovych zastavok
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Prilis vela zastavok nakladnych automobilov
+STR_TOO_MANY_BUS_STOPS :{WHITE}Prilis vela autobusovych zastavok
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Prilis vela zastavok nakladnych automobilov
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Prilis blizko inej stanice/vykladky
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Zeleznicna stanica sa musi naskor zburat
@@ -1922,12 +1922,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} teraz prijima {STRING} a {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Orientacia stanice
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Orientacia vykladky
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientácia osobnej elektricky
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientácia nákladnej elektricky
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientácia osobnej elektricky
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientácia nákladnej elektricky
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Stanica musi byt najskor zburana
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Vykladka musi byt najskor zburana
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Najprv sa musí zbúrat osobná elektricková stanica
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Najprv sa musí zbúrat nákladná elektricková stanica
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Najprv sa musí zbúrat osobná elektricková stanica
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Najprv sa musí zbúrat nákladná elektricková stanica
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Stanic{P a e ""}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Ziadne -
@@ -1939,8 +1939,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Dlzka zeleznicnej stanice
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Vybrat orientaciu stanice
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Vybrat orientaciu vykladky
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Vyberte orientáciu osobnej elektrickovej stanice
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Vyberte orientáciu nákladnej elektrickovej stanice
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Vyberte orientáciu osobnej elektrickovej stanice
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Vyberte orientáciu nákladnej elektrickovej stanice
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Vycentrovat pohlad na poziciu stanice
STR_3054_SHOW_STATION_RATINGS :{BLACK}Zobrazit hodnotenie stanice
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Zmenit nazov stanice
@@ -1962,7 +1962,7 @@
STR_3069_BUOY :Boja
STR_306A_BUOY_IN_THE_WAY :{WHITE}... boja v ceste
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}... stanica je prilis velka
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}... roznorode stanice nie su povolene
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}... roznorode stanice nie su povolene
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Podrzte CTRL pre vyber viacerych poloziek
STR_UNDEFINED :(nedefinovaný retezec)
@@ -2003,7 +2003,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Vyber typ novej hry
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Vyber scenar (zeleny), prednastavenu hra (modra), alebo nahodnu hru
STR_4010_GENERATE_RANDOM_NEW_GAME :Vygenerovat nahodnu novu hru
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Nahrat výškovú mapu
+STR_LOAD_HEIGHTMAP :{WHITE}Nahrat výškovú mapu
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} v ceste
@@ -2207,10 +2207,10 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomika: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Otacanie vlakov: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Havarie: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Postoj miestnej spravy k stavebnym upravam mesta: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Postoj miestnej spravy k stavebnym upravam mesta: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Ziadny
+STR_NONE :Ziadny
STR_NUM_VERY_LOW :Velmi nízky
STR_6816_LOW :Nízky
STR_6817_NORMAL :Normálny
@@ -2248,9 +2248,9 @@
STR_6836_OFF :Vyp.
STR_6837_ON :Zap.
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Zobrazit tabulku najlepsich
-STR_6839_PERMISSIVE :Pozitivny
-STR_683A_TOLERANT :Tolerantny
-STR_683B_HOSTILE :Odmietavy
+STR_PERMISSIVE :Pozitivny
+STR_TOLERANT :Tolerantny
+STR_HOSTILE :Odmietavy
##id 0x7000
STR_7000 :
@@ -2387,7 +2387,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}25% podiel v tejto spolocnosti sa neda predat ...
STR_707D_OWNED_BY :{WHITE}({COMMA}% vlastnene {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} bola kupena spolocnostou {COMPANY}!
-STR_7080_PROTECTED :{WHITE}S akciami tejto spolocnosti nie je zatial mozne obchodovat ...
+STR_PROTECTED :{WHITE}S akciami tejto spolocnosti nie je zatial mozne obchodovat ...
STR_LIVERY_DEFAULT :Standardna schema
STR_LIVERY_STEAM :Parny rusen
@@ -2400,6 +2400,8 @@
STR_LIVERY_PASSENGER_WAGON_STEAM :Osobny vozen (Parny)
STR_LIVERY_PASSENGER_WAGON_DIESEL :Osobny vozen (Diesel)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Osobny vozen (Elektricky)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :Vagón pre cestujúcich (Monorail)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :Vagón pre cestujúcich (Maglev)
STR_LIVERY_FREIGHT_WAGON :Nakladny vagon
STR_LIVERY_BUS :Autobus
STR_LIVERY_TRUCK :Nakladny automobil
@@ -2694,17 +2696,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Chod do {STATION}
-STR_8807_GO_TO_TRANSFER :Chod do {STATION} (prelozit a nalozit iny naklad)
-STR_8808_GO_TO_UNLOAD :Chod do {STATION} (vylozit)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Chod do {STATION} (prelozit a nechat prazdne)
-STR_880A_GO_TO_LOAD :Chod do {STATION} (nalozit)
-STR_880B_GO_TO_TRANSFER_LOAD :Chod do {STATION} (prelozit a plne nalozit)
-STR_880C_GO_NON_STOP_TO :Chod bez zastavenia do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Chod bez zastavenia do {STATION} (prelozit a nalozit iny naklad)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Chod bez zastavenia do {STATION} (vylozit)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Chod bez zastavenia do {STATION} (prelozit a nechat prazdne)
-STR_8810_GO_NON_STOP_TO_LOAD :Chod bez zastavenia do {STATION} (nalozit)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Chod bez zastavenia do {STATION} (prelozit a plne nalozit)
+STR_GO_TO_TRANSFER :Chod do {STATION} (prelozit a nalozit iny naklad)
+STR_8807_GO_TO_UNLOAD :Chod do {STATION} (vylozit)
+STR_GO_TO_TRANSFER_UNLOAD :Chod do {STATION} (prelozit a nechat prazdne)
+STR_8808_GO_TO_LOAD :Chod do {STATION} (nalozit)
+STR_GO_TO_TRANSFER_LOAD :Chod do {STATION} (prelozit a plne nalozit)
+STR_880A_GO_NON_STOP_TO :Chod bez zastavenia do {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Chod bez zastavenia do {STATION} (prelozit a nalozit iny naklad)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Chod bez zastavenia do {STATION} (vylozit)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Chod bez zastavenia do {STATION} (prelozit a nechat prazdne)
+STR_880C_GO_NON_STOP_TO_LOAD :Chod bez zastavenia do {STATION} (nalozit)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Chod bez zastavenia do {STATION} (prelozit a plne nalozit)
STR_GO_TO_TRAIN_DEPOT :Chod do depa {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Opravit v {TOWN} Vlakovom Depe
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Chod bez zastavenia do depa {TOWN}
@@ -2808,7 +2810,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Zobrazit detaily o prevezenom naklade
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Zobrazit detaily o vlaku
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Zobrazit kapacitu kazdeho vozidla
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Zobrazit celkovu kapacitu vlaku, rozdelenu podla typu nakladu
+STR_SHOW_TOTAL_CARGO :{BLACK}Zobrazit celkovu kapacitu vlaku, rozdelenu podla typu nakladu
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Zoznam prikazov - kliknut na prikaz pre oznacenie
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Preskocit aktuálny príkaz a zacat další. Podržte CTRL pre skok na oznacený príkaz
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Vymazat oznaceny prikaz
@@ -2839,8 +2841,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nemozno zmenit smer vlaku ...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Premenovat typ vlaku
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Typ vlaku nemoze byt premenovany ...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}U vyznaceneho prikazu musi vozidlo vylozit naklad
-STR_886F_TRANSFER :{BLACK}Prekladka
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}U vyznaceneho prikazu musi vozidlo vylozit naklad
+STR_TRANSFER :{BLACK}Prekladka
STR_CLEAR_TIME :{BLACK}Vymazat cas
STR_RESET_LATENESS :{BLACK}Reset meskania
@@ -2918,8 +2920,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Pomenovat automobil
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy autobus dorazil do {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy automobil dorazil do {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá elektricka dorazila do stanice {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá nákladná elektricka dorazila do stanice {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá elektricka dorazila do stanice {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá nákladná elektricka dorazila do stanice {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Dopravna nehoda!{}Vodic zahynul po kolizii s vlakom
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Dopravna nehoda!{}{COMMA} mrtvych po kolizii s vlakom
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Nemozno otocit vozidlo ...
@@ -2928,7 +2930,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Premenovat typ automobilu
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Premenovat typ automobilu
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Nemozno premenovat typ automobilu ...
-STR_9038_GO_TO_ROADVEH_DEPOT :Chod do {TOWN} garaze
+STR_GO_TO_ROADVEH_DEPOT :Chod do {TOWN} garaze
STR_SERVICE_AT_ROADVEH_DEPOT :Opravit v {TOWN} garazi
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Prestavat vozidlo na prepravu ineho druhu nakladu
@@ -3302,6 +3304,12 @@
STR_PURCHASE_INFO_ALL_BUT :Všetko okrem {GOLD}
STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. trakcna sila: {GOLD}{FORCE}
+########### For showing numbers in widgets
+
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
########### String for New Landscape Generator
STR_GENERATE :{WHITE}Vytvorit
--- a/src/lang/slovenian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/slovenian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Potrebno je ravno zemljišče
STR_0008_WAITING :{BLACK}Čaka: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (na poti iz
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Sprejema: {WHITE}
STR_000D_ACCEPTS :{BLACK}Sprejema: {GOLD}
STR_000E :
@@ -316,9 +314,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Preveč definiranih imen
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Izbrano ime je že v uporabi
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -329,11 +327,11 @@
STR_013C_CARGO :{BLACK}Tovor
STR_013D_INFORMATION :{BLACK}Informacije
STR_013E_CAPACITIES :{BLACK}Zmogljivosti
-STR_013E_TOTAL_CARGO :{BLACK}Skupni tovor
+STR_TOTAL_CARGO :{BLACK}Skupni tovor
STR_013F_CAPACITY :{BLACK}Zmogljivost: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Zmogljivost: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Skupna tovorna zmogljivost tega vlaka:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Skupna tovorna zmogljivost tega vlaka:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nova igra
STR_0141_LOAD_GAME :{BLACK}Naloži igro
@@ -768,11 +766,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Postavi oddajnik
STR_028F_DEFINE_DESERT_AREA :{BLACK}Določi območja puščave.{}Pritisni in drži CTRL za odstranitev
STR_CREATE_LAKE :{BLACK}Določi področje vode.{}Naredi kanal, razen če je pritisnjen CTRL na morski gladini, ko bo poplavilo okolico.
+STR_CREATE_RIVER :{BLACK}Položi reke.
STR_0290_DELETE :{BLACK}Izbriši
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Popolnoma izbriši mesto
STR_0292_SAVE_SCENARIO :Shrani scenarij
STR_0293_LOAD_SCENARIO :Naloži scenarij
-STR_LOAD_HEIGHTMAP :Naloži višinsko karto
+STR_MENU_LOAD_HEIGHTMAP :Naloži višinsko karto
STR_0294_QUIT_EDITOR :Izhod iz urejevalnika
STR_0295 :
STR_0296_QUIT :Izhod
@@ -812,9 +811,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Možnosti igre
-STR_02C5_DIFFICULTY_SETTINGS :Nastavitve težavnosti
-STR_02C7_CONFIG_PATCHES :Urejanje popravkov
+STR_02C4_GAME_OPTIONS :Možnosti igre
+STR_02C6_DIFFICULTY_SETTINGS :Nastavitve težavnosti
+STR_MENU_CONFIG_PATCHES :Urejanje popravkov
STR_NEWGRF_SETTINGS :NewGRF nastavitve
STR_TRANSPARENCY_OPTIONS :Nastavitve prozornega pogleda
STR_GAMEOPTMENU_0A :
@@ -914,8 +913,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Shranjevanje poteka,{}Prosim počakaj, da se zaključi!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Izberi 'Poulični' glasbeni program
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Angleška (Originalna)
@@ -977,6 +976,7 @@
STR_OPTIONS_FULLSCREEN :{BLACK}Cel zaslon
STR_OPTIONS_FULLSCREEN_TIP :{BLACK}Označi to okno za igro v celozaslonskem načinu
+STR_FULLSCREEN_FAILED :{WHITE}Celozaslonski način spodletel
STR_OPTIONS_RES :{BLACK}Ločljivost
STR_OPTIONS_RES_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1689,42 +1689,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Najprej odstrani cesto
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Cestna dela napredujejo
STR_1802_ROAD_CONSTRUCTION :{WHITE}Cestne gradnje
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Gradnja tramvaj proge
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Gradnja tramvaj proge
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Izberi cestni most
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... enosmerne poti ne morejo imeti odcepov
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Nemogoča gradnja ceste ...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Nemogoča gradnja tramvaja tukaj...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Nemogoča gradnja tramvaja tukaj...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Nemogoča odstranitev ceste ...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nemogoče odstraniti tramvaja od tukaj...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Nemogoče odstraniti tramvaja od tukaj...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Smer garaže
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orijentacija tramvaj garaže
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orijentacija tramvaj garaže
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Nemogoča gradnja garaže tukaj ...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Nemogoča gradnja tramvaj garaže tukaj...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Nemogoča gradnja tramvaj garaže tukaj...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Nemogoča gradnja avtobusne postaje ...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Nemogoča gradnja tovorne postaje tukaj ...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nemogoča gradnja potniške tramvaj postaje...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nemogoča gradnja tovorne tramvaj postaje...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Nemogoča gradnja potniške tramvaj postaje...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Nemogoča gradnja tovorne tramvaj postaje...
STR_180A_ROAD_CONSTRUCTION :Gradnja ceste
-STR_180A_TRAMWAY_CONSTRUCTION :Gradnja tramvaj proge
+STR_TRAMWAY_CONSTRUCTION :Gradnja tramvaj proge
STR_180B_BUILD_ROAD_SECTION :{BLACK}Zgradi cestni odsek
STR_BUILD_AUTOROAD_TIP :{BLACK}Gradnja cestnega odseka v avtomatskem načinu
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Zgradi odsek proge
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Zgradi odsek proge
STR_BUILD_AUTOTRAM_TIP :{BLACK}Gradnja tramvaj proge v avtomatskem načinu
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Zgradi garažo (za izdelavo in servis vozil)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Zgradi tramvaj garažo (za izdelavo in servisiranje vozil)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Zgradi tramvaj garažo (za izdelavo in servisiranje vozil)
STR_180D_BUILD_BUS_STATION :{BLACK}Zgradi avtobusno postajo
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Zgradi tovorno postajo
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Zgradi potniško tramvaj postajo
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Zgradi tovorno tramvaj postajo
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Zgradi potniško tramvaj postajo
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Zgradi tovorno tramvaj postajo
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Zgradi cestni most
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Zgradi most za tramvaj
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Zgradi most za tramvaj
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Zgradi cestni predor
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Zgradi predor za tramvaj
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Zgradi predor za tramvaj
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Omogoči/onemogoči enosmerne ceste
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Preklopi gradnja/rušenje cestnih konstrukcij
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Preklop gradi/odstrani za tramvaj progo
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Preklop gradi/odstrani za tramvaj progo
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Izberi smer garaže
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Izberi orijentacijo tramvaj garaže
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Izberi orijentacijo tramvaj garaže
STR_1814_ROAD :Cesta
STR_1815_ROAD_WITH_STREETLIGHTS :Cesta z razsvetljavo
STR_1816_TREE_LINED_ROAD :Drevored
@@ -1868,8 +1868,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Združi dve ali več postaj
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Preveč postaj v tem mestu
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Preveč postaj na zemljevidu
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Preveč avtobusnih postaj
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Preveč tovornih postaj
+STR_TOO_MANY_BUS_STOPS :{WHITE}Preveč avtobusnih postaj
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Preveč tovornih postaj
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Preblizu druge postaje
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Najprej je potrebno porušiti postajo
@@ -1900,12 +1900,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} sedaj sprejema {STRING.t} in {STRING.t}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Orientacija avtobusne postaje
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Orientacija tovorne postaje
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orijentacija potniške postaje
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Orijentacija tovorne postaje
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orijentacija potniške postaje
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Orijentacija tovorne postaje
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Najprej moraš porušiti avtobusno postajo
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Najprej moraš porušiti tovorno postajo
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Najprej poruši potniško tramvaj postajo
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Najprej poruši tovorno tramvaj postajo
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Najprej poruši potniško tramvaj postajo
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Najprej poruši tovorno tramvaj postajo
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Postaj{P a i e ""}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Brez -
@@ -1917,8 +1917,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Izberi dolžino železniške postaje
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Izberi orientacijo železniške postaje
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Izberi orientacijo tovorne postaje
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Izbor orijentacije potniške tramvaj postaje
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Izbor orijentacije tovorne tramvaj postaje
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Izbor orijentacije potniške tramvaj postaje
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Izbor orijentacije tovorne tramvaj postaje
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Pogled na postajo
STR_3054_SHOW_STATION_RATINGS :{BLACK}Prikaz ocen postaje
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Spremeni ime postaje
@@ -1940,7 +1940,7 @@
STR_3069_BUOY :Boja
STR_306A_BUOY_IN_THE_WAY :{WHITE} ... boja na poti
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE} ... postaja preveč razširjena
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE} ... nehomogene postaje izklopljene
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE} ... nehomogene postaje izklopljene
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Drži CTRL za izbor več stvari
STR_UNDEFINED :(nedefinirana vrstica)
@@ -1981,7 +1981,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Izberi tip nove igre
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Izberi scenarij (zeleno), prednastavljeno igro (modro) ali naključno novo igro
STR_4010_GENERATE_RANDOM_NEW_GAME :Ustvari naključno novo igro
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Naloži višinsko karto
+STR_LOAD_HEIGHTMAP :{WHITE}Naloži višinsko karto
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} na poti
@@ -2222,10 +2222,10 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomija: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Obračanje vlakov: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katastrofe: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Odnos mestnega sveta do prestrukturiranja območja: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Odnos mestnega sveta do prestrukturiranja območja: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Brez
+STR_NONE :Brez
STR_NUM_VERY_LOW :Zelo malo
STR_6816_LOW :Malo
STR_6817_NORMAL :Normalno
@@ -2263,9 +2263,9 @@
STR_6836_OFF :Izklopljeno
STR_6837_ON :Vklopljeno
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Pokaži tabelo najboljših
-STR_6839_PERMISSIVE :Dopustno
-STR_683A_TOLERANT :Tolerantno
-STR_683B_HOSTILE :Sovražno
+STR_PERMISSIVE :Dopustno
+STR_TOLERANT :Tolerantno
+STR_HOSTILE :Sovražno
##id 0x7000
STR_7000 :
@@ -2402,7 +2402,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Ni mogoče prodati 25% delnic tega podjetja ...
STR_707D_OWNED_BY :{WHITE}({COMMA}% v lasti podjetja {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :Podjetje {BLACK}{BIGFONT}{COMPANY} je bilo prevzeto s strani podjetja {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Podjetje še ni dovolj staro, da bi lahko trgovalo z lastnimi delnicami ...
+STR_PROTECTED :{WHITE}Podjetje še ni dovolj staro, da bi lahko trgovalo z lastnimi delnicami ...
STR_LIVERY_DEFAULT :Standardni pogon
STR_LIVERY_STEAM :Parna lokomotiva
@@ -2415,6 +2415,8 @@
STR_LIVERY_PASSENGER_WAGON_STEAM :Potniški vagon (za parne vlake)
STR_LIVERY_PASSENGER_WAGON_DIESEL :Potniški vagon (za diesel vlake)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Potniški vagon (za električne vlake)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :potniški vagon (enotirni)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :potniški vagon (maglev)
STR_LIVERY_FREIGHT_WAGON :Tovorni vagon
STR_LIVERY_BUS :Avtobus
STR_LIVERY_TRUCK :Tovornjak
@@ -2709,17 +2711,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING}{STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING}
STR_8806_GO_TO :Pojdi do {STATION}
-STR_8807_GO_TO_TRANSFER :Pojdi do {STATION} (Pretovori in vzemi tovor)
-STR_8808_GO_TO_UNLOAD :Pojdi do {STATION} (Raztovori)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Pojdi do {STATION} (Pretovori in pusti prazno)
-STR_880A_GO_TO_LOAD :Pojdi do {STATION} (Naloži)
-STR_880B_GO_TO_TRANSFER_LOAD :Pojdi do {STATION} (Prenesi in počakaj na polno breme)
-STR_880C_GO_NON_STOP_TO :Pojdi brez postanka do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Pojdi brez postanka do {STATION} (Prenesi in vzemi tovor)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Pojdi brez postanka do {STATION} (Raztovori)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Pojdi brez postanka do {STATION} (Pretovori in pusti prazno)
-STR_8810_GO_NON_STOP_TO_LOAD :Pojdi brez postanka do {STATION} (Naloži)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Pojdi brez postanka do {STATION} (Prenesi in počakaj na polno breme)
+STR_GO_TO_TRANSFER :Pojdi do {STATION} (Pretovori in vzemi tovor)
+STR_8807_GO_TO_UNLOAD :Pojdi do {STATION} (Raztovori)
+STR_GO_TO_TRANSFER_UNLOAD :Pojdi do {STATION} (Pretovori in pusti prazno)
+STR_8808_GO_TO_LOAD :Pojdi do {STATION} (Naloži)
+STR_GO_TO_TRANSFER_LOAD :Pojdi do {STATION} (Prenesi in počakaj na polno breme)
+STR_880A_GO_NON_STOP_TO :Pojdi brez postanka do {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Pojdi brez postanka do {STATION} (Prenesi in vzemi tovor)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Pojdi brez postanka do {STATION} (Raztovori)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Pojdi brez postanka do {STATION} (Pretovori in pusti prazno)
+STR_880C_GO_NON_STOP_TO_LOAD :Pojdi brez postanka do {STATION} (Naloži)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Pojdi brez postanka do {STATION} (Prenesi in počakaj na polno breme)
STR_GO_TO_TRAIN_DEPOT :Pojdi v {TOWN} železniško garažo
STR_SERVICE_AT_TRAIN_DEPOT :Na servis v {TOWN} železniško garažo
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Pojdi brez postanka do garaže {TOWN}
@@ -2823,7 +2825,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Pokaži podrobnosti tovora na vlaku
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Pokaži podrobnosti o vagonih
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Prikaži zmogljivosti vsakega vagona
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Prikaži polno zmogljivost vlaka, razdeli glede na tip tovora
+STR_SHOW_TOTAL_CARGO :{BLACK}Prikaži polno zmogljivost vlaka, razdeli glede na tip tovora
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Seznam navodil - klikni na ukaz, da ga izbereš. CTRL+klik prikaže postajo
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Preskoči trenutni ukaz in začni naslednjega. CTRL + klik preskoči na izbran ukaz
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Zbriši izbran ukaz
@@ -2854,8 +2856,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Ni mogoče spremeniti smeri vlaka ...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Preimenuj železniško vozilo
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Ni mogoče preimenovati železniškega vozila ...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Nastavi označen ukaz, naj prisili vozilo, da se raztovori
-STR_886F_TRANSFER :{BLACK}Pretovori
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Nastavi označen ukaz, naj prisili vozilo, da se raztovori
+STR_TRANSFER :{BLACK}Pretovori
STR_CLEAR_TIME :{BLACK}Počisti čas
STR_RESET_LATENESS :{BLACK}Resetiraj Late Counter
@@ -2933,8 +2935,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Poimenuj cestno vozilo
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prihod prvega avtobusa na postajo {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prihod prvega tovornjaka na postajo {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Meščani proslavljajo . . .{}Prvi potniški tramvaj je prispel na postajo {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Proslava meščanov . . .{}Prvi tovorni tramvaj je pripeljal na postajo {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Meščani proslavljajo . . .{}Prvi potniški tramvaj je prispel na postajo {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Proslava meščanov . . .{}Prvi tovorni tramvaj je pripeljal na postajo {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Prometna nesreča!{}Voznik umrl v plamenih po trku z vlakom.
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Prometna nesreča!{}{COMMA} mrt{P ev va vi vih} v plamenih ob trku z vlakom.
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Ni mogoče obrniti smeri vozila ...
@@ -2943,7 +2945,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Preimenuj cestno vozilo
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Preimenuj cestno vozilo
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Ni mogoče preimenovati cestnega vozila ...
-STR_9038_GO_TO_ROADVEH_DEPOT :Pojdi v garažo v mestu {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Pojdi v garažo v mestu {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Na servis v {TOWN} cestno garažo
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Predelaj vozilo za prevoz druge vrste tovora
@@ -3317,6 +3319,12 @@
STR_PURCHASE_INFO_ALL_BUT :Vse, razen {GOLD}
STR_PURCHASE_INFO_MAX_TE :{BLACK}Največja vlečna moč: {GOLD}{FORCE}
+########### For showing numbers in widgets
+
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
########### String for New Landscape Generator
STR_GENERATE :{WHITE}Ustvari
--- a/src/lang/spanish.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/spanish.txt Sun Feb 03 20:34:26 2008 +0000
@@ -16,8 +16,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Se requiere terreno llano
STR_0008_WAITING :{BLACK}Esperando: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (en ruta desde
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} en ruta desde {STATION})
STR_000C_ACCEPTS :{BLACK}Acepta: {WHITE}
STR_000D_ACCEPTS :{BLACK}Acepta: {GOLD}
STR_000E :
@@ -275,9 +274,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Demasiados nombres definidos
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}El nombre elegido está en uso
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -288,11 +287,11 @@
STR_013C_CARGO :{BLACK}Carga
STR_013D_INFORMATION :{BLACK}Información
STR_013E_CAPACITIES :{BLACK}Capacidades
-STR_013E_TOTAL_CARGO :{BLACK}Carga total
+STR_TOTAL_CARGO :{BLACK}Carga total
STR_013F_CAPACITY :{BLACK}Capacidad: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Capacidad: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Carga total (capacidad) de este tren:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Carga total (capacidad) de este tren:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nuevo Juego
STR_0141_LOAD_GAME :{BLACK}Cargar Juego
@@ -727,11 +726,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Colocar transmisor
STR_028F_DEFINE_DESERT_AREA :{BLACK}Define área desertica.{}Pulsa y mantén CTRL para quitarla
STR_CREATE_LAKE :{BLACK}Define el area de agua.{}Haz un canal, a menos que mantengas pulsado CTRL a nivel del mar, entonces se inundarán los alrededores del lugar
+STR_CREATE_RIVER :{BLACK}Colocar rios.
STR_0290_DELETE :{BLACK}Borrar
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Borrar esta población completamente
STR_0292_SAVE_SCENARIO :Guardar escenario
STR_0293_LOAD_SCENARIO :Cargar escenario
-STR_LOAD_HEIGHTMAP :Cargar mapa de alturas
+STR_MENU_LOAD_HEIGHTMAP :Cargar mapa de alturas
STR_0294_QUIT_EDITOR :Salir del editor
STR_0295 :
STR_0296_QUIT :Salir
@@ -771,9 +771,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Opciones de juego
-STR_02C5_DIFFICULTY_SETTINGS :Configuración de dificultad
-STR_02C7_CONFIG_PATCHES :Configurar parches
+STR_02C4_GAME_OPTIONS :Opciones de juego
+STR_02C6_DIFFICULTY_SETTINGS :Configuración de dificultad
+STR_MENU_CONFIG_PATCHES :Configurar parches
STR_NEWGRF_SETTINGS :Configuración Newgrf
STR_TRANSPARENCY_OPTIONS :Opciones de transparencia
STR_GAMEOPTMENU_0A :
@@ -873,8 +873,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}El grabado está en progreso,{}por favor espere hasta que termine!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Elegir el programa musical de estilo 'Ezy Street'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Inglés
@@ -1649,42 +1649,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Ha de retirar carretera primero
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Trabajos en la carretera en progreso
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construcción de carretera
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Construcción de tranvía
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Construcción de tranvía
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Elige puente de carretera
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... carreteras de un sentido no pueden tener intersecciones
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}No se puede construir carretera aquí...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}No se puede construir un tranvía aquí...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}No se puede construir un tranvía aquí...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}No se puede retirar carretera de aquí...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}No se puede quitar el tranvía de aquí...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}No se puede quitar el tranvía de aquí...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Orientación del depósito
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Orientación del depósito de tranvía
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Orientación del depósito de tranvía
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}No se puede construir depósito de carretera aquí...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}No se puede construir depósito de tranvía aquí...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}No se puede construir depósito de tranvía aquí...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}No se puede construir estación de autobuses...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}No se puede construir estación de camiones...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}No se puede construir estación de tranvía de pasajeros...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}No puede construir estación de tranvía de carga...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}No se puede construir estación de tranvía de pasajeros...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}No puede construir estación de tranvía de carga...
STR_180A_ROAD_CONSTRUCTION :Construcción de carretera
-STR_180A_TRAMWAY_CONSTRUCTION :Construcción de tranvía
+STR_TRAMWAY_CONSTRUCTION :Construcción de tranvía
STR_180B_BUILD_ROAD_SECTION :{BLACK}Construir sección de carretera
STR_BUILD_AUTOROAD_TIP :{BLACK}Construir carretera usando el modo de Autocarretera
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Construir sección de tranvía
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Construir sección de tranvía
STR_BUILD_AUTOTRAM_TIP :{BLACK}Construir metro usando el modo de Autometro
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Construir depósito de carretera (para construir y despachar vehículos)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construir depósito de tranvías (para vehículos de contrucción y servicio)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Construir depósito de tranvías (para vehículos de contrucción y servicio)
STR_180D_BUILD_BUS_STATION :{BLACK}Construir estación de autobús
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Construir estación de carga para camiones
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construir estación de tranvía de pasajeros
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Construir estación de tranvía de carga
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Construir estación de tranvía de pasajeros
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Construir estación de tranvía de carga
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Construir puente de carretera
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Construir puente de tranvía
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Construir puente de tranvía
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Construir túnel de carretera
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Construir tunel de tranvía
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Construir tunel de tranvía
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Activar/Desactivar carreteras de un sentido
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Cambiar entre construir/retirar carretera
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Activar construir/quitar para construcciones de tranvía
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Activar construir/quitar para construcciones de tranvía
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Elegir orientación del depósito de carretera
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Seleccione orientación del depósito de tranvías
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Seleccione orientación del depósito de tranvías
STR_1814_ROAD :Road
STR_1815_ROAD_WITH_STREETLIGHTS :Carretera con farolas
STR_1816_TREE_LINED_ROAD :Carretera arbolada
@@ -1827,8 +1827,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}djunta más de una estación/zona de carga existente
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Demasiadas estaciones/zonas de carga en esta población
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Demasiadas estaciones/zonas de carga
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Demasiadas paradas de Autobús
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Demasiadas zonas de carga
+STR_TOO_MANY_BUS_STOPS :{WHITE}Demasiadas paradas de Autobús
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Demasiadas zonas de carga
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Demasiado cerca de otra estación/zona de carga
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Primero debe demolerse estación de tren
@@ -1859,12 +1859,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} acepta ahora {STRING} y {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Or. estación de autobús
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Or. estación de camiones
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientación Tranvía Pasajeros
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientación Tranvía de Carga
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Orientación Tranvía Pasajeros
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Orientación Tranvía de Carga
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Primero debe demolerse estación de autobús
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Primero debe demolerse estación de camiones
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Debe demoler la estación del tranvía de pasajeros primero
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Debe demoler la estación del tranvía de carga primero
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Debe demoler la estación del tranvía de pasajeros primero
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Debe demoler la estación del tranvía de carga primero
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Estaciones
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Ninguna -
@@ -1876,8 +1876,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Elige longitud de la estación de tren
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Elige la orientación de la estación de autobús
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Elige la orientación de la estación de camiones
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Seleccione la orientación de la estación del tranvía de pasajeros
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Seleccione la orientación de la estación del tranvía de carga
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Seleccione la orientación de la estación del tranvía de pasajeros
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Seleccione la orientación de la estación del tranvía de carga
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centrar vista en la posición de la estación
STR_3054_SHOW_STATION_RATINGS :{BLACK}Ver calificación de la estación
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Cambiar nombre de la estación
@@ -1899,7 +1899,7 @@
STR_3069_BUOY :Boya
STR_306A_BUOY_IN_THE_WAY :{WHITE}...boya en medio
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...estación demasiado extendida
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...desactivada estaciones no uniformes
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...desactivada estaciones no uniformes
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Manten pulsado CTRL para seleccionar varios elementos
STR_UNDEFINED :(cadena sin determinar)
@@ -1940,7 +1940,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Seleccione Nuevo Tipo de Juego
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Seleccione escenario (verde), juegos preestablecidos-set (azul), o juego al azar
STR_4010_GENERATE_RANDOM_NEW_GAME :Generar juego nuevo al azar
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Cargar Mapas de altura
+STR_LOAD_HEIGHTMAP :{WHITE}Cargar Mapas de altura
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} en medio
@@ -2144,10 +2144,10 @@
STR_6813_ECONOMY :{LTBLUE}Economía: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Marcha atrás trenes: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Actitud de la autoridades sobre reestructuraciones: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Actitud de la autoridades sobre reestructuraciones: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Ninguno
+STR_NONE :Ninguno
STR_NUM_VERY_LOW :Muy bajo
STR_6816_LOW :Baja
STR_6817_NORMAL :Normal
@@ -2185,9 +2185,9 @@
STR_6836_OFF :No
STR_6837_ON :Si
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Ver gráfica de altas puntuaciones
-STR_6839_PERMISSIVE :Permisiva
-STR_683A_TOLERANT :Tolerante
-STR_683B_HOSTILE :Hostil
+STR_PERMISSIVE :Permisiva
+STR_TOLERANT :Tolerante
+STR_HOSTILE :Hostil
##id 0x7000
STR_7000 :
@@ -2324,7 +2324,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}No se puede vender el 25% de acciones...
STR_707D_OWNED_BY :{WHITE}({COMMA}% propiedad de {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} ha sido comprada por {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Esta empresa todavía no dispone acciones a la venta...
+STR_PROTECTED :{WHITE}Esta empresa todavía no dispone acciones a la venta...
STR_LIVERY_DEFAULT :Estación normal
STR_LIVERY_STEAM :Locomotora a Vapor
@@ -2633,17 +2633,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING}{STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING}
STR_8806_GO_TO :Ir a {STATION}
-STR_8807_GO_TO_TRANSFER :Ir a {STATION} (Transferir y cargar)
-STR_8808_GO_TO_UNLOAD :Ir a {STATION} (Descargar)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Ir a {STATION} (Transferir y dejar vacío)
-STR_880A_GO_TO_LOAD :Ir a {STATION} (Cargar)
-STR_880B_GO_TO_TRANSFER_LOAD :Ir a {STATION} (Transferir y esperar a carga completa)
-STR_880C_GO_NON_STOP_TO :Ir sin paradas a {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Ir sin paradas a {STATION} (Transferir y cargar)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Ir sin paradas a {STATION} (Descargar)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sin paradas a {STATION} (Transferir y dejar vacío)
-STR_8810_GO_NON_STOP_TO_LOAD :Ir sin paradas a {STATION} (Cargar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sin paradas a {STATION} (Transferir y esperar a carga completa)
+STR_GO_TO_TRANSFER :Ir a {STATION} (Transferir y cargar)
+STR_8807_GO_TO_UNLOAD :Ir a {STATION} (Descargar)
+STR_GO_TO_TRANSFER_UNLOAD :Ir a {STATION} (Transferir y dejar vacío)
+STR_8808_GO_TO_LOAD :Ir a {STATION} (Cargar)
+STR_GO_TO_TRANSFER_LOAD :Ir a {STATION} (Transferir y esperar a carga completa)
+STR_880A_GO_NON_STOP_TO :Ir sin paradas a {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Ir sin paradas a {STATION} (Transferir y cargar)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Ir sin paradas a {STATION} (Descargar)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sin paradas a {STATION} (Transferir y dejar vacío)
+STR_880C_GO_NON_STOP_TO_LOAD :Ir sin paradas a {STATION} (Cargar)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sin paradas a {STATION} (Transferir y esperar a carga completa)
STR_GO_TO_TRAIN_DEPOT :Ir al depósito del tren de {TOWN}
STR_SERVICE_AT_TRAIN_DEPOT :Ir al depósito de {TOWN} para mantenimiento
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ir sin parar al depósito de {TOWN}
@@ -2747,7 +2747,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Mostrar detalles de mercancía transportada
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Mostrar detalles de los vehículos
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Mostrar capacidades de cada vehículo
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Mostrar capacidad total del tren, dividida por tipo de carga
+STR_SHOW_TOTAL_CARGO :{BLACK}Mostrar capacidad total del tren, dividida por tipo de carga
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista de órdenes - click en orden para resaltarla
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Saltar orden actual y comenzar la siguiente
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Borrar orden resaltada
@@ -2778,8 +2778,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}No se puede revertir la dirección...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renombrar tipo de vehículo
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}No se puede renombrar tipo de vehículo...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Hacer que la orden marcada fuerce al vehículo a descargar
-STR_886F_TRANSFER :{BLACK}Transferir
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Hacer que la orden marcada fuerce al vehículo a descargar
+STR_TRANSFER :{BLACK}Transferir
STR_CLEAR_TIME :{BLACK}Limpiar Horario
STR_RESET_LATENESS :{BLACK}Resetear Retrasos
@@ -2857,8 +2857,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Nombrar vehículo
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer autobús llega a {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer camión llega a {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Ciudadanos celebran . . .{}Llega primer tranvía de pasajeros a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Ciudadanos celebran . . .{}Llega primer tranvía de carga a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Ciudadanos celebran . . .{}Llega primer tranvía de pasajeros a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Ciudadanos celebran . . .{}Llega primer tranvía de carga a {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}¡Accidente de tráfico!{}El conductor fallece en la explosión tras la colisión con el tren
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Accidente de tráfico!{}{COMMA} fallecidos en la explosión tras la colisión con el tren
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}No se puede hacer girar al vehículo...
@@ -2867,7 +2867,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Renombrar tipo de vehículo
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Renombrar tipo de vehículo
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}No se puede renombrar tipo de vehículo....
-STR_9038_GO_TO_ROADVEH_DEPOT :Ir al depósito de {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Ir al depósito de {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Ir al depósito de {TOWN} para mantenimiento
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Reparar vehículo de carretera para transportar otro tipo de cargas
@@ -3243,6 +3243,9 @@
########### For showing numbers in widgets
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
########### String for New Landscape Generator
--- a/src/lang/swedish.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/swedish.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Platt mark krävs
STR_0008_WAITING :{BLACK}Väntar: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (på väg från
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Accepterar: {WHITE}
STR_000D_ACCEPTS :{BLACK}Accepterar: {GOLD}
STR_000E :
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}För många namn definerade
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Namnet används redan
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}Gods
STR_013D_INFORMATION :{BLACK}Information
STR_013E_CAPACITIES :{BLACK}Kapaciteter
-STR_013E_TOTAL_CARGO :{BLACK}Gods Totalt
+STR_TOTAL_CARGO :{BLACK}Gods Totalt
STR_013F_CAPACITY :{BLACK}Kapacitet: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapacitet: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Tågets totala kapacitet:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}{CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Tågets totala kapacitet:
+STR_TOTAL_CAPACITY :{LTBLUE}{CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nytt spel
STR_0141_LOAD_GAME :{BLACK}Ladda spel
@@ -726,11 +724,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Placera radiosändare
STR_028F_DEFINE_DESERT_AREA :{BLACK}Definiera ökenområde.{}Tryck och håll CTRL för att ta bort
STR_CREATE_LAKE :{BLACK}Definiera vattenyta.{}Skapa en kanal, om inte CTRL är nedhållen vid havsnivå, då den kommer att översvämma närliggande områden istället
+STR_CREATE_RIVER :{BLACK}Placera flod.
STR_0290_DELETE :{BLACK}Ta bort
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Ta bort staden helt och hållet
STR_0292_SAVE_SCENARIO :Spara scenario
STR_0293_LOAD_SCENARIO :Öppna scenario
-STR_LOAD_HEIGHTMAP :Ladda höjdkarta
+STR_MENU_LOAD_HEIGHTMAP :Ladda höjdkarta
STR_0294_QUIT_EDITOR :Avsluta editor
STR_0295 :
STR_0296_QUIT :Avsluta
@@ -770,9 +769,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Spelinställningar
-STR_02C5_DIFFICULTY_SETTINGS :Svårighetsgrad
-STR_02C7_CONFIG_PATCHES :Ändra Patchar
+STR_02C4_GAME_OPTIONS :Spelinställningar
+STR_02C6_DIFFICULTY_SETTINGS :Svårighetsgrad
+STR_MENU_CONFIG_PATCHES :Ändra Patchar
STR_NEWGRF_SETTINGS :NewGRF inställningar
STR_TRANSPARENCY_OPTIONS :Genomskinlighetsinställningar
STR_GAMEOPTMENU_0A :
@@ -872,8 +871,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Sparar fortfarande,{}vänta tills det är slutfört!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Välj 'Ezy Street style music'-program
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Engelska
@@ -1648,42 +1647,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Måste ta bort väg först
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Vägarbete pågår
STR_1802_ROAD_CONSTRUCTION :{WHITE}Bygg väg
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Byggnation av spårvagn
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Byggnation av spårvagn
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Välj vägbro
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... enkelriktade vägar kan inte ha korsningar
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Kan inte bygga väg här...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan inte bygga spårvagnsräls här...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Kan inte bygga spårvagnsräls här...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Kan inte ta bort väg här...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan inte ta bort spårvagnsrälsen härifrån...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Kan inte ta bort spårvagnsrälsen härifrån...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Riktning för bussgarage
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Spårvagnsdepåns orientering
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Spårvagnsdepåns orientering
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Kan inte bygga bussgarage här...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan inte bygga spårvagnsdepå här...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Kan inte bygga spårvagnsdepå här...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Kan inte bygga busshållplats...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Kan inte bygga lastbilsstation...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan inte bygga passagerar-spårvagnsstation...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan inte bygga frakt-spårvagnsstation...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Kan inte bygga passagerar-spårvagnsstation...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Kan inte bygga frakt-spårvagnsstation...
STR_180A_ROAD_CONSTRUCTION :Bygg väg
-STR_180A_TRAMWAY_CONSTRUCTION :Spårvagnskonstruktion
+STR_TRAMWAY_CONSTRUCTION :Spårvagnskonstruktion
STR_180B_BUILD_ROAD_SECTION :{BLACK}Bygg väg
STR_BUILD_AUTOROAD_TIP :{BLACK}Använd Automatvägläge för att bygga vägsektion
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Bygg spårvagnssektion
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Bygg spårvagnssektion
STR_BUILD_AUTOTRAM_TIP :{BLACK}Använd Automatspårläge för att bygga spårväg
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Bygg bussgarage (för att bygga eller reparera vägfordon)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Bygg spårvagnsdepå (för att konstruera och serva fordon)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Bygg spårvagnsdepå (för att konstruera och serva fordon)
STR_180D_BUILD_BUS_STATION :{BLACK}Bygg busshållplats
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Bygg lastbilsstation
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Bygg passagerar-spårvagnsstation
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Bygg frakt-spårvagnsstation
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Bygg passagerar-spårvagnsstation
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Bygg frakt-spårvagnsstation
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Bygg vägbro
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Bygg spårvagnsbro
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Bygg spårvagnsbro
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Bygg vägtunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Bygg spårvagnstunnel
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Bygg spårvagnstunnel
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Aktivera/Deaktivera enkelriktade vägar
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Växla mellan att bygga/ta bort väg
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Växla byggande/rivande av spårvagnskonstruktion
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Växla byggande/rivande av spårvagnskonstruktion
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Välj riktning för bussgarage
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Välj spårvagnsdepåns orientering
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Välj spårvagnsdepåns orientering
STR_1814_ROAD :Väg
STR_1815_ROAD_WITH_STREETLIGHTS :Väg med gatubelysning
STR_1816_TREE_LINED_ROAD :Väg med träd
@@ -1826,8 +1825,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Angränsar till mer än en station/hållplats
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}För många stationer/hållplatser i staden
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}För många stationer/hållplatser
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}För många busshållplatser
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}För många lastbilsstationer
+STR_TOO_MANY_BUS_STOPS :{WHITE}För många busshållplatser
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}För många lastbilsstationer
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}För nära en annan stationer/hållplatser
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Måste riva järnvägsstation först
@@ -1858,12 +1857,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} tar nu emot {STRING} och {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Busshållplatsriktning
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Lastbilsbryggsriktning
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passagerar-spårvagns riktning
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Frakt-spårvagns riktning
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passagerar-spårvagns riktning
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Frakt-spårvagns riktning
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Måste riva busshållplats först
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Måste riva lastbilsbrygga först
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Måste ta bort passagerar-spårvagnsstation först
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Måste ta bort frakt-spårvagnsstation först
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Måste ta bort passagerar-spårvagnsstation först
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Måste ta bort frakt-spårvagnsstation först
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Station{P "" er}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Inga -
@@ -1875,8 +1874,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Välj längden på järnvägsstation
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Välj riktning för busshållplats
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Välj riktning för lastbilsbrygga
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Välj passagerar-spårvagnsstationens orientering
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Välj frakt-spårvagnsstationens orientering
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Välj passagerar-spårvagnsstationens orientering
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Välj frakt-spårvagnsstationens orientering
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centrera vyn på stationen
STR_3054_SHOW_STATION_RATINGS :{BLACK}Visa stationens klassificering
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Byt namn på stationen
@@ -1898,7 +1897,7 @@
STR_3069_BUOY :Boj
STR_306A_BUOY_IN_THE_WAY :{WHITE}...boj i vägen
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...station för utspridd
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ej enhetliga stationer inaktiverade
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ej enhetliga stationer inaktiverade
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Håll nere CTRL för att markera mer än en sak
STR_UNDEFINED :(oidentifierad sträng)
@@ -1939,7 +1938,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Välj typ av nytt spel
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Välj scenario (grön), förbestämt spel (blå), eller slumpmässigt nytt spel
STR_4010_GENERATE_RANDOM_NEW_GAME :Skapa slumpmässigt nytt spel
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Läs höjdkarta
+STR_LOAD_HEIGHTMAP :{WHITE}Läs höjdkarta
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} i vägen
@@ -2143,10 +2142,10 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomi: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Tåg kan vända: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Katastrofer: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Stadens attityd mot områdesombyggnad: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Stadens attityd mot områdesombyggnad: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Ingen
+STR_NONE :Ingen
STR_NUM_VERY_LOW :Väldigt låg
STR_6816_LOW :Låg
STR_6817_NORMAL :Normal
@@ -2184,9 +2183,9 @@
STR_6836_OFF :Av
STR_6837_ON :På
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Visa highscore-lista
-STR_6839_PERMISSIVE :Eftergiven
-STR_683A_TOLERANT :Tolerant
-STR_683B_HOSTILE :Fientlig
+STR_PERMISSIVE :Eftergiven
+STR_TOLERANT :Tolerant
+STR_HOSTILE :Fientlig
##id 0x7000
STR_7000 :
@@ -2323,7 +2322,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan inte sälja 25% andelar i detta företag...
STR_707D_OWNED_BY :{WHITE}({COMMA}% ägs av {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} har tagits över av {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Det här företaget bedriver inte aktiehandel ännu....
+STR_PROTECTED :{WHITE}Det här företaget bedriver inte aktiehandel ännu....
STR_LIVERY_DEFAULT :Normalt Färgschema
STR_LIVERY_STEAM :Ånglok
@@ -2336,6 +2335,8 @@
STR_LIVERY_PASSENGER_WAGON_STEAM :Passagerarvagn (Ånga)
STR_LIVERY_PASSENGER_WAGON_DIESEL :Passagervagn (Diesel)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Passagerarvagn (Elektricitet)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :Passagerarvagn (Monorail)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :Passagerarvagn (Maglev)
STR_LIVERY_FREIGHT_WAGON :Fraktvagn
STR_LIVERY_BUS :Buss
STR_LIVERY_TRUCK :Lastbil
@@ -2630,17 +2631,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Åk till {STATION}
-STR_8807_GO_TO_TRANSFER :Åk till {STATION} (Lasta om och på)
-STR_8808_GO_TO_UNLOAD :Åk till {STATION} (Lasta av)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Åk till {STATION} (Lasta om men inte på)
-STR_880A_GO_TO_LOAD :Åk till {STATION} (Lasta på)
-STR_880B_GO_TO_TRANSFER_LOAD :Åk till {STATION} (Lasta om och vänta på full last)
-STR_880C_GO_NON_STOP_TO :Åk nonstop till {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Åk nonstop till {STATION} (Lasta om och på)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Åk nonstop till {STATION} (Lasta av)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Åk nonstop till {STATION} (Lasta om men inte på)
-STR_8810_GO_NON_STOP_TO_LOAD :Åk nonstop till {STATION} (Lasta på)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Åk nonstop till {STATION} (Lasta om och vänta på full last)
+STR_GO_TO_TRANSFER :Åk till {STATION} (Lasta om och på)
+STR_8807_GO_TO_UNLOAD :Åk till {STATION} (Lasta av)
+STR_GO_TO_TRANSFER_UNLOAD :Åk till {STATION} (Lasta om men inte på)
+STR_8808_GO_TO_LOAD :Åk till {STATION} (Lasta på)
+STR_GO_TO_TRANSFER_LOAD :Åk till {STATION} (Lasta om och vänta på full last)
+STR_880A_GO_NON_STOP_TO :Åk nonstop till {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Åk nonstop till {STATION} (Lasta om och på)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Åk nonstop till {STATION} (Lasta av)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Åk nonstop till {STATION} (Lasta om men inte på)
+STR_880C_GO_NON_STOP_TO_LOAD :Åk nonstop till {STATION} (Lasta på)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Åk nonstop till {STATION} (Lasta om och vänta på full last)
STR_GO_TO_TRAIN_DEPOT :Åk till {TOWN}s tågdepå
STR_SERVICE_AT_TRAIN_DEPOT :Servning vid {TOWN} tågdepå
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Åk non-stop till {TOWN}s tågdepå
@@ -2744,7 +2745,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Visa detaljer för lastat gods
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Visa detaljer för tågfordon
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Visa kapaciteter för varje fordon
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Visa tågets totala kapacitet, separera för typ av gods
+STR_SHOW_TOTAL_CARGO :{BLACK}Visa tågets totala kapacitet, separera för typ av gods
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Orderlista - klicka på order för att markera det
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Hoppa över nuvarande order och starta nästa. CTRL + klick hoppar över till vald order
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Ta bort markerad order
@@ -2775,8 +2776,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan inte byta tågets riktning...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Byt namn på tågets fordonstyp
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Kan inte byta namn på tågets fordonstyp...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gör så att den markerade ordern tvingar fordonet att lasta av
-STR_886F_TRANSFER :{BLACK}Lasta om
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gör så att den markerade ordern tvingar fordonet att lasta av
+STR_TRANSFER :{BLACK}Lasta om
STR_CLEAR_TIME :{BLACK}Rensa tid
STR_RESET_LATENESS :{BLACK}Rensa räknaren för sen ankomst
@@ -2854,8 +2855,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Byt namn på vägfordon
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Invånarna firar . . .{}Första bussen ankommer till {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Invånarna firar . . .{}Första lastbilen ankommer till {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Invånarna firar . . .{}Första passagerar-spårvagnen anländer på {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Invånarna firar . . .{}Första frakt-spårvagnen anländer på {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Invånarna firar . . .{}Första passagerar-spårvagnen anländer på {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Invånarna firar . . .{}Första frakt-spårvagnen anländer på {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Vägfordonskrash!{}förare dör i eldklot efter kollision med tåg
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Vägfordonskrash!{}{COMMA} dör i eldklot efter kollision med tåg
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Kan inte tvinga fordonet att vända om...
@@ -2864,7 +2865,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Byt namn på vägfordon typ
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Byt namn på vägfordon typ
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Kan inte byta namn på vägfordon typ...
-STR_9038_GO_TO_ROADVEH_DEPOT :Gå till {TOWN} vägfordonsdepå
+STR_GO_TO_ROADVEH_DEPOT :Gå till {TOWN} vägfordonsdepå
STR_SERVICE_AT_ROADVEH_DEPOT :Servning vid {TOWN} vägfordonsdepå Depot
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Anpassa vägfordon till att bära en annan sorts last
@@ -3238,6 +3239,12 @@
STR_PURCHASE_INFO_ALL_BUT :Allt utom {GOLD}
STR_PURCHASE_INFO_MAX_TE :{BLACK}Maximal Dragkraft: {GOLD}{FORCE}
+########### For showing numbers in widgets
+
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
########### String for New Landscape Generator
STR_GENERATE :{WHITE}Generera
--- a/src/lang/traditional_chinese.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/traditional_chinese.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}需要平地
STR_0008_WAITING :{BLACK}等候：{WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (轉運自
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}接受：{WHITE}
STR_000D_ACCEPTS :{BLACK}接受：{GOLD}
STR_000E :
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}已定義過多名稱
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}所選名稱已被使用
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}貨物
STR_013D_INFORMATION :{BLACK}資訊
STR_013E_CAPACITIES :{BLACK}載量
-STR_013E_TOTAL_CARGO :{BLACK}總貨物量
+STR_TOTAL_CARGO :{BLACK}總貨物量
STR_013F_CAPACITY :{BLACK}載量：{LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}載量：{LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}此列車的總載量：
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}此列車的總載量：
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}開新遊戲
STR_0141_LOAD_GAME :{BLACK}載入遊戲
@@ -727,7 +725,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}完全移除這個市鎮
STR_0292_SAVE_SCENARIO :儲存場景
STR_0293_LOAD_SCENARIO :載入場景
-STR_LOAD_HEIGHTMAP :載入高度圖
+STR_MENU_LOAD_HEIGHTMAP :載入高度圖
STR_0294_QUIT_EDITOR :離開編輯器
STR_0295 :
STR_0296_QUIT :離開
@@ -767,9 +765,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :遊戲選項
-STR_02C5_DIFFICULTY_SETTINGS :難易設定
-STR_02C7_CONFIG_PATCHES :設置修正
+STR_02C4_GAME_OPTIONS :遊戲選項
+STR_02C6_DIFFICULTY_SETTINGS :難易設定
+STR_MENU_CONFIG_PATCHES :設置修正
STR_NEWGRF_SETTINGS :NewGRF 設定
STR_TRANSPARENCY_OPTIONS :透明度選項
STR_GAMEOPTMENU_0A :
@@ -869,8 +867,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}遊戲仍在儲存,{}請稍候!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}選擇「輕鬆街頭音樂」歌單
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :英國 (原版)
@@ -1644,42 +1642,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}必須先移除道路
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}道路施工中
STR_1802_ROAD_CONSTRUCTION :{WHITE}鋪設道路
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}鋪設電車軌
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}鋪設電車軌
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}選擇道路橋樑
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... 單向的道路不能有交叉點
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}不能在此鋪設道路...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}不可以在這裏鋪設電車軌...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}不可以在這裏鋪設電車軌...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}不能從此移除道路...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}不可以移除這裏的電車軌...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}不可以移除這裏的電車軌...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}車庫方向
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}電車
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}電車
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}不能在此設置車庫...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}不可以在這裏興建電車維修廠...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}不可以在這裏興建電車維修廠...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}無法設置公車站...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}無法設置貨運站...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}不可以興建電車站...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}不可興建載貨電車站...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}不可以興建電車站...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}不可興建載貨電車站...
STR_180A_ROAD_CONSTRUCTION :鋪設道路
-STR_180A_TRAMWAY_CONSTRUCTION :鋪設電車軌
+STR_TRAMWAY_CONSTRUCTION :鋪設電車軌
STR_180B_BUILD_ROAD_SECTION :{BLACK}鋪設一段公路
STR_BUILD_AUTOROAD_TIP :{BLACK}鋪設道路區段時使用自動模式
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}興建電車站
+STR_BUILD_TRAMWAY_SECTION :{BLACK}興建電車站
STR_BUILD_AUTOTRAM_TIP :{BLACK}鋪設輕軌區段時使用自動模式
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}設置車庫 (用來購置與維護公路車輛)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}興建電車維修廠 (供製造及維修用)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}興建電車維修廠 (供製造及維修用)
STR_180D_BUILD_BUS_STATION :{BLACK}設置公車站
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}設置貨運站
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}興建載客電車站
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}興建載貨電車站
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}興建載客電車站
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}興建載貨電車站
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}建築公路橋樑
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}架設電車橋
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}架設電車橋
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}挖掘公路隧道
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}開鐅電車隧道
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}開鐅電車隧道
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}切換單行道/雙向道
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}切換鋪設/移除公路
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}鋪設電車軌開關
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}鋪設電車軌開關
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}選擇車庫方向
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}選擇電車維修廠方向
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}選擇電車維修廠方向
STR_1814_ROAD :公路
STR_1815_ROAD_WITH_STREETLIGHTS :有路燈的公路
STR_1816_TREE_LINED_ROAD :有行道樹的公路
@@ -1822,8 +1820,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}鄰接超過一個現有車站/載貨區
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}這個城鎮已有太多車站/載貨區 (可先修改現有車站/載貨區的名稱再試看看)
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}太多車站/載貨區
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}太多工車站
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}太多貨運站
+STR_TOO_MANY_BUS_STOPS :{WHITE}太多工車站
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}太多貨運站
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}太靠近另一個車站/載貨區
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}必須先摧毀鐵道車站
@@ -1854,12 +1852,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} 現在接受 {STRING} 與 {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}公車站方向
STR_3043_TRUCK_STATION_ORIENT :{WHITE}貨運站方向
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}載客電車方向
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}載貨電車方向
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}載客電車方向
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}載貨電車方向
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}必須先摧毀公車站
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}必須先摧毀貨運站
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}必須先移除載客電車車站
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}必須先移除載貨電車車站
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}必須先移除載客電車車站
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}必須先移除載貨電車車站
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} 座車站
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- 無 -
@@ -1871,8 +1869,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}選擇鐵道車站的長度
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}選擇公車站方向
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}選擇貨運站方向
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}選擇載客電車方向
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}選擇載貨電車方向
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}選擇載客電車方向
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}選擇載貨電車方向
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}將主視野帶到車站位置
STR_3054_SHOW_STATION_RATINGS :{BLACK}顯示車站評價
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}變更車站名稱
@@ -1894,7 +1892,7 @@
STR_3069_BUOY :浮標
STR_306A_BUOY_IN_THE_WAY :{WHITE}...被浮標擋住
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...車站範圍太大
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...未啟動不規則車站外型功能
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...未啟動不規則車站外型功能
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}按住 CTRL 選擇多重項目
STR_UNDEFINED :(未定義字串)
@@ -1935,7 +1933,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}選擇新遊戲類型
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}選擇劇本 (綠色)，預設遊戲 (藍)，或隨機產生場景
STR_4010_GENERATE_RANDOM_NEW_GAME :隨機產生新場景
-STR_4011_LOAD_HEIGHTMAP :{WHITE}載入高度圖
+STR_LOAD_HEIGHTMAP :{WHITE}載入高度圖
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}被 {STRING} 擋住
@@ -2139,10 +2137,10 @@
STR_6813_ECONOMY :{LTBLUE}經濟：{ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}列車倒轉：{ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}災難：{ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}市議會對區域重建的態度：{ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}市議會對區域重建的態度：{ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :無
+STR_NONE :無
STR_NUM_VERY_LOW :非常少
STR_6816_LOW :低
STR_6817_NORMAL :普通
@@ -2180,9 +2178,9 @@
STR_6836_OFF :關
STR_6837_ON :開
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}顯示排行榜
-STR_6839_PERMISSIVE :寬容
-STR_683A_TOLERANT :能忍受
-STR_683B_HOSTILE :抱敵意
+STR_PERMISSIVE :寬容
+STR_TOLERANT :能忍受
+STR_HOSTILE :抱敵意
##id 0x7000
STR_7000 :
@@ -2319,7 +2317,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}無法出售這間公司的股份...
STR_707D_OWNED_BY :{WHITE}({COMMA}% 由 {COMPANY} 擁有)
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} 被 {COMPANY} 收購！
-STR_7080_PROTECTED :{WHITE}這間公司才剛成立，還不能交易股票...
+STR_PROTECTED :{WHITE}這間公司才剛成立，還不能交易股票...
STR_LIVERY_DEFAULT :標準配色
STR_LIVERY_STEAM :蒸汽機車
@@ -2626,17 +2624,17 @@
STR_8804 :{SETX 10}{COMMA}：{STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}：{STRING} {STRING}
STR_8806_GO_TO :前往 {STATION}
-STR_8807_GO_TO_TRANSFER :前往 {STATION} (轉運，僅載不卸)
-STR_8808_GO_TO_UNLOAD :前往 {STATION} (卸客貨)
-STR_8809_GO_TO_TRANSFER_UNLOAD :前往 {STATION} (轉運，卸客貨清空離站)
-STR_880A_GO_TO_LOAD :前往 {STATION} (滿載)
-STR_880B_GO_TO_TRANSFER_LOAD :前往 {STATION} (轉運，等待滿載)
-STR_880C_GO_NON_STOP_TO :前往 {STATION} 不停靠/中途不停
-STR_880D_GO_TO_NON_STOP_TRANSFER :前往 {STATION} (轉運 [僅載不卸]) 中途不停
-STR_880E_GO_NON_STOP_TO_UNLOAD :前往 {STATION} (卸載) 中途不停
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :前往 {STATION} (轉運 [卸載清空離站]) 中途不停
-STR_8810_GO_NON_STOP_TO_LOAD :前往 {STATION} (滿載) 中途不停
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :前往 {STATION} (轉運 [等待滿載]) 中途不停
+STR_GO_TO_TRANSFER :前往 {STATION} (轉運，僅載不卸)
+STR_8807_GO_TO_UNLOAD :前往 {STATION} (卸客貨)
+STR_GO_TO_TRANSFER_UNLOAD :前往 {STATION} (轉運，卸客貨清空離站)
+STR_8808_GO_TO_LOAD :前往 {STATION} (滿載)
+STR_GO_TO_TRANSFER_LOAD :前往 {STATION} (轉運，等待滿載)
+STR_880A_GO_NON_STOP_TO :前往 {STATION} 不停靠/中途不停
+STR_GO_TO_NON_STOP_TRANSFER :前往 {STATION} (轉運 [僅載不卸]) 中途不停
+STR_880B_GO_NON_STOP_TO_UNLOAD :前往 {STATION} (卸載) 中途不停
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :前往 {STATION} (轉運 [卸載清空離站]) 中途不停
+STR_880C_GO_NON_STOP_TO_LOAD :前往 {STATION} (滿載) 中途不停
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :前往 {STATION} (轉運 [等待滿載]) 中途不停
STR_GO_TO_TRAIN_DEPOT :前往 {TOWN} 機廠
STR_SERVICE_AT_TRAIN_DEPOT :在 {TOWN} 機廠維護
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :前往 {TOWN} 機廠 中途不停
@@ -2740,7 +2738,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}顯示載貨詳細資料
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}顯示車輛詳細資料
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}顯示車輛的容量
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}顯示列車的總容量，照貨物分類
+STR_SHOW_TOTAL_CARGO :{BLACK}顯示列車的總容量，照貨物分類
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}指令清單 - 點選指令可選擇。按住 CTRL 點選可跳到車站位置
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}跳過目前的命令，從下一個開始。CTRL + 左鍵 可直接跳至所選的命令
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}刪除選定指令
@@ -2771,8 +2769,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}無法到轉列車方向...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}重新命名鐵道車輛
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}無法修改鐵道車輛名稱...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}讓列車在選定的指令強制卸載
-STR_886F_TRANSFER :{BLACK}轉運
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}讓列車在選定的指令強制卸載
+STR_TRANSFER :{BLACK}轉運
STR_CLEAR_TIME :{BLACK}清除時刻
STR_RESET_LATENESS :{BLACK}歸零誤點/慢分
@@ -2849,8 +2847,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}為車輛命名
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛公車抵達 {STATION}！
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛貨車抵達 {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛客運輕軌抵達 {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛貨運輕軌抵達 {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛客運輕軌抵達 {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛貨運輕軌抵達 {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}車禍！{}駕駛在與列車對撞後罹難
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}車禍！{}車輛在與列車對撞後, 造成 {COMMA} 人罹難
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}無法使車輛掉頭...
@@ -2859,7 +2857,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}為車輛類型更名
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}為車輛類型更名
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}無法為車輛類型更名...
-STR_9038_GO_TO_ROADVEH_DEPOT :前往 {TOWN} 車庫
+STR_GO_TO_ROADVEH_DEPOT :前往 {TOWN} 車庫
STR_SERVICE_AT_ROADVEH_DEPOT :在 {TOWN} 車庫維護
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}改裝車輛以運送不同的酬載
--- a/src/lang/turkish.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/turkish.txt Sun Feb 03 20:34:26 2008 +0000
@@ -15,8 +15,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Yerin düzleştirilmesi lazım
STR_0008_WAITING :{BLACK}Bekleyen: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (aktarma:
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}İstenen: {WHITE}
STR_000D_ACCEPTS :{BLACK}İstenen: {GOLD}
STR_000E :
@@ -274,9 +272,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Çok fazla adlandırma
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Seçilen isim kullanımda
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -287,11 +285,11 @@
STR_013C_CARGO :{BLACK}Kargo
STR_013D_INFORMATION :{BLACK}Bilgi
STR_013E_CAPACITIES :{BLACK}Kapasite
-STR_013E_TOTAL_CARGO :{BLACK}Toplam Kargo
+STR_TOTAL_CARGO :{BLACK}Toplam Kargo
STR_013F_CAPACITY :{BLACK}Kapasite: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Kapasite: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Bu trenin toplam kapasitesi:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Bu trenin toplam kapasitesi:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Yeni Oyun
STR_0141_LOAD_GAME :{BLACK}Oyun Yükle
@@ -730,7 +728,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Sehri tamamen sil
STR_0292_SAVE_SCENARIO :Kaydet
STR_0293_LOAD_SCENARIO :Yükle
-STR_LOAD_HEIGHTMAP :Yükseklik haritası yükle
+STR_MENU_LOAD_HEIGHTMAP :Yükseklik haritası yükle
STR_0294_QUIT_EDITOR :Editörden Çık
STR_0295 :
STR_0296_QUIT :Oyundan Çık
@@ -770,9 +768,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Seçenekler
-STR_02C5_DIFFICULTY_SETTINGS :Zorluk Ayarları
-STR_02C7_CONFIG_PATCHES :Yamaları Düzenle
+STR_02C4_GAME_OPTIONS :Seçenekler
+STR_02C6_DIFFICULTY_SETTINGS :Zorluk Ayarları
+STR_MENU_CONFIG_PATCHES :Yamaları Düzenle
STR_NEWGRF_SETTINGS :Newgrf ayarları
STR_TRANSPARENCY_OPTIONS :Şeffaflık seçenekleri
STR_GAMEOPTMENU_0A :
@@ -872,8 +870,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Kayıt işlemi sürüyor,{}lütfen bitene kadar bekleyin!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}'Ezy Sokagi stili muzik' programını seç
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :İngilizce (Orjinal)
@@ -1646,42 +1644,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Önce yol silinmeli
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Yol çalışmaları
STR_1802_ROAD_CONSTRUCTION :{WHITE}Yol Yapımı
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Tramvay Yapımı
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Tramvay Yapımı
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Köprü Seç
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}...tek yönlü yollar kesişemez
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Yol yapılamıyor...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Buraya tramvay yapılamaz...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Buraya tramvay yapılamaz...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Yol kaldırılamıyor...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Tramvay kaldırılamaz...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Tramvay kaldırılamaz...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Garaj Yönü
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Tramvay Garı Yönü
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Tramvay Garı Yönü
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Buraya Garaj yapılamaz...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Buraya tramvay garı yapılamaz...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Buraya tramvay garı yapılamaz...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Otobüs durağı yapılamaz...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Kamyon durağı yapılamaz...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Yolcu tramvayı istasyonu yapılamaz...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Yük tramvayı istasyonu yapılamaz...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Yolcu tramvayı istasyonu yapılamaz...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Yük tramvayı istasyonu yapılamaz...
STR_180A_ROAD_CONSTRUCTION :Yol yapımı
-STR_180A_TRAMWAY_CONSTRUCTION :Tramvay yapımı
+STR_TRAMWAY_CONSTRUCTION :Tramvay yapımı
STR_180B_BUILD_ROAD_SECTION :{BLACK}Yol bölmesi yap
STR_BUILD_AUTOROAD_TIP :{BLACK}Otoyol modunu kullanarak yol yap
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Tramvay yolu yap
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Tramvay yolu yap
STR_BUILD_AUTOTRAM_TIP :{BLACK}Otoray modunu kullanarak tramvay yolu yap
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Garaj yap (araç alımı ve bakımlar için)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Tramvay garı yap (araç alımı ve tamiri için)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Tramvay garı yap (araç alımı ve tamiri için)
STR_180D_BUILD_BUS_STATION :{BLACK}Otobüs durağı yap
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Kamyon yükleme bölgesi yap
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Yolcu tramvayı istasyonu yap
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Yük tramvayı istasyonu yap
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Yolcu tramvayı istasyonu yap
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Yük tramvayı istasyonu yap
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Köprü yap
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Tramvay köprüsü yap
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Tramvay köprüsü yap
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Tünel Yap
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Tramvay tüneli yap
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Tramvay tüneli yap
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Tek yönlü yolları etkinleştir/kapat
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Yol yap/sil arasında geçiş yap
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Tramvay yapımı/yıkımı
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Tramvay yapımı/yıkımı
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Garaj yönünü seç
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Tramvay garı yönü
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Tramvay garı yönü
STR_1814_ROAD :Yol
STR_1815_ROAD_WITH_STREETLIGHTS :Lambali yol
STR_1816_TREE_LINED_ROAD :Ağaçli yol
@@ -1824,8 +1822,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Birden fazla istasyona bitişik
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Bu şehirde çok fazla istasyon var
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Haritada çok fazla istasyon var
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Çok fazla durak var
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Çok fazla kamyon yükleme yeri var
+STR_TOO_MANY_BUS_STOPS :{WHITE}Çok fazla durak var
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Çok fazla kamyon yükleme yeri var
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Başka bir istasyona çok yakın
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Önce tren istasyonu yıkılmalı
@@ -1856,12 +1854,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} artık {STRING} ve {STRING} istiyor
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Otobüs Durağı Yönü
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Kamyon Durağı Yönü
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Yolcu Tramvayı Yönü
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Yük Tramvayı Yönü
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Yolcu Tramvayı Yönü
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Yük Tramvayı Yönü
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Önce otobüs durağı yıkılmalı
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Önce kamyon durağı yıkılmalı
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Önce yolcu tramvayı istasyonu yıkılmalı
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Önce yük tramvayı istasyonu kaldırılmalı
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Önce yolcu tramvayı istasyonu yıkılmalı
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Önce yük tramvayı istasyonu kaldırılmalı
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} istasyonları
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- Yok -
@@ -1873,8 +1871,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Tren istasyonu uzunluğu seç
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Otobüs durağı yönünü seç
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Kamyon durağı yönünü seç
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Yolcu tramvayı istasyonu yönünü seçin
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Yük tramvayı istasyonu yönünü seçin
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Yolcu tramvayı istasyonu yönünü seçin
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Yük tramvayı istasyonu yönünü seçin
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Durağın oldugu yere git
STR_3054_SHOW_STATION_RATINGS :{BLACK}İstasyonun reytinglerini göster
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}İstasyonun ismini değiştir
@@ -1896,7 +1894,7 @@
STR_3069_BUOY :Şamandıra
STR_306A_BUOY_IN_THE_WAY :{WHITE}...yolda şamandıra var
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...istasyon çok yayılmış
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...özel istasyon ayarı kapalı
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...özel istasyon ayarı kapalı
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Birden fazla şey seçmek için CTRL'yi basılı tutun
STR_UNDEFINED :(tanımlanmamış sözcük)
@@ -1937,7 +1935,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Yeni oyun türü seç
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Senaryo (yeşil), kurulu oyun (mavi) veya yeni oyun seç
STR_4010_GENERATE_RANDOM_NEW_GAME :Rastgele haritada oyna
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Yükseklik haritası yükle
+STR_LOAD_HEIGHTMAP :{WHITE}Yükseklik haritası yükle
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}yolda {STRING} var
@@ -2141,10 +2139,10 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomi: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Tren ters dönüşü: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Felaketler: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Belediyenin töleransi: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Belediyenin töleransi: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Hiç
+STR_NONE :Hiç
STR_NUM_VERY_LOW :Çok az
STR_6816_LOW :Düşük
STR_6817_NORMAL :Normal
@@ -2182,9 +2180,9 @@
STR_6836_OFF :Kapalı
STR_6837_ON :Açik
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Punaları Göster
-STR_6839_PERMISSIVE :İzin verici
-STR_683A_TOLERANT :Töleransli
-STR_683B_HOSTILE :Katı
+STR_PERMISSIVE :İzin verici
+STR_TOLERANT :Töleransli
+STR_HOSTILE :Katı
##id 0x7000
STR_7000 :
@@ -2321,7 +2319,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Şirketin %25'i satılamıyor...
STR_707D_OWNED_BY :{WHITE}(%{COMMA} ortağı {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY}, {COMPANY} tarafından alındı!
-STR_7080_PROTECTED :{WHITE}Bu şirket hisselerini satacak kadar eski değil...
+STR_PROTECTED :{WHITE}Bu şirket hisselerini satacak kadar eski değil...
STR_LIVERY_DEFAULT :Şirket Rengi
STR_LIVERY_STEAM :Buharlı Lokomotif
@@ -2628,17 +2626,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
STR_8806_GO_TO :Git: {STATION}
-STR_8807_GO_TO_TRANSFER :Aktar: {STATION} (Kargoyu al)
-STR_8808_GO_TO_UNLOAD :Git: {STATION} (Boşalt)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Aktar: {STATION} (Boş dön)
-STR_880A_GO_TO_LOAD :Git: {STATION} (Doldur)
-STR_880B_GO_TO_TRANSFER_LOAD :Aktar: {STATION} (Tam doldur)
-STR_880C_GO_NON_STOP_TO :Durmadan git: {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Durmadan aktar: {STATION} (Kargoyu al)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Durmadan git: {STATION} (Boşalt)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Durmadan aktar: {STATION} (Boş dön)
-STR_8810_GO_NON_STOP_TO_LOAD :Durmadan git: {STATION} (Doldur)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Durmadan aktar: {STATION} (Tam doldur)
+STR_GO_TO_TRANSFER :Aktar: {STATION} (Kargoyu al)
+STR_8807_GO_TO_UNLOAD :Git: {STATION} (Boşalt)
+STR_GO_TO_TRANSFER_UNLOAD :Aktar: {STATION} (Boş dön)
+STR_8808_GO_TO_LOAD :Git: {STATION} (Doldur)
+STR_GO_TO_TRANSFER_LOAD :Aktar: {STATION} (Tam doldur)
+STR_880A_GO_NON_STOP_TO :Durmadan git: {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Durmadan aktar: {STATION} (Kargoyu al)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Durmadan git: {STATION} (Boşalt)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Durmadan aktar: {STATION} (Boş dön)
+STR_880C_GO_NON_STOP_TO_LOAD :Durmadan git: {STATION} (Doldur)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Durmadan aktar: {STATION} (Tam doldur)
STR_GO_TO_TRAIN_DEPOT :Git: {TOWN} Tren Garı
STR_SERVICE_AT_TRAIN_DEPOT :Bakıma git: {TOWN} Tren Garı
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Durmadan git: {TOWN} Tren Garı
@@ -2742,7 +2740,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Taşınan kargonun ayrıntıları
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Trenin ayrıntıları
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Her aracın kapasitesi
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Trenin kargo türlerine ayrilmis toplam kapasitesini göster
+STR_SHOW_TOTAL_CARGO :{BLACK}Trenin kargo türlerine ayrilmis toplam kapasitesini göster
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Talimat listesi - seçmek için komutu tıklayın. CTRL + tıklama istasyona kaydırir
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Şimdiki talimatı atla ve sonrakine geç. CTRL ile tıklanırsa seçili talimata geçilir
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Seçili talimatı sil
@@ -2773,8 +2771,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Tren çevrilemez...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Tren yeniden adlandırılamaz
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Tren yeniden adlandırılamaz...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Seçili talimatta aracı kargoyu boşaltmaya zorla
-STR_886F_TRANSFER :{BLACK}Aktar
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Seçili talimatta aracı kargoyu boşaltmaya zorla
+STR_TRANSFER :{BLACK}Aktar
STR_CLEAR_TIME :{BLACK}Zamanı Temizle
STR_RESET_LATENESS :{BLACK}Gecikme sayacını sıfırla
@@ -2851,8 +2849,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Arabayı adlandır
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}Şuraya ilk kez otobüs geldi: {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}Şuraya ilk kez kamyon geldi: {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}{STATION} istasyonuna ilk kez yolcu tramvayı geldi!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}{STATION} istasyonuna ilk kez yük tramvayı geldi!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}{STATION} istasyonuna ilk kez yolcu tramvayı geldi!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}{STATION} istasyonuna ilk kez yük tramvayı geldi!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Trafik kazasi!{}Trenle çarpisan aracın soförü feci şekilde can verdi
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Trafik kazasi!{}{COMMA} kişi patlamadan kurtulamadı
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Araç döndürülemiyor...
@@ -2861,7 +2859,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Araç türünü yeniden adlandır
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Araç türünü yeniden adlandır
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Araç türü yeniden adlandırılamıyor...
-STR_9038_GO_TO_ROADVEH_DEPOT :Garaja git: {TOWN}
+STR_GO_TO_ROADVEH_DEPOT :Garaja git: {TOWN}
STR_SERVICE_AT_ROADVEH_DEPOT :Servise git: {TOWN} Garaji
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Kamyonu başka türde kargo taşıyabilmesi için modifiye et
--- a/src/lang/ukrainian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/ukrainian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,7 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Потрібна рівна ділянка
STR_0008_WAITING :{BLACK}Чекає: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (перевезено з
-STR_000B :{YELLOW}{STATION})
+STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} з {STATION})
STR_000C_ACCEPTS :{BLACK}Приймає: {WHITE}
STR_000D_ACCEPTS :{BLACK}Приймає: {GOLD}
STR_000E :
@@ -400,9 +399,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Дуже багато імен
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Таке ім'я вже є
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -413,11 +412,11 @@
STR_013C_CARGO :{BLACK}Вантаж
STR_013D_INFORMATION :{BLACK}Інформація
STR_013E_CAPACITIES :{BLACK}Місткість
-STR_013E_TOTAL_CARGO :{BLACK}Повна місткість
+STR_TOTAL_CARGO :{BLACK}Повна місткість
STR_013F_CAPACITY :{BLACK}Місткість: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Місткість:{LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Повна місткість цього поїзду:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Повна місткість цього поїзду:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Нова гра
STR_0141_LOAD_GAME :{BLACK}Завантажити гру
@@ -852,11 +851,12 @@
STR_028E_PLACE_TRANSMITTER :{BLACK}Поставити ретранслятор
STR_028F_DEFINE_DESERT_AREA :{BLACK}Позначити територію пустелі.{}Натисніть і утримуйте CTRL, щоб відмінити
STR_CREATE_LAKE :{BLACK}Позначити, де буде вода.{}Make a canal, unless CTRL is held down at sea level, when it will flood the surroundings instead
+STR_CREATE_RIVER :{BLACK}Прокласти річки.
STR_0290_DELETE :{BLACK}Видалити
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Видалити місто повністю
STR_0292_SAVE_SCENARIO :Зберегти сценарій
STR_0293_LOAD_SCENARIO :Завантажити сценарій
-STR_LOAD_HEIGHTMAP :Завантажити карту висот
+STR_MENU_LOAD_HEIGHTMAP :Завантажити карту висот
STR_0294_QUIT_EDITOR :Вийти з редактору
STR_0295 :
STR_0296_QUIT :Вихід
@@ -896,9 +896,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Налаштування гри
-STR_02C5_DIFFICULTY_SETTINGS :Налаштування складності
-STR_02C7_CONFIG_PATCHES :Розширені налаштування
+STR_02C4_GAME_OPTIONS :Налаштування гри
+STR_02C6_DIFFICULTY_SETTINGS :Налаштування складності
+STR_MENU_CONFIG_PATCHES :Розширені налаштування
STR_NEWGRF_SETTINGS :Нова графіка
STR_TRANSPARENCY_OPTIONS :Опції прозорості
STR_GAMEOPTMENU_0A :
@@ -998,8 +998,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Збереження...,{}зачекайте поки завершиться!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Вибрати програму 'Дорожні теми'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Англійські(Оригінальні)
@@ -1774,42 +1774,42 @@
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Спочатку зруйнуйте дорогу
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Дорога ремонтується
STR_1802_ROAD_CONSTRUCTION :{WHITE}Будівництво дороги
-STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Будівництво трамвайної колії
+STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Будівництво трамвайної колії
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Виберіть дорожний міст
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... односторонні дороги не можуть перетинатись
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Неможливо тут побудувати дорогу ...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Тут не можна побудувати трамвайну колію...
+STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Тут не можна побудувати трамвайну колію...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Неможливо прибрати дорогу звідси...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Не можна прибрати трамвайну колію звідси...
+STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Не можна прибрати трамвайну колію звідси...
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Орієнтація депо
-STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Орієнтація трамвайного депо
+STR_TRAM_DEPOT_ORIENTATION :{WHITE}Орієнтація трамвайного депо
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Неможливо будувати депо тут...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Тут не можна побудувати трамвайне депо...
+STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Тут не можна побудувати трамвайне депо...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Неможливо будувати зупинку тут...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Неможливо будувати вантажну станцію тут...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Не можна побудувати пасажирську трамвайну станцію...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Не можна побудувати вантажну трамвайну станцію...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Не можна побудувати пасажирську трамвайну станцію...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Не можна побудувати вантажну трамвайну станцію...
STR_180A_ROAD_CONSTRUCTION :Будувати дороги
-STR_180A_TRAMWAY_CONSTRUCTION :Будівництво трамвайної колії
+STR_TRAMWAY_CONSTRUCTION :Будівництво трамвайної колії
STR_180B_BUILD_ROAD_SECTION :{BLACK}Будувати дорогу
STR_BUILD_AUTOROAD_TIP :{BLACK}Будувати дорогу в режимі Автобудування
-STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Будувати трамвайну колію
+STR_BUILD_TRAMWAY_SECTION :{BLACK}Будувати трамвайну колію
STR_BUILD_AUTOTRAM_TIP :{BLACK}Будувати трамвайну лінію в режимі Автобудування
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Будувати автомобільне депо
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Будувати трамвайне депо (для будівництва та обслуговування трамваїв)
+STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Будувати трамвайне депо (для будівництва та обслуговування трамваїв)
STR_180D_BUILD_BUS_STATION :{BLACK}Будувати зупинку
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Будувати вантажну станцію
-STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Побудувати пасажирську трамвайну станцію
-STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Побудувати вантажну трамвайну станцію
+STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Побудувати пасажирську трамвайну станцію
+STR_BUILD_CARGO_TRAM_STATION :{BLACK}Побудувати вантажну трамвайну станцію
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Будувати міст
-STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Побудувати трамвайний міст
+STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Побудувати трамвайний міст
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Будувати тунель
-STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Побудувати трамвайний тунель
+STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Побудувати трамвайний тунель
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Вкл./відкл. односторонні дороги
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Будувати/зруйнувати дорогу
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Будувати/демонтувати колію
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Будувати/демонтувати колію
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Виберіть направлення депо
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Виберіть орієнтацію трамвайного депо
+STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Виберіть орієнтацію трамвайного депо
STR_1814_ROAD :Дорога
STR_1815_ROAD_WITH_STREETLIGHTS :Дорога з вуличними ліхтарями
STR_1816_TREE_LINED_ROAD :Дорога з насадженнями
@@ -1952,8 +1952,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Граничить з іншою станцією
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Дуже багато станцій в цьому місті
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Дуже багато станцій
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Дуже багато зупинок
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Дуже багато вантажних станцій
+STR_TOO_MANY_BUS_STOPS :{WHITE}Дуже багато зупинок
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Дуже багато вантажних станцій
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Дуже близько до іншої станції
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Спочатку зруйнуйте залізничну станцію
@@ -1984,12 +1984,12 @@
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} тепер приймає {STRING} і {STRING}
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Орієнтація зупинки
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Орієнтація станції
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Орієнтація пасажирської трамвайної станції
-STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Орієнтація вантажної трамвайної станції
+STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Орієнтація пасажирської трамвайної станції
+STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Орієнтація вантажної трамвайної станції
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Спочатку зруйнуйте зупинку
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Спочатку зруйнуйте вантажну станцію
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Спочатку треба знести пасажирську трамвайну станцію
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Спочатку треба знести вантажну трамвайну станцію
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Спочатку треба знести пасажирську трамвайну станцію
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Спочатку треба знести вантажну трамвайну станцію
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} станці{P я ї й}
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
STR_304A_NONE :{YELLOW}- нема -
@@ -2001,8 +2001,8 @@
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Виберіть довжину залізничної станції
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Виберіть орієнтацію зупинки
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Виберіть орієнтацію вантажної станції
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Виберіть орієнтацію пасажирської трамвайної станції
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Виберіть орієнтацію вантажної трамвайної станції
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Виберіть орієнтацію пасажирської трамвайної станції
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Виберіть орієнтацію вантажної трамвайної станції
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Показати станцію в центрі екрану
STR_3054_SHOW_STATION_RATINGS :{BLACK}Показати рейтинг станції
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Перейменувати станцію
@@ -2024,7 +2024,7 @@
STR_3069_BUOY :Бакен
STR_306A_BUOY_IN_THE_WAY :{WHITE}...бакен на шляху
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...станція занадто велика
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...неоднорідні станції відключені
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...неоднорідні станції відключені
STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Утримуйте CTRL для вибору більш ніж одного пункту
STR_UNDEFINED :(невизначено)
@@ -2065,7 +2065,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Виберіть новий тип гри
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Виберіть сценарій (зелений), встановлена гра (синій), або випадкова нова гра
STR_4010_GENERATE_RANDOM_NEW_GAME :Генерувати випадкову нову гру
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Завантажити ландшафт
+STR_LOAD_HEIGHTMAP :{WHITE}Завантажити ландшафт
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} на шляху
@@ -2306,10 +2306,10 @@
STR_6813_ECONOMY :{LTBLUE}Економіка: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Поїзди розвертаються: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Стихійні лиха/катастрофи: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Відношення влади до перебудови території міста: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Відношення влади до перебудови території міста: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Нема
+STR_NONE :Нема
STR_NUM_VERY_LOW :дуже мало
STR_6816_LOW :МалО
STR_6817_NORMAL :Нормально
@@ -2347,9 +2347,9 @@
STR_6836_OFF :ВиКл
STR_6837_ON :Вкл
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Показати таблицю рекордів
-STR_6839_PERMISSIVE :Допустиме
-STR_683A_TOLERANT :Терпиме
-STR_683B_HOSTILE :Вороже
+STR_PERMISSIVE :Допустиме
+STR_TOLERANT :Терпиме
+STR_HOSTILE :Вороже
##id 0x7000
STR_7000 :
@@ -2486,7 +2486,7 @@
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Неможливо продати 25% акцій цієї компанії...
STR_707D_OWNED_BY :{WHITE}({COMMA}% у власності {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} викуплено {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Ця компанія поки ще не продається...
+STR_PROTECTED :{WHITE}Ця компанія поки ще не продається...
STR_LIVERY_DEFAULT :Стандартний колір
STR_LIVERY_STEAM :Паровози
@@ -2499,6 +2499,8 @@
STR_LIVERY_PASSENGER_WAGON_STEAM :Пасажирський вагон (пар)
STR_LIVERY_PASSENGER_WAGON_DIESEL :Пасажирський вагон (дизель)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Пасажирський вагон (електричка)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL :Пасажирський вагон (монорельс)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV :Пасажирський вагон (магнітна подушка)
STR_LIVERY_FREIGHT_WAGON :Товарний вагон
STR_LIVERY_BUS :Автобус
STR_LIVERY_TRUCK :Вантажівка
@@ -2793,17 +2795,17 @@
STR_8804 :{SETX 10}{COMMA}: {STRING}{STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING}
STR_8806_GO_TO :Прямувати до {STATION}
-STR_8807_GO_TO_TRANSFER :Прямувати до {STATION} (Пересадити і забрати вантаж)
-STR_8808_GO_TO_UNLOAD :Прямувати до {STATION} (розвантажитися)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Прямувати до {STATION} (Пересадити і залишити вантаж)
-STR_880A_GO_TO_LOAD :Прямувати до {STATION} (Завантажитися)
-STR_880B_GO_TO_TRANSFER_LOAD :Прямувати до {STATION} (Пересадити і завантажити повністю)
-STR_880C_GO_NON_STOP_TO :Прямувати без зупинок до {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Прямувати без зупинок до {STATION} (Пересадити і забрати вантаж)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Прямувати без зупинок до {STATION} (розвантажитися)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Прямувати без зупинок до {STATION} (Пересадити і залишити вантаж)
-STR_8810_GO_NON_STOP_TO_LOAD :Прямувати без зупинок до {STATION} (Завантажити)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Прямувати без зупинок до {STATION} (Пересадити і завантажити повністю)
+STR_GO_TO_TRANSFER :Прямувати до {STATION} (Пересадити і забрати вантаж)
+STR_8807_GO_TO_UNLOAD :Прямувати до {STATION} (розвантажитися)
+STR_GO_TO_TRANSFER_UNLOAD :Прямувати до {STATION} (Пересадити і залишити вантаж)
+STR_8808_GO_TO_LOAD :Прямувати до {STATION} (Завантажитися)
+STR_GO_TO_TRANSFER_LOAD :Прямувати до {STATION} (Пересадити і завантажити повністю)
+STR_880A_GO_NON_STOP_TO :Прямувати без зупинок до {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Прямувати без зупинок до {STATION} (Пересадити і забрати вантаж)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Прямувати без зупинок до {STATION} (розвантажитися)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Прямувати без зупинок до {STATION} (Пересадити і залишити вантаж)
+STR_880C_GO_NON_STOP_TO_LOAD :Прямувати без зупинок до {STATION} (Завантажити)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Прямувати без зупинок до {STATION} (Пересадити і завантажити повністю)
STR_GO_TO_TRAIN_DEPOT :Прямувати до {TOWN} депо
STR_SERVICE_AT_TRAIN_DEPOT :Ремонтуватись в {TOWN} депо
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Прямувати без зупинок до {TOWN} депо
@@ -2907,7 +2909,7 @@
STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Показати інформацію про вантаж
STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Показати інформацію про вагони
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Показати місткість кожного вагону
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Показати загальну місткість поїзда, розділену за типом вантажу
+STR_SHOW_TOTAL_CARGO :{BLACK}Показати загальну місткість поїзда, розділену за типом вантажу
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Маршрутний лист - клікніть на завданні для його вибору. CTRL + клік показати станцію
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Пропустити поточний наказ, і виконувати наступний. CTRL + клік переходить до вибраного наказу
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Видалити виділене завдання
@@ -2938,8 +2940,8 @@
STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Неможливо розвернути поїзд...
STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Перейменувати тип поїзду
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Неможливо перейменувати тип поїзду...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Наказати транспорту примусово відвантажити вантаж
-STR_886F_TRANSFER :{BLACK}Пересадка
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Наказати транспорту примусово відвантажити вантаж
+STR_TRANSFER :{BLACK}Пересадка
STR_CLEAR_TIME :{BLACK}Очистити час
STR_RESET_LATENESS :{BLACK}Очистити лічильник запізнення
@@ -3017,8 +3019,8 @@
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Назвати авто
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший автобус з'явився на {STATION}!
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Жителі святкують . . .{}Перша вантажівка з'явилася на {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший пасажирський трамвай прибув на {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший вантажний трамвай прибув на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший пасажирський трамвай прибув на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший вантажний трамвай прибув на {STATION}!
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Аварія!{}Водій загинув при зіткненні авто з поїздом
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Аварія!{}{COMMA} загинуло при зіткненні авто з поїздом
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Неможливо розвернути авто...
@@ -3027,7 +3029,7 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Перейменувати тип авто
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Перейменувати тип авто
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Неможливо перейменувати тип авто...
-STR_9038_GO_TO_ROADVEH_DEPOT :Їхати в {TOWN} депо
+STR_GO_TO_ROADVEH_DEPOT :Їхати в {TOWN} депо
STR_SERVICE_AT_ROADVEH_DEPOT :Ремонтуватись в {TOWN} депо
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Переобладнати авто для перевезення інших вантажів
@@ -3401,6 +3403,12 @@
STR_PURCHASE_INFO_ALL_BUT :Всі крім {GOLD}
STR_PURCHASE_INFO_MAX_TE :{BLACK}Максимальна тяглова сила: {GOLD}{FORCE}
+########### For showing numbers in widgets
+
+STR_NUM_1 :{BLACK}{SKIP}{NUM}
+STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
########### String for New Landscape Generator
STR_GENERATE :{WHITE}Генерувати
--- a/src/lang/unfinished/frisian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/unfinished/frisian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -12,7 +12,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Flak lân nedich
STR_0008_WAITING :{BLACK}Wachtsjend: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Aksepteart: {WHITE}
STR_000D_ACCEPTS :{BLACK}Aksepteart: {GOLD}
STR_000E :
@@ -217,17 +216,17 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Te folle nammen definearre
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Dizze namme wurd al brûkt
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_013B_OWNED_BY :{WHITE}...is fan {STRING}
STR_013C_CARGO :{BLACK}Fracht
STR_013D_INFORMATION :{BLACK}Ynformaasje
STR_013E_CAPACITIES :{BLACK}Kapasiteit
-STR_013E_TOTAL_CARGO :{BLACK}Totale Fracht
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Totale kapasiteit fan dizze trein:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CARGO :{BLACK}Totale Fracht
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Totale kapasiteit fan dizze trein:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_0140_NEW_GAME :{BLACK}Nei Spul
STR_0141_LOAD_GAME :{BLACK}Laad Spul
@@ -598,9 +597,9 @@
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Sla eigen reau ûntwerp nammen op
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Spul Opsjes
-STR_02C5_DIFFICULTY_SETTINGS :Swierrichheid ynstellings
-STR_02C7_CONFIG_PATCHES :Patches Ynstellings
+STR_02C4_GAME_OPTIONS :Spul Opsjes
+STR_02C6_DIFFICULTY_SETTINGS :Swierrichheid ynstellings
+STR_MENU_CONFIG_PATCHES :Patches Ynstellings
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Stêd nammen sjen litte
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Stasjon nammen sjen litte
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Buordsjes sjen litte
@@ -679,8 +678,8 @@
STR_032F_AUTOSAVE :{RED}AUTOSAVE
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Selektear 'Ezy Street' musyk programma
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
############ end of townname region
@@ -983,8 +982,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Ferbynt mear dan ien stasjon
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Te folle stasjons yn dizze stêd
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Te folle stasjons
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Te folle bushaltes
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Te folle frachtstasjons
+STR_TOO_MANY_BUS_STOPS :{WHITE}Te folle bushaltes
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Te folle frachtstasjons
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Te ticht by in oar stasjon
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Treinspoar moat earst fuorthelle wurde
@@ -1045,7 +1044,7 @@
STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Kin triem net fuortsmite
STR_4009_GAME_LOAD_FAILED :{WHITE}Laden Mislearre{}{STRING}
STR_400A_LIST_OF_DRIVES_DIRECTORIES :{BLACK}List fan skiven, mappen en triemen
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Laad Hichtemap
+STR_LOAD_HEIGHTMAP :{WHITE}Laad Hichtemap
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} yn it paad
@@ -1137,7 +1136,7 @@
STR_6813_ECONOMY :{LTBLUE}Ekonomy: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Gjin
+STR_NONE :Gjin
STR_6816_LOW :Leech
STR_6817_NORMAL :Gewoan
STR_6818_HIGH :Heech
--- a/src/lang/unfinished/greek.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/unfinished/greek.txt Sun Feb 03 20:34:26 2008 +0000
@@ -14,8 +14,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Απαιτείται επίπεδο εδαφος
STR_0008_WAITING :{BLACK}Αναμονη: {WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (καθ'οδόν από
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Δέχεται: {WHITE}
STR_000D_ACCEPTS :{BLACK}Δέχεται: {GOLD}
STR_000E :
@@ -273,9 +271,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Καθορίστηκαν πάρα πολλά ονόματα
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Το όνομα που διαλέξατε υπάρχει ήδη
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -286,11 +284,11 @@
STR_013C_CARGO :{BLACK}Φορτίο
STR_013D_INFORMATION :{BLACK}Πληροφορίες
STR_013E_CAPACITIES :{BLACK}Χωρητικότητες
-STR_013E_TOTAL_CARGO :{BLACK}Συνολικό Φορτίο
+STR_TOTAL_CARGO :{BLACK}Συνολικό Φορτίο
STR_013F_CAPACITY :{BLACK}Χωρητικότητα: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Χωριτηκότητα: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Συνολική χωρητικότητα φορτίου του τραίνου:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Συνολική χωρητικότητα φορτίου του τραίνου:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Νέο Παιχνίδι
STR_0141_LOAD_GAME :{BLACK}Φόρτωση Παιχνιδιού
@@ -724,7 +722,7 @@
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Πλήρης διαγραφή πόλεως
STR_0292_SAVE_SCENARIO :Απποθήκευση σεναρίου
STR_0293_LOAD_SCENARIO :Φόρτωση σεναρίου
-STR_LOAD_HEIGHTMAP :Φόρτωση heightmap
+STR_MENU_LOAD_HEIGHTMAP :Φόρτωση heightmap
STR_0294_QUIT_EDITOR :Έξοδος από το πρόγραμμα επεξεργασίας
STR_0295 :
STR_0296_QUIT :Έξοδος
@@ -763,9 +761,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Επιλογές παιχνιδιού
-STR_02C5_DIFFICULTY_SETTINGS :Ρυθμίσεις δυσκολίας
-STR_02C7_CONFIG_PATCHES :Ρύθμιση διορθώσεων
+STR_02C4_GAME_OPTIONS :Επιλογές παιχνιδιού
+STR_02C6_DIFFICULTY_SETTINGS :Ρυθμίσεις δυσκολίας
+STR_MENU_CONFIG_PATCHES :Ρύθμιση διορθώσεων
STR_NEWGRF_SETTINGS :Ρυθμίσεις NewGRF
STR_GAMEOPTMENU_0A :
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Ονόματα πόλεων που εμφανίζονται
@@ -863,8 +861,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Η αποθήκευση είναι σε εξέλιξη,{}παρακαλώ περιμένετε να τελειώσει!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Επιλογή προγράμματος 'Ezy Street στυλ μουσικής'
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Αγγλικά (Αυθεντικά)
@@ -1462,8 +1460,8 @@
STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Γειτονεύει με περισσότερες από μια υπάρχουσες περιοχές σταθμών/φόρτωσης
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Πάρα πολλές περιοχές σταθμών/φόρτωσης σε αυτή την πόλη
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Πάρα πολλές περιοχές σταθμών/φόρτωσης
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Πάρα πολλές στάσεις λεωφορείου
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Πάρα πολλοί σταθμοί φορτηγών
+STR_TOO_MANY_BUS_STOPS :{WHITE}Πάρα πολλές στάσεις λεωφορείου
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}Πάρα πολλοί σταθμοί φορτηγών
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Πολύ κοντά σε μιά άλλη περιοχή σταθμού/φόρτωσης
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Πρέπει να κατεδαφιστεί ο σιδηροδρομικός σταθμός πρώτα
@@ -1527,7 +1525,7 @@
STR_3069_BUOY :Σημαδούρα
STR_306A_BUOY_IN_THE_WAY :{WHITE}...σημαδούρα στη μέση
STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...ο σταθμός είναι υπερβολικά απλωμένος
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ανομοιόμορφοι σταθμοί απενεργοποιημένοι
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...ανομοιόμορφοι σταθμοί απενεργοποιημένοι
##id 0x3800
@@ -1558,7 +1556,7 @@
STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Επιλογή Τύπου Νέου Παιχνιδιού
STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Επιλογή σεναρίου (πράσινο), προεπιλεγμένου παιχνιδιού (μπλε), ή τυχαίου νέου παιχνιδιού
STR_4010_GENERATE_RANDOM_NEW_GAME :Δημιουργία τυχαίου νέου παιχνιδιού
-STR_4011_LOAD_HEIGHTMAP :{WHITE}Φόρτωση Heightmap
+STR_LOAD_HEIGHTMAP :{WHITE}Φόρτωση Heightmap
##id 0x4800
STR_4800_IN_THE_WAY :{WHITE}{STRING} στη μέση
@@ -1709,10 +1707,10 @@
STR_6813_ECONOMY :{LTBLUE}Οικονομικά: {ORANGE}{STRING}
STR_6814_TRAIN_REVERSING :{LTBLUE}Περιστροφή τρένων: {ORANGE}{STRING}
STR_6815_DISASTERS :{LTBLUE}Καταστροφές: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}Θέση δημαρχιακού συμβουλίου σχετικά με την αναδόμηση της πόλης: {ORANGE}{STRING}
+STR_CITY_APPROVAL :{LTBLUE}Θέση δημαρχιακού συμβουλίου σχετικά με την αναδόμηση της πόλης: {ORANGE}{STRING}
############ range for difficulty settings ends
-STR_26816_NONE :Κανένα
+STR_NONE :Κανένα
STR_6816_LOW :Χαμηλό
STR_6817_NORMAL :Κανονικό
STR_6818_HIGH :Υψηλό
@@ -1748,9 +1746,9 @@
STR_6836_OFF :Ανενεργό
STR_6837_ON :Ενεργό
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Εμφάνιση γραφήματος καλύτεων βαθμολογιών
-STR_6839_PERMISSIVE :Ανεκτικό
-STR_683A_TOLERANT :Υπομονετικό
-STR_683B_HOSTILE :Εχθρικό
+STR_PERMISSIVE :Ανεκτικό
+STR_TOLERANT :Υπομονετικό
+STR_HOSTILE :Εχθρικό
##id 0x7000
STR_7000 :
@@ -1871,7 +1869,7 @@
STR_707D_OWNED_BY :{WHITE}({COMMA}% είναι ιδιοκτησία της {COMPANY})
STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% είναι ιδιοκτησία της εταιρείας {COMPANY}{} {COMMA}% ιδιοκτησία της {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}Η {COMPANY} εξαγοράστηκε από την {COMPANY}!
-STR_7080_PROTECTED :{WHITE}Αυτή η εταιρεία δεν είναι αρκετά ώριμη για συναλλαγή μετοχών ακόμα...
+STR_PROTECTED :{WHITE}Αυτή η εταιρεία δεν είναι αρκετά ώριμη για συναλλαγή μετοχών ακόμα...
--- a/src/lang/unfinished/latvian.txt Sun Feb 03 01:34:21 2008 +0000
+++ b/src/lang/unfinished/latvian.txt Sun Feb 03 20:34:26 2008 +0000
@@ -17,8 +17,6 @@
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Zemei jābūt plakanai
STR_0008_WAITING :{BLACK}Gaidam: {WHITE}{STRING.a}
STR_0009 :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (ceļā no
-STR_000B :{YELLOW}{STATION})
STR_000C_ACCEPTS :{BLACK}Pieņem: {WHITE}
STR_000D_ACCEPTS :{BLACK}Pieņem: {GOLD}
STR_000E :
@@ -276,9 +274,9 @@
STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Define'ti pa'ra'k daudz nosaukumi
STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Izve'le'tais nosaukums jau tiek lietots
-STR_0133_WINDOWS :Windows
-STR_0134_UNIX :Unix
-STR_0135_OSX :OS X
+STR_OSNAME_WINDOWS :Windows
+STR_OSNAME_UNIX :Unix
+STR_OSNAME_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
STR_OSNAME_AMIGAOS :AmigaOS
@@ -289,11 +287,11 @@
STR_013C_CARGO :{BLACK}Krava
STR_013D_INFORMATION :{BLACK}Informa'cija
STR_013E_CAPACITIES :{BLACK}Ietilpi'ba
-STR_013E_TOTAL_CARGO :{BLACK}Krava kopa'
+STR_TOTAL_CARGO :{BLACK}Krava kopa'
STR_013F_CAPACITY :{BLACK}Ietilpi'ba: {LTBLUE}{CARGO}
STR_CAPACITY_MULT :{BLACK}Ietilpība: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Kope'ja' vilciena kravas ietilpi'ba:
-STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT :{BLACK}Kope'ja' vilciena kravas ietilpi'ba:
+STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Jauna spe'le
STR_0141_LOAD_GAME :{BLACK}Iela'de't spe'li
@@ -760,9 +758,9 @@
STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
-STR_02C3_GAME_OPTIONS :Spe'les rez'i'mi
-STR_02C5_DIFFICULTY_SETTINGS :Gru'ti'bas paka'pes
-STR_02C7_CONFIG_PATCHES :Konfigure't labojumus (pac'us)
+STR_02C4_GAME_OPTIONS :Spe'les rez'i'mi
+STR_02C6_DIFFICULTY_SETTINGS :Gru'ti'bas paka'pes
+STR_MENU_CONFIG_PATCHES :Konfigure't labojumus (pac'us)
STR_NEWGRF_SETTINGS :Newgrf rez'i'mi
STR_GAMEOPTMENU_0A :
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Ra'di't pilse'tu nosaukumus
@@ -860,8 +858,8 @@
STR_SAVE_STILL_IN_PROGRESS :{WHITE}Notiek saglabas'ana,{}lu'dzu uzgaidiet!
STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}izve'lies 'Ez'u Ielas muzikas stila' programmu
-STR_0335_6 :{BLACK}6
-STR_0336_7 :{BLACK}7
+STR_6 :{BLACK}6
+STR_7 :{BLACK}7
############ start of townname region
STR_TOWNNAME_ORIGINAL_ENGLISH :Anglijas (orig'ina'lie)
@@ -1470,8 +1468,8 @@
STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD :{WHITE}Pārāk tuvu citai dzelzceļa stacijai
STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Pārāk daudz staciju/iekrašanas zonu šajā pilsētā
STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Pārāk daudz stacijas/iekraušanas zonas
-STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Pa'ra'k daudz autobusa pieturu
-STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}pa'ra'k daudz kravas auto staciju
+STR_TOO_MANY_BUS_STOPS :{WHITE}Pa'ra'k daudz autobusa pieturu
+STR_TOO_MANY_TRUCK_STOPS :{WHITE}pa'ra'k daudz kravas auto staciju
STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Pārāk tuvu citai stacijai/iekraušanas zonai
STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES}
STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Jānojauc dzelzsceļa stacija vispirms
@@ -1525,7 +1523,7 @@
STR_3062_BUS_STATION :Autoosta
STR_3063_SHIP_DOCK :Osta
STR_3068_DOCK :{WHITE}Osta
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...neregula'ras stacijas nav atl'autas
+STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...neregula'ras stacijas nav atl'autas
STR_UNDEFINED :(nedefinēta rinda)
@@ -1678,7 +1676,7 @@
STR_705C_BANKRUPT :{BLACK}{BIGFONT}Bankrots!
STR_7065 :{BLACK}{TINYFONT}{STRING}
STR_COMPANY_PASSWORD :{BLACK}Parole
-STR_7080_PROTECTED :{WHITE}S'i' kompa'nija ir pa'ra'k jauna lai tirgotu akcijas...
+STR_PROTECTED :{WHITE}S'i' kompa'nija ir pa'ra'k jauna lai tirgotu akcijas...
@@ -1782,17 +1780,17 @@
##id 0x8800
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
-STR_8807_GO_TO_TRANSFER :Uz {STATION} (Pa'rvest un pan'emt kravu)
-STR_8808_GO_TO_UNLOAD :Uz {STATION} (Nokraut)
-STR_8809_GO_TO_TRANSFER_UNLOAD :Uz {STATION} (Pa'rvest un atsta't tuks'u)
-STR_880A_GO_TO_LOAD :Uz {STATION} (Piekraut)
-STR_880B_GO_TO_TRANSFER_LOAD :Go to {STATION} (Pa'rvest un gaidi't pilnu kravu)
-STR_880C_GO_NON_STOP_TO :Bez pieturam uz {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER :Bez pieturam uz {STATION} (Pa'rvest un pan'emt kravu)
-STR_880E_GO_NON_STOP_TO_UNLOAD :Bez pieturam uz {STATION} (Nokraut)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Bez pieturam uz {STATION} (Pa'rvest un atsta't tuks'u)
-STR_8810_GO_NON_STOP_TO_LOAD :Bez pieturam uz {STATION} (Piekraut)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Bez pieturam uz {STATION} (Pa'rvest un gaidi't pilnu kravu)
+STR_GO_TO_TRANSFER :Uz {STATION} (Pa'rvest un pan'emt kravu)
+STR_8807_GO_TO_UNLOAD :Uz {STATION} (Nokraut)
+STR_GO_TO_TRANSFER_UNLOAD :Uz {STATION} (Pa'rvest un atsta't tuks'u)
+STR_8808_GO_TO_LOAD :Uz {STATION} (Piekraut)
+STR_GO_TO_TRANSFER_LOAD :Go to {STATION} (Pa'rvest un gaidi't pilnu kravu)
+STR_880A_GO_NON_STOP_TO :Bez pieturam uz {STATION}
+STR_GO_TO_NON_STOP_TRANSFER :Bez pieturam uz {STATION} (Pa'rvest un pan'emt kravu)
+STR_880B_GO_NON_STOP_TO_UNLOAD :Bez pieturam uz {STATION} (Nokraut)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Bez pieturam uz {STATION} (Pa'rvest un atsta't tuks'u)
+STR_880C_GO_NON_STOP_TO_LOAD :Bez pieturam uz {STATION} (Piekraut)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD :Bez pieturam uz {STATION} (Pa'rvest un gaidi't pilnu kravu)
STR_GO_TO_TRAIN_DEPOT :Uz {TOWN} Vilcienu Depo
@@ -1810,8 +1808,8 @@
STR_8865_NAME_TRAIN :{WHITE}Nosaukt vilcienu
STR_8867_NAME_TRAIN :{BLACK}Nosaukt vilcienu
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Uzsve'rtai pa'velei spiest tansportli'dzekl'im nomest kravu
-STR_886F_TRANSFER :{BLACK}Tranzi'ts
+STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Uzsve'rtai pa'velei spiest tansportli'dzekl'im nomest kravu
+STR_TRANSFER :{BLACK}Tranzi'ts
@@ -1823,7 +1821,7 @@
STR_902A_COST_SPEED_RUNNING_COST :{BLACK}Cena: {CURRENCY}{}Atrums: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
STR_9034_RENAME :{BLACK}Pârsaukt
-STR_9038_GO_TO_ROADVEH_DEPOT :Dodas uz {TOWN} ceļa mašīnu depo
+STR_GO_TO_ROADVEH_DEPOT :Dodas uz {TOWN} ceļa mašīnu depo
##id 0x9800
--- a/src/main_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/main_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -176,10 +176,7 @@
case 9: ToggleBit(_display_opt, DO_WAYPOINTS); break;
case 10: ToggleBit(_display_opt, DO_FULL_ANIMATION); break;
case 11: ToggleBit(_display_opt, DO_FULL_DETAIL); break;
- case 12:
- ToggleTransparency(TO_TREES);
- ToggleTransparency(TO_HOUSES);
- break;
+ case 12: ToggleTransparency(TO_HOUSES); break;
case 13: ToggleTransparency(TO_SIGNS); break;
}
MarkWholeScreenDirty();
@@ -972,7 +969,7 @@
{
uint16 x = 0;
- w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 14, 0);
+ w = PopupMainToolbMenu(w, 2, STR_02C4_GAME_OPTIONS, 14, 0);
if (HasBit(_display_opt, DO_SHOW_TOWN_NAMES)) SetBit(x, 6);
if (HasBit(_display_opt, DO_SHOW_STATION_NAMES)) SetBit(x, 7);
--- a/src/map.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/map.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -16,6 +16,7 @@
#endif
uint _map_log_x; ///< 2^_map_log_x == _map_size_x
+uint _map_log_y; ///< 2^_map_log_y == _map_size_y
uint _map_size_x; ///< Size of the map along the X
uint _map_size_y; ///< Size of the map along the Y
uint _map_size; ///< The number of tiles on the map
@@ -43,6 +44,7 @@
DEBUG(map, 1, "Allocating map of size %dx%d", size_x, size_y);
_map_log_x = FindFirstBit(size_x);
+ _map_log_y = FindFirstBit(size_y);
_map_size_x = size_x;
_map_size_y = size_y;
_map_size = size_x * size_y;
--- a/src/map_func.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/map_func.h Sun Feb 03 20:34:26 2008 +0000
@@ -57,6 +57,17 @@
}
/**
+ * Logarithm of the map size along the y side.
+ * @note try to avoid using this one
+ * @return 2^"return value" == MapSizeY()
+ */
+static inline uint MapLogY()
+{
+ extern uint _map_log_y;
+ return _map_log_y;
+}
+
+/**
* Get the size of the map along the X
* @return the number of tiles along the X of the map
*/
--- a/src/misc.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/misc.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -205,8 +205,8 @@
SLEG_CONDVAR(_cur_tileloop_tile, SLE_UINT32, 6, SL_MAX_VERSION),
SLEG_VAR(_disaster_delay, SLE_UINT16),
SLEG_VAR(_station_tick_ctr, SLE_UINT16),
- SLEG_VAR(_random_seeds[0][0], SLE_UINT32),
- SLEG_VAR(_random_seeds[0][1], SLE_UINT32),
+ SLEG_VAR(_random.state[0], SLE_UINT32),
+ SLEG_VAR(_random.state[1], SLE_UINT32),
SLEG_CONDVAR(_cur_town_ctr, SLE_FILE_U8 | SLE_VAR_U32, 0, 9),
SLEG_CONDVAR(_cur_town_ctr, SLE_UINT32, 10, SL_MAX_VERSION),
SLEG_VAR(_cur_player_tick_index, SLE_FILE_U8 | SLE_VAR_U32),
--- a/src/misc_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/misc_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -773,7 +773,7 @@
}
-static void DrawStationCoverageText(const AcceptedCargo accepts,
+static int DrawStationCoverageText(const AcceptedCargo accepts,
int str_x, int str_y, StationCoverageType sct)
{
char *b = _userstring;
@@ -809,17 +809,19 @@
/* Make sure we detect any buffer overflow */
assert(b < endof(_userstring));
- DrawStringMultiLine(str_x, str_y, STR_SPEC_USERSTRING, 144);
+ return DrawStringMultiLine(str_x, str_y, STR_SPEC_USERSTRING, 144);
}
-void DrawStationCoverageAreaText(int sx, int sy, StationCoverageType sct, int rad)
+int DrawStationCoverageAreaText(int sx, int sy, StationCoverageType sct, int rad)
{
TileIndex tile = TileVirtXY(_thd.pos.x, _thd.pos.y);
AcceptedCargo accepts;
if (tile < MapSize()) {
GetAcceptanceAroundTiles(accepts, tile, _thd.size.x / TILE_SIZE, _thd.size.y / TILE_SIZE , rad);
- DrawStationCoverageText(accepts, sx, sy, sct);
+ return sy + DrawStationCoverageText(accepts, sx, sy, sct);
}
+
+ return sy;
}
void CheckRedrawStationCoverage(const Window *w)
@@ -1689,7 +1691,7 @@
STR_0298_LOAD_SCENARIO,
STR_4000_SAVE_GAME,
STR_0299_SAVE_SCENARIO,
- STR_4011_LOAD_HEIGHTMAP,
+ STR_LOAD_HEIGHTMAP,
};
Window *w;
--- a/src/music_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/music_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -14,6 +14,7 @@
#include "sound_func.h"
#include "gfx_func.h"
#include "core/math_func.hpp"
+#include "core/random_func.hpp"
#include "table/strings.h"
#include "table/sprites.h"
--- a/src/network/network.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/network/network.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -404,6 +404,7 @@
inaddr.s_addr = htonl(ip | ~netmask);
_broadcast_list[i] = inaddr.s_addr;
i++;
+ if (i == MAX_INTERFACES) break;
}
if (read < 0) {
break;
@@ -431,6 +432,7 @@
if (ifa->ifa_broadaddr->sa_family != AF_INET) continue;
_broadcast_list[i] = ((struct sockaddr_in*)ifa->ifa_broadaddr)->sin_addr.s_addr;
i++;
+ if (i == MAX_INTERFACES) break;
}
freeifaddrs(ifap);
@@ -470,6 +472,7 @@
_broadcast_list[i++] =
ifo[j].iiAddress.AddressIn.sin_addr.s_addr |
~ifo[j].iiNetmask.AddressIn.sin_addr.s_addr;
+ if (i == MAX_INTERFACES) break;
}
#else
ifconf.ifc_len = sizeof(buf);
@@ -493,6 +496,7 @@
ioctl(sock, SIOCGIFBRDADDR, &r) != -1) {
_broadcast_list[i++] =
((struct sockaddr_in*)&r.ifr_broadaddr)->sin_addr.s_addr;
+ if (i == MAX_INTERFACES) break;
}
}
@@ -1235,9 +1239,9 @@
if (_sync_frame != 0) {
if (_sync_frame == _frame_counter) {
#ifdef NETWORK_SEND_DOUBLE_SEED
- if (_sync_seed_1 != _random_seeds[0][0] || _sync_seed_2 != _random_seeds[0][1]) {
+ if (_sync_seed_1 != _random.state[0] || _sync_seed_2 != _random.state[1]) {
#else
- if (_sync_seed_1 != _random_seeds[0][0]) {
+ if (_sync_seed_1 != _random.state[0]) {
#endif
NetworkError(STR_NETWORK_ERR_DESYNC);
DebugDumpCommands("ddc:serr:%d;%d\n", _date, _date_fract);
@@ -1332,9 +1336,9 @@
// Then we make the frame
StateGameLoop();
- _sync_seed_1 = _random_seeds[0][0];
+ _sync_seed_1 = _random.state[0];
#ifdef NETWORK_SEND_DOUBLE_SEED
- _sync_seed_2 = _random_seeds[0][1];
+ _sync_seed_2 = _random.state[1];
#endif
NetworkServer_Tick(send_frame);
--- a/src/newgrf.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -45,6 +45,7 @@
#include "road_func.h"
#include "player_base.h"
#include "settings_type.h"
+#include "map_func.h"
#include "table/strings.h"
#include "table/sprites.h"
@@ -350,10 +351,9 @@
} break;
case 0x08: // AI passenger service
- /** @todo Tells the AI that this engine is designed for
+ /* Tells the AI that this engine is designed for
* passenger services and shouldn't be used for freight. */
- grf_load_byte(&buf);
- ret = true;
+ rvi->ai_passenger_only = grf_load_byte(&buf);
break;
case 0x09: { // Speed (1 unit is 1 kmh)
@@ -2134,6 +2134,10 @@
indsp->removal_cost_multiplier = grf_load_dword(&buf);
break;
+ case 0x24: // name for nearby station
+ indsp->station_name = GRFMappedStringID(grf_load_dword(&buf), _cur_grffile->grfid);
+ break;
+
default:
ret = true;
break;
@@ -3724,25 +3728,6 @@
return 0;
}
-/** Allows to reposition the loaded sprite to its correct placment.
- * @param load_index SpriteID of the sprite to be relocated */
-static inline void TranslateShoreSprites(SpriteID load_index)
-{
- /** Contains the displacement required for the corresponding initial sprite*/
- static const SpriteID shore_dup[8] = {
- SPR_SHORE_BASE + 4, ///< 4062
- SPR_SHORE_BASE + 1, ///< 4063
- SPR_SHORE_BASE + 2, ///< 4064
- SPR_SHORE_BASE + 8, ///< 4065
- SPR_SHORE_BASE + 6, ///< 4066
- SPR_SHORE_BASE + 12, ///< 4067
- SPR_SHORE_BASE + 3, ///< 4068
- SPR_SHORE_BASE + 9, ///< 4069
- };
-
- DupSprite(load_index, shore_dup[load_index - SPR_ORIGINALSHORE_START]);
-}
-
/* Action 0x05 */
static void GraphicsNew(byte *buf, int len)
{
@@ -3804,23 +3789,16 @@
* Missing shore sprites and initialisation of SPR_SHORE_BASE */
grfmsg(2, "GraphicsNew: Loading 10 missing shore sprites from openttd(d/w).grf.");
LoadNextSprite( SPR_SHORE_BASE + 0, _file_index, _nfo_line++); // SLOPE_STEEP_S
- TranslateShoreSprites(SPR_ORIGINALSHORE_START + 1); // SLOPE_W
- TranslateShoreSprites(SPR_ORIGINALSHORE_START + 2); // SLOPE_S
- TranslateShoreSprites(SPR_ORIGINALSHORE_START + 6); // SLOPE_SW
- TranslateShoreSprites(SPR_ORIGINALSHORE_START ); // SLOPE_E
LoadNextSprite( SPR_SHORE_BASE + 5, _file_index, _nfo_line++); // SLOPE_STEEP_W
- TranslateShoreSprites(SPR_ORIGINALSHORE_START + 4); // SLOPE_SE
LoadNextSprite( SPR_SHORE_BASE + 7, _file_index, _nfo_line++); // SLOPE_WSE
- TranslateShoreSprites(SPR_ORIGINALSHORE_START + 3); // SLOPE_N
- TranslateShoreSprites(SPR_ORIGINALSHORE_START + 7); // SLOPE_NW
LoadNextSprite( SPR_SHORE_BASE + 10, _file_index, _nfo_line++); // SLOPE_STEEP_N
LoadNextSprite( SPR_SHORE_BASE + 11, _file_index, _nfo_line++); // SLOPE_NWS
- TranslateShoreSprites(SPR_ORIGINALSHORE_START + 5); // SLOPE_NE
LoadNextSprite( SPR_SHORE_BASE + 13, _file_index, _nfo_line++); // SLOPE_ENW
LoadNextSprite( SPR_SHORE_BASE + 14, _file_index, _nfo_line++); // SLOPE_SEN
LoadNextSprite( SPR_SHORE_BASE + 15, _file_index, _nfo_line++); // SLOPE_STEEP_E
LoadNextSprite( SPR_SHORE_BASE + 16, _file_index, _nfo_line++); // SLOPE_EW
LoadNextSprite( SPR_SHORE_BASE + 17, _file_index, _nfo_line++); // SLOPE_NS
+ if (_loaded_newgrf_features.shore == SHORE_REPLACE_NONE) _loaded_newgrf_features.shore = SHORE_REPLACE_ONLY_NEW;
return;
}
@@ -3859,6 +3837,8 @@
LoadNextSprite(replace == 0 ? _cur_spriteid++ : replace++, _file_index, _nfo_line);
}
+ if (type == 0x0D) _loaded_newgrf_features.shore = SHORE_REPLACE_ACTION_5;
+
_skip_sprites = skip_num;
}
@@ -4273,9 +4253,11 @@
_nfo_line++;
LoadNextSprite(load_index, _file_index, _nfo_line); // XXX
- /* Shore sprites now located at different addresses.
- * So apply the required displacements */
- if (IsInsideMM(load_index, SPR_ORIGINALSHORE_START, SPR_ORIGINALSHORE_END + 1)) TranslateShoreSprites(load_index);
+ /* Shore sprites now located at different addresses.
+ * So detect when the old ones get replaced. */
+ if (IsInsideMM(load_index, SPR_ORIGINALSHORE_START, SPR_ORIGINALSHORE_END + 1)) {
+ if (_loaded_newgrf_features.shore != SHORE_REPLACE_ACTION_5) _loaded_newgrf_features.shore = SHORE_REPLACE_ACTION_A;
+ }
}
}
}
@@ -4447,15 +4429,46 @@
switch (param) {
/* start year - 1920 */
case 0x0B: return max(_patches.starting_year, ORIGINAL_BASE_YEAR) - ORIGINAL_BASE_YEAR;
+
/* freight trains weight factor */
case 0x0E: return _patches.freight_trains;
+
/* empty wagon speed increase */
case 0x0F: return 0;
+
/* plane speed factor */
case 0x10: return 4;
+
/* 2CC colormap base sprite */
case 0x11: return SPR_2CCMAP_BASE;
+ /* map size: format = -MABXYSS
+ * M : the type of map
+ * bit 0 : set : squared map. Bit 1 is now not relevant
+ * clear : rectangle map. Bit 1 will indicate the bigger edge of the map
+ * bit 1 : set : Y is the bigger edge. Bit 0 is clear
+ * clear : X is the bigger edge.
+ * A : minimum edge(log2) of the map
+ * B : maximum edge(log2) of the map
+ * XY : edges(log2) of each side of the map.
+ * SS : combination of both X and Y, thus giving the size(log2) of the map
+ */
+ case 0x13: {
+ byte map_bits = 0;
+ byte log_X = MapLogX() - 6; // substraction is required to make the minimal size (64) zero based
+ byte log_Y = MapLogY() - 6;
+ byte max_edge = max(log_X, log_Y);
+
+ if (log_X == log_Y) { // we have a squared map, since both edges are identical
+ SetBit(map_bits ,0);
+ } else {
+ if (max_edge == log_Y) SetBit(map_bits, 1); // edge Y been the biggest, mark it
+ }
+
+ return (map_bits << 24) | (min(log_X, log_Y) << 20) | (max_edge << 16) |
+ (log_X << 12) | (log_Y << 8) | (log_X + log_Y);
+ }
+
default:
grfmsg(2, "ParamSet: Unknown Patch variable 0x%02X.", param);
return 0;
@@ -4972,6 +4985,20 @@
if (_cur_grffile->sound_offset == 0) _cur_grffile->sound_offset = GetNumSounds();
}
+/* Action 0x11 (SKIP) */
+static void SkipAct11(byte *buf, int len)
+{
+ /* <11> <num>
+ *
+ * W num Number of sound files that follow */
+
+ if (!check_length(len, 1, "SkipAct11")) return;
+ buf++;
+ _skip_sprites = grf_load_word(&buf);
+
+ grfmsg(3, "SkipAct11: Skipping %d sprites", _skip_sprites);
+}
+
static void ImportGRFSound(byte *buf, int len)
{
const GRFFile *file;
@@ -5116,6 +5143,36 @@
}
}
+/* Action 0x12 (SKIP) */
+static void SkipAct12(byte *buf, int len)
+{
+ /* <12> <num_def> <font_size> <num_char> <base_char>
+ *
+ * B num_def Number of definitions
+ * B font_size Size of font (0 = normal, 1 = small, 2 = large)
+ * B num_char Number of consecutive glyphs
+ * W base_char First character index */
+
+ buf++; len--;
+ if (!check_length(len, 1, "SkipAct12")) return;
+ uint8 num_def = grf_load_byte(&buf);
+
+ if (!check_length(len, 1 + num_def * 4, "SkipAct12")) return;
+
+ for (uint i = 0; i < num_def; i++) {
+ /* Ignore 'size' byte */
+ grf_load_byte(&buf);
+
+ /* Sum up number of characters */
+ _skip_sprites += grf_load_byte(&buf);
+
+ /* Ignore 'base_char' word */
+ grf_load_word(&buf);
+ }
+
+ grfmsg(3, "SkipAct12: Skipping %d sprites", _skip_sprites);
+}
+
/* Action 0x13 */
static void TranslateGRFStrings(byte *buf, int len)
{
@@ -5520,6 +5577,7 @@
_loaded_newgrf_features.has_2CC = false;
_loaded_newgrf_features.has_newhouses = false;
_loaded_newgrf_features.has_newindustries = false;
+ _loaded_newgrf_features.shore = SHORE_REPLACE_NONE;
InitializeSoundPool();
InitializeSpriteGroupPool();
@@ -5792,6 +5850,14 @@
strid = GetGRFStringID(indsp->grf_prop.grffile->grfid, indsp->new_industry_text);
if (strid != STR_UNDEFINED) indsp->new_industry_text = strid;
+ indsp->station_name.MapString();
+ if (indsp->station_name != STR_NULL) {
+ /* STR_NULL (0) can be set by grf. It has a meaning regarding assignation of the
+ * station's name. Don't wont to loose the value, therefor, do not process. */
+ strid = GetGRFStringID(indsp->grf_prop.grffile->grfid, indsp->station_name);
+ if (strid != STR_UNDEFINED) indsp->station_name = strid;
+ }
+
_industry_mngr.SetEntitySpec(indsp);
_loaded_newgrf_features.has_newindustries = true;
}
@@ -5875,8 +5941,8 @@
/* 0x0E */ { NULL, SafeGRFInhibit, NULL, GRFInhibit, GRFInhibit, GRFInhibit, },
/* 0x0F */ { NULL, GRFUnsafe, NULL, FeatureTownName, NULL, NULL, },
/* 0x10 */ { NULL, NULL, DefineGotoLabel, NULL, NULL, NULL, },
- /* 0x11 */ { NULL, GRFUnsafe, NULL, NULL, NULL, GRFSound, },
- /* 0x12 */ { NULL, NULL, NULL, NULL, NULL, LoadFontGlyph, },
+ /* 0x11 */ { SkipAct11,GRFUnsafe, SkipAct11, SkipAct11, SkipAct11, GRFSound, },
+ /* 0x12 */ { SkipAct12, SkipAct12, SkipAct12, SkipAct12, SkipAct12, LoadFontGlyph, },
/* 0x13 */ { NULL, NULL, NULL, NULL, NULL, TranslateGRFStrings, },
};
@@ -6010,6 +6076,47 @@
}
}
+/**
+ * Relocates the old shore sprites at new positions.
+ *
+ * 1. If shore sprites are neither loaded by Action5 nor ActionA, the extra sprites from openttd(w/d).grf are used. (SHORE_REPLACE_ONLY_NEW)
+ * 2. If a newgrf replaces some shore sprites by ActionA. The (maybe also replaced) grass tiles are used for corner shores. (SHORE_REPLACE_ACTION_A)
+ * 3. If a newgrf replaces shore sprites by Action5 any shore replacement by ActionA has no effect. (SHORE_REPLACE_ACTION_5)
+ */
+static void ActivateOldShore()
+{
+ /* Use default graphics, if no shore sprites were loaded.
+ * Should not happen, as openttd(w/d).grf includes some. */
+ if (_loaded_newgrf_features.shore == SHORE_REPLACE_NONE) _loaded_newgrf_features.shore = SHORE_REPLACE_ACTION_A;
+
+ if (_loaded_newgrf_features.shore != SHORE_REPLACE_ACTION_5) {
+ DupSprite(SPR_ORIGINALSHORE_START + 1, SPR_SHORE_BASE + 1); // SLOPE_W
+ DupSprite(SPR_ORIGINALSHORE_START + 2, SPR_SHORE_BASE + 2); // SLOPE_S
+ DupSprite(SPR_ORIGINALSHORE_START + 6, SPR_SHORE_BASE + 3); // SLOPE_SW
+ DupSprite(SPR_ORIGINALSHORE_START , SPR_SHORE_BASE + 4); // SLOPE_E
+ DupSprite(SPR_ORIGINALSHORE_START + 4, SPR_SHORE_BASE + 6); // SLOPE_SE
+ DupSprite(SPR_ORIGINALSHORE_START + 3, SPR_SHORE_BASE + 8); // SLOPE_N
+ DupSprite(SPR_ORIGINALSHORE_START + 7, SPR_SHORE_BASE + 9); // SLOPE_NW
+ DupSprite(SPR_ORIGINALSHORE_START + 5, SPR_SHORE_BASE + 12); // SLOPE_NE
+ }
+
+ if (_loaded_newgrf_features.shore == SHORE_REPLACE_ACTION_A) {
+ DupSprite(SPR_FLAT_GRASS_TILE + 16, SPR_SHORE_BASE + 0); // SLOPE_STEEP_S
+ DupSprite(SPR_FLAT_GRASS_TILE + 17, SPR_SHORE_BASE + 5); // SLOPE_STEEP_W
+ DupSprite(SPR_FLAT_GRASS_TILE + 7, SPR_SHORE_BASE + 7); // SLOPE_WSE
+ DupSprite(SPR_FLAT_GRASS_TILE + 15, SPR_SHORE_BASE + 10); // SLOPE_STEEP_N
+ DupSprite(SPR_FLAT_GRASS_TILE + 11, SPR_SHORE_BASE + 11); // SLOPE_NWS
+ DupSprite(SPR_FLAT_GRASS_TILE + 13, SPR_SHORE_BASE + 13); // SLOPE_ENW
+ DupSprite(SPR_FLAT_GRASS_TILE + 14, SPR_SHORE_BASE + 14); // SLOPE_SEN
+ DupSprite(SPR_FLAT_GRASS_TILE + 18, SPR_SHORE_BASE + 15); // SLOPE_STEEP_E
+
+ /* XXX - SLOPE_EW, SLOPE_NS are currently not used.
+ * If they would be used somewhen, then these grass tiles will most like not look as needed */
+ DupSprite(SPR_FLAT_GRASS_TILE + 5, SPR_SHORE_BASE + 16); // SLOPE_EW
+ DupSprite(SPR_FLAT_GRASS_TILE + 10, SPR_SHORE_BASE + 17); // SLOPE_NS
+ }
+}
+
void InitDepotWindowBlockSizes();
extern void InitGRFTownGeneratorNames();
@@ -6048,6 +6155,9 @@
/* Update references for oil rigs and dummy airport */
AirportFTAClass::oil_rig = GetCustomFSMportsSpecByGrf(0x4450414F, 3)->portFSM;
AirportFTAClass::dummy = GetCustomFSMportsSpecByGrf(0x4450414F, 4)->portFSM;
+
+ /* Load old shore sprites in new position, if they were replaced by ActionA */
+ ActivateOldShore();
}
void LoadNewGRF(uint load_index, uint file_index)
--- a/src/newgrf.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf.h Sun Feb 03 20:34:26 2008 +0000
@@ -87,10 +87,18 @@
extern GRFFile *_first_grffile;
+enum ShoreReplacement {
+ SHORE_REPLACE_NONE, ///< No shore sprites were replaced.
+ SHORE_REPLACE_ACTION_5, ///< Shore sprites were replaced by Action5.
+ SHORE_REPLACE_ACTION_A, ///< Shore sprites were replaced by ActionA (using grass tiles for the corner-shores).
+ SHORE_REPLACE_ONLY_NEW, ///< Only corner-shores were loaded by Action5 (openttd(w/d).grf only).
+};
+
struct GRFLoadedFeatures {
bool has_2CC; ///< Set if any vehicle is loaded which uses 2cc (two company colours).
bool has_newhouses; ///< Set if there are any newhouses loaded.
bool has_newindustries; ///< Set if there are any newindustries loaded.
+ ShoreReplacement shore; ///< It which way shore sprites were replaced.
};
/* Indicates which are the newgrf features currently loaded ingame */
--- a/src/newgrf_canal.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_canal.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -22,7 +22,8 @@
* three functions are stubs. */
static uint32 CanalGetRandomBits(const ResolverObject *object)
{
- return GetWaterTileRandomBits(object->u.canal.tile);
+ /* Return random bits only for water tiles, not station tiles */
+ return IsTileType(object->u.canal.tile, MP_WATER) ? GetWaterTileRandomBits(object->u.canal.tile) : 0;
}
--- a/src/newgrf_commons.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_commons.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -15,6 +15,7 @@
#include "tile_map.h"
#include "station_map.h"
#include "settings_type.h"
+#include "tree_map.h"
/** Constructor of generic class
* @param offset end of original data for this entity. i.e: houses = 110
@@ -265,7 +266,7 @@
uint32 GetTerrainType(TileIndex tile)
{
switch (_opt.landscape) {
- case LT_TROPIC: return GetTropicZone(tile) == TROPICZONE_DESERT ? 1 : 2;
+ case LT_TROPIC: return GetTropicZone(tile);
case LT_ARCTIC: return GetTileZ(tile) > GetSnowLine() ? 4 : 0;
default: return 0;
}
@@ -285,3 +286,22 @@
/* Make sure we never roam outside of the map */
return TILE_MASK(tile + TileDiffXY(x, y));
}
+
+/**
+ * Common part of station var 0x67 , house var 0x62, indtile var 0x60, industry var 0x62.
+ *
+ * @param tile the tile of interest.
+ * @return 0czzbbss: c = TileType; zz = TileZ; bb: 7-3 zero, 4-2 TerrainType, 1 water/shore, 0 zero; ss = TileSlope
+ */
+uint32 GetNearbyTileInformation(TileIndex tile)
+{
+ TileType tile_type = GetTileType(tile);
+
+ /* Fake tile type for trees on shore */
+ if (IsTileType(tile, MP_TREES) && GetTreeGround(tile) == TREE_GROUND_SHORE) tile_type = MP_WATER;
+
+ uint z;
+ Slope tileh = GetTileSlope(tile, &z);
+ byte terrain_type = GetTerrainType(tile) << 2 | (tile_type == MP_WATER ? 1 : 0) << 1;
+ return tile_type << 24 | z << 16 | terrain_type << 8 | tileh;
+}
--- a/src/newgrf_commons.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_commons.h Sun Feb 03 20:34:26 2008 +0000
@@ -93,5 +93,6 @@
uint32 GetTerrainType(TileIndex tile);
TileIndex GetNearbyTile(byte parameter, TileIndex tile);
+uint32 GetNearbyTileInformation(TileIndex tile);
#endif /* NEWGRF_COMMONS_H */
--- a/src/newgrf_house.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_house.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -170,14 +170,8 @@
uint32 GetNearbyTileInformation(byte parameter, TileIndex tile)
{
- uint32 tile_type;
-
tile = GetNearbyTile(parameter, tile);
- tile_type = GetTerrainType(tile) << 2 | (IsTileType(tile, MP_WATER) ? 1 : 0) << 1;
-
- uint z;
- Slope tileh = GetTileSlope(tile, &z);
- return GetTileType(tile) << 24 | z << 16 | tile_type << 8 | tileh;
+ return GetNearbyTileInformation(tile);
}
/**
--- a/src/newgrf_industries.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_industries.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -25,6 +25,8 @@
#include "table/strings.h"
+static Randomizer _industry_creation_randomizer;
+
/* Since the industry IDs defined by the GRF file don't necessarily correlate
* to those used by the game, the IDs used for overriding old industries must be
* translated when the idustry spec is set. */
@@ -465,13 +467,16 @@
/* Square of Euclidian distance from town */
case 0x8D: return min(DistanceSquare(industry->town->xy, tile), 65535);
+
+ /* 32 random bits */
+ case 0x8F: return _industry_creation_randomizer.Next();
}
/* None of the special ones, so try the general ones */
return IndustryGetVariable(object, variable, parameter, available);
}
-bool CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, uint itspec_index)
+bool CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, uint itspec_index, uint32 seed)
{
const IndustrySpec *indspec = GetIndustrySpec(type);
@@ -489,6 +494,7 @@
NewIndustryResolver(&object, tile, &ind, type);
object.GetVariable = IndustryLocationGetVariable;
object.callback = CBID_INDUSTRY_LOCATION;
+ _industry_creation_randomizer.SetSeed(seed);
group = Resolve(GetIndustrySpec(type)->grf_prop.spritegroup, &object);
--- a/src/newgrf_industries.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_industries.h Sun Feb 03 20:34:26 2008 +0000
@@ -30,7 +30,7 @@
uint16 GetIndustryCallback(CallbackID callback, uint32 param1, uint32 param2, Industry *industry, IndustryType type, TileIndex tile);
uint32 GetIndustryIDAtOffset(TileIndex new_tile, const Industry *i);
void IndustryProductionCallback(Industry *ind, int reason);
-bool CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, uint itspec_index);
+bool CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, uint itspec_index, uint32 seed);
bool CheckIfCallBackAllowsAvailability(IndustryType type, IndustryAvailabilityCallType creation_type);
IndustryType MapNewGRFIndustryType(IndustryType grf_type, uint32 grf_id);
--- a/src/newgrf_industrytiles.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_industrytiles.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -45,16 +45,10 @@
*/
uint32 GetNearbyIndustryTileInformation(byte parameter, TileIndex tile, IndustryID index)
{
- byte tile_type;
- bool is_same_industry;
-
if (parameter != 0) tile = GetNearbyTile(parameter, tile); // only perform if it is required
- is_same_industry = (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == index);
- tile_type = GetTerrainType(tile) << 2 | (IsTileType(tile, MP_WATER) ? 1 : 0) << 1 | (is_same_industry ? 1 : 0);
+ bool is_same_industry = (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == index);
- uint z;
- Slope tileh = GetTileSlope(tile, &z);
- return GetTileType(tile) << 24 | z << 16 | tile_type << 8 | tileh;
+ return GetNearbyTileInformation(tile) | (is_same_industry ? 1 : 0) << 8;
}
/** This is the position of the tile relative to the northernmost tile of the industry.
--- a/src/newgrf_spritegroup.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_spritegroup.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -92,6 +92,7 @@
case 0x0C: return object->callback;
case 0x10: return object->callback_param1;
case 0x11: return 0;
+ case 0x12: return _game_mode;
case 0x18: return object->callback_param2;
case 0x1A: return UINT_MAX;
case 0x1B: return GB(_display_opt, 0, 6);
--- a/src/newgrf_station.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_station.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -426,12 +426,11 @@
Axis axis = GetRailStationAxis(tile);
if (parameter != 0) tile = GetNearbyTile(parameter, tile); // only perform if it is required
- byte tile_type = GetTerrainType(tile) << 2 | (IsTileType(tile, MP_WATER) ? 1 : 0) << 1;
- uint z;
- Slope tileh = GetTileSlope(tile, &z);
- bool swap = (axis == AXIS_Y && HasBit(tileh, 0) != HasBit(tileh, 2));
- return GetTileType(tile) << 24 | z << 16 | tile_type << 8 | (tileh ^ (swap ? 5 : 0));
+ Slope tileh = GetTileSlope(tile, NULL);
+ bool swap = (axis == AXIS_Y && HasBit(tileh, SLOPE_W) != HasBit(tileh, SLOPE_E));
+
+ return GetNearbyTileInformation(tile) ^ (swap ? SLOPE_EW : 0);
}
case 0x68: { // Station info of nearby tiles
--- a/src/newgrf_text.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_text.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -293,6 +293,9 @@
case 0xB6: d += Utf8Encode(d, SCC_BUS); break;
case 0xB7: d += Utf8Encode(d, SCC_PLANE); break;
case 0xB8: d += Utf8Encode(d, SCC_SHIP); break;
+ case 0xB9: d += Utf8Encode(d, SCC_SUPERSCRIPT_M1); break;
+ case 0xBC: d += Utf8Encode(d, SCC_SMALLUPARROW); break;
+ case 0xBD: d += Utf8Encode(d, SCC_SMALLDOWNARROW); break;
default:
/* Validate any unhandled character */
if (!IsValidChar(c, CS_ALPHANUMERAL)) c = '?';
@@ -402,7 +405,7 @@
}
-char *GetGRFString(char *buff, uint16 stringid, const char* last)
+const char *GetGRFStringPtr(uint16 stringid)
{
const GRFText *default_text = NULL;
const GRFText *search_text;
@@ -415,7 +418,7 @@
/*Search the list of lang-strings of this stringid for current lang */
for (search_text = _grf_text[stringid].textholder; search_text != NULL; search_text = search_text->next) {
if (search_text->langid == _currentLangID) {
- return strecpy(buff, search_text->text, last);
+ return search_text->text;
}
/* If the current string is English or American, set it as the
@@ -426,10 +429,10 @@
}
/* If there is a fallback string, return that */
- if (default_text != NULL) return strecpy(buff, default_text->text, last);
+ if (default_text != NULL) return default_text->text;
/* Use the default string ID if the fallback string isn't available */
- return GetString(buff, _grf_text[stringid].def_string, last);
+ return GetStringPtr(_grf_text[stringid].def_string);
}
/**
--- a/src/newgrf_text.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/newgrf_text.h Sun Feb 03 20:34:26 2008 +0000
@@ -8,7 +8,7 @@
StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid, bool new_scheme, const char *text_to_add, StringID def_string);
StringID GetGRFStringID(uint32 grfid, uint16 stringid);
-char *GetGRFString(char *buff, uint16 stringid, const char* last);
+const char *GetGRFStringPtr(uint16 stringid);
void CleanUpStrings();
void SetCurrentGrfLangID(const char *iso_name);
char *TranslateTTDPatchCodes(const char *str);
--- a/src/npf.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/npf.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -22,6 +22,7 @@
#include "functions.h"
#include "vehicle_base.h"
#include "settings_type.h"
+#include "tunnelbridge.h"
static AyStar _npf_aystar;
@@ -176,9 +177,7 @@
if (GetTunnelBridgeDirection(tile) == ReverseDiagDir(exitdir)) {
/* We just popped out if this tunnel, since were
* facing the tunnel exit */
- FindLengthOfTunnelResult flotr;
- flotr = FindLengthOfTunnel(tile, ReverseDiagDir(exitdir));
- return flotr.length * NPF_TILE_LENGTH;
+ return NPF_TILE_LENGTH * (GetTunnelBridgeLength(current->tile, GetOtherTunnelEnd(current->tile)) + 1);
/* @todo: Penalty for tunnels? */
} else {
/* We are entering the tunnel, the enter tile is just a
@@ -189,7 +188,7 @@
static inline uint NPFBridgeCost(AyStarNode *current)
{
- return NPF_TILE_LENGTH * GetBridgeLength(current->tile, GetOtherBridgeEnd(current->tile));
+ return NPF_TILE_LENGTH * GetTunnelBridgeLength(current->tile, GetOtherBridgeEnd(current->tile));
}
static uint NPFSlopeCost(AyStarNode* current)
--- a/src/oldloader.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/oldloader.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -1456,7 +1456,7 @@
OCL_VAR ( OC_FILE_U16 | OC_VAR_U32, 1, &_date ),
OCL_VAR ( OC_UINT16, 1, &_date_fract ),
OCL_NULL( 600 ), ///< TextEffects
- OCL_VAR ( OC_UINT32, 2, &_random_seeds[0] ),
+ OCL_VAR ( OC_UINT32, 2, &_random.state ),
OCL_ASSERT( 0x264 ),
OCL_CHUNK( 70, LoadOldTown ),
@@ -1620,23 +1620,14 @@
* clear it for ourselves and let OTTD's rebuild PBS itself */
_m[i].m4 &= 0xF; /* Only keep the lower four bits; upper four is PBS */
break;
- case MP_WATER: {
- /* TTDPatch has all tiles touching water as coast (water)-type, we don't.
- * This is only true from a certain TTDP version, but there is no harm
- * in checking all the time */
- Slope s = GetTileSlope(i, NULL);
- if (s == SLOPE_ENW || s == SLOPE_NWS || s == SLOPE_SEN || s == SLOPE_WSE || IsSteepSlope(s)) {
- SetTileType(i, MP_CLEAR);
- SetTileOwner(i, OWNER_NONE);
- }
- } break;
default: break;
}
}
/* Make sure the available engines are really available, otherwise
* we will get a "new vehicle"-spree. */
- for (Engine *e = _engines; e != endof(_engines); e++) {
+ Engine *e;
+ FOR_ALL_ENGINES(e) {
if (_date >= (e->intro_date + 365)) {
e->flags = (e->flags & ~ENGINE_EXCLUSIVE_PREVIEW) | ENGINE_AVAILABLE;
e->player_avail = (byte)-1;
--- a/src/openttd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/openttd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -78,6 +78,7 @@
#include "tree_map.h"
#include "tunnelbridge_map.h"
#include "void_map.h"
+#include "water.h"
#include <stdarg.h>
@@ -1716,8 +1717,8 @@
case MP_TUNNELBRIDGE:
/* Middle part of "old" bridges */
- if (old_bridge && IsBridgeTile(t) && HasBit(_m[t].m5, 6)) break;
- if ((IsTunnel(t) ? GetTunnelBridgeTransportType(t) : (old_bridge ? (TransportType)GB(_m[t].m5, 1, 2) : GetTunnelBridgeTransportType(t))) == TRANSPORT_ROAD) {
+ if (old_bridge && IsBridge(t) && HasBit(_m[t].m5, 6)) break;
+ if (((old_bridge && IsBridge(t)) ? (TransportType)GB(_m[t].m5, 1, 2) : GetTunnelBridgeTransportType(t)) == TRANSPORT_ROAD) {
SetRoadTypes(t, ROADTYPES_ROAD);
}
break;
@@ -1759,7 +1760,15 @@
if (GB(_m[t].m5, 3, 2) == 0) {
MakeClear(t, CLEAR_GRASS, 3);
} else {
- MakeCanal(t, (GetTileOwner(t) == OWNER_WATER) ? OWNER_NONE : GetTileOwner(t), Random());
+ if (GetTileSlope(t, NULL) != SLOPE_FLAT) {
+ MakeShore(t);
+ } else {
+ if (GetTileOwner(t) == OWNER_WATER) {
+ MakeWater(t);
+ } else {
+ MakeCanal(t, GetTileOwner(t), Random());
+ }
+ }
}
}
SetBridgeMiddle(t, axis);
@@ -2364,9 +2373,31 @@
}
if (CheckSavegameVersion(86)) {
- /* Now all crossings should be in correct state */
for (TileIndex t = 0; t < map_size; t++) {
+ /* Now all crossings should be in correct state */
if (IsLevelCrossingTile(t)) UpdateLevelCrossing(t, false);
+
+ /* Move river flag and update canals to use water class */
+ if (IsTileType(t, MP_WATER)) {
+ if (_m[t].m5 == 2) {
+ MakeRiver(t, Random());
+ } else {
+ Owner o = GetTileOwner(t);
+ if (IsWater(t) && o != OWNER_WATER) {
+ MakeCanal(t, o, Random());
+ }
+ }
+ }
+ }
+
+ /* Update locks, depots, docks and buoys to have a water class based
+ * on its neighbouring tiles. Done after river and canal updates to
+ * ensure neighbours are correct. */
+ for (TileIndex t = 0; t < map_size; t++) {
+ if (GetTileSlope(t, NULL) != SLOPE_FLAT) continue;
+
+ if (IsTileType(t, MP_WATER) && (GetWaterTileType(t) == WATER_TILE_LOCK || IsShipDepot(t))) SetWaterClassDependingOnSurroundings(t);
+ if (IsTileType(t, MP_STATION) && (IsDock(t) || IsBuoy(t))) SetWaterClassDependingOnSurroundings(t);
}
}
--- a/src/order.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/order.h Sun Feb 03 20:34:26 2008 +0000
@@ -212,7 +212,6 @@
bool VehicleHasDepotOrders(const Vehicle *v);
void CheckOrders(const Vehicle*);
void DeleteVehicleOrders(Vehicle *v);
-bool IsOrderListShared(const Vehicle *v);
void AssignOrder(Order *order, Order data);
bool CheckForValidOrders(const Vehicle* v);
--- a/src/order_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/order_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -837,7 +837,7 @@
}
/* make sure there are orders available */
- delta = IsOrderListShared(dst) ? src->num_orders + 1 : src->num_orders - dst->num_orders;
+ delta = dst->IsOrderListShared() ? src->num_orders + 1 : src->num_orders - dst->num_orders;
if (!HasOrderPoolFree(delta))
return_cmd_error(STR_8831_NO_MORE_SPACE_FOR_ORDERS);
@@ -939,7 +939,7 @@
if (v->name != NULL) bak->name = strdup(v->name);
/* If we have shared orders, store it on a special way */
- if (IsOrderListShared(v)) {
+ if (v->IsOrderListShared()) {
const Vehicle *u = (v->next_shared) ? v->next_shared : v->prev_shared;
bak->clone = u->index;
@@ -1209,7 +1209,7 @@
/* If we have a shared order-list, don't delete the list, but just
remove our pointer */
- if (IsOrderListShared(v)) {
+ if (v->IsOrderListShared()) {
Vehicle *u = v;
v->orders = NULL;
@@ -1257,17 +1257,6 @@
return (_patches.servint_ispercent) ? Clamp(index, MIN_SERVINT_PERCENT, MAX_SERVINT_PERCENT) : Clamp(index, MIN_SERVINT_DAYS, MAX_SERVINT_DAYS);
}
-/**
- *
- * Check if we share our orders with an other vehicle
- *
- * @return Returns the vehicle who has the same order
- *
- */
-bool IsOrderListShared(const Vehicle *v)
-{
- return v->next_shared != NULL || v->prev_shared != NULL;
-}
/**
*
--- a/src/order_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/order_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -93,19 +93,19 @@
static StringID StationOrderStrings[] = {
STR_8806_GO_TO,
- STR_8807_GO_TO_TRANSFER,
- STR_8808_GO_TO_UNLOAD,
- STR_8809_GO_TO_TRANSFER_UNLOAD,
- STR_880A_GO_TO_LOAD,
- STR_880B_GO_TO_TRANSFER_LOAD,
+ STR_GO_TO_TRANSFER,
+ STR_8807_GO_TO_UNLOAD,
+ STR_GO_TO_TRANSFER_UNLOAD,
+ STR_8808_GO_TO_LOAD,
+ STR_GO_TO_TRANSFER_LOAD,
STR_NULL,
STR_NULL,
- STR_880C_GO_NON_STOP_TO,
- STR_880D_GO_TO_NON_STOP_TRANSFER,
- STR_880E_GO_NON_STOP_TO_UNLOAD,
- STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD,
- STR_8810_GO_NON_STOP_TO_LOAD,
- STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD,
+ STR_880A_GO_NON_STOP_TO,
+ STR_GO_TO_NON_STOP_TRANSFER,
+ STR_880B_GO_NON_STOP_TO_UNLOAD,
+ STR_GO_TO_NON_STOP_TRANSFER_UNLOAD,
+ STR_880C_GO_NON_STOP_TO_LOAD,
+ STR_GO_TO_NON_STOP_TRANSFER_LOAD,
STR_NULL
};
@@ -120,7 +120,7 @@
v = GetVehicle(w->window_number);
- shared_orders = IsOrderListShared(v);
+ shared_orders = v->IsOrderListShared();
SetVScrollCount(w, v->num_orders + 1);
@@ -216,7 +216,7 @@
switch (v->type) {
case VEH_TRAIN: s = (order->flags & OFB_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break;
- case VEH_ROAD: s = STR_9038_GO_TO_ROADVEH_DEPOT; break;
+ case VEH_ROAD: s = STR_GO_TO_ROADVEH_DEPOT; break;
case VEH_SHIP: s = STR_GO_TO_SHIP_DEPOT; break;
default: break;
}
@@ -761,7 +761,7 @@
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 212, 264, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, // ORDER_WIDGET_FULL_LOAD
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_886F_TRANSFER, STR_886D_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 373, 386, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST
@@ -798,7 +798,7 @@
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 193, 256, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, // ORDER_WIDGET_FULL_LOAD
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_886F_TRANSFER, STR_886D_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 384, 397, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST
--- a/src/pathfind.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/pathfind.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -17,6 +17,7 @@
#include "depot.h"
#include "tunnelbridge_map.h"
#include "core/random_func.hpp"
+#include "tunnelbridge.h"
/* remember which tiles we have already visited so we don't visit them again. */
static bool TPFSetTileBit(TrackPathFinder *tpf, TileIndex tile, int dir)
@@ -192,69 +193,64 @@
}
-
-/* Returns the end tile and the length of a tunnel. The length does not
- * include the starting tile (entry), it does include the end tile (exit).
+/**
+ * Checks if any vehicle can enter/leave tile in given diagdir
+ * Checks only for rail/road depots and road non-drivethrough stations
+ * @param tile tile to check
+ * @param side side of tile we are trying to leave/enter
+ * @param tracktype type of transport
+ * @pre tile has trackbit at that diagdir
+ * @return true iff vehicle can enter/leve the tile in given side
*/
-FindLengthOfTunnelResult FindLengthOfTunnel(TileIndex tile, DiagDirection dir)
+static inline bool CanAccessTileInDir(TileIndex tile, DiagDirection side, TransportType tracktype)
{
- TileIndexDiff delta = TileOffsByDiagDir(dir);
- uint z = GetTileZ(tile);
- FindLengthOfTunnelResult flotr;
-
- flotr.length = 0;
+ if (tracktype == TRANSPORT_RAIL) {
+ /* depot from wrong side */
+ if (IsTileDepotType(tile, TRANSPORT_RAIL) && GetRailDepotDirection(tile) != side) return false;
+ } else if (tracktype == TRANSPORT_ROAD) {
+ /* depot from wrong side */
+ if (IsTileDepotType(tile, TRANSPORT_ROAD) && GetRoadDepotDirection(tile) != side) return false;
+ /* non-driverthrough road station from wrong side */
+ if (IsStandardRoadStopTile(tile) && GetRoadStopDir(tile) != side) return false;
+ }
- dir = ReverseDiagDir(dir);
- do {
- flotr.length++;
- tile += delta;
- } while(
- !IsTunnelTile(tile) ||
- GetTunnelBridgeDirection(tile) != dir ||
- GetTileZ(tile) != z
- );
-
- flotr.tile = tile;
- return flotr;
+ return true;
}
static const uint16 _tpfmode1_and[4] = { 0x1009, 0x16, 0x520, 0x2A00 };
-static uint SkipToEndOfTunnel(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction)
+static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction)
{
- FindLengthOfTunnelResult flotr;
- TPFSetTileBit(tpf, tile, 14);
- flotr = FindLengthOfTunnel(tile, direction);
- tpf->rd.cur_length += flotr.length;
- TPFSetTileBit(tpf, flotr.tile, 14);
- return flotr.tile;
-}
-
-static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction);
+ const TileIndex tile_org = tile;
-/** Most code of the "Normal" case of TPF Mode 1; for signals special tricks
- * have to be done, but those happen in TPFMode1; this is just to prevent
- * gotos ;). */
-static inline void TPFMode1_NormalCase(TrackPathFinder* tpf, TileIndex tile, TileIndex tile_org, DiagDirection direction)
-{
- /* Check in case of rail if the owner is the same */
- if (tpf->tracktype == TRANSPORT_RAIL) {
- /* don't enter train depot from the back */
- if (IsTileDepotType(tile, TRANSPORT_RAIL) && GetRailDepotDirection(tile) == direction) return;
+ if (IsTileType(tile, MP_TUNNELBRIDGE)) {
+ /* wrong track type */
+ if (GetTunnelBridgeTransportType(tile) != tpf->tracktype) return;
- if (IsTileType(tile_org, MP_RAILWAY) || IsTileType(tile_org, MP_STATION) || IsTileType(tile_org, MP_TUNNELBRIDGE))
- if (IsTileType(tile, MP_RAILWAY) || IsTileType(tile, MP_STATION) || IsTileType(tile, MP_TUNNELBRIDGE))
- if (GetTileOwner(tile_org) != GetTileOwner(tile)) return;
+ DiagDirection dir = GetTunnelBridgeDirection(tile);
+ /* entering tunnel / bridge? */
+ if (dir == direction) {
+ TileIndex endtile = GetOtherTunnelBridgeEnd(tile);
+
+ tpf->rd.cur_length += GetTunnelBridgeLength(tile, endtile) + 1;
+
+ TPFSetTileBit(tpf, tile, 14);
+ TPFSetTileBit(tpf, endtile, 14);
+
+ tile = endtile;
+ } else {
+ /* leaving tunnel / bridge? */
+ if (ReverseDiagDir(dir) != direction) return;
+ }
+ } else {
+ /* can we leave tile in this dir? */
+ if (!CanAccessTileInDir(tile, direction, tpf->tracktype)) return;
}
- /* check if the new tile can be entered from that direction */
- if (tpf->tracktype == TRANSPORT_ROAD) {
- /* road stops and depots now have a track (r4419)
- * don't enter road stop from the back */
- if (IsStandardRoadStopTile(tile) && ReverseDiagDir(GetRoadStopDir(tile)) != direction) return;
- /* don't enter road depot from the back */
- if (IsTileDepotType(tile, TRANSPORT_ROAD) && ReverseDiagDir(GetRoadDepotDirection(tile)) != direction) return;
- }
+ tile += TileOffsByDiagDir(direction);
+
+ /* can we enter tile in this dir? */
+ if (!CanAccessTileInDir(tile, ReverseDiagDir(direction), tpf->tracktype)) return;
/* Check if the new tile is a tunnel or bridge head and that the direction
* and transport type match */
@@ -265,10 +261,17 @@
}
}
+ uint32 bits = GetTileTrackStatus(tile, tpf->tracktype, tpf->sub_type);
+
+ /* Check in case of rail if the owner is the same */
+ if (tpf->tracktype == TRANSPORT_RAIL) {
+ if (bits != 0 && GetTileTrackStatus(tile_org, TRANSPORT_RAIL, 0) != 0) {
+ if (GetTileOwner(tile_org) != GetTileOwner(tile)) return;
+ }
+ }
+
tpf->rd.cur_length++;
- uint bits = GetTileTrackStatus(tile, tpf->tracktype, tpf->sub_type);
-
if ((byte)bits != tpf->var2) {
bits &= _tpfmode1_and[direction];
bits |= bits >> 8;
@@ -294,84 +297,6 @@
}
}
-static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction)
-{
- TileIndex tile_org = tile;
-
- if (IsTileType(tile, MP_TUNNELBRIDGE)) {
- if (IsTunnel(tile)) {
- if (GetTunnelBridgeTransportType(tile) != tpf->tracktype) {
- return;
- }
- /* Only skip through the tunnel if heading inwards. We can
- * be headed outwards if our starting position was in a
- * tunnel and we're pathfinding backwards */
- if (GetTunnelBridgeDirection(tile) == direction) {
- tile = SkipToEndOfTunnel(tpf, tile, direction);
- } else if (GetTunnelBridgeDirection(tile) != ReverseDiagDir(direction)) {
- /* We don't support moving through the sides of a tunnel
- * entrance :-) */
- return;
- }
- } else {
- TileIndex tile_end;
- if (GetTunnelBridgeDirection(tile) != direction ||
- GetTunnelBridgeTransportType(tile) != tpf->tracktype) {
- return;
- }
- //fprintf(stderr, "%s: Planning over bridge\n", __func__);
- // TODO doesn't work - WHAT doesn't work?
- TPFSetTileBit(tpf, tile, 14);
- tile_end = GetOtherBridgeEnd(tile);
- tpf->rd.cur_length += DistanceManhattan(tile, tile_end);
- tile = tile_end;
- TPFSetTileBit(tpf, tile, 14);
- }
- }
- tile += TileOffsByDiagDir(direction);
-
- TPFMode1_NormalCase(tpf, tile, tile_org, direction);
-
- /* the next is only used when signals are checked.
- * seems to go in 2 directions simultaneously */
-
- /* if i can get rid of this, tail end recursion can be used to minimize
- * stack space dramatically. */
-
- /* If we are doing signal setting, we must reverse at evere tile, so we
- * iterate all the tracks in a signal block, even when a normal train would
- * not reach it (for example, when two lines merge */
- if (tpf->hasbit_13)
- return;
-
- direction = ReverseDiagDir(direction);
- tile += TileOffsByDiagDir(direction);
-
- uint bits = GetTileTrackStatus(tile, tpf->tracktype, tpf->sub_type);
- bits |= (bits >> 8);
-
- if ( (byte)bits != tpf->var2) {
- bits &= _bits_mask[direction];
- }
-
- bits &= 0xBF;
- if (bits == 0)
- return;
-
- do {
- uint i = FIND_FIRST_BIT(bits);
- bits = KillFirstBit(bits);
-
- tpf->the_dir = (Trackdir)((_otherdir_mask[direction] & (byte)(1 << i)) ? (i + 8) : i);
- RememberData rd = tpf->rd;
- if (TPFSetTileBit(tpf, tile, tpf->the_dir) &&
- !tpf->enum_proc(tile, tpf->userdata, tpf->the_dir, tpf->rd.cur_length, &tpf->rd.pft_var6) ) {
- TPFMode1(tpf, tile, _tpf_new_direction[tpf->the_dir]);
- }
- tpf->rd = rd;
- } while (bits != 0);
-}
-
void FollowTrack(TileIndex tile, uint16 flags, uint sub_type, DiagDirection direction, TPFEnumProc *enum_proc, TPFAfterProc *after_proc, void *data)
{
TrackPathFinder tpf;
@@ -391,7 +316,6 @@
tpf.var2 = HasBit(flags, 15) ? 0x43 : 0xFF; // 0x8000
tpf.disable_tile_hash = HasBit(flags, 12); // 0x1000
- tpf.hasbit_13 = HasBit(flags, 13); // 0x2000
tpf.tracktype = (TransportType)(flags & 0xFF);
@@ -716,8 +640,6 @@
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
if (IsTunnel(tile)) {
if (GetTunnelBridgeDirection(tile) != ReverseDiagDir(direction)) {
- FindLengthOfTunnelResult flotr;
-
/* We are not just driving out of the tunnel */
if (GetTunnelBridgeDirection(tile) != direction ||
GetTunnelBridgeTransportType(tile) != tpf->tracktype) {
@@ -728,12 +650,13 @@
bits = TRACK_BIT_NONE;
break;
}
- flotr = FindLengthOfTunnel(tile, direction);
- si.cur_length += flotr.length * DIAG_FACTOR;
- tile = flotr.tile;
+
+ TileIndex endtile = GetOtherTunnelEnd(tile);
+ si.cur_length += DIAG_FACTOR * (GetTunnelBridgeLength(tile, endtile) + 1);
+ tile = endtile;
/* tile now points to the exit tile of the tunnel */
}
- } else {
+ } else { // IsBridge(tile)
TileIndex tile_end;
if (GetTunnelBridgeDirection(tile) != ReverseDiagDir(direction)) {
/* We are not just leaving the bridge */
@@ -744,7 +667,7 @@
}
}
tile_end = GetOtherBridgeEnd(tile);
- si.cur_length += DistanceManhattan(tile, tile_end) * DIAG_FACTOR;
+ si.cur_length += DIAG_FACTOR * (GetTunnelBridgeLength(tile, tile_end) + 1);
tile = tile_end;
}
}
--- a/src/pathfind.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/pathfind.h Sun Feb 03 20:34:26 2008 +0000
@@ -60,7 +60,6 @@
byte var2;
bool disable_tile_hash;
- bool hasbit_13;
uint16 hash_head[0x400];
TileIndex hash_tile[0x400]; ///< stores the link index when multi link.
@@ -69,13 +68,6 @@
};
void FollowTrack(TileIndex tile, uint16 flags, uint sub_type, DiagDirection direction, TPFEnumProc* enum_proc, TPFAfterProc* after_proc, void* data);
-
-struct FindLengthOfTunnelResult {
- TileIndex tile;
- int length;
-};
-FindLengthOfTunnelResult FindLengthOfTunnel(TileIndex tile, DiagDirection direction);
-
void NewTrainPathfind(TileIndex tile, TileIndex dest, RailTypes railtypes, DiagDirection direction, NTPEnumProc* enum_proc, void* data);
#endif /* PATHFIND_H */
--- a/src/rail.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/rail.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -167,11 +167,12 @@
{
RailTypes rt = RAILTYPES_NONE;
- for (EngineID i = 0; i != TOTAL_NUM_ENGINES; i++) {
+ EngineID i;
+ FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_TRAIN) {
const Engine* e = GetEngine(i);
const EngineInfo *ei = EngInfo(i);
- if (e->type == VEH_TRAIN && HasBit(ei->climates, _opt.landscape) &&
+ if (HasBit(ei->climates, _opt.landscape) &&
(HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) {
const RailVehicleInfo *rvi = RailVehInfo(i);
--- a/src/rail_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/rail_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -40,6 +40,7 @@
#include "vehicle_func.h"
#include "sound_func.h"
#include "signal_func.h"
+#include "tunnelbridge.h"
#include "table/sprites.h"
#include "table/strings.h"
@@ -238,11 +239,11 @@
return (valid_on_leveled ? FOUNDATION_LEVELED : FOUNDATION_INVALID);
case TRACK_BIT_X:
- if (HasSlopeHighestCorner(tileh)) return FOUNDATION_INCLINED_X;
+ if (IsSlopeWithOneCornerRaised(tileh)) return FOUNDATION_INCLINED_X;
return (valid_on_leveled ? FOUNDATION_LEVELED : FOUNDATION_INVALID);
case TRACK_BIT_Y:
- if (HasSlopeHighestCorner(tileh)) return FOUNDATION_INCLINED_Y;
+ if (IsSlopeWithOneCornerRaised(tileh)) return FOUNDATION_INCLINED_Y;
return (valid_on_leveled ? FOUNDATION_LEVELED : FOUNDATION_INVALID);
default:
@@ -254,7 +255,7 @@
if (!valid_on_leveled) return FOUNDATION_INVALID;
/* If slope has three raised corners, build leveled foundation */
- if (HasSlopeHighestCorner(ComplementSlope(tileh))) return FOUNDATION_LEVELED;
+ if (IsSlopeWithThreeCornersRaised(tileh)) return FOUNDATION_LEVELED;
/* If neighboured corners of track_corner are lowered, build halftile foundation */
if ((tileh & SlopeWithThreeCornersRaised(OppositeCorner(track_corner))) == SlopeWithOneCornerRaised(track_corner)) return HalftileFoundation(track_corner);
@@ -395,7 +396,8 @@
/* FALLTHROUGH */
default:
- bool water_ground = IsTileType(tile, MP_WATER) && !IsSteepSlope(tileh) && HasSlopeHighestCorner(tileh);
+ /* Will there be flat water on the lower halftile? */
+ bool water_ground = IsTileType(tile, MP_WATER) && IsSlopeWithOneCornerRaised(tileh);
ret = CheckRailSlope(tileh, trackbit, TRACK_BIT_NONE, tile);
if (CmdFailed(ret)) return ret;
@@ -485,7 +487,9 @@
owner = GetTileOwner(tile);
present ^= trackbit;
if (present == 0) {
- if (GetRailGroundType(tile) == RAIL_GROUND_WATER) {
+ Slope tileh = GetTileSlope(tile, NULL);
+ /* If there is flat water on the lower halftile, convert the tile to shore so the water remains */
+ if (GetRailGroundType(tile) == RAIL_GROUND_WATER && IsSlopeWithOneCornerRaised(tileh)) {
MakeShore(tile);
} else {
DoClearSquare(tile);
@@ -539,7 +543,7 @@
Slope tileh = GetTileSlope(t, NULL);
TrackBits rail_bits = GetTrackBits(t);
- if (!IsSteepSlope(tileh) && HasSlopeHighestCorner(tileh)) {
+ if (IsSlopeWithOneCornerRaised(tileh)) {
TrackBits lower_track = CornerToTrackBits(OppositeCorner(GetHighestSlopeCorner(tileh)));
TrackBits to_remove = lower_track & rail_bits;
@@ -560,6 +564,15 @@
SetRailGroundType(t, RAIL_GROUND_WATER);
MarkTileDirtyByTile(t);
}
+ } else {
+ /* Make shore on steep slopes and 'three-corners-raised'-slopes. */
+ if (ApplyFoundationToSlope(GetRailFoundation(tileh, rail_bits), &tileh) == 0) {
+ if (IsSteepSlope(tileh) || IsSlopeWithThreeCornersRaised(tileh)) {
+ flooded = true;
+ SetRailGroundType(t, RAIL_GROUND_WATER);
+ MarkTileDirtyByTile(t);
+ }
+ }
}
return flooded;
}
@@ -939,7 +952,7 @@
* note that tile is a parameter by reference, so it must be updated */
tile = GetOtherTunnelBridgeEnd(tile);
- signal_ctr += 2 + DistanceMax(orig_tile, tile) * 2;
+ signal_ctr += (GetTunnelBridgeLength(orig_tile, tile) + 2) * 2;
return true;
}
@@ -1294,7 +1307,7 @@
}
}
- cost.AddCost((DistanceManhattan(tile, endtile) + 1) * RailConvertCost(type, totype));
+ cost.AddCost((GetTunnelBridgeLength(tile, endtile) + 2) * RailConvertCost(type, totype));
} break;
default: // MP_STATION, MP_ROAD
@@ -1353,7 +1366,9 @@
switch (GetRailTileType(tile)) {
case RAIL_TILE_SIGNALS:
case RAIL_TILE_NORMAL: {
- bool water_ground = (GetRailGroundType(tile) == RAIL_GROUND_WATER);
+ Slope tileh = GetTileSlope(tile, NULL);
+ /* Is there flat water on the lower halftile, that gets cleared expensively? */
+ bool water_ground = (GetRailGroundType(tile) == RAIL_GROUND_WATER && IsSlopeWithOneCornerRaised(tileh));
TrackBits tracks = GetTrackBits(tile);
while (tracks != TRACK_BIT_NONE) {
@@ -1496,9 +1511,7 @@
*/
static void DrawTrackFence_NS_1(const TileInfo *ti)
{
- int z = ti->z;
- if (ti->tileh & SLOPE_W) z += TILE_HEIGHT;
- if (IsSteepSlope(ti->tileh)) z += TILE_HEIGHT;
+ uint z = ti->z + GetSlopeZInCorner(RemoveHalftileSlope(ti->tileh), CORNER_W);
AddSortableSpriteToDraw(SPR_TRACK_FENCE_FLAT_VERT, _drawtile_track_palette,
ti->x + TILE_SIZE / 2, ti->y + TILE_SIZE / 2, 1, 1, 4, z);
}
@@ -1508,9 +1521,7 @@
*/
static void DrawTrackFence_NS_2(const TileInfo *ti)
{
- int z = ti->z;
- if (ti->tileh & SLOPE_E) z += TILE_HEIGHT;
- if (IsSteepSlope(ti->tileh)) z += TILE_HEIGHT;
+ uint z = ti->z + GetSlopeZInCorner(RemoveHalftileSlope(ti->tileh), CORNER_E);
AddSortableSpriteToDraw(SPR_TRACK_FENCE_FLAT_VERT, _drawtile_track_palette,
ti->x + TILE_SIZE / 2, ti->y + TILE_SIZE / 2, 1, 1, 4, z);
}
@@ -1520,9 +1531,7 @@
*/
static void DrawTrackFence_WE_1(const TileInfo *ti)
{
- int z = ti->z;
- if (ti->tileh & SLOPE_N) z += TILE_HEIGHT;
- if (IsSteepSlope(ti->tileh)) z += TILE_HEIGHT;
+ uint z = ti->z + GetSlopeZInCorner(RemoveHalftileSlope(ti->tileh), CORNER_N);
AddSortableSpriteToDraw(SPR_TRACK_FENCE_FLAT_HORZ, _drawtile_track_palette,
ti->x + TILE_SIZE / 2, ti->y + TILE_SIZE / 2, 1, 1, 4, z);
}
@@ -1532,9 +1541,7 @@
*/
static void DrawTrackFence_WE_2(const TileInfo *ti)
{
- int z = ti->z;
- if (ti->tileh & SLOPE_S) z += TILE_HEIGHT;
- if (IsSteepSlope(ti->tileh)) z += TILE_HEIGHT;
+ uint z = ti->z + GetSlopeZInCorner(RemoveHalftileSlope(ti->tileh), CORNER_S);
AddSortableSpriteToDraw(SPR_TRACK_FENCE_FLAT_HORZ, _drawtile_track_palette,
ti->x + TILE_SIZE / 2, ti->y + TILE_SIZE / 2, 1, 1, 4, z);
}
@@ -1553,8 +1560,16 @@
case RAIL_GROUND_FENCE_VERT2: DrawTrackFence_NS_2(ti); break;
case RAIL_GROUND_FENCE_HORIZ1: DrawTrackFence_WE_1(ti); break;
case RAIL_GROUND_FENCE_HORIZ2: DrawTrackFence_WE_2(ti); break;
- case RAIL_GROUND_WATER:
- switch (GetHalftileSlopeCorner(ti->tileh)) {
+ case RAIL_GROUND_WATER: {
+ Corner track_corner;
+ if (IsHalftileSlope(ti->tileh)) {
+ /* Steep slope or one-corner-raised slope with halftile foundation */
+ track_corner = GetHalftileSlopeCorner(ti->tileh);
+ } else {
+ /* Three-corner-raised slope */
+ track_corner = OppositeCorner(GetHighestSlopeCorner(ComplementSlope(ti->tileh)));
+ }
+ switch (track_corner) {
case CORNER_W: DrawTrackFence_NS_1(ti); break;
case CORNER_S: DrawTrackFence_WE_2(ti); break;
case CORNER_E: DrawTrackFence_NS_2(ti); break;
@@ -1562,6 +1577,7 @@
default: NOT_REACHED();
}
break;
+ }
default: break;
}
}
@@ -1574,6 +1590,15 @@
*/
static void DrawTrackBits(TileInfo* ti, TrackBits track)
{
+ /* SubSprite for drawing the track halftile of 'three-corners-raised'-sloped rail sprites. */
+ static const int INF = 1000; // big number compared to tilesprite size
+ static const SubSprite _halftile_sub_sprite[4] = {
+ { -INF , -INF , 32 - 33, INF }, // CORNER_W, clip 33 pixels from right
+ { -INF , 0 + 7, INF , INF }, // CORNER_S, clip 7 pixels from top
+ { -31 + 33, -INF , INF , INF }, // CORNER_E, clip 33 pixels from left
+ { -INF , -INF , INF , 30 - 23 } // CORNER_N, clip 23 pixels from bottom
+ };
+
const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile));
RailGroundType rgt = GetRailGroundType(ti->tile);
Foundation f = GetRailFoundation(ti->tileh, track);
@@ -1592,13 +1617,19 @@
SpriteID image;
SpriteID pal = PAL_NONE;
+ const SubSprite *sub = NULL;
bool junction = false;
/* Select the sprite to use. */
if (track == 0) {
/* Clear ground (only track on halftile foundation) */
if (rgt == RAIL_GROUND_WATER) {
- image = SPR_FLAT_WATER_TILE;
+ if (IsSteepSlope(ti->tileh)) {
+ DrawShoreTile(ti->tileh);
+ image = 0;
+ } else {
+ image = SPR_FLAT_WATER_TILE;
+ }
} else {
switch (rgt) {
case RAIL_GROUND_BARREN: image = SPR_FLAT_BARE_LAND; break;
@@ -1635,12 +1666,18 @@
switch (rgt) {
case RAIL_GROUND_BARREN: pal = PALETTE_TO_BARE_LAND; break;
case RAIL_GROUND_ICE_DESERT: image += rti->snow_offset; break;
- case RAIL_GROUND_WATER: NOT_REACHED();
+ case RAIL_GROUND_WATER: {
+ /* three-corner-raised slope */
+ DrawShoreTile(ti->tileh);
+ Corner track_corner = OppositeCorner(GetHighestSlopeCorner(ComplementSlope(ti->tileh)));
+ sub = &(_halftile_sub_sprite[track_corner]);
+ break;
+ }
default: break;
}
}
- DrawGroundSprite(image, pal);
+ if (image != 0) DrawGroundSprite(image, pal, sub);
/* Draw track pieces individually for junction tiles */
if (junction) {
@@ -1664,15 +1701,6 @@
case RAIL_GROUND_ICE_DESERT: image += rti->snow_offset; break;
default: break;
}
-
- static const int INF = 1000; // big number compared to tilesprite size
- static const SubSprite _halftile_sub_sprite[4] = {
- { -INF , -INF , 32 - 33, INF }, // CORNER_W, clip 33 pixels from right
- { -INF , 0 + 7, INF , INF }, // CORNER_S, clip 7 pixels from top
- { -31 + 33, -INF , INF , INF }, // CORNER_E, clip 33 pixels from left
- { -INF , -INF , INF , 30 - 23 } // CORNER_N, clip 23 pixels from bottom
- };
-
DrawGroundSprite(image, pal, &(_halftile_sub_sprite[halftile_corner]));
}
}
@@ -2216,14 +2244,15 @@
}
/* The height of the track_corner must not be changed. The rest ensures GetRailFoundation() already. */
- z_old += GetSlopeZInCorner((Slope)(tileh_old & ~SLOPE_HALFTILE_MASK), track_corner);
- z_new += GetSlopeZInCorner((Slope)(tileh_new & ~SLOPE_HALFTILE_MASK), track_corner);
+ z_old += GetSlopeZInCorner(RemoveHalftileSlope(tileh_old), track_corner);
+ z_new += GetSlopeZInCorner(RemoveHalftileSlope(tileh_new), track_corner);
if (z_old != z_new) return CMD_ERROR;
CommandCost cost = CommandCost(EXPENSES_CONSTRUCTION, _price.terraform);
/* Make the ground dirty, if surface slope has changed */
if (tileh_old != tileh_new) {
- if (GetRailGroundType(tile) == RAIL_GROUND_WATER) cost.AddCost(_price.clear_water);
+ /* If there is flat water on the lower halftile add the cost for clearing it */
+ if (GetRailGroundType(tile) == RAIL_GROUND_WATER && IsSlopeWithOneCornerRaised(tileh_old)) cost.AddCost(_price.clear_water);
if ((flags & DC_EXEC) != 0) SetRailGroundType(tile, RAIL_GROUND_BARREN);
}
return cost;
@@ -2235,7 +2264,8 @@
Slope tileh_old = GetTileSlope(tile, &z_old);
if (IsPlainRailTile(tile)) {
TrackBits rail_bits = GetTrackBits(tile);
- bool was_water = GetRailGroundType(tile) == RAIL_GROUND_WATER;
+ /* Is there flat water on the lower halftile, that must be cleared expensively? */
+ bool was_water = (GetRailGroundType(tile) == RAIL_GROUND_WATER && IsSlopeWithOneCornerRaised(tileh_old));
_error_message = STR_1008_MUST_REMOVE_RAILROAD_TRACK;
--- a/src/rail_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/rail_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -867,7 +867,12 @@
DrawStringCentered(74, 101 + y_offset, STR_3004_PLATFORM_LENGTH, TC_FROMSTRING);
DrawStringCentered(74, 141 + y_offset, STR_3066_COVERAGE_AREA_HIGHLIGHT, TC_FROMSTRING);
- DrawStationCoverageAreaText(2, 166 + y_offset, SCT_ALL, rad);
+ int text_end = DrawStationCoverageAreaText(2, 166 + y_offset, SCT_ALL, rad) + 4;
+ if (text_end > w->widget[BRSW_BACKGROUND].bottom) {
+ SetWindowDirty(w);
+ ResizeWindowForWidget(w, BRSW_BACKGROUND, 0, text_end - w->widget[BRSW_BACKGROUND].bottom);
+ SetWindowDirty(w);
+ }
if (newstations) {
uint y = 35;
@@ -1077,16 +1082,16 @@
{ WWT_TEXTBTN, RESIZE_NONE, 14, 52, 66, 87, 98, STR_00CD_3, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_3
{ WWT_TEXTBTN, RESIZE_NONE, 14, 67, 81, 87, 98, STR_00CE_4, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_4
{ WWT_TEXTBTN, RESIZE_NONE, 14, 82, 96, 87, 98, STR_00CF_5, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_5
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 87, 98, STR_0335_6, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_6
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 87, 98, STR_0336_7, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_7
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 87, 98, STR_6, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_6
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 87, 98, STR_7, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_7
{ WWT_TEXTBTN, RESIZE_NONE, 14, 22, 36, 112, 123, STR_00CB_1, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_1
{ WWT_TEXTBTN, RESIZE_NONE, 14, 37, 51, 112, 123, STR_00CC_2, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_2
{ WWT_TEXTBTN, RESIZE_NONE, 14, 52, 66, 112, 123, STR_00CD_3, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_3
{ WWT_TEXTBTN, RESIZE_NONE, 14, 67, 81, 112, 123, STR_00CE_4, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_4
{ WWT_TEXTBTN, RESIZE_NONE, 14, 82, 96, 112, 123, STR_00CF_5, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_5
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 112, 123, STR_0335_6, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_6
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 112, 123, STR_0336_7, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_7
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 112, 123, STR_6, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_6
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 112, 123, STR_7, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_7
{ WWT_TEXTBTN, RESIZE_NONE, 14, 37, 111, 126, 137, STR_DRAG_DROP, STR_STATION_DRAG_DROP}, // BRSW_PLATFORM_DRAG_N_DROP
{ WWT_TEXTBTN, RESIZE_NONE, 14, 14, 73, 152, 163, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE}, // BRSW_HIGHLIGHT_OFF
@@ -1107,16 +1112,16 @@
{ WWT_TEXTBTN, RESIZE_NONE, 14, 52, 66, 177, 188, STR_00CD_3, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_3
{ WWT_TEXTBTN, RESIZE_NONE, 14, 67, 81, 177, 188, STR_00CE_4, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_4
{ WWT_TEXTBTN, RESIZE_NONE, 14, 82, 96, 177, 188, STR_00CF_5, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_5
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 177, 188, STR_0335_6, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_6
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 177, 188, STR_0336_7, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_7
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 177, 188, STR_6, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_6
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 177, 188, STR_7, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_7
{ WWT_TEXTBTN, RESIZE_NONE, 14, 22, 36, 202, 213, STR_00CB_1, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_1
{ WWT_TEXTBTN, RESIZE_NONE, 14, 37, 51, 202, 213, STR_00CC_2, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_2
{ WWT_TEXTBTN, RESIZE_NONE, 14, 52, 66, 202, 213, STR_00CD_3, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_3
{ WWT_TEXTBTN, RESIZE_NONE, 14, 67, 81, 202, 213, STR_00CE_4, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_4
{ WWT_TEXTBTN, RESIZE_NONE, 14, 82, 96, 202, 213, STR_00CF_5, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_5
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 202, 213, STR_0335_6, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_6
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 202, 213, STR_0336_7, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_7
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 202, 213, STR_6, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_6
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 202, 213, STR_7, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_7
{ WWT_TEXTBTN, RESIZE_NONE, 14, 37, 111, 216, 227, STR_DRAG_DROP, STR_STATION_DRAG_DROP}, // BRSW_PLATFORM_DRAG_N_DROP
{ WWT_TEXTBTN, RESIZE_NONE, 14, 14, 73, 242, 253, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE}, // BRSW_HIGHLIGHT_OFF
--- a/src/rail_map.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/rail_map.h Sun Feb 03 20:34:26 2008 +0000
@@ -408,7 +408,7 @@
RAIL_GROUND_FENCE_HORIZ1 = 10, ///< Grass with a fence at the southern side
RAIL_GROUND_FENCE_HORIZ2 = 11, ///< Grass with a fence at the northern side
RAIL_GROUND_ICE_DESERT = 12, ///< Icy or sandy
- RAIL_GROUND_WATER = 13, ///< Grass with a fence and water on the lower halftile
+ RAIL_GROUND_WATER = 13, ///< Grass with a fence and shore or water on the free halftile
};
static inline void SetRailGroundType(TileIndex t, RailGroundType rgt)
--- a/src/road.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/road.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -96,11 +96,12 @@
{
RoadTypes rt = ROADTYPES_NONE;
- for (EngineID i = 0; i != TOTAL_NUM_ENGINES; i++) {
+ EngineID i;
+ FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_ROAD) {
const Engine* e = GetEngine(i);
const EngineInfo *ei = EngInfo(i);
- if (e->type == VEH_ROAD && HasBit(ei->climates, _opt.landscape) &&
+ if (HasBit(ei->climates, _opt.landscape) &&
(HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) {
SetBit(rt, HasBit(ei->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD);
}
--- a/src/road_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/road_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -33,6 +33,7 @@
#include "vehicle_base.h"
#include "sound_func.h"
#include "road_func.h"
+#include "tunnelbridge.h"
#include "table/sprites.h"
#include "table/strings.h"
@@ -42,6 +43,8 @@
static const uint32 VALID_LEVEL_CROSSING_SLOPES = (M(SLOPE_SEN) | M(SLOPE_ENW) | M(SLOPE_NWS) | M(SLOPE_NS) | M(SLOPE_WSE) | M(SLOPE_EW) | M(SLOPE_FLAT));
#undef M
+Foundation GetRoadFoundation(Slope tileh, RoadBits bits);
+
bool CheckAllowRemoveRoad(TileIndex tile, RoadBits remove, Owner owner, bool *edge_road, RoadType rt)
{
RoadBits present;
@@ -93,19 +96,15 @@
return CheckAllowRemoveRoad(tile, remove, GetRoadOwner(tile, rt), edge_road, rt);
}
+
/** Delete a piece of road.
* @param tile tile where to remove road from
* @param flags operation to perform
- * @param p1 bit 0..3 road pieces to remove (RoadBits)
- * bit 4..5 road type
- * bit 6 ignore the fact that the tram track has not been removed
- * yet when removing the road bits when not actually doing
- * it. Makes it possible to test whether the road bits can
- * be removed from a level crossing without physically
- * removing the tram bits before the test.
- * @param p2 unused
+ * @param pieces roadbits to remove
+ * @param rt roadtype to remove
+ * @param crossing_check should we check if there is a tram track when we are removing road from crossing?
*/
-CommandCost CmdRemoveRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+static CommandCost RemoveRoad(TileIndex tile, uint32 flags, RoadBits pieces, RoadType rt, bool crossing_check)
{
/* cost for removing inner/edge -roads */
static const uint16 road_remove_cost[2] = {50, 18};
@@ -114,9 +113,6 @@
* false if it was a center piece. Affects town ratings drop */
bool edge_road;
- RoadType rt = (RoadType)GB(p1, 4, 2);
- if (!IsValidRoadType(rt)) return CMD_ERROR;
-
Town *t = NULL;
switch (GetTileType(tile)) {
case MP_ROAD:
@@ -130,16 +126,14 @@
break;
case MP_TUNNELBRIDGE:
- {
- if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR;
- if (GetVehicleTunnelBridge(tile, GetOtherTunnelBridgeEnd(tile)) != NULL) return CMD_ERROR;
- } break;
+ if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR;
+ if (GetVehicleTunnelBridge(tile, GetOtherTunnelBridgeEnd(tile)) != NULL) return CMD_ERROR;
+ break;
default:
return CMD_ERROR;
}
- RoadBits pieces = Extract<RoadBits, 0>(p1);
RoadTypes rts = GetRoadTypes(tile);
/* The tile doesn't have the given road type */
if (!HasBit(rts, rt)) return CMD_ERROR;
@@ -158,7 +152,7 @@
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
TileIndex other_end = GetOtherTunnelBridgeEnd(tile);
/* Pay for *every* tile of the bridge or tunnel */
- cost.AddCost((DistanceManhattan(other_end, tile) + 1) * _price.remove_road);
+ cost.AddCost((GetTunnelBridgeLength(other_end, tile) + 2) * _price.remove_road);
if (flags & DC_EXEC) {
SetRoadTypes(other_end, GetRoadTypes(other_end) & ~RoadTypeToRoadTypes(rt));
SetRoadTypes(tile, GetRoadTypes(tile) & ~RoadTypeToRoadTypes(rt));
@@ -231,7 +225,7 @@
/* Don't allow road to be removed from the crossing when there is tram;
* we can't draw the crossing without trambits ;) */
- if (rt == ROADTYPE_ROAD && HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) && ((flags & DC_EXEC) || !HasBit(p1, 6))) return CMD_ERROR;
+ if (rt == ROADTYPE_ROAD && HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) && (flags & DC_EXEC || crossing_check)) return CMD_ERROR;
if (rt == ROADTYPE_ROAD) {
ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM);
@@ -257,6 +251,24 @@
}
+/** Delete a piece of road.
+ * @param tile tile where to remove road from
+ * @param flags operation to perform
+ * @param p1 bit 0..3 road pieces to remove (RoadBits)
+ * bit 4..5 road type
+ * @param p2 unused
+ */
+CommandCost CmdRemoveRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
+ RoadType rt = (RoadType)GB(p1, 4, 2);
+ if (!IsValidRoadType(rt)) return CMD_ERROR;
+
+ RoadBits pieces = Extract<RoadBits, 0>(p1);
+
+ return RemoveRoad(tile, flags, pieces, rt, true);
+}
+
+
static const RoadBits _valid_tileh_slopes_road[][15] = {
/* set of normal ones */
{
@@ -374,7 +386,7 @@
*pieces |= MirrorRoadBits(*pieces);
/* partly leveled up tile, only if there's no road on that tile */
- if ((existing == ROAD_NONE || existing == *pieces) && (tileh == SLOPE_W || tileh == SLOPE_S || tileh == SLOPE_E || tileh == SLOPE_N)) {
+ if ((existing == ROAD_NONE || existing == *pieces) && IsSlopeWithOneCornerRaised(tileh)) {
if (*pieces == ROAD_X || *pieces == ROAD_Y) return CommandCost(EXPENSES_CONSTRUCTION, _price.terraform);
}
return CMD_ERROR;
@@ -496,18 +508,16 @@
case MP_STATION:
if (!IsDriveThroughStopTile(tile)) return CMD_ERROR;
if (HasBit(GetRoadTypes(tile), rt)) return_cmd_error(STR_1007_ALREADY_BUILT);
- /* Don't allow "upgrading" the roadstop when vehicles are already driving on it */
+ /* Don't allow adding roadtype to the roadstop when vehicles are already driving on it */
if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
break;
case MP_TUNNELBRIDGE:
- {
- if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR;
- if (HasBit(GetRoadTypes(tile), rt)) return_cmd_error(STR_1007_ALREADY_BUILT);
-
- /* Don't allow "upgrading" the bridge/tunnel when vehicles are already driving on it */
- if (GetVehicleTunnelBridge(tile, GetOtherTunnelBridgeEnd(tile)) != NULL) return CMD_ERROR;
- } break;
+ if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return CMD_ERROR;
+ if (HasBit(GetRoadTypes(tile), rt)) return_cmd_error(STR_1007_ALREADY_BUILT);
+ /* Don't allow adding roadtype to the bridge/tunnel when vehicles are already driving on it */
+ if (GetVehicleTunnelBridge(tile, GetOtherTunnelBridgeEnd(tile)) != NULL) return CMD_ERROR;
+ break;
default:
do_clear:;
@@ -530,12 +540,29 @@
if (IsTileType(tile, MP_ROAD)) {
/* Don't put the pieces that already exist */
pieces &= ComplementRoadBits(existing);
+
+ /* Check if new road bits will have the same foundation as other existing road types */
+ if (GetRoadTileType(tile) == ROAD_TILE_NORMAL) {
+ Slope slope = GetTileSlope(tile, NULL);
+ Foundation found_new = GetRoadFoundation(slope, pieces | existing);
+
+ /* Test if all other roadtypes can be built at that foundation */
+ for (RoadType rtest = ROADTYPE_ROAD; rtest < ROADTYPE_END; rtest++) {
+ if (rtest != rt) { // check only other road types
+ RoadBits bits = GetRoadBits(tile, rtest);
+ /* do not check if there are not road bits of given type */
+ if (bits != ROAD_NONE && GetRoadFoundation(slope, bits) != found_new) {
+ return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
+ }
+ }
+ }
+ }
}
cost.AddCost(CountBits(pieces) * _price.build_road);
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
/* Pay for *every* tile of the bridge or tunnel */
- cost.MultiplyCost(DistanceManhattan(GetOtherTunnelBridgeEnd(tile), tile) + 1);
+ cost.MultiplyCost(GetTunnelBridgeLength(GetOtherTunnelBridgeEnd(tile), tile) + 2);
}
if (flags & DC_EXEC) {
@@ -653,7 +680,7 @@
cost.AddCost(ret);
}
had_bridge = true;
- } else {
+ } else { // IsTunnel(tile)
if ((!had_tunnel || GetTunnelBridgeDirection(tile) == DIAGDIR_SE || GetTunnelBridgeDirection(tile) == DIAGDIR_SW)) {
cost.AddCost(ret);
}
@@ -717,7 +744,7 @@
/* try to remove the halves. */
if (bits != 0) {
- ret = DoCommand(tile, rt << 4 | bits, 0, flags & ~DC_EXEC, CMD_REMOVE_ROAD);
+ ret = RemoveRoad(tile, flags & ~DC_EXEC, bits, rt, true);
if (CmdSucceeded(ret)) {
if (flags & DC_EXEC) {
money -= ret.GetCost();
@@ -725,7 +752,7 @@
_additional_cash_required = DoCommand(end_tile, start_tile, p2, flags & ~DC_EXEC, CMD_REMOVE_LONG_ROAD).GetCost();
return cost;
}
- DoCommand(tile, rt << 4 | bits, 0, flags, CMD_REMOVE_ROAD);
+ RemoveRoad(tile, flags, bits, rt, true);
}
cost.AddCost(ret);
}
@@ -818,7 +845,7 @@
CommandCost ret(EXPENSES_CONSTRUCTION);
for (RoadType rt = ROADTYPE_ROAD; rt < ROADTYPE_END; rt++) {
if (HasBit(rts, rt)) {
- CommandCost tmp_ret = DoCommand(tile, rt << 4 | GetRoadBits(tile, rt), 0, flags, CMD_REMOVE_ROAD);
+ CommandCost tmp_ret = RemoveRoad(tile, flags, GetRoadBits(tile, rt), rt, true);
if (CmdFailed(tmp_ret)) return tmp_ret;
ret.AddCost(tmp_ret);
}
@@ -838,7 +865,7 @@
* tram tracks must be removed before the road bits. */
for (RoadType rt = ROADTYPE_HWAY; rt >= ROADTYPE_ROAD; rt--) {
if (HasBit(rts, rt)) {
- CommandCost tmp_ret = DoCommand(tile, 1 << 6 | rt << 4 | GetCrossingRoadBits(tile), 0, flags, CMD_REMOVE_ROAD);
+ CommandCost tmp_ret = RemoveRoad(tile, flags, GetCrossingRoadBits(tile), rt, false);
if (CmdFailed(tmp_ret)) return tmp_ret;
ret.AddCost(tmp_ret);
}
@@ -1259,7 +1286,7 @@
const RoadBits new_rb = CleanUpRoadBits(tile, old_rb);
if (old_rb != new_rb) {
- DoCommand(tile, (old_rb ^ new_rb), t->index, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_REMOVE_ROAD);
+ RemoveRoad(tile, DC_EXEC | DC_AUTO | DC_NO_WATER, (old_rb ^ new_rb), ROADTYPE_ROAD, true);
}
}
--- a/src/road_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/road_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -154,13 +154,13 @@
SPR_CURSOR_AUTOROAD,
},
{
- STR_1804_CAN_T_BUILD_TRAMWAY_HERE,
- STR_1805_CAN_T_REMOVE_TRAMWAY_FROM,
- STR_1807_CAN_T_BUILD_TRAM_VEHICLE,
- { STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION, STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION },
- { STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION, STR_CAN_T_REMOVE_CARGO_TRAM_STATION },
- { STR_3042_PASSENGER_TRAM_STATION_ORIENTATION, STR_3043_CARGO_TRAM_STATION_ORIENT },
- { STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION, STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION },
+ STR_CAN_T_BUILD_TRAMWAY_HERE,
+ STR_CAN_T_REMOVE_TRAMWAY_FROM,
+ STR_CAN_T_BUILD_TRAM_VEHICLE,
+ { STR_CAN_T_BUILD_PASSENGER_TRAM_STATION, STR_CAN_T_BUILD_CARGO_TRAM_STATION },
+ { STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION, STR_CAN_T_REMOVE_CARGO_TRAM_STATION },
+ { STR_PASSENGER_TRAM_STATION_ORIENTATION, STR_CARGO_TRAM_STATION_ORIENT },
+ { STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION, STR_SELECT_CARGO_TRAM_STATION_ORIENTATION },
SPR_CURSOR_TRAMWAY_NESW,
SPR_CURSOR_TRAMWAY_NWSE,
@@ -602,21 +602,21 @@
/** Widget definition of the build tram toolbar */
static const Widget _build_tramway_widgets[] = {
-{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // RTW_CLOSEBOX
-{ WWT_CAPTION, RESIZE_NONE, 7, 11, 228, 0, 13, STR_1802_TRAMWAY_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // RTW_CAPTION
-{ WWT_STICKYBOX, RESIZE_NONE, 7, 229, 240, 0, 13, 0x0, STR_STICKY_BUTTON}, // RTW_STICKY
+{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // RTW_CLOSEBOX
+{ WWT_CAPTION, RESIZE_NONE, 7, 11, 228, 0, 13, STR_WHITE_TRAMWAY_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // RTW_CAPTION
+{ WWT_STICKYBOX, RESIZE_NONE, 7, 229, 240, 0, 13, 0x0, STR_STICKY_BUTTON}, // RTW_STICKY
-{ WWT_IMGBTN, RESIZE_NONE, 7, 0, 21, 14, 35, SPR_IMG_TRAMWAY_X_DIR, STR_180B_BUILD_TRAMWAY_SECTION}, // RTW_ROAD_X
-{ WWT_IMGBTN, RESIZE_NONE, 7, 22, 43, 14, 35, SPR_IMG_TRAMWAY_Y_DIR, STR_180B_BUILD_TRAMWAY_SECTION}, // RTW_ROAD_Y
-{ WWT_IMGBTN, RESIZE_NONE, 7, 44, 65, 14, 35, SPR_IMG_AUTOTRAM, STR_BUILD_AUTOTRAM_TIP}, // RTW_AUTOROAD
-{ WWT_IMGBTN, RESIZE_NONE, 7, 66, 87, 14, 35, SPR_IMG_DYNAMITE, STR_018D_DEMOLISH_BUILDINGS_ETC}, // RTW_DEMOLISH
-{ WWT_IMGBTN, RESIZE_NONE, 7, 88, 109, 14, 35, SPR_IMG_ROAD_DEPOT, STR_180C_BUILD_TRAM_VEHICLE_DEPOT}, // RTW_DEPOT
-{ WWT_IMGBTN, RESIZE_NONE, 7, 110, 131, 14, 35, SPR_IMG_BUS_STATION, STR_180D_BUILD_PASSENGER_TRAM_STATION}, // RTW_BUS_STATION
-{ WWT_IMGBTN, RESIZE_NONE, 7, 132, 153, 14, 35, SPR_IMG_TRUCK_BAY, STR_180E_BUILD_CARGO_TRAM_STATION}, // RTW_TRUCK_STATION
-{ WWT_EMPTY, RESIZE_NONE, 0, 0, 0, 0, 0, 0x0, STR_NULL}, // RTW_ONE_WAY
-{ WWT_IMGBTN, RESIZE_NONE, 7, 154, 196, 14, 35, SPR_IMG_BRIDGE, STR_180F_BUILD_TRAMWAY_BRIDGE}, // RTW_BUILD_BRIDGE
-{ WWT_IMGBTN, RESIZE_NONE, 7, 197, 218, 14, 35, SPR_IMG_ROAD_TUNNEL, STR_1810_BUILD_TRAMWAY_TUNNEL}, // RTW_BUILD_TUNNEL
-{ WWT_IMGBTN, RESIZE_NONE, 7, 219, 240, 14, 35, SPR_IMG_REMOVE, STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS}, // RTW_REMOVE
+{ WWT_IMGBTN, RESIZE_NONE, 7, 0, 21, 14, 35, SPR_IMG_TRAMWAY_X_DIR, STR_BUILD_TRAMWAY_SECTION}, // RTW_ROAD_X
+{ WWT_IMGBTN, RESIZE_NONE, 7, 22, 43, 14, 35, SPR_IMG_TRAMWAY_Y_DIR, STR_BUILD_TRAMWAY_SECTION}, // RTW_ROAD_Y
+{ WWT_IMGBTN, RESIZE_NONE, 7, 44, 65, 14, 35, SPR_IMG_AUTOTRAM, STR_BUILD_AUTOTRAM_TIP}, // RTW_AUTOROAD
+{ WWT_IMGBTN, RESIZE_NONE, 7, 66, 87, 14, 35, SPR_IMG_DYNAMITE, STR_018D_DEMOLISH_BUILDINGS_ETC}, // RTW_DEMOLISH
+{ WWT_IMGBTN, RESIZE_NONE, 7, 88, 109, 14, 35, SPR_IMG_ROAD_DEPOT, STR_BUILD_TRAM_VEHICLE_DEPOT}, // RTW_DEPOT
+{ WWT_IMGBTN, RESIZE_NONE, 7, 110, 131, 14, 35, SPR_IMG_BUS_STATION, STR_BUILD_PASSENGER_TRAM_STATION}, // RTW_BUS_STATION
+{ WWT_IMGBTN, RESIZE_NONE, 7, 132, 153, 14, 35, SPR_IMG_TRUCK_BAY, STR_BUILD_CARGO_TRAM_STATION}, // RTW_TRUCK_STATION
+{ WWT_EMPTY, RESIZE_NONE, 0, 0, 0, 0, 0, 0x0, STR_NULL}, // RTW_ONE_WAY
+{ WWT_IMGBTN, RESIZE_NONE, 7, 154, 196, 14, 35, SPR_IMG_BRIDGE, STR_BUILD_TRAMWAY_BRIDGE}, // RTW_BUILD_BRIDGE
+{ WWT_IMGBTN, RESIZE_NONE, 7, 197, 218, 14, 35, SPR_IMG_ROAD_TUNNEL, STR_BUILD_TRAMWAY_TUNNEL}, // RTW_BUILD_TUNNEL
+{ WWT_IMGBTN, RESIZE_NONE, 7, 219, 240, 14, 35, SPR_IMG_REMOVE, STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS}, // RTW_REMOVE
{ WIDGETS_END},
};
@@ -738,12 +738,12 @@
/** Widget definition of the build tram depot window */
static const Widget _build_tram_depot_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // BRDW_CLOSEBOX
-{ WWT_CAPTION, RESIZE_NONE, 7, 11, 139, 0, 13, STR_1806_TRAM_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // BRDW_CAPTION
+{ WWT_CAPTION, RESIZE_NONE, 7, 11, 139, 0, 13, STR_TRAM_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // BRDW_CAPTION
{ WWT_PANEL, RESIZE_NONE, 7, 0, 139, 14, 121, 0x0, STR_NULL}, // BRDW_BACKGROUND
-{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 17, 66, 0x0, STR_1813_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_NE
-{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 69, 118, 0x0, STR_1813_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_SE
-{ WWT_PANEL, RESIZE_NONE, 14, 3, 68, 69, 118, 0x0, STR_1813_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_SW
-{ WWT_PANEL, RESIZE_NONE, 14, 3, 68, 17, 66, 0x0, STR_1813_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_NW
+{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 17, 66, 0x0, STR_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_NE
+{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 69, 118, 0x0, STR_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_SE
+{ WWT_PANEL, RESIZE_NONE, 14, 3, 68, 69, 118, 0x0, STR_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_SW
+{ WWT_PANEL, RESIZE_NONE, 14, 3, 68, 17, 66, 0x0, STR_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_NW
{ WIDGETS_END},
};
@@ -828,9 +828,14 @@
StationPickerDrawSprite(171, 35, st, INVALID_RAILTYPE, _cur_roadtype, 4);
StationPickerDrawSprite(171, 85, st, INVALID_RAILTYPE, _cur_roadtype, 5);
- DrawStationCoverageAreaText(2, 146,
+ int text_end = DrawStationCoverageAreaText(2, 146,
(w->window_class == WC_BUS_STATION) ? SCT_PASSENGERS_ONLY : SCT_NON_PASSENGERS_ONLY,
- 3);
+ 3) + 4;
+ if (text_end > w->widget[BRSW_BACKGROUND].bottom) {
+ SetWindowDirty(w);
+ ResizeWindowForWidget(w, BRSW_BACKGROUND, 0, text_end - w->widget[BRSW_BACKGROUND].bottom);
+ SetWindowDirty(w);
+ }
} break;
--- a/src/roadveh.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/roadveh.h Sun Feb 03 20:34:26 2008 +0000
@@ -75,6 +75,7 @@
Money GetRunningCost() const { return RoadVehInfo(this->engine_type)->running_cost * _price.roadveh_running; }
bool IsInDepot() const { return this->u.road.state == RVSB_IN_DEPOT; }
void Tick();
+ void OnNewDay();
};
byte GetRoadVehLength(const Vehicle *v);
--- a/src/roadveh_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/roadveh_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -439,7 +439,7 @@
/* search in all directions */
for (DiagDirection i = DIAGDIR_BEGIN; i != DIAGDIR_END; i++) {
- FollowTrack(tile, 0x2000 | TRANSPORT_ROAD, v->u.road.compatible_roadtypes, i, EnumRoadSignalFindDepot, NULL, &rfdd);
+ FollowTrack(tile, TRANSPORT_ROAD, v->u.road.compatible_roadtypes, i, EnumRoadSignalFindDepot, NULL, &rfdd);
}
if (rfdd.best_length == (uint)-1) return NULL;
@@ -925,7 +925,7 @@
SetDParam(0, st->index);
flags = (v->owner == _local_player) ? NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_PLAYER, 0) : NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_OTHER, 0);
AddNewsItem(
- v->u.road.roadtype == ROADTYPE_ROAD ? STR_902F_CITIZENS_CELEBRATE_FIRST : STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM,
+ v->u.road.roadtype == ROADTYPE_ROAD ? STR_902F_CITIZENS_CELEBRATE_FIRST : STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM,
flags,
v->index,
0);
@@ -939,7 +939,7 @@
SetDParam(0, st->index);
flags = (v->owner == _local_player) ? NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_PLAYER, 0) : NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_OTHER, 0);
AddNewsItem(
- v->u.road.roadtype == ROADTYPE_ROAD ? STR_9030_CITIZENS_CELEBRATE_FIRST : STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM,
+ v->u.road.roadtype == ROADTYPE_ROAD ? STR_9030_CITIZENS_CELEBRATE_FIRST : STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM,
flags,
v->index,
0
@@ -1280,7 +1280,7 @@
if (best_track == INVALID_TRACKDIR) best_track = (Trackdir)i; // in case we don't find the path, just pick a track
frd.maxtracklen = (uint)-1;
frd.mindist = (uint)-1;
- FollowTrack(tile, 0x2000 | TRANSPORT_ROAD, v->u.road.compatible_roadtypes, _road_pf_directions[i], EnumRoadTrackFindDist, NULL, &frd);
+ FollowTrack(tile, TRANSPORT_ROAD, v->u.road.compatible_roadtypes, _road_pf_directions[i], EnumRoadTrackFindDist, NULL, &frd);
if (frd.mindist < best_dist || (frd.mindist == best_dist && frd.maxtracklen < best_maxlen)) {
best_dist = frd.mindist;
@@ -1520,7 +1520,7 @@
}
}
- if ((IsTunnelTile(gp.new_tile) || IsBridgeTile(gp.new_tile)) && HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) {
+ if (IsTileType(gp.new_tile, MP_TUNNELBRIDGE) && HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) {
/* Vehicle has just entered a bridge or tunnel */
v->cur_image = v->GetImage(v->direction);
v->UpdateDeltaXY(v->direction);
@@ -2004,33 +2004,33 @@
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
}
-void OnNewDay_RoadVeh(Vehicle *v)
+void RoadVehicle::OnNewDay()
{
CommandCost cost(EXPENSES_ROADVEH_RUN);
- if (!IsRoadVehFront(v)) return;
+ if (!IsRoadVehFront(this)) return;
- if ((++v->day_counter & 7) == 0) DecreaseVehicleValue(v);
- if (v->u.road.blocked_ctr == 0) CheckVehicleBreakdown(v);
+ if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
+ if (this->u.road.blocked_ctr == 0) CheckVehicleBreakdown(this);
- AgeVehicle(v);
- CheckIfRoadVehNeedsService(v);
+ AgeVehicle(this);
+ CheckIfRoadVehNeedsService(this);
- CheckOrders(v);
+ CheckOrders(this);
/* Current slot has expired */
- if (v->current_order.type == OT_GOTO_STATION && v->u.road.slot != NULL && v->u.road.slot_age-- == 0) {
+ if (this->current_order.type == OT_GOTO_STATION && this->u.road.slot != NULL && this->u.road.slot_age-- == 0) {
DEBUG(ms, 3, "Slot expired for vehicle %d (index %d) at stop 0x%X",
- v->unitnumber, v->index, v->u.road.slot->xy);
- ClearSlot(v);
+ this->unitnumber, this->index, this->u.road.slot->xy);
+ ClearSlot(this);
}
- if (v->vehstatus & VS_STOPPED) return;
+ if (this->vehstatus & VS_STOPPED) return;
/* update destination */
- if (v->current_order.type == OT_GOTO_STATION && v->u.road.slot == NULL && !(v->vehstatus & VS_CRASHED)) {
- Station *st = GetStation(v->current_order.dest);
- RoadStop *rs = st->GetPrimaryRoadStop(v);
+ if (this->current_order.type == OT_GOTO_STATION && this->u.road.slot == NULL && !(this->vehstatus & VS_CRASHED)) {
+ Station *st = GetStation(this->current_order.dest);
+ RoadStop *rs = st->GetPrimaryRoadStop(this);
RoadStop *best = NULL;
if (rs != NULL) {
@@ -2040,16 +2040,16 @@
* 2) we're somewhere close to the station rectangle (to make sure we do assign
* slots even if the station and its road stops are incredibly spread out)
*/
- if (DistanceManhattan(v->tile, rs->xy) < 16 || st->rect.PtInExtendedRect(TileX(v->tile), TileY(v->tile), 2)) {
+ if (DistanceManhattan(this->tile, rs->xy) < 16 || st->rect.PtInExtendedRect(TileX(this->tile), TileY(this->tile), 2)) {
uint dist, badness;
uint minbadness = UINT_MAX;
DEBUG(ms, 2, "Attempting to obtain a slot for vehicle %d (index %d) at station %d (0x%X)",
- v->unitnumber, v->index, st->index, st->xy
+ this->unitnumber, this->index, st->index, st->xy
);
/* Now we find the nearest road stop that has a free slot */
- for (; rs != NULL; rs = rs->GetNextRoadStop(v)) {
- dist = RoadFindPathToStop(v, rs->xy);
+ for (; rs != NULL; rs = rs->GetNextRoadStop(this)) {
+ dist = RoadFindPathToStop(this, rs->xy);
if (dist == UINT_MAX) {
DEBUG(ms, 4, " stop 0x%X is unreachable, not treating further", rs->xy);
continue;
@@ -2070,29 +2070,29 @@
best->num_vehicles++;
DEBUG(ms, 3, "Assigned to stop 0x%X", best->xy);
- v->u.road.slot = best;
- v->dest_tile = best->xy;
- v->u.road.slot_age = 14;
+ this->u.road.slot = best;
+ this->dest_tile = best->xy;
+ this->u.road.slot_age = 14;
} else {
DEBUG(ms, 3, "Could not find a suitable stop");
}
} else {
DEBUG(ms, 5, "Distance from station too far. Postponing slotting for vehicle %d (index %d) at station %d, (0x%X)",
- v->unitnumber, v->index, st->index, st->xy);
+ this->unitnumber, this->index, st->index, st->xy);
}
} else {
DEBUG(ms, 4, "No road stop for vehicle %d (index %d) at station %d (0x%X)",
- v->unitnumber, v->index, st->index, st->xy);
+ this->unitnumber, this->index, st->index, st->xy);
}
}
- cost = CommandCost(EXPENSES_ROADVEH_RUN, RoadVehInfo(v->engine_type)->running_cost * _price.roadveh_running / 364);
+ cost = CommandCost(EXPENSES_ROADVEH_RUN, RoadVehInfo(this->engine_type)->running_cost * _price.roadveh_running / 364);
- v->profit_this_year -= cost.GetCost() >> 8;
+ this->profit_this_year -= cost.GetCost() >> 8;
- SubtractMoneyFromPlayerFract(v->owner, cost);
+ SubtractMoneyFromPlayerFract(this->owner, cost);
- InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
+ InvalidateWindow(WC_VEHICLE_DETAILS, this->index);
InvalidateWindowClasses(WC_ROADVEH_LIST);
}
--- a/src/saveload.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/saveload.h Sun Feb 03 20:34:26 2008 +0000
@@ -13,7 +13,7 @@
#define SIZE_MAX ((size_t)-1)
-static const uint NEWGRF_AIRPORTS_SAVEGAME = 86;
+static const uint NEWGRF_AIRPORTS_SAVEGAME = 87;
enum SaveOrLoadResult {
SL_OK = 0, ///< completed successfully
--- a/src/settings.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/settings.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -1324,8 +1324,10 @@
* same-sized members
* XXX - To save file-space and since values are never bigger than about 10? only
* save the first 16 bits in the savegame. Question is why the values are still int32
- * and why not byte for example? */
- SDT_GENERAL("diff_custom", SDT_INTLIST, SL_ARR, SLE_UINT16, 0, 0, GameOptions, diff, 17, 0, 0, 0, 0, NULL, STR_NULL, NULL, NULL, 0, 3),
+ * and why not byte for example?
+ * 'SLE_FILE_I16 | SLE_VAR_U16' in "diff_custom" is needed to get around SlArray() hack
+ * for savegames version 0 - though it is an array, it has to go through the byteswap process */
+ SDT_GENERAL("diff_custom", SDT_INTLIST, SL_ARR, SLE_FILE_I16 | SLE_VAR_U16, 0, 0, GameOptions, diff, 17, 0, 0, 0, 0, NULL, STR_NULL, NULL, NULL, 0, 3),
SDT_GENERAL("diff_custom", SDT_INTLIST, SL_ARR, SLE_UINT16, 0, 0, GameOptions, diff, 18, 0, 0, 0, 0, NULL, STR_NULL, NULL, NULL, 4, SL_MAX_VERSION),
SDT_VAR(GameOptions, diff_level, SLE_UINT8, 0, 0, 0, 0, 3, 0, STR_NULL, NULL),
SDT_OMANY(GameOptions, currency, SLE_UINT8, N, 0, 0, CUSTOM_CURRENCY_ID, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SIT|SEK|YTL|SKK|BRR|custom", STR_NULL, NULL, NULL),
--- a/src/settings_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/settings_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -30,10 +30,6 @@
#include "table/sprites.h"
#include "table/strings.h"
-static uint32 _difficulty_click_a;
-static uint32 _difficulty_click_b;
-static byte _difficulty_timeout;
-
static const StringID _units_dropdown[] = {
STR_UNITS_IMPERIAL,
STR_UNITS_METRIC,
@@ -404,7 +400,7 @@
{ 0, 7, 1, STR_NULL},
{ 0, 3, 1, STR_6830_IMMEDIATE},
{ 0, 3, 1, STR_NUM_VERY_LOW},
- { 0, 4, 1, STR_26816_NONE},
+ { 0, 4, 1, STR_NONE},
{100, 500, 50, STR_NULL},
{ 2, 4, 1, STR_NULL},
{ 0, 2, 1, STR_6820_LOW},
@@ -418,7 +414,7 @@
{ 0, 1, 1, STR_682E_STEADY},
{ 0, 1, 1, STR_6834_AT_END_OF_LINE_AND_AT_STATIONS},
{ 0, 1, 1, STR_6836_OFF},
- { 0, 2, 1, STR_6839_PERMISSIVE},
+ { 0, 2, 1, STR_PERMISSIVE},
};
/*
@@ -489,6 +485,16 @@
// 0x383E = (1 << 13) | (1 << 12) | (1 << 11) | (1 << 5) | (1 << 4) | (1 << 3) | (1 << 2) | (1 << 1)
#define DIFF_INGAME_DISABLED_BUTTONS 0x383E
+#define NO_SETTINGS_BUTTON 0xFF
+
+/** Carriage for the game settings window data */
+struct difficulty_d {
+ bool clicked_increase;
+ uint8 clicked_button;
+ uint8 timeout;
+};
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(difficulty_d));
+
/* Names of the game difficulty settings window */
enum GameDifficultyWidgets {
GDW_CLOSEBOX = 0,
@@ -507,8 +513,12 @@
static void GameDifficultyWndProc(Window *w, WindowEvent *e)
{
+ difficulty_d *diffic_d = &WP(w, difficulty_d);
switch (e->event) {
case WE_CREATE:
+ diffic_d->clicked_increase = false;
+ diffic_d->clicked_button = NO_SETTINGS_BUTTON;
+ diffic_d->timeout = 0;
/* Hide the closebox to make sure that the user aborts or confirms his changes */
w->HideWidget(GDW_CLOSEBOX);
w->widget[GDW_CAPTION].left = 0;
@@ -545,7 +555,7 @@
value = ((GDType*)&_opt_mod_temp.diff)[i];
DrawArrowButtons(5, y, 3,
- !!HasBit(_difficulty_click_a, i) | !!HasBit(_difficulty_click_b, i) << 1,
+ (diffic_d->clicked_button == i) ? 1 << diffic_d->clicked_increase : 0,
!(HasBit(disabled, i) || gsd->min == value),
!(HasBit(disabled, i) || gsd->max == value));
@@ -572,7 +582,7 @@
if (y < 0) return;
/* Get button from Y coord. */
- const uint btn = y / (GAMEDIFF_WND_ROWSIZE + 2);
+ const uint8 btn = y / (GAMEDIFF_WND_ROWSIZE + 2);
if (btn >= GAME_DIFFICULTY_NUM || y % (GAMEDIFF_WND_ROWSIZE + 2) >= 9)
return;
@@ -580,7 +590,7 @@
if (_game_mode == GM_NORMAL && HasBit(DIFF_INGAME_DISABLED_BUTTONS, btn))
return;
- _difficulty_timeout = 5;
+ diffic_d->timeout = 5;
int16 val = ((GDType*)&_opt_mod_temp.diff)[btn];
@@ -588,13 +598,14 @@
if (x >= 10) {
/* Increase button clicked */
val = min(val + info->step, info->max);
- SetBit(_difficulty_click_b, btn);
+ diffic_d->clicked_increase = true;
} else {
/* Decrease button clicked */
val -= info->step;
val = max(val, info->min);
- SetBit(_difficulty_click_a, btn);
+ diffic_d->clicked_increase = false;
}
+ diffic_d->clicked_button = btn;
/* save value in temporary variable */
((GDType*)&_opt_mod_temp.diff)[btn] = val;
@@ -642,9 +653,9 @@
} break;
case WE_MOUSELOOP: /* Handle the visual 'clicking' of the buttons */
- if (_difficulty_timeout != 0 && !--_difficulty_timeout) {
- _difficulty_click_a = 0;
- _difficulty_click_b = 0;
+ if (diffic_d->timeout != 0) {
+ diffic_d->timeout--;
+ if (diffic_d->timeout == 0) diffic_d->clicked_button = NO_SETTINGS_BUTTON;
SetWindowDirty(w);
}
break;
--- a/src/settings_type.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/settings_type.h Sun Feb 03 20:34:26 2008 +0000
@@ -22,7 +22,7 @@
GDType initial_interest;
GDType vehicle_costs;
GDType competitor_speed;
- GDType competitor_intelligence; // no longer in use
+ GDType competitor_intelligence; ///< no longer in use
GDType vehicle_breakdowns;
GDType subsidy_multiplier;
GDType construction_cost;
@@ -31,7 +31,7 @@
GDType economy;
GDType line_reverse_mode;
GDType disasters;
- GDType town_council_tolerance; // minimum required town ratings to be allowed to demolish stuff
+ GDType town_council_tolerance; ///< minimum required town ratings to be allowed to demolish stuff
};
struct GameOptions {
@@ -57,122 +57,122 @@
extern GameOptions *_opt_ptr;
struct Patches {
- bool modified_catchment; // different-size catchment areas
- bool vehicle_speed; // show vehicle speed
- bool build_on_slopes; // allow building on slopes
- bool mammoth_trains; // allow very long trains
- bool join_stations; // allow joining of train stations
- bool full_load_any; // new full load calculation, any cargo must be full
- bool improved_load; // improved loading algorithm
- bool gradual_loading; // load vehicles gradually
- byte station_spread; // amount a station may spread
- bool inflation; // disable inflation
- bool selectgoods; // only send the goods to station if a train has been there
- bool longbridges; // allow 100 tile long bridges
- bool gotodepot; // allow goto depot in orders
+ bool modified_catchment; ///< different-size catchment areas
+ bool vehicle_speed; ///< show vehicle speed
+ bool build_on_slopes; ///< allow building on slopes
+ bool mammoth_trains; ///< allow very long trains
+ bool join_stations; ///< allow joining of train stations
+ bool full_load_any; ///< new full load calculation, any cargo must be full
+ bool improved_load; ///< improved loading algorithm
+ bool gradual_loading; ///< load vehicles gradually
+ byte station_spread; ///< amount a station may spread
+ bool inflation; ///< disable inflation
+ bool selectgoods; ///< only send the goods to station if a train has been there
+ bool longbridges; ///< allow 100 tile long bridges
+ bool gotodepot; ///< allow goto depot in orders
uint8 raw_industry_construction; ///< Type of (raw) industry construction (none, "normal", prospecting)
- bool multiple_industry_per_town; // allow many industries of the same type per town
- bool same_industry_close; // allow same type industries to be built close to each other
- bool lost_train_warn; // if a train can't find its destination, show a warning
+ bool multiple_industry_per_town; ///< allow many industries of the same type per town
+ bool same_industry_close; ///< allow same type industries to be built close to each other
+ bool lost_train_warn; ///< if a train can't find its destination, show a warning
uint8 order_review_system;
- bool train_income_warn; // if train is generating little income, show a warning
- bool status_long_date; // always show long date in status bar
- bool signal_side; // show signals on right side
- bool show_finances; // show finances at end of year
- bool new_nonstop; // ttdpatch compatible nonstop handling
- bool roadveh_queue; // buggy road vehicle queueing
- bool autoscroll; // scroll when moving mouse to the edge.
- byte errmsg_duration; // duration of error message
- byte land_generator; // the landscape generator
- byte oil_refinery_limit; // distance oil refineries allowed from map edge
- byte snow_line_height; // a number 0-15 that configured snow line height
- byte tgen_smoothness; // how rough is the terrain from 0-3
- uint32 generation_seed; // noise seed for world generation
- byte tree_placer; // the tree placer algorithm
- byte heightmap_rotation; // rotation director for the heightmap
- byte se_flat_world_height; // land height a flat world gets in SE
- bool bribe; // enable bribing the local authority
- bool nonuniform_stations; // allow nonuniform train stations
- bool adjacent_stations; // allow stations to be built directly adjacent to other stations
- bool always_small_airport; // always allow small airports
- bool realistic_acceleration; // realistic acceleration for trains
- bool wagon_speed_limits; // enable wagon speed limits
- bool forbid_90_deg; // forbid trains to make 90 deg turns
- bool invisible_trees; // don't show trees when buildings are transparent
- bool no_servicing_if_no_breakdowns; // dont send vehicles to depot when breakdowns are disabled
- bool link_terraform_toolbar; // display terraform toolbar when displaying rail, road, water and airport toolbars
- bool reverse_scroll; // Right-Click-Scrolling scrolls in the opposite direction
+ bool train_income_warn; ///< if train is generating little income, show a warning
+ bool status_long_date; ///< always show long date in status bar
+ bool signal_side; ///< show signals on right side
+ bool show_finances; ///< show finances at end of year
+ bool new_nonstop; ///< ttdpatch compatible nonstop handling
+ bool roadveh_queue; ///< buggy road vehicle queueing
+ bool autoscroll; ///< scroll when moving mouse to the edge.
+ byte errmsg_duration; ///< duration of error message
+ byte land_generator; ///< the landscape generator
+ byte oil_refinery_limit; ///< distance oil refineries allowed from map edge
+ byte snow_line_height; ///< a number 0-15 that configured snow line height
+ byte tgen_smoothness; ///< how rough is the terrain from 0-3
+ uint32 generation_seed; ///< noise seed for world generation
+ byte tree_placer; ///< the tree placer algorithm
+ byte heightmap_rotation; ///< rotation director for the heightmap
+ byte se_flat_world_height; ///< land height a flat world gets in SE
+ bool bribe; ///< enable bribing the local authority
+ bool nonuniform_stations; ///< allow nonuniform train stations
+ bool adjacent_stations; ///< allow stations to be built directly adjacent to other stations
+ bool always_small_airport; ///< always allow small airports
+ bool realistic_acceleration; ///< realistic acceleration for trains
+ bool wagon_speed_limits; ///< enable wagon speed limits
+ bool forbid_90_deg; ///< forbid trains to make 90 deg turns
+ bool invisible_trees; ///< don't show trees when buildings are transparent
+ bool no_servicing_if_no_breakdowns; ///< dont send vehicles to depot when breakdowns are disabled
+ bool link_terraform_toolbar; ///< display terraform toolbar when displaying rail, road, water and airport toolbars
+ bool reverse_scroll; ///< Right-Click-Scrolling scrolls in the opposite direction
bool smooth_scroll; ///< Smooth scroll viewports
- bool disable_elrails; // when true, the elrails are disabled
- bool measure_tooltip; // Show a permanent tooltip when dragging tools
- byte liveries; // Options for displaying company liveries, 0=none, 1=self, 2=all
- bool prefer_teamchat; // Choose the chat message target with <ENTER>, true=all players, false=your team
- uint8 advanced_vehicle_list; // Use the "advanced" vehicle list
- uint8 loading_indicators; // Show loading indicators
+ bool disable_elrails; ///< when true, the elrails are disabled
+ bool measure_tooltip; ///< Show a permanent tooltip when dragging tools
+ byte liveries; ///< Options for displaying company liveries, 0=none, 1=self, 2=all
+ bool prefer_teamchat; ///< Choose the chat message target with <ENTER>, true=all players, false=your team
+ uint8 advanced_vehicle_list; ///< Use the "advanced" vehicle list
+ uint8 loading_indicators; ///< Show loading indicators
uint8 default_rail_type; ///< The default rail type for the rail GUI
- uint8 toolbar_pos; // position of toolbars, 0=left, 1=center, 2=right
- uint8 window_snap_radius; // Windows snap at each other if closer than this
+ uint8 toolbar_pos; ///< position of toolbars, 0=left, 1=center, 2=right
+ uint8 window_snap_radius; ///< Windows snap at each other if closer than this
bool always_build_infrastructure; ///< Always allow building of infrastructure, even when you do not have the vehicles for it
- UnitID max_trains; // max trains in game per player (these are 16bit because the unitnumber field can't hold more)
- UnitID max_roadveh; // max trucks in game per player
- UnitID max_aircraft; // max planes in game per player
- UnitID max_ships; // max ships in game per player
+ UnitID max_trains; ///< max trains in game per player (these are 16bit because the unitnumber field can't hold more)
+ UnitID max_roadveh; ///< max trucks in game per player
+ UnitID max_aircraft; ///< max planes in game per player
+ UnitID max_ships; ///< max ships in game per player
- bool servint_ispercent; // service intervals are in percents
- uint16 servint_trains; // service interval for trains
- uint16 servint_roadveh; // service interval for road vehicles
- uint16 servint_aircraft; // service interval for aircraft
- uint16 servint_ships; // service interval for ships
+ bool servint_ispercent; ///< service intervals are in percents
+ uint16 servint_trains; ///< service interval for trains
+ uint16 servint_roadveh; ///< service interval for road vehicles
+ uint16 servint_aircraft; ///< service interval for aircraft
+ uint16 servint_ships; ///< service interval for ships
bool autorenew;
int16 autorenew_months;
int32 autorenew_money;
- byte pf_maxdepth; // maximum recursion depth when searching for a train route for new pathfinder
- uint16 pf_maxlength; // maximum length when searching for a train route for new pathfinder
-
- bool bridge_pillars; // show bridge pillars for high bridges
-
- bool ai_disable_veh_train; // disable types for AI
- bool ai_disable_veh_roadveh; // disable types for AI
- bool ai_disable_veh_aircraft; // disable types for AI
- bool ai_disable_veh_ship; // disable types for AI
- Year starting_year; // starting date
- Year ending_year; // end of the game (just show highscore)
- Year colored_news_year; // when does newspaper become colored?
+ byte pf_maxdepth; ///< maximum recursion depth when searching for a train route for new pathfinder
+ uint16 pf_maxlength; ///< maximum length when searching for a train route for new pathfinder
- bool keep_all_autosave; // name the autosave in a different way.
- bool autosave_on_exit; // save an autosave when you quit the game, but do not ask "Do you really want to quit?"
- byte max_num_autosaves; // controls how many autosavegames are made before the game starts to overwrite (names them 0 to max_num_autosaves - 1)
- bool extra_dynamite; // extra dynamite
- bool road_stop_on_town_road; // allow building of drive-through road stops on town owned roads
-
- bool never_expire_vehicles; // never expire vehicles
- byte extend_vehicle_life; // extend vehicle life by this many years
+ bool bridge_pillars; ///< show bridge pillars for high bridges
- bool auto_euro; // automatically switch to euro in 2002
- bool serviceathelipad; // service helicopters at helipads automatically (no need to send to depot)
- bool smooth_economy; // smooth economy
- bool allow_shares; // allow the buying/selling of shares
- byte dist_local_authority; // distance for town local authority, default 20
+ bool ai_disable_veh_train; ///< disable types for AI
+ bool ai_disable_veh_roadveh; ///< disable types for AI
+ bool ai_disable_veh_aircraft; ///< disable types for AI
+ bool ai_disable_veh_ship; ///< disable types for AI
+ Year starting_year; ///< starting date
+ Year ending_year; ///< end of the game (just show highscore)
+ Year colored_news_year; ///< when does newspaper become colored?
- byte wait_oneway_signal; // waitingtime in days before a oneway signal
- byte wait_twoway_signal; // waitingtime in days before a twoway signal
+ bool keep_all_autosave; ///< name the autosave in a different way.
+ bool autosave_on_exit; ///< save an autosave when you quit the game, but do not ask "Do you really want to quit?"
+ byte max_num_autosaves; ///< controls how many autosavegames are made before the game starts to overwrite (names them 0 to max_num_autosaves - 1)
+ bool extra_dynamite; ///< extra dynamite
+ bool road_stop_on_town_road; ///< allow building of drive-through road stops on town owned roads
- uint8 map_x; // Size of map
+ bool never_expire_vehicles; ///< never expire vehicles
+ byte extend_vehicle_life; ///< extend vehicle life by this many years
+
+ bool auto_euro; ///< automatically switch to euro in 2002
+ bool serviceathelipad; ///< service helicopters at helipads automatically (no need to send to depot)
+ bool smooth_economy; ///< smooth economy
+ bool allow_shares; ///< allow the buying/selling of shares
+ byte dist_local_authority; ///< distance for town local authority, default 20
+
+ byte wait_oneway_signal; ///< waitingtime in days before a oneway signal
+ byte wait_twoway_signal; ///< waitingtime in days before a twoway signal
+
+ uint8 map_x; ///< Size of map
uint8 map_y;
- byte drag_signals_density; // many signals density
- Year semaphore_build_before; // Build semaphore signals automatically before this year
- bool ainew_active; // Is the new AI active?
- bool ai_in_multiplayer; // Do we allow AIs in multiplayer
+ byte drag_signals_density; ///< many signals density
+ Year semaphore_build_before; ///< Build semaphore signals automatically before this year
+ bool ainew_active; ///< Is the new AI active?
+ bool ai_in_multiplayer; ///< Do we allow AIs in multiplayer
/*
* New Path Finding
*/
- bool new_pathfinding_all; /* Use the newest pathfinding algorithm for all */
+ bool new_pathfinding_all; ///< Use the newest pathfinding algorithm for all
/**
* The maximum amount of search nodes a single NPF run should take. This
@@ -182,22 +182,22 @@
*/
uint32 npf_max_search_nodes;
- uint32 npf_rail_firstred_penalty; // The penalty for when the first signal is red (and it is not an exit or combo signal)
- uint32 npf_rail_firstred_exit_penalty; // The penalty for when the first signal is red (and it is an exit or combo signal)
- uint32 npf_rail_lastred_penalty; // The penalty for when the last signal is red
- uint32 npf_rail_station_penalty; // The penalty for station tiles
- uint32 npf_rail_slope_penalty; // The penalty for sloping upwards
- uint32 npf_rail_curve_penalty; // The penalty for curves
- uint32 npf_rail_depot_reverse_penalty; // The penalty for reversing in depots
- uint32 npf_buoy_penalty; // The penalty for going over (through) a buoy
- uint32 npf_water_curve_penalty; // The penalty for curves
- uint32 npf_road_curve_penalty; // The penalty for curves
- uint32 npf_crossing_penalty; // The penalty for level crossings
- uint32 npf_road_drive_through_penalty; // The penalty for going through a drive-through road stop
+ uint32 npf_rail_firstred_penalty; ///< The penalty for when the first signal is red (and it is not an exit or combo signal)
+ uint32 npf_rail_firstred_exit_penalty; ///< The penalty for when the first signal is red (and it is an exit or combo signal)
+ uint32 npf_rail_lastred_penalty; ///< The penalty for when the last signal is red
+ uint32 npf_rail_station_penalty; ///< The penalty for station tiles
+ uint32 npf_rail_slope_penalty; ///< The penalty for sloping upwards
+ uint32 npf_rail_curve_penalty; ///< The penalty for curves
+ uint32 npf_rail_depot_reverse_penalty; ///< The penalty for reversing in depots
+ uint32 npf_buoy_penalty; ///< The penalty for going over (through) a buoy
+ uint32 npf_water_curve_penalty; ///< The penalty for curves
+ uint32 npf_road_curve_penalty; ///< The penalty for curves
+ uint32 npf_crossing_penalty; ///< The penalty for level crossings
+ uint32 npf_road_drive_through_penalty; ///< The penalty for going through a drive-through road stop
- bool population_in_label; // Show the population of a town in his label?
+ bool population_in_label; ///< Show the population of a town in his label?
- uint8 freight_trains; // Value to multiply the weight of cargo by
+ uint8 freight_trains; ///< Value to multiply the weight of cargo by
/** YAPF settings */
YapfSettings yapf;
@@ -207,25 +207,25 @@
uint8 scrollwheel_scrolling;
uint8 scrollwheel_multiplier;
- uint8 town_growth_rate; ///< Town growth rate
- uint8 larger_towns; ///< The number of cities to build. These start off larger and grow twice as fast
- uint8 initial_city_size; ///< Multiplier for the initial size of the cities compared to towns
+ uint8 town_growth_rate; ///< Town growth rate
+ uint8 larger_towns; ///< The number of cities to build. These start off larger and grow twice as fast
+ uint8 initial_city_size; ///< Multiplier for the initial size of the cities compared to towns
- bool pause_on_newgame; ///< Whether to start new games paused or not.
+ bool pause_on_newgame; ///< Whether to start new games paused or not.
TownLayoutByte town_layout; ///< Select town layout
- bool timetabling; ///< Whether to allow timetabling.
- bool timetable_in_ticks; ///< Whether to show the timetable in ticks rather than days.
-
- bool autoslope; ///< Allow terraforming under things.
+ bool timetabling; ///< Whether to allow timetabling.
+ bool timetable_in_ticks; ///< Whether to show the timetable in ticks rather than days.
- bool mod_road_rebuild; ///< Roadworks remove unneccesary RoadBits
+ bool autoslope; ///< Allow terraforming under things.
- bool exclusive_rights; ///< allow buying exclusive rights
- bool give_money; ///< allow giving other players money
+ bool mod_road_rebuild; ///< Roadworks remove unneccesary RoadBits
- bool enable_signal_gui; ///< Show the signal GUI when the signal button is pressed
+ bool exclusive_rights; ///< allow buying exclusive rights
+ bool give_money; ///< allow giving other players money
+
+ bool enable_signal_gui; ///< Show the signal GUI when the signal button is pressed
};
extern Patches _patches;
--- a/src/ship.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/ship.h Sun Feb 03 20:34:26 2008 +0000
@@ -41,6 +41,7 @@
Money GetRunningCost() const { return ShipVehInfo(this->engine_type)->running_cost * _price.ship_running; }
bool IsInDepot() const { return this->u.ship.state == 0x80; }
void Tick();
+ void OnNewDay();
};
#endif /* SHIP_H */
--- a/src/ship_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/ship_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -170,27 +170,27 @@
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
}
-void OnNewDay_Ship(Vehicle *v)
+void Ship::OnNewDay()
{
CommandCost cost(EXPENSES_SHIP_RUN);
- if ((++v->day_counter & 7) == 0)
- DecreaseVehicleValue(v);
-
- CheckVehicleBreakdown(v);
- AgeVehicle(v);
- CheckIfShipNeedsService(v);
+ if ((++this->day_counter & 7) == 0)
+ DecreaseVehicleValue(this);
- CheckOrders(v);
-
- if (v->vehstatus & VS_STOPPED) return;
+ CheckVehicleBreakdown(this);
+ AgeVehicle(this);
+ CheckIfShipNeedsService(this);
- cost.AddCost(GetVehicleProperty(v, 0x0F, ShipVehInfo(v->engine_type)->running_cost) * _price.ship_running / 364);
- v->profit_this_year -= cost.GetCost() >> 8;
+ CheckOrders(this);
- SubtractMoneyFromPlayerFract(v->owner, cost);
+ if (this->vehstatus & VS_STOPPED) return;
- InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
+ cost.AddCost(GetVehicleProperty(this, 0x0F, ShipVehInfo(this->engine_type)->running_cost) * _price.ship_running / 364);
+ this->profit_this_year -= cost.GetCost() >> 8;
+
+ SubtractMoneyFromPlayerFract(this->owner, cost);
+
+ InvalidateWindow(WC_VEHICLE_DETAILS, this->index);
/* we need this for the profit */
InvalidateWindowClasses(WC_SHIPS_LIST);
}
@@ -479,7 +479,7 @@
pfs.best_bird_dist = (uint)-1;
pfs.best_length = (uint)-1;
- FollowTrack(tile, 0x3800 | TRANSPORT_WATER, 0, (DiagDirection)_ship_search_directions[i][dir], (TPFEnumProc*)ShipTrackFollower, NULL, &pfs);
+ FollowTrack(tile, 0x1800 | TRANSPORT_WATER, 0, (DiagDirection)_ship_search_directions[i][dir], (TPFEnumProc*)ShipTrackFollower, NULL, &pfs);
if (best_track != INVALID_TRACK) {
if (pfs.best_bird_dist != 0) {
--- a/src/slope_func.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/slope_func.h Sun Feb 03 20:34:26 2008 +0000
@@ -45,6 +45,19 @@
}
/**
+ * Removes a halftile slope from a slope
+ *
+ * Non-halftile slopes remain unmodified.
+ *
+ * @param s A #Slope.
+ * @return The slope s without it's halftile slope.
+ */
+static inline Slope RemoveHalftileSlope(Slope s)
+{
+ return (Slope)(s & ~SLOPE_HALFTILE_MASK);
+}
+
+/**
* Return the complement of a slope.
*
* This method returns the complement of a slope. The complement of a
@@ -62,6 +75,29 @@
}
/**
+ * Tests if a specific slope has exactly one corner raised.
+ *
+ * @param s The #Slope
+ * @return true iff exactly one corner is raised
+ */
+static inline bool IsSlopeWithOneCornerRaised(Slope s)
+{
+ return (s == SLOPE_W) || (s == SLOPE_S) || (s == SLOPE_E) || (s == SLOPE_N);
+}
+
+/**
+ * Returns the slope with a specific corner raised.
+ *
+ * @param corner The #Corner.
+ * @return The #Slope with corner "corner" raised.
+ */
+static inline Slope SlopeWithOneCornerRaised(Corner corner)
+{
+ assert(IsValidCorner(corner));
+ return (Slope)(1 << corner);
+}
+
+/**
* Tests if a slope has a highest corner (i.e. one corner raised or a steep slope).
*
* Note: A halftile slope is ignored.
@@ -71,8 +107,8 @@
*/
static inline bool HasSlopeHighestCorner(Slope s)
{
- s = (Slope)(s & ~SLOPE_HALFTILE_MASK);
- return IsSteepSlope(s) || (s == SLOPE_W) || (s == SLOPE_S) || (s == SLOPE_E) || (s == SLOPE_N);
+ s = RemoveHalftileSlope(s);
+ return IsSteepSlope(s) || IsSlopeWithOneCornerRaised(s);
}
/**
@@ -84,7 +120,7 @@
*/
static inline Corner GetHighestSlopeCorner(Slope s)
{
- switch (s & ~SLOPE_HALFTILE_MASK) {
+ switch (RemoveHalftileSlope(s)) {
case SLOPE_W:
case SLOPE_STEEP_W: return CORNER_W;
case SLOPE_S:
@@ -135,15 +171,14 @@
}
/**
- * Returns the slope with a specific corner raised.
+ * Tests if a specific slope has exactly three corners raised.
*
- * @param corner The #Corner.
- * @return The #Slope with corner "corner" raised.
+ * @param s The #Slope
+ * @return true iff exactly three corners are raised
*/
-static inline Slope SlopeWithOneCornerRaised(Corner corner)
+static inline bool IsSlopeWithThreeCornersRaised(Slope s)
{
- assert(IsValidCorner(corner));
- return (Slope)(1 << corner);
+ return !IsHalftileSlope(s) && !IsSteepSlope(s) && IsSlopeWithOneCornerRaised(ComplementSlope(s));
}
/**
@@ -158,6 +193,62 @@
}
/**
+ * Returns a specific steep slope
+ *
+ * @param corner A #Corner.
+ * @return The steep #Slope with "corner" as highest corner.
+ */
+static inline Slope SteepSlope(Corner corner)
+{
+ return (Slope)(SLOPE_STEEP | SlopeWithThreeCornersRaised(OppositeCorner(corner)));
+}
+
+/**
+ * Tests if a specific slope is an inclined slope.
+ *
+ * @param s The #Slope
+ * @return true iff the slope is inclined.
+ */
+static inline bool IsInclinedSlope(Slope s)
+{
+ return (s == SLOPE_NW) || (s == SLOPE_SW) || (s == SLOPE_SE) || (s == SLOPE_NE);
+}
+
+/**
+ * Returns the direction of an inclined slope.
+ *
+ * @param s A #Slope
+ * @return The direction the slope goes up in. Or INVALID_DIAGDIR if the slope is not an inclined slope.
+ */
+static inline DiagDirection GetInclinedSlopeDirection(Slope s)
+{
+ switch (s) {
+ case SLOPE_NE: return DIAGDIR_NE;
+ case SLOPE_SE: return DIAGDIR_SE;
+ case SLOPE_SW: return DIAGDIR_SW;
+ case SLOPE_NW: return DIAGDIR_NW;
+ default: return INVALID_DIAGDIR;
+ }
+}
+
+/**
+ * Returns the slope, that is inclined in a specific direction.
+ *
+ * @param dir A #DiagDirection
+ * @return The #Slope that goes up in direction dir.
+ */
+static inline Slope InclinedSlope(DiagDirection dir)
+{
+ switch (dir) {
+ case DIAGDIR_NE: return SLOPE_NE;
+ case DIAGDIR_SE: return SLOPE_SE;
+ case DIAGDIR_SW: return SLOPE_SW;
+ case DIAGDIR_NW: return SLOPE_NW;
+ default: NOT_REACHED();
+ }
+}
+
+/**
* Adds a halftile slope to a slope.
*
* @param s #Slope without a halftile slope.
--- a/src/sound.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/sound.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -14,6 +14,7 @@
#include "core/alloc_func.hpp"
#include "map_func.h"
#include "vehicle_base.h"
+#include "debug.h"
static uint _file_count;
static FileEntry *_files;
@@ -25,12 +26,20 @@
static void OpenBankFile(const char *filename)
{
- uint count;
uint i;
FioOpenFile(SOUND_SLOT, filename);
uint pos = FioGetPos();
- count = FioReadDword() / 8;
+ uint count = FioReadDword() / 8;
+
+ /* Simple check for the correct number of original sounds. */
+ if (count != 73) {
+ DEBUG(misc, 6, "Incorrect number of sounds in '%s', ignoring.", filename);
+ _file_count = 0;
+ _files = NULL;
+ return;
+ }
+
FileEntry *fe = CallocT<FileEntry>(count);
if (fe == NULL) {
@@ -104,13 +113,9 @@
return _file_count;
}
-static bool SetBankSource(MixerChannel *mc, uint bank)
+static bool SetBankSource(MixerChannel *mc, const FileEntry *fe)
{
- const FileEntry *fe;
- uint i;
-
- if (bank >= GetNumSounds()) return false;
- fe = GetSound(bank);
+ assert(fe != NULL);
if (fe->file_size == 0) return false;
@@ -120,8 +125,9 @@
FioSeekToFile(fe->file_slot, fe->file_offset);
FioReadBlock(mem, fe->file_size);
- for (i = 0; i != fe->file_size; i++)
+ for (uint i = 0; i != fe->file_size; i++) {
mem[i] += -128; // Convert unsigned sound data to signed
+ }
assert(fe->bits_per_sample == 8 && fe->channels == 1 && fe->file_size != 0 && fe->rate != 0);
@@ -139,17 +145,22 @@
/* Low level sound player */
static void StartSound(uint sound, int panning, uint volume)
{
- MixerChannel *mc;
- uint left_vol, right_vol;
+ if (volume == 0) return;
- if (volume == 0) return;
- mc = MxAllocateChannel();
+ const FileEntry *fe = GetSound(sound);
+ if (fe == NULL) return;
+
+ MixerChannel *mc = MxAllocateChannel();
if (mc == NULL) return;
- if (!SetBankSource(mc, sound)) return;
+
+ if (!SetBankSource(mc, fe)) return;
+
+ /* Apply the sound effect's own volume. */
+ volume = (fe->volume * volume) / 128;
panning = Clamp(panning, -PANNING_LEVELS, PANNING_LEVELS);
- left_vol = (volume * PANNING_LEVELS) - (volume * panning);
- right_vol = (volume * PANNING_LEVELS) + (volume * panning);
+ uint left_vol = (volume * PANNING_LEVELS) - (volume * panning);
+ uint right_vol = (volume * PANNING_LEVELS) + (volume * panning);
MxSetChannelVolume(mc, left_vol * 128 / PANNING_LEVELS, right_vol * 128 / PANNING_LEVELS);
MxActivateChannel(mc);
}
@@ -215,7 +226,7 @@
StartSound(
sound,
left / max(1, vp->virtual_width / ((PANNING_LEVELS << 1) + 1)) - PANNING_LEVELS,
- (GetSound(sound)->volume * msf.effect_vol * _vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN]) >> 15
+ (msf.effect_vol * _vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN]) / 256
);
return;
}
@@ -242,9 +253,5 @@
void SndPlayFx(SoundFx sound)
{
- StartSound(
- sound,
- 0,
- (GetSound(sound)->volume * msf.effect_vol) >> 7
- );
+ StartSound(sound, 0, msf.effect_vol);
}
--- a/src/spritecache.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/spritecache.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -262,8 +262,8 @@
void DupSprite(SpriteID old_spr, SpriteID new_spr)
{
+ SpriteCache *scnew = AllocateSpriteCache(new_spr); // may reallocate: so put it first
SpriteCache *scold = GetSpriteCache(old_spr);
- SpriteCache *scnew = AllocateSpriteCache(new_spr);
scnew->file_slot = scold->file_slot;
scnew->file_pos = scold->file_pos;
@@ -272,14 +272,6 @@
}
-void SkipSprites(uint count)
-{
- for (; count > 0; --count) {
- if (!ReadSpriteHeaderSkipData()) return;
- }
-}
-
-
#define S_FREE_MASK 1
static inline MemBlock* NextBlock(MemBlock* block)
--- a/src/spritecache.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/spritecache.h Sun Feb 03 20:34:26 2008 +0000
@@ -35,6 +35,5 @@
bool LoadNextSprite(int load_index, byte file_index, uint file_sprite_id);
void DupSprite(SpriteID old_spr, SpriteID new_spr);
-void SkipSprites(uint count);
#endif /* SPRITECACHE_H */
--- a/src/station_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/station_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -762,7 +762,7 @@
* @param w width of search area
* @param h height of search area
* @param flags operation to perform
- * @param invalid_dirs prohibited directions
+ * @param invalid_dirs prohibited directions (set of DiagDirections)
* @param station StationID to be queried and returned if available
* @param check_clear if clearing tile should be performed (in wich case, cost will be added)
* @return the cost in case of success, or an error code if it failed.
@@ -805,11 +805,12 @@
int flat_z = z;
if (tileh != SLOPE_FLAT) {
- /* need to check so the entrance to the station is not pointing at a slope. */
- if ((invalid_dirs & 1 && !(tileh & SLOPE_NE) && (uint)w_cur == w) ||
- (invalid_dirs & 2 && !(tileh & SLOPE_SE) && h_cur == 1) ||
- (invalid_dirs & 4 && !(tileh & SLOPE_SW) && w_cur == 1) ||
- (invalid_dirs & 8 && !(tileh & SLOPE_NW) && (uint)h_cur == h)) {
+ /* need to check so the entrance to the station is not pointing at a slope.
+ * This must be valid for all station tiles, as the user can remove single station tiles. */
+ if ((HasBit(invalid_dirs, DIAGDIR_NE) && !(tileh & SLOPE_NE)) ||
+ (HasBit(invalid_dirs, DIAGDIR_SE) && !(tileh & SLOPE_SE)) ||
+ (HasBit(invalid_dirs, DIAGDIR_SW) && !(tileh & SLOPE_SW)) ||
+ (HasBit(invalid_dirs, DIAGDIR_NW) && !(tileh & SLOPE_NW))) {
return_cmd_error(STR_0007_FLAT_LAND_REQUIRED);
}
cost.AddCost(_price.terraform);
@@ -887,14 +888,14 @@
* the uniform-stations code wouldn't handle it well */
BEGIN_TILE_LOOP(t, st->trainst_w, st->trainst_h, st->train_tile)
if (!st->TileBelongsToRailStation(t)) { // there may be adjoined station
- _error_message = STR_306D_NONUNIFORM_STATIONS_DISALLOWED;
+ _error_message = STR_NONUNIFORM_STATIONS_DISALLOWED;
return false;
}
END_TILE_LOOP(t, st->trainst_w, st->trainst_h, st->train_tile)
/* check so the orientation is the same */
if (GetRailStationAxis(st->train_tile) != axis) {
- _error_message = STR_306D_NONUNIFORM_STATIONS_DISALLOWED;
+ _error_message = STR_NONUNIFORM_STATIONS_DISALLOWED;
return false;
}
@@ -914,7 +915,7 @@
tile -= TileDiffXY(curw, 0);
curw += w;
} else {
- _error_message = STR_306D_NONUNIFORM_STATIONS_DISALLOWED;
+ _error_message = STR_NONUNIFORM_STATIONS_DISALLOWED;
return false;
}
}
@@ -1285,7 +1286,7 @@
/* Do not allow removing from stations if non-uniform stations are not enabled
* The check must be here to give correct error message
*/
- if (!_patches.nonuniform_stations) return_cmd_error(STR_306D_NONUNIFORM_STATIONS_DISALLOWED);
+ if (!_patches.nonuniform_stations) return_cmd_error(STR_NONUNIFORM_STATIONS_DISALLOWED);
/* If we reached here, the tile is valid so increase the quantity of tiles we will remove */
quantity++;
@@ -1482,7 +1483,7 @@
/* give us a road stop in the list, and check if something went wrong */
RoadStop *road_stop = new RoadStop(tile);
if (road_stop == NULL) {
- return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS);
+ return_cmd_error(type ? STR_TOO_MANY_TRUCK_STOPS : STR_TOO_MANY_BUS_STOPS);
}
/* ensure that in case of error (or no DC_EXEC) the new road stop gets deleted upon return */
@@ -1490,7 +1491,7 @@
if (st != NULL &&
GetNumRoadStopsInStation(st, RoadStop::BUS) + GetNumRoadStopsInStation(st, RoadStop::TRUCK) >= RoadStop::LIMIT) {
- return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS);
+ return_cmd_error(type ? STR_TOO_MANY_TRUCK_STOPS : STR_TOO_MANY_BUS_STOPS);
}
/* In case of new station if DC_EXEC is NOT set we still need to create the station
@@ -1913,6 +1914,8 @@
if (!IsWaterTile(tile) || tile == 0) return_cmd_error(STR_304B_SITE_UNSUITABLE);
if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
+ if (GetTileSlope(tile, NULL) != SLOPE_FLAT) return_cmd_error(STR_304B_SITE_UNSUITABLE);
+
/* allocate and initialize new station */
Station *st = new Station(tile);
if (st == NULL) return_cmd_error(STR_3008_TOO_MANY_STATIONS_LOADING);
@@ -1935,7 +1938,7 @@
st->build_date = _date;
- MakeBuoy(tile, st->index);
+ MakeBuoy(tile, st->index, GetWaterClass(tile));
UpdateStationVirtCoordDirty(st);
UpdateStationAcceptance(st, false);
@@ -1993,7 +1996,7 @@
/* We have to set the water tile's state to the same state as before the
* buoy was placed. Otherwise one could plant a buoy on a canal edge,
* remove it and flood the land (if the canal edge is at level 0) */
- MakeWaterOrCanalDependingOnOwner(tile, GetTileOwner(tile));
+ MakeWaterKeepingClass(tile, GetTileOwner(tile));
MarkTileDirtyByTile(tile);
UpdateStationVirtCoordDirty(st);
@@ -2022,14 +2025,12 @@
{
CommandCost cost;
- DiagDirection direction;
- switch (GetTileSlope(tile, NULL)) {
- case SLOPE_SW: direction = DIAGDIR_NE; break;
- case SLOPE_SE: direction = DIAGDIR_NW; break;
- case SLOPE_NW: direction = DIAGDIR_SE; break;
- case SLOPE_NE: direction = DIAGDIR_SW; break;
- default: return_cmd_error(STR_304B_SITE_UNSUITABLE);
- }
+ DiagDirection direction = GetInclinedSlopeDirection(GetTileSlope(tile, NULL));
+ if (direction == INVALID_DIAGDIR) return_cmd_error(STR_304B_SITE_UNSUITABLE);
+ direction = ReverseDiagDir(direction);
+
+ /* Docks cannot be placed on rapids */
+ if (IsWaterTile(tile)) return_cmd_error(STR_304B_SITE_UNSUITABLE);
if (!(flags & DC_NO_TOWN_RATING) && !CheckIfAuthorityAllows(tile)) return CMD_ERROR;
@@ -2046,6 +2047,9 @@
if (MayHaveBridgeAbove(tile_cur) && IsBridgeAbove(tile_cur)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
+ /* Get the water class of the water tile before it is cleared.*/
+ WaterClass wc = GetWaterClass(tile_cur);
+
cost = DoCommand(tile_cur, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
if (CmdFailed(cost)) return CMD_ERROR;
@@ -2103,7 +2107,7 @@
st->rect.BeforeAddRect(tile, _dock_w_chk[direction], _dock_h_chk[direction], StationRect::ADD_TRY);
- MakeDock(tile, st->owner, st->index, direction);
+ MakeDock(tile, st->owner, st->index, direction, wc);
UpdateStationVirtCoordDirty(st);
UpdateStationAcceptance(st, false);
@@ -2128,7 +2132,7 @@
if (flags & DC_EXEC) {
DoClearSquare(tile1);
- MakeWaterOrCanalDependingOnSurroundings(tile2, st->owner);
+ MakeWaterKeepingClass(tile2, st->owner);
st->rect.AfterRemoveTile(st, tile1);
st->rect.AfterRemoveTile(st, tile2);
@@ -2166,7 +2170,7 @@
total_offset = rti->total_offset;
custom_ground_offset = rti->custom_ground_offset;
} else {
- roadtypes = GetRoadTypes(ti->tile);
+ roadtypes = IsRoadStop(ti->tile) ? GetRoadTypes(ti->tile) : ROADTYPES_NONE;
total_offset = 0;
custom_ground_offset = 0;
}
@@ -2260,7 +2264,14 @@
DrawTramCatenary(ti, axis == AXIS_X ? ROAD_X : ROAD_Y);
}
- if (IsCanalBuoyTile(ti->tile)) DrawCanalWater(ti->tile);
+ if (IsBuoy(ti->tile)) {
+ /* Draw appropriate water edges */
+ switch (GetWaterClass(ti->tile)) {
+ case WATER_CLASS_SEA: break;
+ case WATER_CLASS_CANAL: DrawCanalWater(ti->tile, false); break;
+ case WATER_CLASS_RIVER: DrawRiverWater(ti, false); break;
+ }
+ }
const DrawTileSeqStruct *dtss;
foreach_draw_tile_seq(dtss, t->seq) {
@@ -3015,8 +3026,8 @@
switch (GetStationType(tile)) {
case STATION_RAIL: return_cmd_error(STR_300B_MUST_DEMOLISH_RAILROAD);
case STATION_AIRPORT: return_cmd_error(STR_300E_MUST_DEMOLISH_AIRPORT_FIRST);
- case STATION_TRUCK: return_cmd_error(HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) ? STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION : STR_3047_MUST_DEMOLISH_TRUCK_STATION);
- case STATION_BUS: return_cmd_error(HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) ? STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION : STR_3046_MUST_DEMOLISH_BUS_STATION);
+ case STATION_TRUCK: return_cmd_error(HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) ? STR_MUST_DEMOLISH_CARGO_TRAM_STATION : STR_3047_MUST_DEMOLISH_TRUCK_STATION);
+ case STATION_BUS: return_cmd_error(HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) ? STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION : STR_3046_MUST_DEMOLISH_BUS_STATION);
case STATION_BUOY: return_cmd_error(STR_306A_BUOY_IN_THE_WAY);
case STATION_DOCK: return_cmd_error(STR_304D_MUST_DEMOLISH_DOCK_FIRST);
case STATION_OILRIG:
--- a/src/station_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/station_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -664,39 +664,21 @@
}
}
-static const Widget _station_view_expanded_widgets[] = {
-{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // SVW_CLOSEBOX
-{ WWT_CAPTION, RESIZE_NONE, 14, 11, 236, 0, 13, STR_300A_0, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{ WWT_STICKYBOX, RESIZE_NONE, 14, 237, 248, 0, 13, 0x0, STR_STICKY_BUTTON},
-{ WWT_PANEL, RESIZE_NONE, 14, 0, 236, 14, 65, 0x0, STR_NULL}, // SVW_WAITING
-{ WWT_SCROLLBAR, RESIZE_NONE, 14, 237, 248, 14, 65, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{ WWT_EMPTY, RESIZE_NONE, 0, 0, 0, 0, 0, 0x0, STR_NULL}, // SVW_ACCEPTLIST
-{ WWT_PANEL, RESIZE_NONE, 14, 0, 248, 66, 197, 0x0, STR_NULL}, // SVW_RATINGLIST
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 63, 198, 209, STR_00E4_LOCATION, STR_3053_CENTER_MAIN_VIEW_ON_STATION}, // SVW_LOCATION
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 64, 128, 198, 209, STR_3033_ACCEPTS, STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO}, // SVW_ACCEPTS
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 129, 192, 198, 209, STR_0130_RENAME, STR_3055_CHANGE_NAME_OF_STATION}, // SVW_RENAME
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 193, 206, 198, 209, STR_TRAIN, STR_SCHEDULED_TRAINS_TIP }, // SVW_TRAINS
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 207, 220, 198, 209, STR_LORRY, STR_SCHEDULED_ROAD_VEHICLES_TIP }, // SVW_ROADVEHS
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 221, 234, 198, 209, STR_PLANE, STR_SCHEDULED_AIRCRAFT_TIP }, // SVW_PLANES
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 235, 248, 198, 209, STR_SHIP, STR_SCHEDULED_SHIPS_TIP }, // SVW_SHIPS
-{ WIDGETS_END},
-};
-
static const Widget _station_view_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // SVW_CLOSEBOX
-{ WWT_CAPTION, RESIZE_NONE, 14, 11, 236, 0, 13, STR_300A_0, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{ WWT_STICKYBOX, RESIZE_NONE, 14, 237, 248, 0, 13, 0x0, STR_STICKY_BUTTON},
-{ WWT_PANEL, RESIZE_NONE, 14, 0, 236, 14, 65, 0x0, STR_NULL}, // SVW_WAITING
-{ WWT_SCROLLBAR, RESIZE_NONE, 14, 237, 248, 14, 65, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{ WWT_PANEL, RESIZE_NONE, 14, 0, 248, 66, 97, 0x0, STR_NULL}, // SVW_ACCEPTLIST
-{ WWT_EMPTY, RESIZE_NONE, 0, 0, 0, 0, 0, 0x0, STR_NULL}, // SVW_RATINGLIST
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 63, 98, 109, STR_00E4_LOCATION, STR_3053_CENTER_MAIN_VIEW_ON_STATION}, // SVW_LOCATION
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 64, 128, 98, 109, STR_3032_RATINGS, STR_3054_SHOW_STATION_RATINGS}, // SVW_RATINGS
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 129, 192, 98, 109, STR_0130_RENAME, STR_3055_CHANGE_NAME_OF_STATION}, // SVW_RENAME
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 193, 206, 98, 109, STR_TRAIN, STR_SCHEDULED_TRAINS_TIP }, // SVW_TRAINS
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 207, 220, 98, 109, STR_LORRY, STR_SCHEDULED_ROAD_VEHICLES_TIP }, // SVW_ROADVEHS
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 221, 234, 98, 109, STR_PLANE, STR_SCHEDULED_AIRCRAFT_TIP }, // SVW_PLANES
-{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 235, 248, 98, 109, STR_SHIP, STR_SCHEDULED_SHIPS_TIP }, // SVW_SHIPS
+{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 236, 0, 13, STR_300A_0, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{ WWT_STICKYBOX, RESIZE_LR, 14, 237, 248, 0, 13, 0x0, STR_STICKY_BUTTON},
+{ WWT_PANEL, RESIZE_RB, 14, 0, 236, 14, 65, 0x0, STR_NULL}, // SVW_WAITING
+{ WWT_SCROLLBAR, RESIZE_LRB, 14, 237, 248, 14, 65, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
+{ WWT_PANEL, RESIZE_RTB, 14, 0, 248, 66, 97, 0x0, STR_NULL}, // SVW_ACCEPTLIST / SVW_RATINGLIST
+{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 59, 98, 109, STR_00E4_LOCATION, STR_3053_CENTER_MAIN_VIEW_ON_STATION}, // SVW_LOCATION
+{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 60, 120, 98, 109, STR_3032_RATINGS, STR_3054_SHOW_STATION_RATINGS}, // SVW_RATINGS / SVW_ACCEPTS
+{ WWT_PUSHTXTBTN, RESIZE_RTB, 14, 121, 180, 98, 109, STR_0130_RENAME, STR_3055_CHANGE_NAME_OF_STATION}, // SVW_RENAME
+{ WWT_PUSHTXTBTN, RESIZE_LRTB, 14, 181, 194, 98, 109, STR_TRAIN, STR_SCHEDULED_TRAINS_TIP }, // SVW_TRAINS
+{ WWT_PUSHTXTBTN, RESIZE_LRTB, 14, 195, 208, 98, 109, STR_LORRY, STR_SCHEDULED_ROAD_VEHICLES_TIP }, // SVW_ROADVEHS
+{ WWT_PUSHTXTBTN, RESIZE_LRTB, 14, 209, 222, 98, 109, STR_PLANE, STR_SCHEDULED_AIRCRAFT_TIP }, // SVW_PLANES
+{ WWT_PUSHTXTBTN, RESIZE_LRTB, 14, 223, 236, 98, 109, STR_SHIP, STR_SCHEDULED_SHIPS_TIP }, // SVW_SHIPS
+{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 237, 248, 98, 109, 0x0, STR_RESIZE_BUTTON},
{ WIDGETS_END},
};
@@ -708,9 +690,9 @@
* @param x x on-screen coordinate where to start with drawing icons
* @param y y coordinate
*/
-static void DrawCargoIcons(CargoID i, uint waiting, int x, int y)
+static void DrawCargoIcons(CargoID i, uint waiting, int x, int y, uint width)
{
- uint num = min((waiting + 5) / 10, 23); // maximum is 23 icons so it won't overflow
+ uint num = min((waiting + 5) / 10, width / 10); // maximum is width / 10 icons so it won't overflow
if (num == 0) return;
const CargoSpec *cs = GetCargo(i);
@@ -731,6 +713,20 @@
} while (--num);
}
+struct CargoData {
+ CargoID cargo;
+ StationID source;
+ uint count;
+
+ CargoData(CargoID cargo, StationID source, uint count) :
+ cargo(cargo),
+ source(source),
+ count(count)
+ { }
+};
+
+typedef std::list<CargoData> CargoDataList;
+
/**
* Redraws whole StationView window
*
@@ -740,20 +736,40 @@
{
StationID station_id = w->window_number;
const Station* st = GetStation(station_id);
- uint num; ///< number of cargo types waiting at station
int x, y; ///< coordinates used for printing waiting/accepted/rating of cargo
int pos; ///< = w->vscroll.pos
StringID str;
+ CargoDataList cargolist;
/* count types of cargos waiting in station */
- num = 1;
for (CargoID i = 0; i < NUM_CARGO; i++) {
if (!st->goods[i].cargo.Empty()) {
- num++;
- if (st->goods[i].cargo.Source() != station_id) num++;
+ /* Add an entry for total amount of cargo of this type waiting. */
+ cargolist.push_back(CargoData(i, INVALID_STATION, st->goods[i].cargo.Count()));
+
+ /* Add an entry for each distinct cargo source. */
+ const CargoList::List *packets = st->goods[i].cargo.Packets();
+ for (CargoList::List::const_iterator it = packets->begin(); it != packets->end(); it++) {
+ const CargoPacket *cp = *it;
+ if (cp->source != station_id) {
+ bool added = false;
+
+ /* Check if we already have this source in the list */
+ for (CargoDataList::iterator jt = cargolist.begin(); jt != cargolist.end(); jt++) {
+ CargoData *cd = &(*jt);
+ if (cd->cargo == i && cd->source == cp->source) {
+ cd->count += cp->count;
+ added = true;
+ break;
+ }
+ }
+
+ if (!added) cargolist.push_back(CargoData(i, cp->source, cp->count));
+ }
+ }
}
}
- SetVScrollCount(w, num); // update scrollbar
+ SetVScrollCount(w, cargolist.size() + 1); // update scrollbar
/* disable some buttons */
w->SetWidgetDisabledState(SVW_RENAME, st->owner != _local_player);
@@ -770,6 +786,9 @@
y = 15;
pos = w->vscroll.pos;
+ uint width = w->widget[SVW_WAITING].right - w->widget[SVW_WAITING].left - 4;
+ int maxrows = w->vscroll.cap;
+
if (--pos < 0) {
str = STR_00D0_NOTHING;
for (CargoID i = 0; i < NUM_CARGO; i++) {
@@ -780,37 +799,27 @@
y += 10;
}
- for (CargoID i = 0; i < NUM_CARGO && pos > -5; i++) {
- uint waiting = st->goods[i].cargo.Count();
- if (waiting == 0) continue;
-
- if (st->goods[i].cargo.Source() == station_id) {
- if (--pos < 0) {
- DrawCargoIcons(i, waiting, x, y);
- SetDParam(1, waiting);
- SetDParam(0, i);
- DrawStringRightAligned(x + 234, y, STR_0009, TC_FROMSTRING);
- y += 10;
- }
- } else {
- /* enroute */
- if (--pos < 0) {
- DrawCargoIcons(i, waiting, x, y);
- SetDParam(1, waiting);
- SetDParam(0, i);
- DrawStringRightAligned(x + 234, y, STR_000A_EN_ROUTE_FROM, TC_FROMSTRING);
- y += 10;
+ for (CargoDataList::const_iterator it = cargolist.begin(); it != cargolist.end() && pos > -maxrows; ++it) {
+ if (--pos < 0) {
+ const CargoData *cd = &(*it);
+ if (cd->source == INVALID_STATION) {
+ /* Heading */
+ DrawCargoIcons(cd->cargo, cd->count, x, y, width);
+ SetDParam(0, cd->cargo);
+ SetDParam(1, cd->count);
+ DrawStringRightAligned(x + width, y, STR_0009, TC_FROMSTRING);
+ } else {
+ SetDParam(0, cd->cargo);
+ SetDParam(1, cd->count);
+ SetDParam(2, cd->source);
+ DrawStringRightAlignedTruncated(x + width, y, STR_EN_ROUTE_FROM, TC_FROMSTRING, width);
}
- if (pos > -5 && --pos < 0) {
- SetDParam(0, st->goods[i].cargo.Source());
- DrawStringRightAligned(x + 234, y, STR_000B, TC_FROMSTRING);
- y += 10;
- }
+ y += 10;
}
}
- if (IsWindowOfPrototype(w, _station_view_widgets)) { // small window with list of accepted cargo
+ if (w->widget[SVW_ACCEPTS].data == STR_3032_RATINGS) { // small window with list of accepted cargo
char *b = _userstring;
bool first = true;
@@ -838,11 +847,13 @@
/* Make sure we detect any buffer overflow */
assert(b < endof(_userstring));
- DrawStringMultiLine(2, 67, STR_SPEC_USERSTRING, 245);
+ DrawStringMultiLine(2, w->widget[SVW_ACCEPTLIST].top + 1, STR_SPEC_USERSTRING, w->widget[SVW_ACCEPTLIST].right - w->widget[SVW_ACCEPTLIST].left);
} else { // extended window with list of cargo ratings
- DrawString(2, 67, STR_3034_LOCAL_RATING_OF_TRANSPORT, TC_FROMSTRING);
+ y = w->widget[SVW_RATINGLIST].top + 1;
- y = 77;
+ DrawString(2, y, STR_3034_LOCAL_RATING_OF_TRANSPORT, TC_FROMSTRING);
+ y += 10;
+
for (CargoID i = 0; i < NUM_CARGO; i++) {
const CargoSpec *cs = GetCargo(i);
if (!cs->IsValid()) continue;
@@ -882,13 +893,16 @@
case SVW_RATINGS:
SetWindowDirty(w);
- /* toggle height/widget set */
- if (IsWindowOfPrototype(w, _station_view_expanded_widgets)) {
- AssignWidgetToWindow(w, _station_view_widgets);
- w->height = 110;
+ if (w->widget[SVW_RATINGS].data == STR_3032_RATINGS) {
+ /* Switch to ratings view */
+ w->widget[SVW_RATINGS].data = STR_3033_ACCEPTS;
+ w->widget[SVW_RATINGS].tooltips = STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO;
+ ResizeWindowForWidget(w, SVW_ACCEPTLIST, 0, 100);
} else {
- AssignWidgetToWindow(w, _station_view_expanded_widgets);
- w->height = 210;
+ /* Switch to accepts view */
+ w->widget[SVW_RATINGS].data = STR_3032_RATINGS;
+ w->widget[SVW_RATINGS].tooltips = STR_3054_SHOW_STATION_RATINGS;
+ ResizeWindowForWidget(w, SVW_ACCEPTLIST, 0, -100);
}
SetWindowDirty(w);
@@ -947,6 +961,11 @@
DeleteWindowById(WC_AIRCRAFT_LIST, wno);
break;
}
+
+ case WE_RESIZE:
+ if (e->we.sizing.diff.x != 0) ResizeButtons(w, SVW_LOCATION, SVW_RENAME);
+ w->vscroll.cap += e->we.sizing.diff.y / (int)w->resize.step_height;
+ break;
}
}
@@ -954,7 +973,7 @@
static const WindowDesc _station_view_desc = {
WDP_AUTO, WDP_AUTO, 249, 110, 249, 110,
WC_STATION_VIEW, WC_NONE,
- WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
+ WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_station_view_widgets,
StationViewWndProc
};
@@ -972,4 +991,5 @@
PlayerID owner = GetStation(w->window_number)->owner;
if (owner != OWNER_NONE) w->caption_color = owner;
w->vscroll.cap = 5;
+ w->resize.step_height = 10;
}
--- a/src/station_gui.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/station_gui.h Sun Feb 03 20:34:26 2008 +0000
@@ -36,15 +36,16 @@
SVW_CAPTION = 1, ///< Caption of the window
SVW_WAITING = 3, ///< List of waiting cargo
SVW_ACCEPTLIST = 5, ///< List of accepted cargos
- SVW_RATINGLIST = 6, ///< Ratings of cargos
- SVW_LOCATION = 7, ///< 'Location' button
- SVW_RATINGS = 8, ///< 'Ratings' button
- SVW_ACCEPTS = 8, ///< 'Accepts' button
- SVW_RENAME = 9, ///< 'Rename' button
- SVW_TRAINS = 10, ///< List of scheduled trains button
+ SVW_RATINGLIST = 5, ///< Ratings of cargos
+ SVW_LOCATION = 6, ///< 'Location' button
+ SVW_RATINGS = 7, ///< 'Ratings' button
+ SVW_ACCEPTS = 7, ///< 'Accepts' button
+ SVW_RENAME = 8, ///< 'Rename' button
+ SVW_TRAINS = 9, ///< List of scheduled trains button
SVW_ROADVEHS, ///< List of scheduled road vehs button
SVW_PLANES, ///< List of scheduled planes button
SVW_SHIPS, ///< List of scheduled ships button
+ SVW_RESIZE, ///< Resize button
};
/* sorter stuff */
@@ -57,7 +58,7 @@
SCT_ALL
};
-void DrawStationCoverageAreaText(int sx, int sy, StationCoverageType sct, int rad);
+int DrawStationCoverageAreaText(int sx, int sy, StationCoverageType sct, int rad);
void CheckRedrawStationCoverage(const Window *w);
extern bool _station_show_coverage;
--- a/src/station_map.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/station_map.h Sun Feb 03 20:34:26 2008 +0000
@@ -7,6 +7,7 @@
#include "rail_map.h"
#include "road_map.h"
+#include "water_map.h"
#include "station.h"
#include "rail.h"
@@ -155,16 +156,6 @@
return IsTileType(t, MP_STATION) && IsBuoy(t);
}
-static inline bool IsCanalBuoyTile(TileIndex t)
-{
- return IsBuoyTile(t) && !IsTileOwner(t, OWNER_WATER);
-}
-
-static inline bool IsSeaBuoyTile(TileIndex t)
-{
- return IsBuoyTile(t) && IsTileOwner(t, OWNER_WATER);
-}
-
static inline bool IsHangarTile(TileIndex t)
{
return IsTileType(t, MP_STATION) && IsHangar(t);
@@ -190,6 +181,7 @@
IsRailwayStationTile(t1) &&
IsCompatibleRail(GetRailType(t1), GetRailType(t2)) &&
GetRailStationAxis(t1) == GetRailStationAxis(t2) &&
+ GetStationIndex(t1) == GetStationIndex(t2) &&
!IsStationTileBlocked(t1);
}
@@ -288,18 +280,20 @@
if (section != 255) MakeStation(t, o, sid, STATION_AIRPORT, section);
}
-static inline void MakeBuoy(TileIndex t, StationID sid)
+static inline void MakeBuoy(TileIndex t, StationID sid, WaterClass wc)
{
/* Make the owner of the buoy tile the same as the current owner of the
* water tile. In this way, we can reset the owner of the water to its
* original state when the buoy gets removed. */
MakeStation(t, GetTileOwner(t), sid, STATION_BUOY, 0);
+ SetWaterClass(t, wc);
}
-static inline void MakeDock(TileIndex t, Owner o, StationID sid, DiagDirection d)
+static inline void MakeDock(TileIndex t, Owner o, StationID sid, DiagDirection d, WaterClass wc)
{
MakeStation(t, o, sid, STATION_DOCK, d);
MakeStation(t + TileOffsByDiagDir(d), o, sid, STATION_DOCK, GFX_DOCK_BASE_WATER_PART + DiagDirToAxis(d));
+ SetWaterClass(t + TileOffsByDiagDir(d), wc);
}
static inline void MakeOilrig(TileIndex t, StationID sid)
--- a/src/stdafx.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/stdafx.h Sun Feb 03 20:34:26 2008 +0000
@@ -156,19 +156,17 @@
#pragma warning(disable: 4761) // integral size mismatch in argument : conversion supplied
#pragma warning(disable: 4200) // nonstandard extension used : zero-sized array in struct/union
- #if (_MSC_VER >= 1400) // MSVC 2005 safety checks
- #pragma warning(disable: 4996) // 'strdup' was declared deprecated
- #define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions
- #pragma warning(disable: 6308) // code analyzer: 'realloc' might return null pointer: assigning null pointer to 't_ptr', which is passed as an argument to 'realloc', will cause the original memory block to be leaked
- #pragma warning(disable: 6011) // code analyzer: Dereferencing NULL pointer 'pfGetAddrInfo': Lines: 995, 996, 998, 999, 1001
- #pragma warning(disable: 6326) // code analyzer: potential comparison of a constant with another constant
- #pragma warning(disable: 6031) // code analyzer: Return value ignored: 'ReadFile'
- #pragma warning(disable: 6255) // code analyzer: _alloca indicates failure by raising a stack overflow exception. Consider using _malloca instead
- #pragma warning(disable: 6246) // code analyzer: Local declaration of 'statspec' hides declaration of the same name in outer scope. For additional information, see previous declaration at ...
- #else /* _MSC_VER >= 1400 ( <1400 for MSVC2003) */
- #pragma warning(disable: 4288) // nonstandard extension used : 'y' : loop control variable declared in the for-loop is used outside the for-loop scope; it conflicts with the declaration in the outer scope
- #pragma warning(disable: 4292) // compiler limit : terminating debug information emission for enum 'StringIdEnum' with member 'STR_801D_COAL_CAR'
- #endif /* _MSC_VER >= 1400 */
+ #if (_MSC_VER < 1400) // MSVC 2005 safety checks
+ #error "Only MSVC 2005 or higher are supported. MSVC 2003 and earlier are not!. Upgrade your compiler."
+ #endif /* (_MSC_VER < 1400) */
+ #pragma warning(disable: 4996) // 'strdup' was declared deprecated
+ #define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions
+ #pragma warning(disable: 6308) // code analyzer: 'realloc' might return null pointer: assigning null pointer to 't_ptr', which is passed as an argument to 'realloc', will cause the original memory block to be leaked
+ #pragma warning(disable: 6011) // code analyzer: Dereferencing NULL pointer 'pfGetAddrInfo': Lines: 995, 996, 998, 999, 1001
+ #pragma warning(disable: 6326) // code analyzer: potential comparison of a constant with another constant
+ #pragma warning(disable: 6031) // code analyzer: Return value ignored: 'ReadFile'
+ #pragma warning(disable: 6255) // code analyzer: _alloca indicates failure by raising a stack overflow exception. Consider using _malloca instead
+ #pragma warning(disable: 6246) // code analyzer: Local declaration of 'statspec' hides declaration of the same name in outer scope. For additional information, see previous declaration at ...
#include <malloc.h> // alloca()
#define NORETURN __declspec(noreturn)
--- a/src/strings.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/strings.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -104,9 +104,14 @@
* the indices will be reused. */
static int _bind_index;
-static const char *GetStringPtr(StringID string)
+const char *GetStringPtr(StringID string)
{
- return _langpack_offs[_langtab_start[string >> 11] + (string & 0x7FF)];
+ switch (GB(string, 11, 5)) {
+ case 28: return GetGRFStringPtr(GB(string, 0, 11));
+ case 29: return GetGRFStringPtr(GB(string, 0, 11) + 0x0800);
+ case 30: return GetGRFStringPtr(GB(string, 0, 11) + 0x1000);
+ default: return _langpack_offs[_langtab_start[string >> 11] + (string & 0x7FF)];
+ }
}
/** The highest 8 bits of string contain the "case index".
@@ -125,7 +130,6 @@
uint index = GB(string, 0, 11);
uint tab = GB(string, 11, 5);
- char buff[512];
switch (tab) {
case 4:
@@ -139,7 +143,8 @@
break;
case 15:
- error("Boo!");
+ /* Old table for custom names. This is no longer used */
+ error("Incorrect conversion of custom name string.");
case 26:
/* Include string within newgrf text (format code 81) */
@@ -150,16 +155,13 @@
break;
case 28:
- GetGRFString(buff, index, lastof(buff));
- return FormatString(buffr, buff, argv, 0, last);
+ return FormatString(buffr, GetGRFStringPtr(index), argv, 0, last);
case 29:
- GetGRFString(buff, index + 0x800, lastof(buff));
- return FormatString(buffr, buff, argv, 0, last);
+ return FormatString(buffr, GetGRFStringPtr(index + 0x0800), argv, 0, last);
case 30:
- GetGRFString(buff, index + 0x1000, lastof(buff));
- return FormatString(buffr, buff, argv, 0, last);
+ return FormatString(buffr, GetGRFStringPtr(index + 0x1000), argv, 0, last);
case 31:
/* dynamic strings. These are NOT to be passed through the formatter,
@@ -695,8 +697,7 @@
}
case SCC_GENDER_LIST: { // {G 0 Der Die Das}
- char buffr[512];
- const char *s = GetStringWithArgs(buffr, argv_orig[(byte)*str++], argv, last); // contains the string that determines gender.
+ const char *s = GetStringPtr(argv_orig[(byte)*str++]); // contains the string that determines gender.
int len;
int gender = 0;
if (s != NULL) {
--- a/src/strings_func.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/strings_func.h Sun Feb 03 20:34:26 2008 +0000
@@ -9,6 +9,7 @@
char *InlineString(char *buf, StringID string);
char *GetString(char *buffr, StringID string, const char *last);
+const char *GetStringPtr(StringID string);
extern char _userstring[128];
--- a/src/table/build_industry.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/table/build_industry.h Sun Feb 03 20:34:26 2008 +0000
@@ -1176,7 +1176,7 @@
#define MI(tbl, sndc, snd, d, pc, ai1, ai2, ai3, ai4, ag1, ag2, ag3, ag4, col, \
c1, c2, c3, proc, p1, r1, p2, r2, m, a1, im1, a2, im2, a3, im3, pr, clim, bev, in, intx, s1, s2, s3) \
{tbl, lengthof(tbl), min(255, d), 0, d, pc, {c1, c2, c3}, proc, {p1, p2}, {r1, r2}, m, \
- {a1, a2, a3}, {{im1, 0}, {im2, 0}, {im3, 0}}, pr, clim, bev, col, GRFMappedStringID(in, 0), GRFMappedStringID(intx, 0), GRFMappedStringID(s1, 0), GRFMappedStringID(s2, 0), GRFMappedStringID(s3, 0), {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, \
+ {a1, a2, a3}, {{im1, 0}, {im2, 0}, {im3, 0}}, pr, clim, bev, col, GRFMappedStringID(in, 0), GRFMappedStringID(intx, 0), GRFMappedStringID(s1, 0), GRFMappedStringID(s2, 0), GRFMappedStringID(s3, 0), GRFMappedStringID(STR_UNDEFINED, 0), {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, \
sndc, snd, 0, 0, true, {INVALID_INDUSTRYTYPE, 0, NULL, NULL, INVALID_INDUSTRYTYPE}}
/* Format:
tile table count and sounds table
--- a/src/table/control_codes.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/table/control_codes.h Sun Feb 03 20:34:26 2008 +0000
@@ -116,18 +116,19 @@
* These are mapped to the original glyphs */
SCC_LESSTHAN = SCC_SPRITE_START + 0x3C,
SCC_GREATERTHAN = SCC_SPRITE_START + 0x3E,
- SCC_UPARROW = SCC_SPRITE_START + 0x80,
- SCC_SMALLUPARROW = SCC_SPRITE_START + 0x90,
- SCC_SMALLDOWNARROW = SCC_SPRITE_START + 0x91,
- SCC_TRAIN = SCC_SPRITE_START + 0x94,
- SCC_LORRY = SCC_SPRITE_START + 0x95,
- SCC_BUS = SCC_SPRITE_START + 0x96,
- SCC_PLANE = SCC_SPRITE_START + 0x97,
- SCC_SHIP = SCC_SPRITE_START + 0x98,
+ SCC_UPARROW = SCC_SPRITE_START + 0xA0,
SCC_DOWNARROW = SCC_SPRITE_START + 0xAA,
SCC_CHECKMARK = SCC_SPRITE_START + 0xAC,
SCC_CROSS = SCC_SPRITE_START + 0xAD,
SCC_RIGHTARROW = SCC_SPRITE_START + 0xAF,
+ SCC_TRAIN = SCC_SPRITE_START + 0xB4,
+ SCC_LORRY = SCC_SPRITE_START + 0xB5,
+ SCC_BUS = SCC_SPRITE_START + 0xB6,
+ SCC_PLANE = SCC_SPRITE_START + 0xB7,
+ SCC_SHIP = SCC_SPRITE_START + 0xB8,
+ SCC_SUPERSCRIPT_M1 = SCC_SPRITE_START + 0xB9,
+ SCC_SMALLUPARROW = SCC_SPRITE_START + 0xBC,
+ SCC_SMALLDOWNARROW = SCC_SPRITE_START + 0xBD,
};
#endif /* CONTROL_CODES_H */
--- a/src/table/engines.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/table/engines.h Sun Feb 03 20:34:26 2008 +0000
@@ -345,7 +345,7 @@
* @param m engclass
* Tractive effort coefficient by default is the same as TTDPatch, 0.30*256=76
*/
-#define RVI(a, b, c, d, e, f, g, h, i, j, k, l, m) { a, b, c, {l}, d, e, f, g, h, m, i, j, k, 0, 0, 0, 0, 76, 0 }
+#define RVI(a, b, c, d, e, f, g, h, i, j, k, l, m) { a, b, c, {l}, d, e, f, g, h, m, i, j, k, 0, 0, 0, 0, 0, 76, 0 }
#define M RAILVEH_MULTIHEAD
#define W RAILVEH_WAGON
#define G RAILVEH_SINGLEHEAD
--- a/src/table/landscape_sprite.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/table/landscape_sprite.h Sun Feb 03 20:34:26 2008 +0000
@@ -1,7 +1,6 @@
/* $Id$ */
enum {
- SKIP = 0xFFFE,
END = 0xFFFF
};
--- a/src/table/unicode.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/table/unicode.h Sun Feb 03 20:34:26 2008 +0000
@@ -6,6 +6,10 @@
byte key; ///< Character index of sprite
};
+enum {
+ CLRA = 0, ///< Identifier to clear all glyphs at this codepoint
+ CLRL = 1, ///< Identifier to clear glyphs for large font at this codepoint
+};
/* Default unicode mapping table for sprite based glyphs.
* This table allows us use unicode characters even though the glyphs don't
@@ -13,5 +17,40 @@
* This is not used for FreeType rendering */
static DefaultUnicodeMapping _default_unicode_map[] = {
+ { 0x00A0, 0x20 }, /* Non-breaking space / Up arrow */
+ { 0x00A4, CLRL }, /* Currency sign */
+ { 0x00A6, CLRL }, /* Broken bar */
+ { 0x00A7, CLRL }, /* Section sign */
+ { 0x00A8, CLRL }, /* Diaeresis */
+ { 0x00A9, CLRL }, /* Copyright sign */
+ { 0x00AA, CLRA }, /* Feminine ordinal indicator / Down arrow */
+ { 0x00AC, CLRA }, /* Not sign / Tick mark */
+ { 0x00AD, 0x20 }, /* Soft hyphen / X mark */
+ { 0x00AF, CLRA }, /* Macron / Right arrow */
+ { 0x00B0, CLRL }, /* Degree sign */
+ { 0x00B1, CLRL }, /* Plus-Minus sign */
+ { 0x00B2, CLRL }, /* Superscript 2 */
+ { 0x00B3, CLRL }, /* Superscript 3 */
+ { 0x00B4, CLRA }, /* Acute accent / Train symbol */
+ { 0x00B5, CLRA }, /* Micro sign / Truck symbol */
+ { 0x00B6, CLRA }, /* Pilcrow sign / Bus symbol */
+ { 0x00B7, CLRA }, /* Middle dot / Aircraft symbol */
+ { 0x00B8, CLRA }, /* Cedilla / Ship symbol */
+ { 0x00B9, CLRA }, /* Superscript 1 / Superscript -1 */
+ { 0x00BA, CLRL }, /* Masculine ordinal indicator */
+ { 0x00BC, CLRA }, /* One quarter / Small up arrow */
+ { 0x00BD, CLRA }, /* One half / Small down arrow */
+ { 0x00BE, CLRL }, /* Three quarters */
+ { 0x00D0, CLRL }, /* Capital letter eth */
+ { 0x00D7, CLRL }, /* Multiplication sign */
+ { 0x00D8, CLRL }, /* Capital letter O with stroke */
+ { 0x00D9, CLRL }, /* Capital letter U with grave */
+ { 0x00DE, CLRL }, /* Capital letter thorn */
+ { 0x00E6, CLRL }, /* Small letter ae */
+ { 0x00F0, CLRL }, /* Small letter eth */
+ { 0x00F7, CLRL }, /* Divison sign */
+ { 0x00F8, CLRL }, /* Small letter o with stroke */
+ { 0x00FE, CLRL }, /* Small letter thorn */
+ { 0x0178, 0x9F }, /* Capital letter Y with diaeresis */
{ 0x010D, 0x63 }, /* Small letter c with caron */
};
--- a/src/terraform_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/terraform_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -22,6 +22,7 @@
#include "textbuf_gui.h"
#include "genworld.h"
#include "settings_type.h"
+#include "tree_map.h"
#include "table/sprites.h"
#include "table/strings.h"
@@ -56,7 +57,7 @@
_generating_world = true;
BEGIN_TILE_LOOP(tile, size_x, size_y, TileXY(sx, sy)) {
if (GetTileType(tile) != MP_WATER) {
- SetTropicZone(tile, (_ctrl_pressed) ? TROPICZONE_INVALID : TROPICZONE_DESERT);
+ SetTropicZone(tile, (_ctrl_pressed) ? TROPICZONE_NORMAL : TROPICZONE_DESERT);
DoCommandP(tile, 0, 0, NULL, CMD_LANDSCAPE_CLEAR);
MarkTileDirtyByTile(tile);
}
@@ -83,8 +84,10 @@
BEGIN_TILE_LOOP(tile, size_x, size_y, TileXY(sx, sy)) {
switch (GetTileType(tile)) {
+ case MP_TREES:
+ if (GetTreeGround(tile) == TREE_GROUND_SHORE) continue;
+ /* FALL THROUGH */
case MP_CLEAR:
- case MP_TREES:
MakeClear(tile, CLEAR_ROCKS, 3);
break;
@@ -385,7 +388,8 @@
static void PlaceProc_LightHouse(TileIndex tile)
{
- if (!IsTileType(tile, MP_CLEAR) || IsSteepSlope(GetTileSlope(tile, NULL)) || IsBridgeAbove(tile)) {
+ /* not flat || not(trees || clear without bridge above) */
+ if (GetTileSlope(tile, NULL) != SLOPE_FLAT || !(IsTileType(tile, MP_TREES) || (IsTileType(tile, MP_CLEAR) && !IsBridgeAbove(tile)))) {
return;
}
@@ -396,7 +400,8 @@
static void PlaceProc_Transmitter(TileIndex tile)
{
- if (!IsTileType(tile, MP_CLEAR) || IsSteepSlope(GetTileSlope(tile, NULL)) || IsBridgeAbove(tile)) {
+ /* not flat || not(trees || clear without bridge above) */
+ if (GetTileSlope(tile, NULL) != SLOPE_FLAT || !(IsTileType(tile, MP_TREES) || (IsTileType(tile, MP_CLEAR) && !IsBridgeAbove(tile)))) {
return;
}
--- a/src/tile_type.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/tile_type.h Sun Feb 03 20:34:26 2008 +0000
@@ -41,11 +41,20 @@
/**
* Additional infos of a tile on a tropic game.
*
- * Each non-water tile in a tropic game is either a rainforest tile or a
- * desert one.
+ * The tropiczone is not modified during gameplay. It mainly affects tree growth. (desert tiles are visible though)
+ *
+ * In randomly generated maps:
+ * TROPICZONE_DESERT: Generated everywhere, if there is neither water nor mountains (TileHeight >= 4) in a certain distance from the tile.
+ * TROPICZONE_RAINFOREST: Genereated everywhere, if there is no desert in a certain distance from the tile.
+ * TROPICZONE_NORMAL: Everywhere else, i.e. between desert and rainforest and on sea (if you clear the water).
+ *
+ * In scenarios:
+ * TROPICZONE_NORMAL: Default value.
+ * TROPICZONE_DESERT: Placed manually.
+ * TROPICZONE_RAINFOREST: Placed if you plant certain rainforest-trees.
*/
enum TropicZone {
- TROPICZONE_INVALID = 0, ///< Invalid tropiczone-type
+ TROPICZONE_NORMAL = 0, ///< Normal tropiczone
TROPICZONE_DESERT = 1, ///< Tile is desert
TROPICZONE_RAINFOREST = 2, ///< Rainforest tile
};
--- a/src/timetable_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/timetable_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -104,7 +104,7 @@
break;
case OT_GOTO_STATION:
- SetDParam(0, (order->flags & OFB_NON_STOP) ? STR_880C_GO_NON_STOP_TO : STR_8806_GO_TO);
+ SetDParam(0, (order->flags & OFB_NON_STOP) ? STR_880A_GO_NON_STOP_TO : STR_8806_GO_TO);
SetDParam(1, order->dest);
if (order->wait_time > 0) {
@@ -125,7 +125,7 @@
switch (v->type) {
case VEH_TRAIN: string = (order->flags & OFB_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break;
- case VEH_ROAD: string = STR_9038_GO_TO_ROADVEH_DEPOT; break;
+ case VEH_ROAD: string = STR_GO_TO_ROADVEH_DEPOT; break;
case VEH_SHIP: string = STR_GO_TO_SHIP_DEPOT; break;
default: break;
}
--- a/src/town_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/town_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -673,25 +673,25 @@
* @return true if one of the neighboring tiles at the
* given distance is a road tile else false
*/
-static bool IsNeighborRoadTile(TileIndex tile, DiagDirection dir, uint dist_multi)
+static bool IsNeighborRoadTile(TileIndex tile, const DiagDirection dir, uint dist_multi)
{
- static TileIndexDiff tid_lt[3]; // lookup table for the used diff values
- tid_lt[0] = TileOffsByDiagDir(ChangeDiagDir(dir, DIAGDIRDIFF_90RIGHT));
- tid_lt[1] = TileOffsByDiagDir(ChangeDiagDir(dir, DIAGDIRDIFF_90LEFT));
- tid_lt[2] = TileOffsByDiagDir(ReverseDiagDir(dir));
+ /* Lookup table for the used diff values */
+ const TileIndexDiff tid_lt[3] = {
+ TileOffsByDiagDir(ChangeDiagDir(dir, DIAGDIRDIFF_90RIGHT)),
+ TileOffsByDiagDir(ChangeDiagDir(dir, DIAGDIRDIFF_90LEFT)),
+ TileOffsByDiagDir(ReverseDiagDir(dir)),
+ };
/* We add 1 to the distance because we want to get 1 for
* the min distance multiplyer and not 0.
* Therefore we start at 4. The 4 is used because
- * there are 4 tiles per distance step to check.
- */
+ * there are 4 tiles per distance step to check. */
dist_multi = (dist_multi + 1) * 4;
for (uint pos = 4; pos < dist_multi; pos++) {
TileIndexDiff cur = 0;
/* For each even value of pos add the right TileIndexDiff
* for each uneven value the left TileIndexDiff
- * for each with 2nd bit set (2,3,6,7,..) add the reversed TileIndexDiff
- */
+ * for each with 2nd bit set (2,3,6,7,..) add the reversed TileIndexDiff */
cur += tid_lt[(pos & 1) ? 0 : 1];
if (pos & 2) cur += tid_lt[2];
@@ -710,19 +710,15 @@
*/
static bool IsRoadAllowedHere(TileIndex tile, DiagDirection dir)
{
- if (TileX(tile) < 2 || TileY(tile) < 2 || MapMaxX() <= TileX(tile) || MapMaxY() <= TileY(tile)) return false;
+ if (TileX(tile) < 2 || TileX(tile) >= MapMaxX() || TileY(tile) < 2 || TileY(tile) >= MapMaxY()) return false;
Slope cur_slope, desired_slope;
- /* If this assertion fails, it might be because the world contains
- * land at the edges. This is not ok. */
- TILE_ASSERT(tile);
-
for (;;) {
/* Check if there already is a road at this point? */
if (GetTownRoadBits(tile) == ROAD_NONE) {
- /* No, try to build one in the direction.
- * if that fails clear the land, and if that fails exit.
+ /* No, try if we are able to build a road piece there.
+ * If that fails clear the land, and if that fails exit.
* This is to make sure that we can build a road here later. */
if (CmdFailed(DoCommand(tile, ((dir == DIAGDIR_NW || dir == DIAGDIR_SE) ? ROAD_X : ROAD_Y), 0, DC_AUTO, CMD_BUILD_ROAD)) &&
CmdFailed(DoCommand(tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR)))
@@ -736,10 +732,10 @@
switch (_patches.town_layout) {
default: NOT_REACHED();
- case TL_ORIGINAL: /* Disallow the road if any neighboring tile has a road (distance: 1) */
+ case TL_ORIGINAL: // Disallow the road if any neighboring tile has a road (distance: 1)
return !IsNeighborRoadTile(tile, dir, 1);
- case TL_BETTER_ROADS: /* Disallow the road if any neighboring tile has a road (distance: 1 and 2). */
+ case TL_BETTER_ROADS: // Disallow the road if any neighboring tile has a road (distance: 1 and 2).
return !IsNeighborRoadTile(tile, dir, 2);
}
}
@@ -751,8 +747,8 @@
if (Chance16(1, 8)) {
CommandCost res = CMD_ERROR;
if (!_generating_world && Chance16(1, 10)) {
- /* Note: Do not replace " ^ 0xF" with ComplementSlope(). The slope might be steep. */
- res = DoCommand(tile, Chance16(1, 16) ? cur_slope : cur_slope ^ 0xF, 0,
+ /* Note: Do not replace "^ SLOPE_ELEVATED" with ComplementSlope(). The slope might be steep. */
+ res = DoCommand(tile, Chance16(1, 16) ? cur_slope : cur_slope ^ SLOPE_ELEVATED, 0,
DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_TERRAFORM_LAND);
}
if (CmdFailed(res) && Chance16(1, 3)) {
@@ -790,8 +786,8 @@
if (tileh == SLOPE_FLAT) return;
/* First try up, then down */
- if (!TerraformTownTile(tile, ~tileh & 0xF, 1)) {
- TerraformTownTile(tile, tileh & 0xF, 0);
+ if (!TerraformTownTile(tile, ~tileh & SLOPE_ELEVATED, 1)) {
+ TerraformTownTile(tile, tileh & SLOPE_ELEVATED, 0);
}
}
@@ -914,7 +910,7 @@
* @param bridge_dir The valid direction in which to grow a bridge
* @return true if a bridge has been build else false
*/
-static bool GrowTownWithBridge(const Town *t, TileIndex tile, DiagDirection bridge_dir)
+static bool GrowTownWithBridge(const Town *t, const TileIndex tile, const DiagDirection bridge_dir)
{
assert(bridge_dir < DIAGDIR_END);
@@ -922,33 +918,25 @@
if (slope == SLOPE_FLAT) return false; // no slope, no bridge
/* Make sure the direction is compatible with the slope.
- * If any of the following bits match, the slope is forbidden for
- * that diagdir. This means 5 non-steep slopes, and 3 steep-slopes
- * per diagdir.
- * 0 -> 0b1100
- * 1 -> 0b0110
- * 2 -> 0b0011
- * 3 -> 0b1001
- * 0xCC is 0b11001100, so we just shift it right with
- * the direction to get the forbidden slope mask. */
- if (HASBITS(slope & 0x0F, 0xCC >> bridge_dir)) return false;
+ * Well we check if the slope has an up bit set in the
+ * reverse direction. */
+ if (HASBITS(slope, InclinedSlope(bridge_dir))) return false;
/* Assure that the bridge is connectable to the start side */
if (!(GetTownRoadBits(TileAddByDiagDir(tile, ReverseDiagDir(bridge_dir))) & DiagDirToRoadBits(bridge_dir))) return false;
/* We are in the right direction */
- uint8 bridge_length = 0; // This value stores the length of the possible bridge
+ uint8 bridge_length = 0; // This value stores the length of the possible bridge
TileIndex bridge_tile = tile; // Used to store the other waterside
- int delta = TileOffsByDiagDir(bridge_dir);
-
+ const int delta = TileOffsByDiagDir(bridge_dir);
do {
if (bridge_length++ >= 11) {
/* Max 11 tile long bridges */
return false;
}
bridge_tile += delta;
- } while (TileX(bridge_tile) != 0 && TileY(bridge_tile) != 0 && IsWaterTile(bridge_tile) && TileX(bridge_tile) != 0);
+ } while (TileX(bridge_tile) != 0 && TileY(bridge_tile) != 0 && IsWaterTile(bridge_tile));
/* no water tiles in between? */
if (bridge_length == 1) return false;
@@ -1201,7 +1189,7 @@
/* Don't allow building over roads of other cities */
if (IsTileOwner(tile, OWNER_TOWN) && GetTownByTile(tile) != t) {
_grow_town_result = GROWTH_SUCCEED;
- } else if (_game_mode == GM_EDITOR) {
+ } else if (IsTileOwner(tile, OWNER_NONE) && _game_mode == GM_EDITOR) {
/* If we are in the SE, and this road-piece has no town owner yet, it just found an
* owner :) (happy happy happy road now) */
SetTileOwner(tile, OWNER_TOWN);
--- a/src/train.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/train.h Sun Feb 03 20:34:26 2008 +0000
@@ -304,6 +304,7 @@
bool IsInDepot() const { return CheckTrainInDepot(this, false) != -1; }
bool IsStoppedInDepot() const { return CheckTrainStoppedInDepot(this) >= 0; }
void Tick();
+ void OnNewDay();
};
#endif /* TRAIN_H */
--- a/src/train_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/train_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -3135,7 +3135,7 @@
min(v->cur_speed, GetBridge(GetBridgeType(v->tile))->speed);
}
- if (!(IsTunnelTile(gp.new_tile) || IsBridgeTile(gp.new_tile)) || !HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) {
+ if (!IsTileType(gp.new_tile, MP_TUNNELBRIDGE) || !HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) {
v->x_pos = gp.x;
v->y_pos = gp.y;
VehiclePositionChanged(v);
@@ -3523,6 +3523,12 @@
if (!mode) HandleLocomotiveSmokeCloud(v);
int j = UpdateTrainSpeed(v);
+
+ /* we need to invalidate the widget if we are stopping from 'Stopping 0 km/h' to 'Stopped' */
+ if (v->cur_speed == 0 && v->u.rail.last_speed == 0 && v->vehstatus & VS_STOPPED) {
+ InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
+ }
+
if (j == 0) {
/* if the vehicle has speed 0, update the last_speed field. */
if (v->cur_speed != 0) return;
@@ -3619,38 +3625,38 @@
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
}
-void OnNewDay_Train(Vehicle *v)
+void Train::OnNewDay()
{
- if ((++v->day_counter & 7) == 0) DecreaseVehicleValue(v);
-
- if (IsFrontEngine(v)) {
- CheckVehicleBreakdown(v);
- AgeVehicle(v);
-
- CheckIfTrainNeedsService(v);
-
- CheckOrders(v);
+ if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
+
+ if (IsFrontEngine(this)) {
+ CheckVehicleBreakdown(this);
+ AgeVehicle(this);
+
+ CheckIfTrainNeedsService(this);
+
+ CheckOrders(this);
/* update destination */
- if (v->current_order.type == OT_GOTO_STATION) {
- TileIndex tile = GetStation(v->current_order.dest)->train_tile;
- if (tile != 0) v->dest_tile = tile;
+ if (this->current_order.type == OT_GOTO_STATION) {
+ TileIndex tile = GetStation(this->current_order.dest)->train_tile;
+ if (tile != 0) this->dest_tile = tile;
}
- if ((v->vehstatus & VS_STOPPED) == 0) {
+ if ((this->vehstatus & VS_STOPPED) == 0) {
/* running costs */
- CommandCost cost(EXPENSES_TRAIN_RUN, v->GetRunningCost() / 364);
-
- v->profit_this_year -= cost.GetCost() >> 8;
-
- SubtractMoneyFromPlayerFract(v->owner, cost);
-
- InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
+ CommandCost cost(EXPENSES_TRAIN_RUN, this->GetRunningCost() / 364);
+
+ this->profit_this_year -= cost.GetCost() >> 8;
+
+ SubtractMoneyFromPlayerFract(this->owner, cost);
+
+ InvalidateWindow(WC_VEHICLE_DETAILS, this->index);
InvalidateWindowClasses(WC_TRAINS_LIST);
}
- } else if (IsTrainEngine(v)) {
+ } else if (IsTrainEngine(this)) {
/* Also age engines that aren't front engines */
- AgeVehicle(v);
+ AgeVehicle(this);
}
}
--- a/src/train_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/train_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -241,7 +241,7 @@
}
/* draw total cargo tab */
- DrawString(x, y + 2, STR_013F_TOTAL_CAPACITY_TEXT, TC_FROMSTRING);
+ DrawString(x, y + 2, STR_TOTAL_CAPACITY_TEXT, TC_FROMSTRING);
for (CargoID i = 0; i < NUM_CARGO; i++) {
if (max_cargo[i] > 0 && --vscroll_pos < 0 && vscroll_pos > -vscroll_cap) {
y += 14;
@@ -250,7 +250,7 @@
SetDParam(2, i); // {SHORTCARGO} #1
SetDParam(3, max_cargo[i]); // {SHORTCARGO} #2
SetDParam(4, _patches.freight_trains);
- DrawString(x, y + 2, FreightWagonMult(i) > 1 ? STR_TOTAL_CAPACITY_MULT : STR_013F_TOTAL_CAPACITY, TC_FROMSTRING);
+ DrawString(x, y + 2, FreightWagonMult(i) > 1 ? STR_TOTAL_CAPACITY_MULT : STR_TOTAL_CAPACITY, TC_FROMSTRING);
}
}
SetDParam(0, v->cargo.FeederShare());
--- a/src/transparency_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/transparency_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -37,6 +37,7 @@
for (uint i = TTW_WIDGET_SIGNS; i < TTW_WIDGET_END; i++) {
w->SetWidgetLoweredState(i, IsTransparencySet((TransparencyOption)(i - TTW_WIDGET_SIGNS)));
}
+
DrawWindowWidgets(w);
break;
--- a/src/tree_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/tree_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -20,6 +20,8 @@
#include "player_func.h"
#include "sound_func.h"
#include "settings_type.h"
+#include "water_map.h"
+#include "water.h"
#include "table/strings.h"
#include "table/sprites.h"
@@ -37,6 +39,66 @@
};
/**
+ * Tests if a tile can be converted to MP_TREES
+ * This is true for clear ground without farms or rocks.
+ *
+ * @param tile the tile of interest
+ * @param allow_desert Allow planting trees on CLEAR_DESERT?
+ * @return true if trees can be built.
+ */
+static bool CanPlantTreesOnTile(TileIndex tile, bool allow_desert)
+{
+ switch (GetTileType(tile)) {
+ case MP_WATER:
+ return !IsBridgeAbove(tile) && IsCoast(tile) && !IsSlopeWithOneCornerRaised(GetTileSlope(tile, NULL));
+
+ case MP_CLEAR:
+ return !IsBridgeAbove(tile) && !IsClearGround(tile, CLEAR_FIELDS) && !IsClearGround(tile, CLEAR_ROCKS) &&
+ (allow_desert || !IsClearGround(tile, CLEAR_DESERT));
+
+ default: return false;
+ }
+}
+
+/**
+ * Creates a tree tile
+ * Ground type and density is preserved.
+ *
+ * @pre the tile must be suitable for trees.
+ *
+ * @param tile where to plant the trees.
+ * @param type The type of the tree
+ * @param count the number of trees (minus 1)
+ * @param growth the growth status
+ */
+static void PlantTreesOnTile(TileIndex tile, TreeType treetype, uint count, uint growth)
+{
+ assert(treetype != TREE_INVALID);
+ assert(CanPlantTreesOnTile(tile, true));
+
+ TreeGround ground;
+ uint density = 3;
+
+ switch (GetTileType(tile)) {
+ case MP_WATER:
+ ground = TREE_GROUND_SHORE;
+ break;
+
+ case MP_CLEAR:
+ switch (GetClearGround(tile)) {
+ case CLEAR_GRASS: ground = TREE_GROUND_GRASS; density = GetClearDensity(tile); break;
+ case CLEAR_ROUGH: ground = TREE_GROUND_ROUGH; break;
+ default: ground = TREE_GROUND_SNOW_DESERT; density = GetClearDensity(tile); break;
+ }
+ break;
+
+ default: NOT_REACHED();
+ }
+
+ MakeTree(tile, treetype, count, growth, ground, density);
+}
+
+/**
* Get a random TreeType for the given tile based on a given seed
*
* This function returns a random TreeType which can be placed on the given tile.
@@ -58,7 +120,7 @@
case LT_TROPIC:
switch (GetTropicZone(tile)) {
- case TROPICZONE_INVALID: return (TreeType)(seed * TREE_COUNT_SUB_TROPICAL / 256 + TREE_SUB_TROPICAL);
+ case TROPICZONE_NORMAL: return (TreeType)(seed * TREE_COUNT_SUB_TROPICAL / 256 + TREE_SUB_TROPICAL);
case TROPICZONE_DESERT: return (TreeType)((seed > 12) ? TREE_INVALID : TREE_CACTUS);
default: return (TreeType)(seed * TREE_COUNT_RAINFOREST / 256 + TREE_RAINFOREST);
}
@@ -82,16 +144,16 @@
TreeType tree = GetRandomTreeType(tile, GB(r, 24, 8));
if (tree != TREE_INVALID) {
- MakeTree(tile, tree, GB(r, 22, 2), min(GB(r, 16, 3), 6), TREE_GROUND_GRASS, 0);
+ PlantTreesOnTile(tile, tree, GB(r, 22, 2), min(GB(r, 16, 3), 6));
- /* above snowline? */
- if (_opt.landscape == LT_ARCTIC && GetTileZ(tile) > GetSnowLine()) {
- SetTreeGroundDensity(tile, TREE_GROUND_SNOW_DESERT, 3);
- SetTreeCounter(tile, (TreeGround)GB(r, 24, 3));
- } else {
+ /* Rerandomize ground, if neither snow nor shore */
+ TreeGround ground = GetTreeGround(tile);
+ if (ground != TREE_GROUND_SNOW_DESERT && ground != TREE_GROUND_SHORE) {
SetTreeGroundDensity(tile, (TreeGround)GB(r, 28, 1), 3);
- SetTreeCounter(tile, (TreeGround)GB(r, 24, 4));
}
+
+ /* Set the counter to a random start value */
+ SetTreeCounter(tile, (TreeGround)GB(r, 24, 4));
}
}
@@ -115,11 +177,7 @@
uint dist = abs(x) + abs(y);
TileIndex cur_tile = TILE_MASK(tile + TileDiffXY(x, y));
- if (dist <= 13 &&
- IsTileType(cur_tile, MP_CLEAR) &&
- !IsBridgeAbove(cur_tile) &&
- !IsClearGround(cur_tile, CLEAR_FIELDS) &&
- !IsClearGround(cur_tile, CLEAR_ROCKS)) {
+ if (dist <= 13 && CanPlantTreesOnTile(cur_tile, true)) {
PlaceTree(cur_tile, r);
}
}
@@ -147,7 +205,7 @@
* @param tile The base tile to add a new tree somewhere around
* @param height The height (like the one from the tile)
*/
-void PlaceTreeAtSameHeight(TileIndex tile, uint height)
+static void PlaceTreeAtSameHeight(TileIndex tile, uint height)
{
uint i;
@@ -161,10 +219,7 @@
if (abs(x) + abs(y) > 16) continue;
/* Clear tile, no farm-tiles or rocks */
- if (!IsTileType(cur_tile, MP_CLEAR) ||
- IsClearGround(cur_tile, CLEAR_FIELDS) ||
- IsClearGround(cur_tile, CLEAR_ROCKS))
- continue;
+ if (!CanPlantTreesOnTile(cur_tile, true)) continue;
/* Not too much height difference */
if (Delta(GetTileZ(cur_tile), height) > 2) continue;
@@ -191,10 +246,7 @@
IncreaseGeneratingWorldProgress(GWP_TREE);
- if (IsTileType(tile, MP_CLEAR) &&
- !IsBridgeAbove(tile) &&
- !IsClearGround(tile, CLEAR_FIELDS) &&
- !IsClearGround(tile, CLEAR_ROCKS)) {
+ if (CanPlantTreesOnTile(tile, true)) {
PlaceTree(tile, r);
if (_patches.tree_placer != TP_IMPROVED) continue;
@@ -226,10 +278,7 @@
IncreaseGeneratingWorldProgress(GWP_TREE);
- if (IsTileType(tile, MP_CLEAR) &&
- !IsBridgeAbove(tile) &&
- !IsClearGround(tile, CLEAR_FIELDS) &&
- GetTropicZone(tile) == TROPICZONE_RAINFOREST) {
+ if (GetTropicZone(tile) == TROPICZONE_RAINFOREST && CanPlantTreesOnTile(tile, false)) {
PlaceTree(tile, r);
}
} while (--i);
@@ -313,21 +362,30 @@
break;
case MP_WATER:
- msg = STR_3807_CAN_T_BUILD_ON_WATER;
- continue;
- break;
-
+ if (!IsCoast(tile) || IsSlopeWithOneCornerRaised(GetTileSlope(tile, NULL))) {
+ msg = STR_3807_CAN_T_BUILD_ON_WATER;
+ continue;
+ }
+ /* FALL THROUGH */
case MP_CLEAR:
- if (!IsTileOwner(tile, OWNER_NONE) ||
- IsBridgeAbove(tile)) {
+ if (IsBridgeAbove(tile)) {
msg = STR_2804_SITE_UNSUITABLE;
continue;
}
- switch (GetClearGround(tile)) {
- case CLEAR_FIELDS: cost.AddCost(_price.clear_fields); break;
- case CLEAR_ROCKS: cost.AddCost(_price.clear_rocks); break;
- default: break;
+ if (IsTileType(tile, MP_CLEAR)) {
+ /* Remove fields or rocks. Note that the ground will get barrened */
+ switch (GetClearGround(tile)) {
+ case CLEAR_FIELDS:
+ case CLEAR_ROCKS: {
+ CommandCost ret = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
+ if (CmdFailed(ret)) return ret;
+ cost.AddCost(ret);
+ break;
+ }
+
+ default: break;
+ }
}
if (_game_mode != GM_EDITOR && IsValidPlayer(_current_player)) {
@@ -337,7 +395,6 @@
if (flags & DC_EXEC) {
TreeType treetype;
- uint growth;
treetype = (TreeType)p1;
if (treetype == TREE_INVALID) {
@@ -345,15 +402,11 @@
if (treetype == TREE_INVALID) treetype = TREE_CACTUS;
}
- growth = _game_mode == GM_EDITOR ? 3 : 0;
- switch (GetClearGround(tile)) {
- case CLEAR_ROUGH: MakeTree(tile, treetype, 0, growth, TREE_GROUND_ROUGH, 3); break;
- case CLEAR_SNOW:
- case CLEAR_DESERT: MakeTree(tile, treetype, 0, growth, TREE_GROUND_SNOW_DESERT, GetClearDensity(tile)); break;
- default: MakeTree(tile, treetype, 0, growth, TREE_GROUND_GRASS, GetClearDensity(tile)); break;
- }
+ /* Plant full grown trees in scenario editor */
+ PlantTreesOnTile(tile, treetype, 0, _game_mode == GM_EDITOR ? 3 : 0);
MarkTileDirtyByTile(tile);
+ /* When planting rainforest-trees, set tropiczone to rainforest in editor. */
if (_game_mode == GM_EDITOR && IsInsideMM(treetype, TREE_RAINFOREST, TREE_CACTUS))
SetTropicZone(tile, TROPICZONE_RAINFOREST);
}
@@ -387,6 +440,7 @@
byte z;
switch (GetTreeGround(ti->tile)) {
+ case TREE_GROUND_SHORE: DrawShoreTile(ti->tileh); break;
case TREE_GROUND_GRASS: DrawClearLandTile(ti, GetTreeDensity(ti->tile)); break;
case TREE_GROUND_ROUGH: DrawHillyLandTile(ti); break;
default: DrawGroundSprite(_tree_sprites_1[GetTreeDensity(ti->tile)] + _tileh_to_sprite[ti->tileh], PAL_NONE); break;
@@ -428,6 +482,7 @@
StartSpriteCombine();
+ /* Do not draw trees when the invisible trees patch and transparency tree are set */
if (!(IsTransparencySet(TO_TREES) && _patches.invisible_trees)) {
TreeListEnt te[4];
uint i;
@@ -578,9 +633,13 @@
static void TileLoop_Trees(TileIndex tile)
{
- switch (_opt.landscape) {
- case LT_TROPIC: TileLoopTreesDesert(tile); break;
- case LT_ARCTIC: TileLoopTreesAlps(tile); break;
+ if (GetTreeGround(tile) == TREE_GROUND_SHORE) {
+ TileLoop_Water(tile);
+ } else {
+ switch (_opt.landscape) {
+ case LT_TROPIC: TileLoopTreesDesert(tile); break;
+ case LT_ARCTIC: TileLoopTreesAlps(tile); break;
+ }
}
TileLoopClearHelper(tile);
@@ -626,19 +685,14 @@
tile += TileOffsByDir((Direction)(Random() & 7));
- if (!IsTileType(tile, MP_CLEAR) || IsBridgeAbove(tile)) return;
+ /* Cacti don't spread */
+ if (!CanPlantTreesOnTile(tile, false)) return;
- switch (GetClearGround(tile)) {
- case CLEAR_GRASS:
- if (GetClearDensity(tile) != 3) return;
- MakeTree(tile, treetype, 0, 0, TREE_GROUND_GRASS, 3);
- break;
+ /* Don't plant trees, if ground was freshly cleared */
+ if (IsTileType(tile, MP_CLEAR) && GetClearGround(tile) == CLEAR_GRASS && GetClearDensity(tile) != 3) return;
- case CLEAR_ROUGH: MakeTree(tile, treetype, 0, 0, TREE_GROUND_ROUGH, 3); break;
- case CLEAR_DESERT: return; // Cacti don't spread
- case CLEAR_SNOW: MakeTree(tile, treetype, 0, 0, TREE_GROUND_SNOW_DESERT, GetClearDensity(tile)); break;
- default: return;
- }
+ PlantTreesOnTile(tile, treetype, 0, 0);
+
break;
}
@@ -656,6 +710,7 @@
} else {
/* just one tree, change type into MP_CLEAR */
switch (GetTreeGround(tile)) {
+ case TREE_GROUND_SHORE: MakeShore(tile); break;
case TREE_GROUND_GRASS: MakeClear(tile, CLEAR_GRASS, GetTreeDensity(tile)); break;
case TREE_GROUND_ROUGH: MakeClear(tile, CLEAR_ROUGH, 3); break;
default: // snow or desert
@@ -677,17 +732,14 @@
{
uint32 r;
TileIndex tile;
- ClearGround ct;
TreeType tree;
/* place a tree at a random rainforest spot */
if (_opt.landscape == LT_TROPIC &&
(r = Random(), tile = RandomTileSeed(r), GetTropicZone(tile) == TROPICZONE_RAINFOREST) &&
- IsTileType(tile, MP_CLEAR) &&
- !IsBridgeAbove(tile) &&
- (ct = GetClearGround(tile), ct == CLEAR_GRASS || ct == CLEAR_ROUGH) &&
+ CanPlantTreesOnTile(tile, false) &&
(tree = GetRandomTreeType(tile, GB(r, 24, 8))) != TREE_INVALID) {
- MakeTree(tile, tree, 0, 0, ct == CLEAR_ROUGH ? TREE_GROUND_ROUGH : TREE_GROUND_GRASS, GetClearDensity(tile));
+ PlantTreesOnTile(tile, tree, 0, 0);
}
/* byte underflow */
@@ -696,15 +748,8 @@
/* place a tree at a random spot */
r = Random();
tile = TILE_MASK(r);
- if (IsTileType(tile, MP_CLEAR) &&
- !IsBridgeAbove(tile) &&
- (ct = GetClearGround(tile), ct == CLEAR_GRASS || ct == CLEAR_ROUGH || ct == CLEAR_SNOW) &&
- (tree = GetRandomTreeType(tile, GB(r, 24, 8))) != TREE_INVALID) {
- switch (ct) {
- case CLEAR_GRASS: MakeTree(tile, tree, 0, 0, TREE_GROUND_GRASS, GetClearDensity(tile)); break;
- case CLEAR_ROUGH: MakeTree(tile, tree, 0, 0, TREE_GROUND_ROUGH, 3); break;
- default: MakeTree(tile, tree, 0, 0, TREE_GROUND_SNOW_DESERT, GetClearDensity(tile)); break;
- }
+ if (CanPlantTreesOnTile(tile, false) && (tree = GetRandomTreeType(tile, GB(r, 24, 8))) != TREE_INVALID) {
+ PlantTreesOnTile(tile, tree, 0, 0);
}
}
--- a/src/tree_map.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/tree_map.h Sun Feb 03 20:34:26 2008 +0000
@@ -49,7 +49,8 @@
enum TreeGround {
TREE_GROUND_GRASS = 0, ///< normal grass
TREE_GROUND_ROUGH = 1, ///< some rough tile
- TREE_GROUND_SNOW_DESERT = 2 ///< a desert or snow tile, depend on landscape
+ TREE_GROUND_SNOW_DESERT = 2, ///< a desert or snow tile, depend on landscape
+ TREE_GROUND_SHORE = 3, ///< shore
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/tunnelbridge.h Sun Feb 03 20:34:26 2008 +0000
@@ -0,0 +1,26 @@
+/* $Id$ */
+
+/** @file tunnelbridge.h Header file for things common for tunnels and bridges */
+
+#ifndef TUNNELBRIDGE_H
+#define TUNNELBRIDGE_H
+
+#include "tile_type.h"
+#include "map_func.h"
+#include "tunnelbridge_map.h"
+
+/**
+ * Calculates the length of a tunnel or a bridge (without end tiles)
+ * @return length of bridge/tunnel middle
+ */
+static inline uint GetTunnelBridgeLength(TileIndex begin, TileIndex end)
+{
+ int x1 = TileX(begin);
+ int y1 = TileY(begin);
+ int x2 = TileX(end);
+ int y2 = TileY(end);
+
+ return abs(x2 + y2 - x1 - y1) - 1;
+}
+
+#endif /* TUNNELBRIDGE_H */
--- a/src/tunnelbridge_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/tunnelbridge_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -32,35 +32,81 @@
#include "vehicle_func.h"
#include "sound_func.h"
#include "signal_func.h"
+#include "tunnelbridge.h"
#include "table/sprites.h"
#include "table/strings.h"
#include "table/bridge_land.h"
+
+/** Describes the data that defines each bridge in the game
+ * @param y year of availablity
+ * @param mnl minimum length
+ * @param mxl maximum length
+ * @param p price
+ * @param mxs maximum speed allowed
+ * @param spr sprite to use in purchase GUI
+ * @param plt palette for the sprite in purchase GUI
+ * @param dsc description of the bridge in purchase GUI
+ * @param nrl description of the rail bridge in query tool
+ * @param nrd description of the road bridge in query tool
+ */
+#define MB(y, mnl, mxl, p, mxs, spr, plt, dsc, nrl, nrd) \
+ {y, mnl, mxl, p, mxs, spr, plt, dsc, nrl, nrd, NULL, 0}
+
const Bridge orig_bridge[] = {
/*
- year of availablity
- | minimum length
- | | maximum length
- | | | price
- | | | | maximum speed
- | | | | | sprite to use in GUI string with description
- | | | | | | | */
- { 0, 0, 16, 80, 32, 0xA24, PAL_NONE , STR_5012_WOODEN , NULL, 0 },
- { 0, 0, 2, 112, 48, 0xA26, PALETTE_TO_STRUCT_RED , STR_5013_CONCRETE , NULL, 0 },
- { 1930, 0, 5, 144, 64, 0xA25, PAL_NONE , STR_500F_GIRDER_STEEL , NULL, 0 },
- { 0, 2, 10, 168, 80, 0xA22, PALETTE_TO_STRUCT_CONCRETE, STR_5011_SUSPENSION_CONCRETE, NULL, 0 },
- { 1930, 3, 16, 185, 96, 0xA22, PAL_NONE , STR_500E_SUSPENSION_STEEL , NULL, 0 },
- { 1930, 3, 16, 192, 112, 0xA22, PALETTE_TO_STRUCT_YELLOW , STR_500E_SUSPENSION_STEEL , NULL, 0 },
- { 1930, 3, 7, 224, 160, 0xA23, PAL_NONE , STR_5010_CANTILEVER_STEEL , NULL, 0 },
- { 1930, 3, 8, 232, 208, 0xA23, PALETTE_TO_STRUCT_BROWN , STR_5010_CANTILEVER_STEEL , NULL, 0 },
- { 1930, 3, 9, 248, 240, 0xA23, PALETTE_TO_STRUCT_RED , STR_5010_CANTILEVER_STEEL , NULL, 0 },
- { 1930, 0, 2, 240, 256, 0xA27, PAL_NONE , STR_500F_GIRDER_STEEL , NULL, 0 },
- { 1995, 2, 16, 255, 320, 0xA28, PAL_NONE , STR_5014_TUBULAR_STEEL , NULL, 0 },
- { 2005, 2, 32, 380, 512, 0xA28, PALETTE_TO_STRUCT_YELLOW , STR_5014_TUBULAR_STEEL , NULL, 0 },
- { 2010, 2, 32, 510, 608, 0xA28, PALETTE_TO_STRUCT_GREY , STR_BRIDGE_TUBULAR_SILICON , NULL, 0 }
+ year of availablity
+ | minimum length
+ | | maximum length
+ | | | price
+ | | | | maximum speed
+ | | | | | sprite to use in GUI
+ | | | | | | palette in GUI
+ string with description name on rail name on road
+ | | | */
+ MB( 0, 0, 16, 80, 32, 0xA24, PAL_NONE,
+ STR_5012_WOODEN, STR_501F_WOODEN_RAIL_BRIDGE, STR_5025_WOODEN_ROAD_BRIDGE),
+
+ MB( 0, 0, 2, 112, 48, 0xA26, PALETTE_TO_STRUCT_RED,
+ STR_5013_CONCRETE, STR_5020_CONCRETE_RAIL_BRIDGE, STR_5026_CONCRETE_ROAD_BRIDGE),
+
+ MB( 1930, 0, 5, 144, 64, 0xA25, PAL_NONE,
+ STR_500F_GIRDER_STEEL, STR_501C_STEEL_GIRDER_RAIL_BRIDGE, STR_5022_STEEL_GIRDER_ROAD_BRIDGE),
+
+ MB( 0, 2, 10, 168, 80, 0xA22, PALETTE_TO_STRUCT_CONCRETE,
+ STR_5011_SUSPENSION_CONCRETE, STR_501E_REINFORCED_CONCRETE_SUSPENSION, STR_5024_REINFORCED_CONCRETE_SUSPENSION),
+
+ MB( 1930, 3, 16, 185, 96, 0xA22, PAL_NONE,
+ STR_500E_SUSPENSION_STEEL, STR_501B_STEEL_SUSPENSION_RAIL_BRIDGE, STR_5021_STEEL_SUSPENSION_ROAD_BRIDGE),
+
+ MB( 1930, 3, 16, 192, 112, 0xA22, PALETTE_TO_STRUCT_YELLOW,
+ STR_500E_SUSPENSION_STEEL, STR_501B_STEEL_SUSPENSION_RAIL_BRIDGE, STR_5021_STEEL_SUSPENSION_ROAD_BRIDGE),
+
+ MB( 1930, 3, 7, 224, 160, 0xA23, PAL_NONE,
+ STR_5010_CANTILEVER_STEEL, STR_501D_STEEL_CANTILEVER_RAIL_BRIDGE, STR_5023_STEEL_CANTILEVER_ROAD_BRIDGE),
+
+ MB( 1930, 3, 8, 232, 208, 0xA23, PALETTE_TO_STRUCT_BROWN,
+ STR_5010_CANTILEVER_STEEL, STR_501D_STEEL_CANTILEVER_RAIL_BRIDGE, STR_5023_STEEL_CANTILEVER_ROAD_BRIDGE),
+
+ MB( 1930, 3, 9, 248, 240, 0xA23, PALETTE_TO_STRUCT_RED,
+ STR_5010_CANTILEVER_STEEL, STR_501D_STEEL_CANTILEVER_RAIL_BRIDGE, STR_5023_STEEL_CANTILEVER_ROAD_BRIDGE),
+
+ MB( 1930, 0, 2, 240, 256, 0xA27, PAL_NONE,
+ STR_500F_GIRDER_STEEL, STR_501C_STEEL_GIRDER_RAIL_BRIDGE, STR_5022_STEEL_GIRDER_ROAD_BRIDGE),
+
+ MB( 1995, 2, 16, 255, 320, 0xA28, PAL_NONE,
+ STR_5014_TUBULAR_STEEL, STR_5027_TUBULAR_RAIL_BRIDGE, STR_5028_TUBULAR_ROAD_BRIDGE),
+
+ MB( 2005, 2, 32, 380, 512, 0xA28, PALETTE_TO_STRUCT_YELLOW,
+ STR_5014_TUBULAR_STEEL, STR_5027_TUBULAR_RAIL_BRIDGE, STR_5028_TUBULAR_ROAD_BRIDGE),
+
+ MB( 2010, 2, 32, 510, 608, 0xA28, PALETTE_TO_STRUCT_GREY,
+ STR_BRIDGE_TUBULAR_SILICON, STR_5027_TUBULAR_RAIL_BRIDGE, STR_5028_TUBULAR_ROAD_BRIDGE)
};
+#undef MB
+
Bridge _bridge[MAX_BRIDGES];
@@ -160,17 +206,6 @@
return CommandCost(EXPENSES_CONSTRUCTION, _price.terraform);
}
-
-uint32 GetBridgeLength(TileIndex begin, TileIndex end)
-{
- int x1 = TileX(begin);
- int y1 = TileY(begin);
- int x2 = TileX(end);
- int y2 = TileY(end);
-
- return abs(x2 + y2 - x1 - y1) - 1;
-}
-
bool CheckBridge_Stuff(byte bridge_type, uint bridge_len)
{
const Bridge *b = &_bridge[bridge_type];
@@ -383,7 +418,7 @@
switch (GetTileType(tile)) {
case MP_WATER:
if (!EnsureNoVehicleOnGround(tile)) return_cmd_error(STR_980E_SHIP_IN_THE_WAY);
- if (!IsWater(tile) && !IsCoast(tile) && !IsRiver(tile)) goto not_valid_below;
+ if (!IsWater(tile) && !IsCoast(tile)) goto not_valid_below;
break;
case MP_RAILWAY:
@@ -475,14 +510,10 @@
}
start_tileh = GetTileSlope(start_tile, &start_z);
+ direction = GetInclinedSlopeDirection(start_tileh);
+ if (direction == INVALID_DIAGDIR) return_cmd_error(STR_500B_SITE_UNSUITABLE_FOR_TUNNEL);
- switch (start_tileh) {
- case SLOPE_SW: direction = DIAGDIR_SW; break;
- case SLOPE_SE: direction = DIAGDIR_SE; break;
- case SLOPE_NW: direction = DIAGDIR_NW; break;
- case SLOPE_NE: direction = DIAGDIR_NE; break;
- default: return_cmd_error(STR_500B_SITE_UNSUITABLE_FOR_TUNNEL);
- }
+ if (IsWaterTile(start_tile)) return_cmd_error(STR_3807_CAN_T_BUILD_ON_WATER);
ret = DoCommand(start_tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
if (CmdFailed(ret)) return ret;
@@ -536,6 +567,8 @@
/* if the command fails from here on we want the end tile to be highlighted */
_build_tunnel_endtile = end_tile;
+ if (IsWaterTile(end_tile)) return_cmd_error(STR_3807_CAN_T_BUILD_ON_WATER);
+
/* slope of end tile must be complementary to the slope of the start tile */
if (end_tileh != ComplementSlope(start_tileh)) {
/* Check if there is a structure on the terraformed tile. Do not add the cost, that will be done by the terraforming */
@@ -629,7 +662,7 @@
DoClearSquare(endtile);
}
}
- return CommandCost(EXPENSES_CONSTRUCTION, _price.clear_tunnel * (DistanceManhattan(tile, endtile) + 1));
+ return CommandCost(EXPENSES_CONSTRUCTION, _price.clear_tunnel * (GetTunnelBridgeLength(tile, endtile) + 2));
}
@@ -689,7 +722,7 @@
}
}
- return CommandCost(EXPENSES_CONSTRUCTION, (DistanceManhattan(tile, endtile) + 1) * _price.clear_bridge);
+ return CommandCost(EXPENSES_CONSTRUCTION, (GetTunnelBridgeLength(tile, endtile) + 2) * _price.clear_bridge);
}
static CommandCost ClearTile_TunnelBridge(TileIndex tile, byte flags)
@@ -697,7 +730,7 @@
if (IsTunnel(tile)) {
if (flags & DC_AUTO) return_cmd_error(STR_5006_MUST_DEMOLISH_TUNNEL_FIRST);
return DoClearTunnel(tile, flags);
- } else if (IsBridge(tile)) { // XXX Is this necessary?
+ } else { // IsBridge(tile)
if (flags & DC_AUTO) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
return DoClearBridge(tile, flags);
}
@@ -875,7 +908,7 @@
AddSortableSpriteToDraw(SPR_EMPTY_BOUNDING_BOX, PAL_NONE, ti->x + BB_data[4], ti->y + BB_data[5], BB_data[6], BB_data[7], TILE_HEIGHT, ti->z);
DrawBridgeMiddle(ti);
- } else if (IsBridge(ti->tile)) { // XXX is this necessary?
+ } else { // IsBridge(ti->tile)
const PalSpriteID *psid;
int base_offset;
bool ice = HasTunnelBridgeSnowOrDesert(ti->tile);
@@ -939,8 +972,6 @@
}
DrawBridgeMiddle(ti);
- } else {
- NOT_REACHED();
}
}
@@ -1016,8 +1047,8 @@
axis = GetBridgeAxis(ti->tile);
piece = CalcBridgePiece(
- DistanceManhattan(ti->tile, rampnorth),
- DistanceManhattan(ti->tile, rampsouth)
+ GetTunnelBridgeLength(ti->tile, rampnorth) + 1,
+ GetTunnelBridgeLength(ti->tile, rampsouth) + 1
);
type = GetBridgeType(rampsouth);
@@ -1109,7 +1140,7 @@
/* In the tunnel entrance? */
if (5 <= pos && pos <= 10) return z;
- } else {
+ } else { // IsBridge(tile)
DiagDirection dir = GetTunnelBridgeDirection(tile);
uint pos = (DiagDirToAxis(dir) == AXIS_X ? y : x);
@@ -1146,45 +1177,14 @@
/* not used */
}
-static const StringID _bridge_tile_str[(MAX_BRIDGES + 3) + (MAX_BRIDGES + 3)] = {
- STR_501F_WOODEN_RAIL_BRIDGE,
- STR_5020_CONCRETE_RAIL_BRIDGE,
- STR_501C_STEEL_GIRDER_RAIL_BRIDGE,
- STR_501E_REINFORCED_CONCRETE_SUSPENSION,
- STR_501B_STEEL_SUSPENSION_RAIL_BRIDGE,
- STR_501B_STEEL_SUSPENSION_RAIL_BRIDGE,
- STR_501D_STEEL_CANTILEVER_RAIL_BRIDGE,
- STR_501D_STEEL_CANTILEVER_RAIL_BRIDGE,
- STR_501D_STEEL_CANTILEVER_RAIL_BRIDGE,
- STR_501C_STEEL_GIRDER_RAIL_BRIDGE,
- STR_5027_TUBULAR_RAIL_BRIDGE,
- STR_5027_TUBULAR_RAIL_BRIDGE,
- STR_5027_TUBULAR_RAIL_BRIDGE,
- 0, 0, 0,
-
- STR_5025_WOODEN_ROAD_BRIDGE,
- STR_5026_CONCRETE_ROAD_BRIDGE,
- STR_5022_STEEL_GIRDER_ROAD_BRIDGE,
- STR_5024_REINFORCED_CONCRETE_SUSPENSION,
- STR_5021_STEEL_SUSPENSION_ROAD_BRIDGE,
- STR_5021_STEEL_SUSPENSION_ROAD_BRIDGE,
- STR_5023_STEEL_CANTILEVER_ROAD_BRIDGE,
- STR_5023_STEEL_CANTILEVER_ROAD_BRIDGE,
- STR_5023_STEEL_CANTILEVER_ROAD_BRIDGE,
- STR_5022_STEEL_GIRDER_ROAD_BRIDGE,
- STR_5028_TUBULAR_ROAD_BRIDGE,
- STR_5028_TUBULAR_ROAD_BRIDGE,
- STR_5028_TUBULAR_ROAD_BRIDGE,
- 0, 0, 0,
-};
-
static void GetTileDesc_TunnelBridge(TileIndex tile, TileDesc *td)
{
if (IsTunnel(tile)) {
td->str = (GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL) ?
STR_5017_RAILROAD_TUNNEL : STR_5018_ROAD_TUNNEL;
- } else {
- td->str = _bridge_tile_str[GetTunnelBridgeTransportType(tile) << 4 | GetBridgeType(tile)];
+ } else { //so it must be a bridge
+ int brtype = GetBridgeType(tile);
+ td->str = GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL ? _bridge[brtype].name_rail : _bridge[brtype].name_road;
}
td->owner = GetTileOwner(tile);
}
@@ -1337,7 +1337,7 @@
return VETSB_ENTERED_WORMHOLE;
}
}
- } else if (IsBridge(tile)) { // XXX is this necessary?
+ } else { // IsBridge(tile)
DiagDirection dir;
if (v->IsPrimaryVehicle()) {
--- a/src/unmovable_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/unmovable_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -264,8 +264,10 @@
return_cmd_error(STR_5800_OBJECT_IN_THE_WAY);
if (IsStatue(tile)) {
+ if (flags & DC_AUTO) return_cmd_error(STR_5800_OBJECT_IN_THE_WAY);
+
TownID town = GetStatueTownID(tile);
- ClrBit(GetTown(town)->statues, _current_player);
+ ClrBit(GetTown(town)->statues, GetTileOwner(tile));
InvalidateWindow(WC_TOWN_AUTHORITY, town);
}
@@ -447,6 +449,19 @@
if (IsOwnedLand(tile) && new_player != PLAYER_SPECTATOR) {
SetTileOwner(tile, new_player);
+ } else if (IsStatueTile(tile)) {
+ TownID town = GetStatueTownID(tile);
+ Town *t = GetTown(town);
+ ClrBit(t->statues, old_player);
+ if (new_player != PLAYER_SPECTATOR && !HasBit(t->statues, new_player)) {
+ /* Transfer ownership to the new company */
+ SetBit(t->statues, new_player);
+ SetTileOwner(tile, new_player);
+ } else {
+ DoClearSquare(tile);
+ }
+
+ InvalidateWindow(WC_TOWN_AUTHORITY, town);
} else {
DoClearSquare(tile);
}
--- a/src/vehicle.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/vehicle.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -251,6 +251,7 @@
assert(v->first != NULL);
if (v->type == VEH_TRAIN && (IsFrontEngine(v) || IsFreeWagon(v))) {
+ if (IsFrontEngine(v)) v->u.rail.last_speed = v->cur_speed; // update displayed train speed
TrainConsistChanged(v);
} else if (v->type == VEH_ROAD && IsRoadVehFront(v)) {
RoadVehUpdateCache(v);
--- a/src/vehicle_base.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/vehicle_base.h Sun Feb 03 20:34:26 2008 +0000
@@ -428,6 +428,11 @@
virtual void Tick() {};
/**
+ * Calls the new day handler of the vehicle
+ */
+ virtual void OnNewDay() {};
+
+ /**
* Gets the running cost of a vehicle that can be sent into SetDParam for string processing.
* @return the vehicle's running cost
*/
@@ -458,6 +463,13 @@
* @return the first vehicle of the chain.
*/
inline Vehicle *First() const { return this->first; }
+
+ /**
+ * Check if we share our orders with another vehicle.
+ * This is done by checking the previous and next pointers in the shared chain.
+ * @return true if there are other vehicles sharing the same order
+ */
+ inline bool IsOrderListShared() const { return this->next_shared != NULL || this->prev_shared != NULL; };
};
/**
--- a/src/vehicle_gui.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/vehicle_gui.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -1308,7 +1308,7 @@
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 95, 113, 124, STR_013C_CARGO, STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED}, // VLD_WIDGET_DETAILS_CARGO_CARRIED
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 96, 194, 113, 124, STR_013D_INFORMATION, STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES},// VLD_WIDGET_DETAILS_TRAIN_VEHICLES
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 195, 293, 113, 124, STR_013E_CAPACITIES, STR_8851_SHOW_CAPACITIES_OF_EACH}, // VLD_WIDGET_DETAILS_CAPACITY_OF_EACH
- { WWT_PUSHTXTBTN, RESIZE_RTB, 14, 294, 392, 113, 124, STR_013E_TOTAL_CARGO, STR_8852_SHOW_TOTAL_CARGO}, // VLD_WIDGET_DETAILS_TOTAL_CARGO
+ { WWT_PUSHTXTBTN, RESIZE_RTB, 14, 294, 392, 113, 124, STR_TOTAL_CARGO, STR_SHOW_TOTAL_CARGO}, // VLD_WIDGET_DETAILS_TOTAL_CARGO
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 393, 404, 113, 124, 0x0, STR_RESIZE_BUTTON}, // VLD_RESIZE
{ WIDGETS_END},
};
--- a/src/video/cocoa/event.mm Sun Feb 03 01:34:21 2008 +0000
+++ b/src/video/cocoa/event.mm Sun Feb 03 20:34:26 2008 +0000
@@ -47,6 +47,7 @@
#include "../../blitter/factory.hpp"
#include "../../gfx_func.h"
#include "../../network/network.h"
+#include "../../core/random_func.hpp"
/* Right Mouse Button Emulation enum */
--- a/src/video/dedicated_v.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/video/dedicated_v.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -17,6 +17,7 @@
#include "../blitter/factory.hpp"
#include "../core/alloc_func.hpp"
#include "../player_func.h"
+#include "../core/random_func.hpp"
#include "dedicated_v.h"
#ifdef BEOS_NET_SERVER
--- a/src/video/sdl_v.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/video/sdl_v.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -12,6 +12,7 @@
#include "../blitter/factory.hpp"
#include "../network/network.h"
#include "../core/math_func.hpp"
+#include "../core/random_func.hpp"
#include "sdl_v.h"
#include <SDL.h>
--- a/src/video/win32_v.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/video/win32_v.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -8,6 +8,7 @@
#include "../blitter/factory.hpp"
#include "../network/network.h"
#include "../core/math_func.hpp"
+#include "../core/random_func.hpp"
#include "win32_v.h"
#include <windows.h>
#include <tchar.h>
--- a/src/viewport.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/viewport.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -910,7 +910,7 @@
int offset;
FoundationPart foundation_part = FOUNDATION_PART_NORMAL;
- Slope autorail_tileh = (Slope)(ti->tileh & ~SLOPE_HALFTILE_MASK);
+ Slope autorail_tileh = RemoveHalftileSlope(ti->tileh);
if (IsHalftileSlope(ti->tileh)) {
static const uint _lower_rail[4] = { 5U, 2U, 4U, 3U };
Corner halftile_corner = GetHalftileSlopeCorner(ti->tileh);
@@ -983,7 +983,7 @@
FoundationPart foundation_part = FOUNDATION_PART_NORMAL;
if (ti->tileh & SLOPE_N) {
z += TILE_HEIGHT;
- if ((ti->tileh & ~SLOPE_HALFTILE_MASK) == SLOPE_STEEP_N) z += TILE_HEIGHT;
+ if (RemoveHalftileSlope(ti->tileh) == SLOPE_STEEP_N) z += TILE_HEIGHT;
}
if (IsHalftileSlope(ti->tileh)) {
Corner halftile_corner = GetHalftileSlopeCorner(ti->tileh);
@@ -2184,9 +2184,8 @@
/* scrolls the viewport in a window to a given location */
bool ScrollWindowTo(int x , int y, Window *w, bool instant)
{
- Point pt;
-
- pt = MapXYZToViewport(w->viewport, x, y, GetSlopeZ(x, y));
+ /* The slope cannot be acquired outside of the map, so make sure we are always within the map. */
+ Point pt = MapXYZToViewport(w->viewport, x, y, GetSlopeZ(Clamp(x, 0, MapSizeX()), Clamp(y, 0, MapSizeY())));
WP(w, vp_d).follow_vehicle = INVALID_VEHICLE;
if (WP(w, vp_d).dest_scrollpos_x == pt.x && WP(w, vp_d).dest_scrollpos_y == pt.y)
--- a/src/water.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/water.h Sun Feb 03 20:34:26 2008 +0000
@@ -11,10 +11,11 @@
void ConvertGroundTilesIntoWaterTiles();
void DrawShipDepotSprite(int x, int y, int image);
-void DrawCanalWater(TileIndex tile);
+void DrawCanalWater(TileIndex tile, bool draw_base);
+void DrawRiverWater(const struct TileInfo *ti, bool draw_base);
void DrawShoreTile(Slope tileh);
-void MakeWaterOrCanalDependingOnOwner(TileIndex tile, Owner o);
-void MakeWaterOrCanalDependingOnSurroundings(TileIndex t, Owner o);
+void MakeWaterKeepingClass(TileIndex tile, Owner o);
+void SetWaterClassDependingOnSurroundings(TileIndex t);
#endif /* WATER_H */
--- a/src/water_cmd.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/water_cmd.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -34,6 +34,7 @@
#include "player_func.h"
#include "settings_type.h"
#include "clear_map.h"
+#include "tree_map.h"
#include "table/sprites.h"
#include "table/strings.h"
@@ -70,9 +71,28 @@
};
/**
- * Slopes that contain flat water and not only shore.
+ * Marks tile dirty if it is a canal or river tile.
+ * Called to avoid glitches when flooding tiles next to canal tile.
+ *
+ * @param tile tile to check
*/
-static const uint32 _active_water_slopes = (1 << SLOPE_FLAT) | (1 << SLOPE_W) | (1 << SLOPE_S) | (1 << SLOPE_E) | (1 << SLOPE_N);
+static inline void MarkTileDirtyIfCanalOrRiver(TileIndex tile)
+{
+ if (IsTileType(tile, MP_WATER) && (IsCanal(tile) || IsRiver(tile))) MarkTileDirtyByTile(tile);
+}
+
+/**
+ * Marks the tiles around a tile as dirty, if they are canals or rivers.
+ *
+ * @param tile The center of the tile where all other tiles are marked as dirty
+ * @ingroup dirty
+ */
+static void MarkCanalsAndRiversAroundDirty(TileIndex tile)
+{
+ for (Direction dir = DIR_BEGIN; dir < DIR_END; dir++) {
+ MarkTileDirtyIfCanalOrRiver(tile + TileOffsByDir(dir));
+ }
+}
/**
* Makes a tile canal or water depending on the surroundings.
@@ -81,33 +101,46 @@
* @param t the tile to change.
* @param o the owner of the new tile.
*/
-void MakeWaterOrCanalDependingOnSurroundings(TileIndex t, Owner o)
+void SetWaterClassDependingOnSurroundings(TileIndex t)
{
assert(GetTileSlope(t, NULL) == SLOPE_FLAT);
/* Mark tile dirty in all cases */
MarkTileDirtyByTile(t);
- /* Non-sealevel -> canal */
- if (TileHeight(t) != 0) {
- MakeCanal(t, o, Random());
- return;
- }
-
bool has_water = false;
bool has_canal = false;
+ bool has_river = false;
for (DiagDirection dir = DIAGDIR_BEGIN; dir < DIAGDIR_END; dir++) {
TileIndex neighbour = TileAddByDiagDir(t, dir);
- if (IsTileType(neighbour, MP_WATER)) {
- has_water |= IsSea(neighbour) || IsCoast(neighbour) || (IsShipDepot(neighbour) && GetShipDepotWaterOwner(neighbour) == OWNER_WATER);
- has_canal |= IsCanal(neighbour) || (IsShipDepot(neighbour) && GetShipDepotWaterOwner(neighbour) != OWNER_WATER);
+ switch (GetTileType(neighbour)) {
+ case MP_WATER:
+ has_water |= IsSea(neighbour) || IsCoast(neighbour) || (IsShipDepot(neighbour) && GetShipDepotWaterOwner(neighbour) == OWNER_WATER);
+ has_canal |= IsCanal(neighbour) || (IsShipDepot(neighbour) && GetShipDepotWaterOwner(neighbour) != OWNER_WATER);
+ has_river |= IsRiver(neighbour);
+ break;
+
+ case MP_RAILWAY:
+ /* Shore or flooded halftile */
+ has_water |= (GetRailGroundType(neighbour) == RAIL_GROUND_WATER);
+ break;
+
+ case MP_TREES:
+ /* trees on shore */
+ has_water |= (GetTreeGround(neighbour) == TREE_GROUND_SHORE);
+ break;
+
+ default: break;
}
}
- if (has_canal || !has_water) {
- MakeCanal(t, o, Random());
+
+ if (has_river && !has_canal) {
+ SetWaterClass(t, WATER_CLASS_RIVER);
+ } else if (has_canal || !has_water) {
+ SetWaterClass(t, WATER_CLASS_CANAL);
} else {
- MakeWater(t);
+ SetWaterClass(t, WATER_CLASS_SEA);
}
}
@@ -128,11 +161,19 @@
tile2 = tile + (axis == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
- if (!IsWaterTile(tile) || !IsWaterTile(tile2))
+ if (!IsWaterTile(tile) || !IsWaterTile(tile2)) {
return_cmd_error(STR_3801_MUST_BE_BUILT_ON_WATER);
+ }
if (IsBridgeAbove(tile) || IsBridgeAbove(tile2)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
+ if (GetTileSlope(tile, NULL) != SLOPE_FLAT || GetTileSlope(tile2, NULL) != SLOPE_FLAT) {
+ /* Prevent depots on rapids */
+ return_cmd_error(STR_0239_SITE_UNSUITABLE);
+ }
+
+ WaterClass wc1 = GetWaterClass(tile);
+ WaterClass wc2 = GetWaterClass(tile2);
Owner o1 = GetTileOwner(tile);
Owner o2 = GetTileOwner(tile2);
ret = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
@@ -147,8 +188,8 @@
if (flags & DC_EXEC) {
depot->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
- MakeShipDepot(tile, _current_player, DEPOT_NORTH, axis, o1);
- MakeShipDepot(tile2, _current_player, DEPOT_SOUTH, axis, o2);
+ MakeShipDepot(tile, _current_player, DEPOT_NORTH, axis, wc1, o1);
+ MakeShipDepot(tile2, _current_player, DEPOT_SOUTH, axis, wc2, o2);
MarkTileDirtyByTile(tile);
MarkTileDirtyByTile(tile2);
d_auto_delete.Detach();
@@ -157,12 +198,14 @@
return CommandCost(EXPENSES_CONSTRUCTION, _price.build_ship_depot);
}
-void MakeWaterOrCanalDependingOnOwner(TileIndex tile, Owner o)
+void MakeWaterKeepingClass(TileIndex tile, Owner o)
{
- if (o == OWNER_WATER) {
- MakeWater(tile);
- } else {
- MakeCanal(tile, o, Random());
+ assert(IsTileType(tile, MP_WATER) || (IsTileType(tile, MP_STATION) && (IsBuoy(tile) || IsDock(tile))));
+
+ switch (GetWaterClass(tile)) {
+ case WATER_CLASS_SEA: MakeWater(tile); break;
+ case WATER_CLASS_CANAL: MakeCanal(tile, o, Random()); break;
+ case WATER_CLASS_RIVER: MakeRiver(tile, Random()); break;
}
}
@@ -182,8 +225,8 @@
/* Kill the depot, which is registered at the northernmost tile. Use that one */
delete GetDepotByTile(tile2 < tile ? tile2 : tile);
- MakeWaterOrCanalDependingOnOwner(tile, GetShipDepotWaterOwner(tile));
- MakeWaterOrCanalDependingOnOwner(tile2, GetShipDepotWaterOwner(tile2));
+ MakeWaterKeepingClass(tile, GetShipDepotWaterOwner(tile));
+ MakeWaterKeepingClass(tile2, GetShipDepotWaterOwner(tile2));
MarkTileDirtyByTile(tile);
MarkTileDirtyByTile(tile2);
}
@@ -203,6 +246,8 @@
delta = TileOffsByDiagDir(dir);
/* lower tile */
+ WaterClass wc_lower = IsWaterTile(tile - delta) ? GetWaterClass(tile - delta) : WATER_CLASS_CANAL;
+
ret = DoCommand(tile - delta, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
if (CmdFailed(ret)) return CMD_ERROR;
if (GetTileSlope(tile - delta, NULL) != SLOPE_FLAT) {
@@ -210,6 +255,8 @@
}
/* upper tile */
+ WaterClass wc_upper = IsWaterTile(tile + delta) ? GetWaterClass(tile + delta) : WATER_CLASS_CANAL;
+
ret = DoCommand(tile + delta, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
if (CmdFailed(ret)) return CMD_ERROR;
if (GetTileSlope(tile + delta, NULL) != SLOPE_FLAT) {
@@ -223,10 +270,12 @@
}
if (flags & DC_EXEC) {
- MakeLock(tile, _current_player, dir);
+ MakeLock(tile, _current_player, dir, wc_lower, wc_upper);
MarkTileDirtyByTile(tile);
MarkTileDirtyByTile(tile - delta);
MarkTileDirtyByTile(tile + delta);
+ MarkCanalsAndRiversAroundDirty(tile - delta);
+ MarkCanalsAndRiversAroundDirty(tile + delta);
}
return CommandCost(EXPENSES_CONSTRUCTION, _price.clear_water * 22 >> 3);
@@ -244,30 +293,17 @@
if (flags & DC_EXEC) {
DoClearSquare(tile);
- MakeWaterOrCanalDependingOnSurroundings(tile + delta, _current_player);
- MakeWaterOrCanalDependingOnSurroundings(tile - delta, _current_player);
+ MakeWaterKeepingClass(tile + delta, GetTileOwner(tile));
+ MakeWaterKeepingClass(tile - delta, GetTileOwner(tile));
+ MarkTileDirtyByTile(tile - delta);
+ MarkTileDirtyByTile(tile + delta);
+ MarkCanalsAndRiversAroundDirty(tile - delta);
+ MarkCanalsAndRiversAroundDirty(tile + delta);
}
return CommandCost(EXPENSES_CONSTRUCTION, _price.clear_water * 2);
}
-/**
- * Marks the tiles around a tile as dirty.
- *
- * This functions marks the tiles around a given tile as dirty for repaint.
- *
- * @param tile The center of the tile where all other tiles are marked as dirty
- * @ingroup dirty
- * @see TerraformAddDirtyTileAround
- */
-static void MarkTilesAroundDirty(TileIndex tile)
-{
- MarkTileDirtyByTile(TILE_ADDXY(tile, 0, 1));
- MarkTileDirtyByTile(TILE_ADDXY(tile, 0, -1));
- MarkTileDirtyByTile(TILE_ADDXY(tile, 1, 0));
- MarkTileDirtyByTile(TILE_ADDXY(tile, -1, 0));
-}
-
/** Builds a lock (ship-lift)
* @param tile tile where to place the lock
* @param flags type of operation
@@ -276,15 +312,12 @@
*/
CommandCost CmdBuildLock(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
{
- DiagDirection dir;
+ DiagDirection dir = GetInclinedSlopeDirection(GetTileSlope(tile, NULL));
+ if (dir == INVALID_DIAGDIR) return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
- switch (GetTileSlope(tile, NULL)) {
- case SLOPE_SW: dir = DIAGDIR_SW; break;
- case SLOPE_SE: dir = DIAGDIR_SE; break;
- case SLOPE_NW: dir = DIAGDIR_NW; break;
- case SLOPE_NE: dir = DIAGDIR_NE; break;
- default: return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
- }
+ /* Disallow building of locks on river rapids */
+ if (IsWaterTile(tile)) return_cmd_error(STR_0239_SITE_UNSUITABLE);
+
return DoBuildShiplift(tile, dir, flags);
}
@@ -292,7 +325,7 @@
* @param tile end tile of stretch-dragging
* @param flags type of operation
* @param p1 start tile of stretch-dragging
- * @param p2 ctrl pressed - toggles ocean / canals at sealevel (ocean only allowed in the scenario editor)
+ * @param p2 specifies canal (0), water (1) or river (2); last two can only be built in scenario editor
*/
CommandCost CmdBuildCanal(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
{
@@ -324,7 +357,7 @@
CommandCost ret;
Slope slope = GetTileSlope(tile, NULL);
- if (slope != SLOPE_FLAT && (p2 != 2 || (slope != SLOPE_NW && slope != SLOPE_NE && slope != SLOPE_SW && slope != SLOPE_SE))) {
+ if (slope != SLOPE_FLAT && (p2 != 2 || !IsInclinedSlope(slope))) {
return_cmd_error(STR_0007_FLAT_LAND_REQUIRED);
}
@@ -344,7 +377,7 @@
MakeCanal(tile, _current_player, Random());
}
MarkTileDirtyByTile(tile);
- MarkTilesAroundDirty(tile);
+ MarkCanalsAndRiversAroundDirty(tile);
}
cost.AddCost(_price.clear_water);
@@ -361,7 +394,6 @@
{
switch (GetWaterTileType(tile)) {
case WATER_TILE_CLEAR:
- case WATER_TILE_RIVER:
if (flags & DC_NO_WATER) return_cmd_error(STR_3807_CAN_T_BUILD_ON_WATER);
/* Make sure it's not an edge tile. */
@@ -375,7 +407,10 @@
if (GetTileOwner(tile) != OWNER_WATER && GetTileOwner(tile) != OWNER_NONE && !CheckTileOwnership(tile)) return CMD_ERROR;
- if (flags & DC_EXEC) DoClearSquare(tile);
+ if (flags & DC_EXEC) {
+ DoClearSquare(tile);
+ MarkCanalsAndRiversAroundDirty(tile);
+ }
return CommandCost(EXPENSES_CONSTRUCTION, _price.clear_water);
case WATER_TILE_COAST: {
@@ -384,8 +419,11 @@
/* Make sure no vehicle is on the tile */
if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
- if (flags & DC_EXEC) DoClearSquare(tile);
- if (slope == SLOPE_N || slope == SLOPE_E || slope == SLOPE_S || slope == SLOPE_W) {
+ if (flags & DC_EXEC) {
+ DoClearSquare(tile);
+ MarkCanalsAndRiversAroundDirty(tile);
+ }
+ if (IsSlopeWithOneCornerRaised(slope)) {
return CommandCost(EXPENSES_CONSTRUCTION, _price.clear_water);
} else {
return CommandCost(EXPENSES_CONSTRUCTION, _price.clear_roughland);
@@ -414,26 +452,41 @@
}
}
-/** return true if a tile is a water tile. */
-static bool IsWateredTile(TileIndex tile)
+/**
+ * return true if a tile is a water tile wrt. a certain direction.
+ *
+ * @param tile The tile of interest.
+ * @param from The direction of interest.
+ * @return true iff the tile is water in the view of 'from'.
+ *
+ */
+static bool IsWateredTile(TileIndex tile, Direction from)
{
switch (GetTileType(tile)) {
case MP_WATER:
if (!IsCoast(tile)) return true;
-
switch (GetTileSlope(tile, NULL)) {
- case SLOPE_W:
- case SLOPE_S:
- case SLOPE_E:
- case SLOPE_N:
- return true;
-
- default:
- return false;
+ case SLOPE_W: return (from == DIR_SE) || (from == DIR_E) || (from == DIR_NE);
+ case SLOPE_S: return (from == DIR_NE) || (from == DIR_N) || (from == DIR_NW);
+ case SLOPE_E: return (from == DIR_NW) || (from == DIR_W) || (from == DIR_SW);
+ case SLOPE_N: return (from == DIR_SW) || (from == DIR_S) || (from == DIR_SE);
+ default: return false;
}
- case MP_RAILWAY: return GetRailGroundType(tile) == RAIL_GROUND_WATER;
- case MP_STATION: return IsCustomFSMportsSpecIndex(tile) || IsOilRig(tile) || IsDock(tile) || IsBuoy(tile);
+ case MP_RAILWAY:
+ if (GetRailGroundType(tile) == RAIL_GROUND_WATER) {
+ assert(IsPlainRailTile(tile));
+ switch (GetTileSlope(tile, NULL)) {
+ case SLOPE_W: return (from == DIR_SE) || (from == DIR_E) || (from == DIR_NE);
+ case SLOPE_S: return (from == DIR_NE) || (from == DIR_N) || (from == DIR_NW);
+ case SLOPE_E: return (from == DIR_NW) || (from == DIR_W) || (from == DIR_SW);
+ case SLOPE_N: return (from == DIR_SW) || (from == DIR_S) || (from == DIR_SE);
+ default: return false;
+ }
+ }
+ return false;
+
+ case MP_STATION: return IsCustomFSMportsSpecIndex(tile) || IsOilRig(tile) || (IsDock(tile) && GetTileSlope(tile, NULL) == SLOPE_FLAT) || IsBuoy(tile);
case MP_INDUSTRY: return (GetIndustrySpec(GetIndustryType(tile))->behaviour & INDUSTRYBEH_BUILT_ONWATER) != 0;
default: return false;
}
@@ -444,10 +497,10 @@
uint wa;
/* determine the edges around with water. */
- wa = IsWateredTile(TILE_ADDXY(tile, -1, 0)) << 0;
- wa += IsWateredTile(TILE_ADDXY(tile, 0, 1)) << 1;
- wa += IsWateredTile(TILE_ADDXY(tile, 1, 0)) << 2;
- wa += IsWateredTile(TILE_ADDXY(tile, 0, -1)) << 3;
+ wa = IsWateredTile(TILE_ADDXY(tile, -1, 0), DIR_SW) << 0;
+ wa += IsWateredTile(TILE_ADDXY(tile, 0, 1), DIR_NW) << 1;
+ wa += IsWateredTile(TILE_ADDXY(tile, 1, 0), DIR_NE) << 2;
+ wa += IsWateredTile(TILE_ADDXY(tile, 0, -1), DIR_SE) << 3;
if (!(wa & 1)) DrawGroundSprite(base, PAL_NONE);
if (!(wa & 2)) DrawGroundSprite(base + 1, PAL_NONE);
@@ -457,31 +510,39 @@
/* right corner */
switch (wa & 0x03) {
case 0: DrawGroundSprite(base + 4, PAL_NONE); break;
- case 3: if (!IsWateredTile(TILE_ADDXY(tile, -1, 1))) DrawGroundSprite(base + 8, PAL_NONE); break;
+ case 3: if (!IsWateredTile(TILE_ADDXY(tile, -1, 1), DIR_W)) DrawGroundSprite(base + 8, PAL_NONE); break;
}
/* bottom corner */
switch (wa & 0x06) {
case 0: DrawGroundSprite(base + 5, PAL_NONE); break;
- case 6: if (!IsWateredTile(TILE_ADDXY(tile, 1, 1))) DrawGroundSprite(base + 9, PAL_NONE); break;
+ case 6: if (!IsWateredTile(TILE_ADDXY(tile, 1, 1), DIR_N)) DrawGroundSprite(base + 9, PAL_NONE); break;
}
/* left corner */
switch (wa & 0x0C) {
case 0: DrawGroundSprite(base + 6, PAL_NONE); break;
- case 12: if (!IsWateredTile(TILE_ADDXY(tile, 1, -1))) DrawGroundSprite(base + 10, PAL_NONE); break;
+ case 12: if (!IsWateredTile(TILE_ADDXY(tile, 1, -1), DIR_E)) DrawGroundSprite(base + 10, PAL_NONE); break;
}
/* upper corner */
switch (wa & 0x09) {
case 0: DrawGroundSprite(base + 7, PAL_NONE); break;
- case 9: if (!IsWateredTile(TILE_ADDXY(tile, -1, -1))) DrawGroundSprite(base + 11, PAL_NONE); break;
+ case 9: if (!IsWateredTile(TILE_ADDXY(tile, -1, -1), DIR_S)) DrawGroundSprite(base + 11, PAL_NONE); break;
}
}
+/** Draw a plain sea water tile with no edges */
+void DrawSeaWater(TileIndex tile)
+{
+ DrawGroundSprite(SPR_FLAT_WATER_TILE, PAL_NONE);
+}
+
/** draw a canal styled water tile with dikes around */
-void DrawCanalWater(TileIndex tile)
+void DrawCanalWater(TileIndex tile, bool draw_base)
{
+ if (draw_base) DrawGroundSprite(SPR_FLAT_WATER_TILE, PAL_NONE);
+
/* Test for custom graphics, else use the default */
SpriteID dikes_base = GetCanalSprite(CF_DIKES, tile);
if (dikes_base == 0) dikes_base = SPR_CANAL_DIKES_BASE;
@@ -527,7 +588,7 @@
}
}
-static void DrawRiverWater(const TileInfo *ti)
+void DrawRiverWater(const TileInfo *ti, bool draw_base)
{
SpriteID image = SPR_FLAT_WATER_TILE;
SpriteID edges_base = GetCanalSprite(CF_RIVER_EDGE, ti->tile);
@@ -535,7 +596,13 @@
if (ti->tileh != SLOPE_FLAT) {
image = GetCanalSprite(CF_RIVER_SLOPE, ti->tile);
if (image == 0) {
- image = SPR_FLAT_WATER_TILE;
+ switch (ti->tileh) {
+ case SLOPE_NW: image = SPR_WATER_SLOPE_Y_DOWN; break;
+ case SLOPE_SW: image = SPR_WATER_SLOPE_X_UP; break;
+ case SLOPE_SE: image = SPR_WATER_SLOPE_Y_UP; break;
+ case SLOPE_NE: image = SPR_WATER_SLOPE_X_DOWN; break;
+ default: image = SPR_FLAT_WATER_TILE; break;
+ }
} else {
switch (ti->tileh) {
default: NOT_REACHED();
@@ -547,11 +614,10 @@
}
}
- DrawGroundSprite(image, PAL_NONE);
+ if (draw_base) DrawGroundSprite(image, PAL_NONE);
- /* Draw canal dikes if there are no river edges to draw. */
- if (edges_base <= 48) edges_base = SPR_CANAL_DIKES_BASE;
- DrawWaterEdges(edges_base, ti->tile);
+ /* Draw river edges if available. */
+ if (edges_base > 48) DrawWaterEdges(edges_base, ti->tile);
}
void DrawShoreTile(Slope tileh)
@@ -575,8 +641,11 @@
{
switch (GetWaterTileType(ti->tile)) {
case WATER_TILE_CLEAR:
- DrawGroundSprite(SPR_FLAT_WATER_TILE, PAL_NONE);
- if (IsCanal(ti->tile)) DrawCanalWater(ti->tile);
+ switch (GetWaterClass(ti->tile)) {
+ case WATER_CLASS_SEA: DrawSeaWater(ti->tile); break;
+ case WATER_CLASS_CANAL: DrawCanalWater(ti->tile, true); break;
+ case WATER_CLASS_RIVER: DrawRiverWater(ti, true); break;
+ }
DrawBridgeMiddle(ti);
break;
@@ -593,11 +662,6 @@
case WATER_TILE_DEPOT:
DrawWaterStuff(ti, _shipdepot_display_seq[GetSection(ti->tile)], PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile)), 0);
break;
-
- case WATER_TILE_RIVER:
- DrawRiverWater(ti);
- DrawBridgeMiddle(ti);
- break;
}
}
@@ -636,7 +700,6 @@
{
switch (GetWaterTileType(tile)) {
case WATER_TILE_CLEAR:
- case WATER_TILE_RIVER:
if (!IsCanal(tile)) {
td->str = STR_3804_WATER;
} else {
@@ -657,17 +720,6 @@
/* not used */
}
-/**
- * Marks tile dirty if it is a canal tile.
- * Called to avoid glitches when flooding tiles next to canal tile.
- *
- * @param tile tile to check
- */
-static inline void MarkTileDirtyIfCanal(TileIndex tile)
-{
- if (IsTileType(tile, MP_WATER) && IsCanal(tile)) MarkTileDirtyByTile(tile);
-}
-
/**
* Finds a vehicle to flood.
@@ -803,7 +855,7 @@
static FloodingBehaviour GetFloodingBehaviour(TileIndex tile)
{
/* FLOOD_ACTIVE: 'single-corner-raised'-coast, sea, sea-shipdepots, sea-buoys, rail with flooded halftile
- * FLOOD_DRYUP: coast with more than one corner raised
+ * FLOOD_DRYUP: coast with more than one corner raised, coast with rail-track, coast with trees
* FLOOD_PASSIVE: oilrig, dock, water-industries
* FLOOD_NONE: canals, rivers, everything else
*/
@@ -811,16 +863,22 @@
case MP_WATER:
if (IsCoast(tile)) {
Slope tileh = GetTileSlope(tile, NULL);
- return (HasBit(_active_water_slopes, tileh) ? FLOOD_ACTIVE : FLOOD_DRYUP);
+ return (IsSlopeWithOneCornerRaised(tileh) ? FLOOD_ACTIVE : FLOOD_DRYUP);
} else {
- return ((IsSea(tile) || (IsShipDepot(tile) && (GetShipDepotWaterOwner(tile) == OWNER_WATER))) ? FLOOD_ACTIVE : FLOOD_NONE);
+ return (GetWaterClass(tile) == WATER_CLASS_SEA) ? FLOOD_ACTIVE : FLOOD_NONE;
}
case MP_RAILWAY:
- return ((GetRailGroundType(tile) == RAIL_GROUND_WATER) ? FLOOD_ACTIVE : FLOOD_NONE);
+ if (GetRailGroundType(tile) == RAIL_GROUND_WATER) {
+ return (IsSlopeWithOneCornerRaised(GetTileSlope(tile, NULL)) ? FLOOD_ACTIVE : FLOOD_DRYUP);
+ }
+ return FLOOD_NONE;
+
+ case MP_TREES:
+ return (GetTreeGround(tile) == TREE_GROUND_SHORE ? FLOOD_DRYUP : FLOOD_NONE);
case MP_STATION:
- if (IsSeaBuoyTile(tile)) return FLOOD_ACTIVE;
+ if (IsBuoy(tile) && GetWaterClass(tile) == WATER_CLASS_SEA) return FLOOD_ACTIVE;
if (IsOilRig(tile) || IsDock(tile)) return FLOOD_PASSIVE;
if (GetStationByTile(tile)->FSMport_flood_protected) return FLOOD_PASSIVE;
return FLOOD_NONE;
@@ -844,7 +902,8 @@
_current_player = OWNER_WATER;
- if (GetTileSlope(target, NULL) != SLOPE_FLAT) {
+ Slope tileh = GetTileSlope(target, NULL);
+ if (tileh != SLOPE_FLAT) {
/* make coast.. */
switch (GetTileType(target)) {
case MP_RAILWAY: {
@@ -858,8 +917,15 @@
break;
}
+ case MP_TREES:
+ if (!IsSlopeWithOneCornerRaised(tileh)) {
+ SetTreeGroundDensity(target, TREE_GROUND_SHORE, 3);
+ MarkTileDirtyByTile(target);
+ flooded = true;
+ break;
+ }
+ /* FALL THROUGH */
case MP_CLEAR:
- case MP_TREES:
if (CmdSucceeded(DoCommand(target, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR))) {
MakeShore(target);
MarkTileDirtyByTile(target);
@@ -888,9 +954,7 @@
if (flooded) {
/* Mark surrounding canal tiles dirty too to avoid glitches */
- for (Direction dir = DIR_BEGIN; dir < DIR_END; dir++) {
- MarkTileDirtyIfCanal(target + TileOffsByDir(dir));
- }
+ MarkCanalsAndRiversAroundDirty(target);
/* update signals if needed */
UpdateSignalsInBuffer();
@@ -904,12 +968,40 @@
*/
static void DoDryUp(TileIndex tile)
{
- assert(IsTileType(tile, MP_WATER) && IsCoast(tile));
_current_player = OWNER_WATER;
- if (CmdSucceeded(DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR))) {
- MakeClear(tile, CLEAR_GRASS, 3);
- MarkTileDirtyByTile(tile);
+ switch (GetTileType(tile)) {
+ case MP_RAILWAY:
+ assert(IsPlainRailTile(tile));
+ assert(GetRailGroundType(tile) == RAIL_GROUND_WATER);
+
+ RailGroundType new_ground;
+ switch (GetTrackBits(tile)) {
+ case TRACK_BIT_UPPER: new_ground = RAIL_GROUND_FENCE_HORIZ1; break;
+ case TRACK_BIT_LOWER: new_ground = RAIL_GROUND_FENCE_HORIZ2; break;
+ case TRACK_BIT_LEFT: new_ground = RAIL_GROUND_FENCE_VERT1; break;
+ case TRACK_BIT_RIGHT: new_ground = RAIL_GROUND_FENCE_VERT2; break;
+ default: NOT_REACHED();
+ }
+ SetRailGroundType(tile, new_ground);
+ MarkTileDirtyByTile(tile);
+ break;
+
+ case MP_TREES:
+ SetTreeGroundDensity(tile, TREE_GROUND_GRASS, 3);
+ MarkTileDirtyByTile(tile);
+ break;
+
+ case MP_WATER:
+ assert(IsCoast(tile));
+
+ if (CmdSucceeded(DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR))) {
+ MakeClear(tile, CLEAR_GRASS, 3);
+ MarkTileDirtyByTile(tile);
+ }
+ break;
+
+ default: NOT_REACHED();
}
_current_player = OWNER_NONE;
@@ -988,7 +1080,7 @@
FOR_EACH_SET_BIT(dir, check_dirs) {
TileIndex dest = TILE_ADD(tile, TileOffsByDir((Direction)dir));
Slope slope_dest = (Slope)(GetTileSlope(dest, NULL) & ~SLOPE_STEEP);
- if (HasBit(_active_water_slopes, slope_dest)) {
+ if (slope_dest == SLOPE_FLAT || IsSlopeWithOneCornerRaised(slope_dest)) {
MakeShore(tile);
break;
}
@@ -1008,11 +1100,10 @@
if (mode != TRANSPORT_WATER) return 0;
switch (GetWaterTileType(tile)) {
- case WATER_TILE_CLEAR: ts = TRACK_BIT_ALL; break;
+ case WATER_TILE_CLEAR: ts = (GetTileSlope(tile, NULL) == SLOPE_FLAT) ? TRACK_BIT_ALL : TRACK_BIT_NONE; break;
case WATER_TILE_COAST: ts = (TrackBits)coast_tracks[GetTileSlope(tile, NULL) & 0xF]; break;
case WATER_TILE_LOCK: ts = AxisToTrackBits(DiagDirToAxis(GetLockDirection(tile))); break;
case WATER_TILE_DEPOT: ts = AxisToTrackBits(GetShipDepotAxis(tile)); break;
- case WATER_TILE_RIVER: ts = (GetTileSlope(tile, NULL) == SLOPE_FLAT) ? TRACK_BIT_ALL : TRACK_BIT_NONE; break;
default: return 0;
}
if (TileX(tile) == 0) {
--- a/src/water_map.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/water_map.h Sun Feb 03 20:34:26 2008 +0000
@@ -10,7 +10,12 @@
WATER_TILE_COAST,
WATER_TILE_LOCK,
WATER_TILE_DEPOT,
- WATER_TILE_RIVER,
+};
+
+enum WaterClass {
+ WATER_CLASS_SEA,
+ WATER_CLASS_CANAL,
+ WATER_CLASS_RIVER,
};
enum DepotPart {
@@ -32,13 +37,24 @@
if (_m[t].m5 == 0) return WATER_TILE_CLEAR;
if (_m[t].m5 == 1) return WATER_TILE_COAST;
- if (_m[t].m5 == 2) return WATER_TILE_RIVER;
if (IsInsideMM(_m[t].m5, LOCK_MIDDLE, LOCK_END)) return WATER_TILE_LOCK;
assert(IsInsideMM(_m[t].m5, DEPOT_NORTH, DEPOT_END));
return WATER_TILE_DEPOT;
}
+static inline WaterClass GetWaterClass(TileIndex t)
+{
+ assert(IsTileType(t, MP_WATER) || IsTileType(t, MP_STATION));
+ return (WaterClass)GB(_m[t].m3, 0, 2);
+}
+
+static inline void SetWaterClass(TileIndex t, WaterClass wc)
+{
+ assert(IsTileType(t, MP_WATER) || IsTileType(t, MP_STATION));
+ SB(_m[t].m3, 0, 2, wc);
+}
+
/** IsWater return true if any type of clear water like ocean, river, canal */
static inline bool IsWater(TileIndex t)
{
@@ -47,9 +63,22 @@
static inline bool IsSea(TileIndex t)
{
- if (GetWaterTileType(t) != WATER_TILE_CLEAR) return false;
- if (!IsTileOwner(t, OWNER_WATER)) return false; // 'Human' built water = canal, not sea
- return true;
+ return IsWater(t) && GetWaterClass(t) == WATER_CLASS_SEA;
+}
+
+static inline bool IsCanal(TileIndex t)
+{
+ return IsWater(t) && GetWaterClass(t) == WATER_CLASS_CANAL;
+}
+
+static inline bool IsRiver(TileIndex t)
+{
+ return IsWater(t) && GetWaterClass(t) == WATER_CLASS_RIVER;
+}
+
+static inline bool IsWaterTile(TileIndex t)
+{
+ return IsTileType(t, MP_WATER) && IsWater(t);
}
static inline bool IsCoast(TileIndex t)
@@ -57,21 +86,6 @@
return GetWaterTileType(t) == WATER_TILE_COAST;
}
-static inline bool IsCanal(TileIndex t)
-{
- return GetWaterTileType(t) == WATER_TILE_CLEAR && GetTileOwner(t) != OWNER_WATER;
-}
-
-static inline bool IsRiver(TileIndex t)
-{
- return GetWaterTileType(t) == WATER_TILE_RIVER;
-}
-
-static inline bool IsWaterTile(TileIndex t)
-{
- return IsTileType(t, MP_WATER) && IsWater(t);
-}
-
static inline TileIndex GetOtherShipDepotTile(TileIndex t)
{
return t + (HasBit(_m[t].m5, 0) ? -1 : 1) * (HasBit(_m[t].m5, 1) ? TileDiffXY(0, 1) : TileDiffXY(1, 0));
@@ -119,7 +133,7 @@
SetTileType(t, MP_WATER);
SetTileOwner(t, OWNER_WATER);
_m[t].m2 = 0;
- _m[t].m3 = 0;
+ _m[t].m3 = WATER_CLASS_SEA;
_m[t].m4 = 0;
_m[t].m5 = 0;
}
@@ -139,9 +153,9 @@
SetTileType(t, MP_WATER);
SetTileOwner(t, OWNER_WATER);
_m[t].m2 = 0;
- _m[t].m3 = 0;
+ _m[t].m3 = WATER_CLASS_RIVER;
_m[t].m4 = random_bits;
- _m[t].m5 = 2;
+ _m[t].m5 = 0;
}
static inline void MakeCanal(TileIndex t, Owner o, uint8 random_bits)
@@ -150,38 +164,38 @@
SetTileType(t, MP_WATER);
SetTileOwner(t, o);
_m[t].m2 = 0;
- _m[t].m3 = 0;
+ _m[t].m3 = WATER_CLASS_CANAL;
_m[t].m4 = random_bits;
_m[t].m5 = 0;
}
-static inline void MakeShipDepot(TileIndex t, Owner o, DepotPart base, Axis a, Owner original_owner)
+static inline void MakeShipDepot(TileIndex t, Owner o, DepotPart base, Axis a, WaterClass original_water_class, Owner original_owner)
{
SetTileType(t, MP_WATER);
SetTileOwner(t, o);
_m[t].m2 = 0;
- _m[t].m3 = 0;
+ _m[t].m3 = original_water_class;
_m[t].m4 = original_owner;
_m[t].m5 = base + a * 2;
}
-static inline void MakeLockTile(TileIndex t, Owner o, byte section)
+static inline void MakeLockTile(TileIndex t, Owner o, byte section, WaterClass original_water_class)
{
SetTileType(t, MP_WATER);
SetTileOwner(t, o);
_m[t].m2 = 0;
- _m[t].m3 = 0;
+ _m[t].m3 = original_water_class;
_m[t].m4 = 0;
_m[t].m5 = section;
}
-static inline void MakeLock(TileIndex t, Owner o, DiagDirection d)
+static inline void MakeLock(TileIndex t, Owner o, DiagDirection d, WaterClass wc_lower, WaterClass wc_upper)
{
TileIndexDiff delta = TileOffsByDiagDir(d);
- MakeLockTile(t, o, LOCK_MIDDLE + d);
- MakeLockTile(t - delta, o, LOCK_LOWER + d);
- MakeLockTile(t + delta, o, LOCK_UPPER + d);
+ MakeLockTile(t, o, LOCK_MIDDLE + d, WATER_CLASS_CANAL);
+ MakeLockTile(t - delta, o, LOCK_LOWER + d, wc_lower);
+ MakeLockTile(t + delta, o, LOCK_UPPER + d, wc_upper);
}
#endif /* WATER_MAP_H */
--- a/src/widget.cpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/widget.cpp Sun Feb 03 20:34:26 2008 +0000
@@ -14,7 +14,7 @@
#include "table/sprites.h"
#include "table/strings.h"
-static const char *UPARROW = "\xEE\x8A\x80";
+static const char *UPARROW = "\xEE\x8A\xA0";
static const char *DOWNARROW = "\xEE\x8A\xAA";
static Point HandleScrollbarHittest(const Scrollbar *sb, int top, int bottom)
@@ -583,6 +583,24 @@
}
}
+void ResizeWindowForWidget(Window *w, int widget, int delta_x, int delta_y)
+{
+ int right = w->widget[widget].right;
+ int bottom = w->widget[widget].bottom;
+
+ for (uint i = 0; i < w->widget_count; i++) {
+ if (w->widget[i].left >= right) w->widget[i].left += delta_x;
+ if (w->widget[i].right >= right) w->widget[i].right += delta_x;
+ if (w->widget[i].top >= bottom) w->widget[i].top += delta_y;
+ if (w->widget[i].bottom >= bottom) w->widget[i].bottom += delta_y;
+ }
+
+ w->width += delta_x;
+ w->height += delta_y;
+ w->resize.width += delta_x;
+ w->resize.height += delta_y;
+}
+
/** Draw a sort button's up or down arrow symbol.
* @param w Window of widget
* @param widget Sort button widget
--- a/src/window_gui.h Sun Feb 03 01:34:21 2008 +0000
+++ b/src/window_gui.h Sun Feb 03 20:34:26 2008 +0000
@@ -630,6 +630,10 @@
*/
void ResizeButtons(Window *w, byte left, byte right);
+/** Resize a widget an shuffle other widgets around to fit.
+ */
+void ResizeWindowForWidget(Window *w, int widget, int delta_x, int delta_y);
+
/**
* Sets the enabled/disabled status of a widget.
--- a/src/yapf/follow_track.hpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/yapf/follow_track.hpp Sun Feb 03 20:34:26 2008 +0000
@@ -37,9 +37,26 @@
FORCEINLINE static TransportType TT() {return Ttr_type_;}
FORCEINLINE static bool IsWaterTT() {return TT() == TRANSPORT_WATER;}
FORCEINLINE static bool IsRailTT() {return TT() == TRANSPORT_RAIL;}
+ FORCEINLINE bool IsTram() {return IsRoadTT() && HasBit(m_veh->u.road.compatible_roadtypes, ROADTYPE_TRAM);}
FORCEINLINE static bool IsRoadTT() {return TT() == TRANSPORT_ROAD;}
FORCEINLINE static bool Allow90degTurns() {return T90deg_turns_allowed_;}
+ /** Tests if a tile is a road tile with a single tramtrack (tram can reverse) */
+ FORCEINLINE DiagDirection GetSingleTramBit(TileIndex tile)
+ {
+ if (IsTram() && IsTileType(tile, MP_ROAD) && GetRoadTileType(tile) == ROAD_TILE_NORMAL) {
+ RoadBits rb = GetRoadBits(tile, ROADTYPE_TRAM);
+ switch (rb) {
+ case ROAD_NW: return DIAGDIR_NW;
+ case ROAD_SW: return DIAGDIR_SW;
+ case ROAD_SE: return DIAGDIR_SE;
+ case ROAD_NE: return DIAGDIR_NE;
+ default: break;
+ }
+ }
+ return INVALID_DIAGDIR;
+ }
+
/** main follower routine. Fills all members and return true on success.
* Otherwise returns false if track can't be followed. */
FORCEINLINE bool Follow(TileIndex old_tile, Trackdir old_td)
@@ -47,9 +64,10 @@
m_old_tile = old_tile;
m_old_td = old_td;
m_err = EC_NONE;
- assert((GetTileTrackStatus(m_old_tile, TT(), m_veh->u.road.compatible_roadtypes) & TrackdirToTrackdirBits(m_old_td)) != 0);
+ assert(((GetTileTrackStatus(m_old_tile, TT(), m_veh->u.road.compatible_roadtypes) & TrackdirToTrackdirBits(m_old_td)) != 0) ||
+ (GetSingleTramBit(m_old_tile) != INVALID_DIAGDIR)); // Disable the assertion for single tram bits
m_exitdir = TrackdirToExitdir(m_old_td);
- if (EnteredDepot()) return true;
+ if (ForcedReverse()) return true;
if (!CanExitOldTile()) return false;
FollowTileExit();
if (!QueryNewTileTrackStatus()) return TryReverse();
@@ -76,32 +94,22 @@
m_is_station = m_is_bridge = m_is_tunnel = false;
m_tiles_skipped = 0;
- // extra handling for tunnels in our direction
- if (IsTunnelTile(m_old_tile)) {
- DiagDirection tunnel_enterdir = GetTunnelBridgeDirection(m_old_tile);
- if (tunnel_enterdir == m_exitdir) {
- // we are entering the tunnel
- FindLengthOfTunnelResult flotr = FindLengthOfTunnel(m_old_tile, m_exitdir);
- m_new_tile = flotr.tile;
- m_is_tunnel = true;
- m_tiles_skipped = flotr.length - 1;
+ // extra handling for tunnels and bridges in our direction
+ if (IsTileType(m_old_tile, MP_TUNNELBRIDGE)) {
+ DiagDirection enterdir = GetTunnelBridgeDirection(m_old_tile);
+ if (enterdir == m_exitdir) {
+ // we are entering the tunnel / bridge
+ if (IsTunnel(m_old_tile)) {
+ m_is_tunnel = true;
+ m_new_tile = GetOtherTunnelEnd(m_old_tile);
+ } else { // IsBridge(m_old_tile)
+ m_is_bridge = true;
+ m_new_tile = GetOtherBridgeEnd(m_old_tile);
+ }
+ m_tiles_skipped = GetTunnelBridgeLength(m_new_tile, m_old_tile);
return;
}
- assert(ReverseDiagDir(tunnel_enterdir) == m_exitdir);
- }
-
- // extra handling for bridge ramp in our direction
- if (IsBridgeTile(m_old_tile)) {
- DiagDirection bridge_enterdir = GetTunnelBridgeDirection(m_old_tile);
- if (bridge_enterdir == m_exitdir) {
- // we are entering the bridge ramp
- m_new_tile = GetOtherBridgeEnd(m_old_tile);
- uint32 bridge_length = GetBridgeLength(m_old_tile, m_new_tile);
- m_tiles_skipped = bridge_length;
- m_is_bridge = true;
- return;
- }
- assert(ReverseDiagDir(bridge_enterdir) == m_exitdir);
+ assert(ReverseDiagDir(enterdir) == m_exitdir);
}
// normal or station tile, do one step
@@ -127,6 +135,24 @@
} else {
uint32 ts = GetTileTrackStatus(m_new_tile, TT(), m_veh->u.road.compatible_roadtypes);
m_new_td_bits = (TrackdirBits)(ts & TRACKDIR_BIT_MASK);
+
+ if (m_new_td_bits == 0) {
+ /* GetTileTrackStatus() returns 0 for single tram bits.
+ * As we cannot change it there (easily) without breaking something, change it here */
+ switch (GetSingleTramBit(m_new_tile)) {
+ case DIAGDIR_NE:
+ case DIAGDIR_SW:
+ m_new_td_bits = TRACKDIR_BIT_X_NE | TRACKDIR_BIT_X_SW;
+ break;
+
+ case DIAGDIR_NW:
+ case DIAGDIR_SE:
+ m_new_td_bits = TRACKDIR_BIT_Y_NW | TRACKDIR_BIT_Y_SE;
+ break;
+
+ default: break;
+ }
+ }
}
return (m_new_td_bits != TRACKDIR_BIT_NONE);
}
@@ -143,6 +169,13 @@
}
}
+ /* single tram bits can only be left in one direction */
+ DiagDirection single_tram = GetSingleTramBit(m_old_tile);
+ if (single_tram != INVALID_DIAGDIR && single_tram != m_exitdir) {
+ m_err = EC_NO_WAY;
+ return false;
+ }
+
// road depots can be also left in one direction only
if (IsRoadTT() && IsTileDepotType(m_old_tile, TT())) {
DiagDirection exitdir = GetRoadDepotDirection(m_old_tile);
@@ -166,6 +199,13 @@
}
}
+ /* single tram bits can only be entered from one direction */
+ DiagDirection single_tram = GetSingleTramBit(m_new_tile);
+ if (single_tram != INVALID_DIAGDIR && single_tram != ReverseDiagDir(m_exitdir)) {
+ m_err = EC_NO_WAY;
+ return false;
+ }
+
// road and rail depots can also be entered from one direction only
if (IsRoadTT() && IsTileDepotType(m_new_tile, TT())) {
DiagDirection exitdir = GetRoadDepotDirection(m_new_tile);
@@ -214,7 +254,7 @@
return false;
}
}
- } else if (IsBridge(m_new_tile)) {
+ } else { // IsBridge(m_new_tile)
if (!m_is_bridge) {
DiagDirection ramp_enderdir = GetTunnelBridgeDirection(m_new_tile);
if (ramp_enderdir != m_exitdir) {
@@ -242,8 +282,8 @@
return true;
}
- /** return true if we entered depot and reversed inside */
- FORCEINLINE bool EnteredDepot()
+ /** return true if we must reverse (in depots and single tram bits) */
+ FORCEINLINE bool ForcedReverse()
{
// rail and road depots cause reversing
if (!IsWaterTT() && IsTileDepotType(m_old_tile, TT())) {
@@ -258,13 +298,25 @@
return true;
}
}
+
+ // single tram bits cause reversing
+ if (GetSingleTramBit(m_old_tile) == ReverseDiagDir(m_exitdir)) {
+ // reverse
+ m_new_tile = m_old_tile;
+ m_new_td_bits = TrackdirToTrackdirBits(ReverseTrackdir(m_old_td));
+ m_exitdir = ReverseDiagDir(m_exitdir);
+ m_tiles_skipped = 0;
+ m_is_tunnel = m_is_bridge = m_is_station = false;
+ return true;
+ }
+
return false;
}
/** return true if we successfully reversed at end of road/track */
FORCEINLINE bool TryReverse()
{
- if (IsRoadTT()) {
+ if (IsRoadTT() && !IsTram()) {
// if we reached the end of road, we can reverse the RV and continue moving
m_exitdir = ReverseDiagDir(m_exitdir);
// new tile will be the same as old one
--- a/src/yapf/yapf.hpp Sun Feb 03 01:34:21 2008 +0000
+++ b/src/yapf/yapf.hpp Sun Feb 03 20:34:26 2008 +0000
@@ -23,6 +23,7 @@
#include "../waypoint.h"
#include "../debug.h"
#include "../settings_type.h"
+#include "../tunnelbridge.h"
extern uint64 _rdtsc();