cpp/openttd-patchpack/source Changelog /src/lang/simplified_chinese.txt

Changelog - /src/lang/simplified_chinese.txt @ 3bd72b951042 - showing 100 out of 664 revisions

rubidium	r19922:3bd72b951042	11 years ago	(svn r24878) -Update: the obligatory first of January commit master
translators	r19920:bc193fea4193	11 years ago	(svn r24876) -Update from WebTranslator v3.0: (svn r24876) -Update from WebTranslator v3.0: belarusian - 30 changes by Wowanxm simplified_chinese - 99 changes by huanggua2002, xiangyigao greek - 118 changes by Evropi icelandic - 89 changes by Stimrol korean - 12 changes by telk5093 polish - 3 changes by wojteks86 portuguese - 31 changes by fspinto, neuralshock romanian - 36 changes by mariush slovenian - 17 changes by gligoran spanish - 1 changes by Terkhen tamil - 44 changes by aswn master
translators	r19917:339429c6ad39	11 years ago	(svn r24873) -Update from WebTranslator v3.0: (svn r24873) -Update from WebTranslator v3.0: bulgarian - 13 changes by Tvel simplified_chinese - 31 changes by xiangyigao czech - 16 changes by Eskymak danish - 48 changes by Knogle english_AU - 1 changes by Rubidium english_US - 1 changes by Rubidium estonian - 22 changes by runekri3 icelandic - 145 changes by Stimrol indonesian - 9 changes by fanioz korean - 116 changes by telk5093 norwegian_bokmal - 148 changes by Inspirion, cuthbert polish - 7 changes by wojteks86 slovenian - 64 changes by gligoran tamil - 157 changes by aswn master
translators	r19910:ca6a56124bb8	11 years ago	(svn r24866) -Update from WebTranslator v3.0: (svn r24866) -Update from WebTranslator v3.0: catalan - 39 changes by Bassals simplified_chinese - 2 changes by chenwt0315 croatian - 8 changes by VoyagerOne danish - 6 changes by Hatsen dutch - 40 changes by habell english_US - 7 changes by Rubidium french - 7 changes by glx greek - 3 changes by Evropi italian - 7 changes by lorenzodv korean - 7 changes by telk5093 norwegian_bokmal - 8 changes by Inspirion polish - 10 changes by wojteks86 portuguese - 81 changes by SupSuper romanian - 35 changes by kneekoo russian - 7 changes by KorneySan slovak - 1 changes by JamesSVK master
frosch	r19908:4506018745d5	11 years ago	(svn r24864) -Fix (r24863): Update before running sed. master
translators	r19896:4e5d2197d2a9	11 years ago	(svn r24852) -Update from WebTranslator v3.0: (svn r24852) -Update from WebTranslator v3.0: simplified_chinese - 64 changes by chenwt0315 italian - 14 changes by lorenzodv korean - 33 changes by telk5093 master
frosch	r19892:7529d3e7332a	11 years ago	(svn r24847) -Cleanup (r24750): Remove unused strings. master
frosch	r19890:8a1009b78524	11 years ago	(svn r24845) -Add: News ticker sound setting to adv. settings window. master
frosch	r19889:b28040683861	11 years ago	(svn r24844) -Add: News display settings to adv. settings window. master
frosch	r19887:9ae85713528d	11 years ago	(svn r24842) -Remove: News settings window. master
translators	r19880:f49270efec92	11 years ago	(svn r24835) -Update from WebTranslator v3.0: (svn r24835) -Update from WebTranslator v3.0: simplified_chinese - 47 changes by chenwt0315 master
translators	r19843:e39c3c22b9fc	11 years ago	(svn r24798) -Update from WebTranslator v3.0: (svn r24798) -Update from WebTranslator v3.0: basque - 374 changes by lutxiketa catalan - 66 changes by arnau finnish - 1 changes by jpx_ italian - 1 changes by lorenzodv russian - 8 changes by Lone_Wolf ukrainian - 1 changes by Norby89 master
frosch	r19838:49408d0fba38	11 years ago	(svn r24793) -Change: Move script opcodes setting from Economy to AI settings. master
frosch	r19837:b08e70a8cf98	11 years ago	(svn r24792) -Add: Readd difficulty settings to advanced settings unless they are already present in other settings windows. master
frosch	r19836:9d82dfe1ad85	11 years ago	(svn r24791) -Remove: Difficulty settings window. master
frosch	r19835:9f41fb5b6fd7	11 years ago	(svn r24790) -Remove: Classic difficulty profiles. master
terkhen	r19615:c929a66cbed1	12 years ago	(svn r24546) -Fix (r24544): Change all other languages too. master
frosch	r19353:9498160d5be9	12 years ago	(svn r24268) -Fix: Use the same colour scheme for the script selection window as in other comparable windows. master
alberth	r19327:8378807e7aeb	12 years ago	(svn r24238) -Add: String to display highlight selected setting in all languages. master
alberth	r19308:915da12901fd	12 years ago	(svn r24211) -Change: Update other languages too with the changed autorenew string. master
alberth	r19304:65a34a561a84	12 years ago	(svn r24207) -Change: Update the other languages too. master
frosch	r19291:d199fcaeac08	12 years ago	(svn r24194) -Change: Rename the 'signal_side' setting to 'train_signal_side', and add a third option while doing so. master
translators	r19254:76c046cc28ae	12 years ago	(svn r24157) -Update from WebTranslator v3.0: (svn r24157) -Update from WebTranslator v3.0: afrikaans - 45 changes by telanus belarusian - 10 changes by Wowanxm simplified_chinese - 3 changes by chenwt0315 croatian - 12 changes by VoyagerOne german - 12 changes by planetmaker latvian - 24 changes by Parastais, Tranzistors master
michi_cc	r19237:867c4b3026e7	12 years ago	(svn r24140) -Add [FS #1117 ]: Group name in the replace vehicle window caption. (Juanjo) master
frosch	r19170:2bf34ee1afd6	12 years ago	(svn r24058) -Fix [FS #5124 ]: Wrong numbering of string parameters. master
translators	r19159:8e55a8a132ee	12 years ago	(svn r24042) -Update from WebTranslator v3.0: (svn r24042) -Update from WebTranslator v3.0: english_US - 2 changes by Rubidium french - 2 changes by OliTTD, glx hungarian - 2 changes by Brumi italian - 2 changes by lorenzodv korean - 1 changes by telk5093 lithuanian - 64 changes by Stabilitronas portuguese - 5 changes by JayCity serbian - 2 changes by etran spanish - 2 changes by Terkhen tamil - 115 changes by aswn master
rubidium	r19154:31c0ebf5eed9	12 years ago	(svn r24035) -Add: "missing" strings to translations that were merely control codes master
rubidium	r19144:d93270bd24c0	12 years ago	(svn r24024) -Update: translation w.r.t. the changes in r24023 master
translators	r19125:4c3b727c0952	12 years ago	(svn r23996) -Update from WebTranslator v3.0: (svn r23996) -Update from WebTranslator v3.0: afrikaans - 82 changes by Maccie123 basque - 12 changes by HerrBasque belarusian - 2 changes by KorneySan simplified_chinese - 47 changes by Gavin dutch - 4 changes by habell english_AU - 11 changes by tomas4g french - 26 changes by OliTTD indonesian - 6 changes by fanioz korean - 22 changes by telk5093 latvian - 8 changes by Parastais polish - 2 changes by wojteks86 russian - 2 changes by KorneySan slovak - 10 changes by klingacik welsh - 5 changes by kazzie master
frosch	r19120:272cdd873f1d	12 years ago	(svn r23991) -Fix [FS #5076 ]: Also display the cargo subtype for vehicles which have no capacity, but a subtype. master
translators	r19119:66e8a5f3bca2	12 years ago	(svn r23990) -Update from WebTranslator v3.0: (svn r23990) -Update from WebTranslator v3.0: catalan - 5 changes by arnau simplified_chinese - 9 changes by chenwt0315 french - 3 changes by glx frisian - 1 changes by Flexo korean - 6 changes by telk5093 norwegian_bokmal - 3 changes by kristoffer_hh polish - 5 changes by nouwak portuguese - 10 changes by JayCity romanian - 16 changes by tonny serbian - 1 changes by etran swedish - 5 changes by Zuu ukrainian - 29 changes by Madvin urdu - 26 changes by haider vietnamese - 7 changes by nglekhoi welsh - 8 changes by kazzie master
translators	r19098:b39f7b047b6a	12 years ago	(svn r23966) -Update from WebTranslator v3.0: (svn r23966) -Update from WebTranslator v3.0: latvian - 47 changes by Parastais lithuanian - 56 changes by Stabilitronas spanish - 9 changes by Terkhen swedish - 6 changes by Zuu urdu - 95 changes by haider master
rubidium	r19066:5536c388f98b	12 years ago	(svn r23934) -Update: other language files w.r.t. the previous change master
translators	r19007:4d2259daf59b	12 years ago	(svn r23873) -Update from WebTranslator v3.0: (svn r23873) -Update from WebTranslator v3.0: simplified_chinese - 1 changes by chenwt0315 croatian - 1 changes by VoyagerOne french - 71 changes by OliTTD latvian - 65 changes by Parastais lithuanian - 7 changes by Stabilitronas russian - 1 changes by akasoft master
translators	r19006:0717e2818b67	12 years ago	(svn r23872) -Update from WebTranslator v3.0: (svn r23872) -Update from WebTranslator v3.0: simplified_chinese - 1 changes by chenwt0315 finnish - 1 changes by jpx_ french - 23 changes by OliTTD german - 2 changes by planetmaker hungarian - 12 changes by IPG italian - 1 changes by lorenzodv latvian - 1 changes by Parastais lithuanian - 32 changes by Stabilitronas portuguese - 27 changes by JayCity vietnamese - 1 changes by nglekhoi master
rubidium	r18962:69567f39810d	12 years ago	(svn r23827) -Feature [FS #4992 ]: [NoGo] Allow to chose the goal question window's title from a (small) set of options master
translators	r18958:4ac91ffd441a	12 years ago	(svn r23823) -Update from WebTranslator v3.0: (svn r23823) -Update from WebTranslator v3.0: simplified_chinese - 46 changes by chenwt0315 dutch - 2 changes by Parody french - 56 changes by OliTTD german - 38 changes by Jogio latvian - 23 changes by Parastais polish - 5 changes by wojteks86 russian - 17 changes by akasoft tamil - 13 changes by aswn master
yexo	r18948:90c3284d6e08	12 years ago	(svn r23813) -Codechange: fix other language files master
frosch	r18944:249f4ba29f41	12 years ago	(svn r23808) -Codechange: Remove various translations which will be invalid with the next commit. master
translators	r18930:63f78e17e5ca	12 years ago	(svn r23790) -Update from WebTranslator v3.0: (svn r23790) -Update from WebTranslator v3.0: belarusian - 7 changes by Wowanxm simplified_chinese - 62 changes by Gavin italian - 2 changes by Snail_ latvian - 3 changes by serbian - 8 changes by etran master
rubidium	r18875:1438011bedd9	12 years ago	(svn r23734) -Cleanup: remove the translated strings as well master
rubidium	r18839:f81a97fd6143	12 years ago	(svn r23698) -Fix (r21685): small, apparantly yearly reoccuring, typo master
translators	r18830:f65e221ce48e	12 years ago	(svn r23689) -Update from WebTranslator v3.0: (svn r23689) -Update from WebTranslator v3.0: simplified_chinese - 23 changes by chenwt0315 norwegian_bokmal - 236 changes by mantaray swedish - 9 changes by tobjork master
translators	r18783:bc122a900899	12 years ago	(svn r23641) -Update from WebTranslator v3.0: (svn r23641) -Update from WebTranslator v3.0: afrikaans - 98 changes by Maccie123, kdzar bulgarian - 4 changes by Tvel catalan - 44 changes by arnau simplified_chinese - 62 changes by ww9980 traditional_chinese - 46 changes by elleryq, ww9980 croatian - 43 changes by VoyagerOne danish - 188 changes by majbom, mgarde dutch - 44 changes by habell english_US - 32 changes by Rubidium finnish - 43 changes by jpx_ french - 43 changes by glx frisian - 16 changes by Fopper german - 44 changes by NG, planetmaker greek - 49 changes by kyrm indonesian - 31 changes by fanioz korean - 39 changes by junho2813, telk5093 lithuanian - 66 changes by BlinK_, Devastator malay - 36 changes by Syed maltese - 20 changes by ercolesptr norwegian_bokmal - 6 changes by kristoffer_hh norwegian_nynorsk - 1 changes by Utvik polish - 68 changes by lion, matma6, nouwak, wojteks86 portuguese - 104 changes by ABCRic romanian - 148 changes by kneekoo, tonny russian - 43 changes by Lone_Wolf, MajestiC, akasoft slovak - 135 changes by teso spanish - 43 changes by Terkhen swedish - 38 changes by Zuu, urdh ukrainian - 28 changes by Madvin vietnamese - 3 changes by nglekhoi master
truebrain	r18750:f99c3a48f013	12 years ago	(svn r23608) -Fix: remove now unused strings from all other languages too master
michi_cc	r18647:b388bd59d544	12 years ago	(svn r23505) -Add: Indication in the order list if the next destination of an order is out of range. master
truebrain	r18534:b55a4d57f442	13 years ago	(svn r23388) -Fix: remove now unused strings from all other languages too master
truebrain	r18531:7427f2b93828	13 years ago	(svn r23385) -Fix: remove now unused strings from all other languages too master
truebrain	r18447:1a8a2a5c5ac2	13 years ago	(svn r23301) -Fix: remove changed strings from all languages and alter those we can master
rubidium	r18417:d063e7cb7d51	13 years ago	(svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent master
rubidium	r18338:37cf54977e50	13 years ago	(svn r23184) -Cleanup: remove the removed strings from the translations as well master
michi_cc	r18283:584850043783	13 years ago	(svn r23129) -Add: [NewGRF] Property for the rail type name. master
translators	r18134:69dfe8027e9f	13 years ago	(svn r22969) -Update from WebTranslator v3.0: (svn r22969) -Update from WebTranslator v3.0: simplified_chinese - 3 changes by sebastian_my traditional_chinese - 4 changes by sebastian_my danish - 2 changes by beruic latvian - 25 changes by Parastais master
translators	r18058:4beecb7dfd79	13 years ago	(svn r22883) -Update from WebTranslator v3.0: (svn r22883) -Update from WebTranslator v3.0: simplified_chinese - 23 changes by Gavin czech - 9 changes by TheLamer finnish - 1 changes by jpx_ hungarian - 6 changes by IPG italian - 1 changes by lorenzodv persian - 76 changes by Peymanpn russian - 1 changes by Lone_Wolf serbian - 1 changes by etran spanish - 1 changes by Terkhen swedish - 1 changes by Zuu vietnamese - 1 changes by nglekhoi master
rubidium	r17993:1095c48b4ba9	13 years ago	(svn r22812) -Fix: incorrect currency code master
translators	r17812:ea250850383c	13 years ago	(svn r22613) -Update from WebTranslator v3.0: (svn r22613) -Update from WebTranslator v3.0: simplified_chinese - 1 changes by Gavin master
translators	r17804:dd16447df793	13 years ago	(svn r22605) -Update from WebTranslator v3.0: (svn r22605) -Update from WebTranslator v3.0: simplified_chinese - 3 changes by Gavin czech - 3 changes by marek995 master
translators	r17755:f58844eb4b95	13 years ago	(svn r22549) -Update from WebTranslator v3.0: (svn r22549) -Update from WebTranslator v3.0: simplified_chinese - 1 changes by Gavin dutch - 2 changes by Parody norwegian_bokmal - 16 changes by kristoffer_hh swedish - 7 changes by Ingerfara master
translators	r17737:a92142757bcd	13 years ago	(svn r22531) -Update from WebTranslator v3.0: (svn r22531) -Update from WebTranslator v3.0: simplified_chinese - 5 changes by Gavin master
translators	r17708:0750662c7c75	13 years ago	(svn r22498) -Update from WebTranslator v3.0: (svn r22498) -Update from WebTranslator v3.0: simplified_chinese - 1 changes by Gavin master
planetmaker	r17683:ed148d83dec5	13 years ago	(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added master
translators	r17656:aac1870b6ea1	13 years ago	(svn r22438) -Update from WebTranslator v3.0: (svn r22438) -Update from WebTranslator v3.0: simplified_chinese - 1 changes by Gavin romanian - 6 changes by tonny master
planetmaker	r17607:c2e4a6a89225	13 years ago	(svn r22381) -Codechange: It's called 'steel', not 'steele' master
translators	r17602:b5a12beb4733	13 years ago	(svn r22376) -Update from WebTranslator v3.0: (svn r22376) -Update from WebTranslator v3.0: simplified_chinese - 6 changes by Gavin portuguese - 1 changes by JayCity slovenian - 2 changes by Necrolyte master
smatz	r17579:dbd98cec4484	13 years ago	(svn r22353) -Cleanup (r22352): remove unused strings from all language files master
peter1138	r17567:b6cf484395f9	13 years ago	(svn r22341) -Change: Remove string unused since r22337 master
translators	r17527:2dc2de26d96b	13 years ago	(svn r22301) -Update from WebTranslator v3.0: (svn r22301) -Update from WebTranslator v3.0: simplified_chinese - 35 changes by Gavin master
translators	r17457:4e4b77602b7e	13 years ago	(svn r22221) -Update from WebTranslator v3.0: (svn r22221) -Update from WebTranslator v3.0: danish - 14 changes by beruic vietnamese - 4 changes by nglekhoi master
alberth	r17456:602bfe3129d0	13 years ago	(svn r22220) -Codechange: Unduplicate npf/yapf strings for the other languages. master
alberth	r17454:08e10b9da11e	13 years ago	(svn r22218) -Codechange: Unduplicate horizontal positioning strings for the other languages. master
alberth	r17452:78bc3d889f7b	13 years ago	(svn r22216) -Codechange: Unduplicate original/realistic strings for the other languages. master
alberth	r17450:6871dcb2f756	13 years ago	(svn r22214) -Codechange: Unduplicate company on/off strings for the other languages. master
alberth	r17448:b159e5231e03	13 years ago	(svn r22212) -Codechange: Unduplicate Off/On strings for the other languages. master
translators	r17339:93dca30597af	13 years ago	(svn r22091) -Update from WebTranslator v3.0: (svn r22091) -Update from WebTranslator v3.0: simplified_chinese - 41 changes by ww9980 danish - 23 changes by beruic, krak brazilian_portuguese - 125 changes by Luis_Mizuchiro thai - 19 changes by kenny urdu - 15 changes by yasirniazkhan master
translators	r17216:804895dad5ea	13 years ago	(svn r21965) -Update from WebTranslator v3.0: (svn r21965) -Update from WebTranslator v3.0: czech - 6 changes by SmatZ dutch - 15 changes by Yexo english_US - 10 changes by Rubidium finnish - 9 changes by jpx_ french - 9 changes by glx russian - 6 changes by Lone_Wolf spanish - 6 changes by Terkhen master
rubidium	r17145:e6b8cf2be611	13 years ago	(svn r21893) -Update (r21892): remove the strings from the other language files as well master
rubidium	r17080:faa6050bcb73	13 years ago	(svn r21827) -Cleanup: remove string removed in r21826 from other languages too master
alberth	r17027:c810fcb62ed0	13 years ago	(svn r21774) -Change: Update the other languages too. master
terkhen	r16976:7a308a6a23f9	13 years ago	(svn r21722) -Update: String names on other translations. master
rubidium	r16939:8edef28c6ca0	13 years ago	(svn r21685) -Codechange: prevent bug tracker entries like FS #2487 and FS #1613 for this year master
translators	r16924:7e73f30657af	13 years ago	(svn r21669) -Update from WebTranslator v3.0: (svn r21669) -Update from WebTranslator v3.0: simplified_chinese - 6 changes by ww9980 greek - 10 changes by fumantsu master
rubidium	r16869:be6b10090d65	13 years ago	(svn r21613) -Update: sync comments in the translation files with English for some recently untouched translations master
rubidium	r16764:5f867d9d04db	13 years ago	(svn r21507) -Update: the other translations master
translators	r16707:e51e77b53f92	13 years ago	(svn r21450) -Update from WebTranslator v3.0: (svn r21450) -Update from WebTranslator v3.0: romanian - 14 changes by kkmic ukrainian - 6 changes by Fixer master
rubidium	r16690:03335364596b	13 years ago	(svn r21432) -Cleanup: remove the now obsolete strings as well master
rubidium	r16650:d8ab6c031a63	13 years ago	(svn r21391) -Update (r21390): the string names in the translations master
rubidium	r16575:8632c74e8e22	14 years ago	(svn r21315) -Cleanup: remove a pair of unused strings master
rubidium	r16486:3f3907517c65	14 years ago	(svn r21222) -Codechange: unify some string drawing and make it use the proper infrastructure for that... master
rubidium	r16485:6b81edee6bf6	14 years ago	(svn r21221) -Fix (r11429): short cargo units names for some cargo types/strings are not properly mapped to the strings that we use for the default industries master
rubidium	r16484:6fa82bb2c6a4	14 years ago	(svn r21220) -Codechange: give a string a much better name master
rubidium	r16428:f3b8489bc556	14 years ago	(svn r21154) -Fix [FS #4223 ]: OPF has been removed for trains, so the 90 degree turn option doesn't need to mention it's not supported for OPF master
rubidium	r16403:e6c50f3b6d1d	14 years ago	(svn r21129) -Fix [FS #4208 -ish]: Crash when showing the "disabled static NewGRF for desync purposes" message master
translators	r16284:82b967b4106b	14 years ago	(svn r21002) -Update from WebTranslator v3.0: (svn r21002) -Update from WebTranslator v3.0: simplified_chinese - 14 changes by lmartinking german - 1 changes by norbert79 romanian - 1 changes by kkmic thai - 255 changes by reindeeruz master
rubidium	r15974:209eb2bd2712	14 years ago	(svn r20672) -Remove: some stale strings master
translators	r15955:45d8890de7f9	14 years ago	(svn r20653) -Update from WebTranslator v3.0: (svn r20653) -Update from WebTranslator v3.0: simplified_chinese - 23 changes by ww9980 traditional_chinese - 2 changes by ww9980 esperanto - 6 changes by Christopher icelandic - 108 changes by grjonib thai - 6 changes by angelix master
translators	r15873:e4545914edf2	14 years ago	(svn r20565) -Update from WebTranslator v3.0: (svn r20565) -Update from WebTranslator v3.0: belarusian - 7 changes by KorneySan simplified_chinese - 3 changes by pda1573 traditional_chinese - 5 changes by josesun chuvash - 31 changes by mefisteron dutch - 5 changes by habell esperanto - 16 changes by Christopher finnish - 4 changes by jpx_ french - 4 changes by glx german - 6 changes by planetmaker hungarian - 1 changes by norbert79 italian - 6 changes by lorenzodv romanian - 2 changes by kkmic russian - 13 changes by KorneySan, Lone_Wolf slovenian - 4 changes by ntadej spanish - 3 changes by Terkhen master
yexo	r15842:58697bf3ba72	14 years ago	(svn r20534) -Codechange: unify the naming of the 'vehicle must be stopped in depot' strings master
translators	r15834:b43e1129838f	14 years ago	(svn r20526) -Update from WebTranslator v3.0: (svn r20526) -Update from WebTranslator v3.0: belarusian - 7 changes by KorneySan simplified_chinese - 1 changes by pda1573 croatian - 5 changes by VoyagerOne czech - 8 changes by marek995 dutch - 4 changes by habell esperanto - 24 changes by Christopher finnish - 7 changes by jpx_ german - 4 changes by NG hungarian - 9 changes by IPG indonesian - 6 changes by prof irish - 9 changes by tem italian - 4 changes by lorenzodv romanian - 4 changes by tonny russian - 5 changes by KorneySan slovenian - 8 changes by ntadej swedish - 5 changes by Zuu master
translators	r15812:f4678f52ebfc	14 years ago	(svn r20501) -Update from WebTranslator v3.0: (svn r20501) -Update from WebTranslator v3.0: simplified_chinese - 3 changes by pda1573 chuvash - 7 changes by mefisteron estonian - 5 changes by Jaanus hungarian - 6 changes by IPG turkish - 28 changes by niw3 master
translators	r15748:b54c3c20f478	14 years ago	(svn r20425) -Update from WebTranslator v3.0: (svn r20425) -Update from WebTranslator v3.0: simplified_chinese - 14 changes by pda1573 traditional_chinese - 32 changes by josesun chuvash - 25 changes by mefisteron croatian - 3 changes by VoyagerOne estonian - 44 changes by KSiimson german - 3 changes by planetmaker hungarian - 1 changes by IPG italian - 1 changes by lorenzodv russian - 3 changes by Lone_Wolf serbian - 2 changes by etran master