Commit b634ff70c6527370532c1251fffd9a90b77d850d

Authored by 徐烜
2 parents 0e19ca28 c4df8711

Merge branch 'pudong_jdk8_wvp' of http://192.168.168.245:8888/panzhaov5/bsth_con…

…trol into pudong_jdk8_wvp
src/main/resources/message_en_US.properties
... ... @@ -1370,7 +1370,7 @@ txt-1369=Enter location search
1370 1370 txt-1370=Modify the report registration
1371 1371 txt-1371=Add reporting registration
1372 1372 txt-1372=Off-site refueling settings
1373   -txt-1373=Bus dispatch system
  1373 +txt-1373=Dispatch system
1374 1374 txt-1374=Large interval statistics table
1375 1375 txt-1375=After editing the graphics
1376 1376 txt-1376=Set as Down
... ... @@ -2161,7 +2161,7 @@ txt-2160=Latest shift to
2161 2161 txt-2161=Discontinuous recording
2162 2162 txt-2162=Recording missing notification
2163 2163 txt-2163=Intermittent black screen
2164   -txt-2164=
  2164 +txt-2164=No middle-door video
2165 2165 txt-2165=No reversing video
2166 2166 txt-2166=Not an empty array
2167 2167 txt-2167=Initialize data
... ...