localization update

2016-03-18 16:05:02 +03:00
parent 9a567a436f
commit 7409160fbe
47 changed files with 395 additions and 171 deletions
--- a/client/src/main/resources/lang/locale.properties
+++ b/client/src/main/resources/lang/locale.properties
@@ -56,6 +56,23 @@ economic.TOURISM=Tourism
 economic.COLONY=Colony
 economic.NONE=None

+power.DUVAL=Aisling Duval
+power.DELAINE=Archon Delaine
+power.LAVIGNY_DUVAL=Arissa Lavigny-Duval
+power.PATREUS=Denton Patreus
+power.MAHON=Edmund Mahon
+power.WINTERS=Felicia Winters
+power.YONG_RUI=Li Yong-Rui
+power.ANTAL=Pranav Antal
+power.HUDSON=Zachary Hudson
+power.TORVAL=Zemina Torval
+power.NONE=None
+
+power.states.CONTROL=Controlling
+power.states.EXPLOITED=Exploited
+power.states.EXPANSION=Expansion
+power.states.NONE=None
+
 item.group.chemicals=Chemicals
 item.explosives=Explosives
 item.hydrogenfuel=Hydrogen Fuel
--- a/client/src/main/resources/lang/locale_en_US.properties
+++ b/client/src/main/resources/lang/locale_en_US.properties
@@ -5,12 +5,29 @@ market.stations=Stations
 market.groups=Commodities groups
 market.items=Commods
 market.offers=Offers
-market.item.name=Commodity
-market.system.name=System
-market.station.name=Station
 market.allegiance=Allegiance
 market.government=Government
 market.economic=Economy
+market.power=Power
+market.powerState=State
+
+#Item
+market.item=Commodity
+market.item.name=Name
+market.item.illegal=Illegal in
+market.item.legal=Legal in
+
+#Group
+market.group=Group
+
+#System
+market.system=System
+market.system.name=Name
+
+#Station
+market.station=Station
+market.station.name=Name
+market.station.distance=Distance
 market.station.services=Services
 market.station.type=Station type

@@ -44,15 +61,21 @@ routes.profitByTime=Cr/Sec
 routes.text.format=Profit: %.0f Cr/t, Time: %s

 # Dialog
+dialog.exception.title=Exception Dialog
+dialog.exception.label.stacktrace=The exception stacktrace was:
+dialog.confirm.title=Confirmation Dialog
 dialog.confirm.save=Changes were not saved, save changes?
 dialog.confirm.remove=Are you sure you want to delete %s?
 dialog.button.add=Add
+dialog.button.ok=\u041E\u041A
 dialog.button.save=Save
 dialog.button.cancel=Cancel
 dialog.button.edit=Edit
 dialog.button.remove=Remove
 dialog.button.clear=Clear
 dialog.button.copy=Copy
+dialog.button.yes=Yes
+dialog.button.no=No

 # main.fxml
 main.title=Trader
@@ -77,6 +100,7 @@ main.menu.settings.parameters=Preferences
 main.menu.settings.filter=Filter
 main.tab.routes=Routes
 main.tab.search=Search
+main.tab.route=Current route

 # add item dialog
 dialog.item.title=Adding new commodity
@@ -87,6 +111,18 @@ dialog.group.title=Adding new group
 dialog.group.id=ID:
 dialog.group.type=Type:

+#profile.fxml
+profile.name=Cmdr:
+profile.balance=Balance:
+profile.system=System:
+profile.station=Station:
+profile.docked=Docked:
+profile.ship.cargo=Cargo:
+profile.ship.tank=Fuel tank:
+profile.ship.mass=Mass:
+profile.ship.engine=Engine:
+profile.ship.jump=Jump range, LY:
+
 # items.fxml

 # itemDesc.fxml
@@ -131,6 +167,10 @@ router.button.top=TOP 100
 router.pane.total=Total
 router.pane.total.profit=Profit:
 router.pane.missions=Missions
+router.search.type=Search type:
+router.search.byTime=Best time, hours
+router.search.byProfit=Best profit, Cr/h
+router.search.full=Full scan

 # settings.fxml
 settings.title=Settings
@@ -142,6 +182,20 @@ settings.emdn.auto=Auto update (sec.):
 settings.performance=Performance
 settings.performance.segmentSize=Segment size (0 - auto):
 settings.performance.limit=Routes count:
+settings.edce.on=Active
+settings.edce.interval=Update interval, sec.
+settings.performance.jumps=Jumps:
+settings.performance.landings=Landings:
+settings.search=Search options
+settings.search.fuelPrice=1t fuel price:
+settings.search.pathType=Path priority:
+settings.search.times.jump=Hyperjump time:
+settings.search.times.landing=Landing time:
+settings.search.times.takeoff=Takeoff time:
+settings.search.times.recharge=Recharging FSD time:
+settings.search.times.orbital=Orbital flight time:
+settings.hotkeys=Hotkeys
+settings.hotkeys.complete=Target complete:

 # sEditor.fxml
 sEditor.title=Star systems editor
@@ -155,6 +209,15 @@ filter.radius=Rsdius(LY):
 filter.distance=Distance to station(Ls):
 filter.services=Services:
 filter.excludes=Excludes stations:
+filter.stations=Market filters:
+filter.stations.global=Default filter
+
+# vFilter.fxml
+filter.stations.legalOnly=Legals only
+filter.stations.notBuy=Don't buy
+filter.stations.notSell=Don't sell
+filter.stations.label.notBuy=Don't buy:
+filter.stations.label.notSell=Don't sell:

 # analyzer progress
 analyzer.orders.title=Search orders
@@ -186,4 +249,22 @@ missions.label.starport=Starport:
 missions.label.cargo=Cargo:
 missions.label.quantity=Quantity:
 missions.label.leftTime=Time left:
-missions.label.reward=Reward:
+missions.label.reward=Reward:
+missions.delivery.text=Deliver %d items to %s at %s
+missions.courier.text=Deliver message to %s at %s
+missions.supply.text=Supply %d %s to %s at %s
+
+#helper
+helper.system=System:
+helper.station=Station:
+helper.time=Time:
+helper.refuel=Refuel:
+helper.sell=Sell:
+helper.buy=Buy:
+helper.missions=Complete missions:
+helper.stations=Stations:
+helper.items=Commodities:
+
+#messages
+message.wrongNumber=Wrong number
+message.wrongDuration=Wrong duration format, use like 1w1d1h1m1s
--- a/client/src/main/resources/lang/locale_ru_RU.properties
+++ b/client/src/main/resources/lang/locale_ru_RU.properties
@@ -5,15 +5,33 @@ market.stations=\u0421\u0442\u0430\u043D\u0446\u0438\u0438
 market.groups=\u0413\u0440\u0443\u043F\u043F\u044B \u0442\u043E\u0432\u0430\u0440\u043E\u0432
 market.items=\u0422\u043E\u0432\u0430\u0440\u044B
 market.offers=\u0417\u0430\u043A\u0430\u0437\u044B
-market.item.name=\u0422\u043E\u0432\u0430\u0440
-market.system.name=\u0421\u0438\u0441\u0442\u0435\u043C\u0430
-market.station.name=\u0421\u0442\u0430\u043D\u0446\u0438\u044F
 market.allegiance=\u041F\u0440\u0438\u043D\u0430\u0434\u043B\u0435\u0436\u043D\u043E\u0441\u0442\u044C
 market.government=\u0424\u043E\u0440\u043C\u0430 \u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F
 market.economic=\u042D\u043A\u043E\u043D\u043E\u043C\u0438\u043A\u0430
+market.power=\u0421\u0438\u043B\u0430
+market.powerState=\u0421\u0442\u0430\u0442\u0443\u0441
+
+#Item
+market.item=\u0422\u043E\u0432\u0430\u0440
+market.item.name=\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435
+market.item.illegal=\u0417\u0430\u043F\u0440\u0435\u0449\u0435\u043D \u0432
+market.item.legal=\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043D \u0432
+
+#Group
+market.group=\u0413\u0440\u0443\u043F\u043F\u0430
+
+#System
+market.system=\u0421\u0438\u0441\u0442\u0435\u043C\u0430
+market.system.name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435
+
+#Station
+market.station=\u0421\u0442\u0430\u043D\u0446\u0438\u044F
+market.station.name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435
+market.station.distance=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F
 market.station.services=\u0421\u0435\u0440\u0432\u0438\u0441\u044B
 market.station.type=\u0422\u0438\u043F \u0441\u0442\u0430\u043D\u0446\u0438\u0438

+
 # Offer
 market.offer.buy=\u041F\u043E\u043A\u0443\u043F\u043A\u0430
 market.offer.sell=\u041F\u0440\u043E\u0434\u0430\u0436\u0430
@@ -44,16 +62,21 @@ routes.profitByTime=\u041A\u0440/\u0421\u0435\u043A
 routes.text.format=\u041F\u0440\u0438\u0431\u044B\u043B\u044C: %.0f \u041A\u0440/\u0442, \u0412\u0440\u0435\u043C\u044F: %s

 # Dialog
+dialog.exception.title=\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F
+dialog.exception.label.stacktrace=\u041F\u0440\u0438\u0447\u0438\u043D\u0430 \u0432\u043E\u0437\u043D\u0438\u043A\u043D\u043E\u0432\u0435\u043D\u0438\u044F \u043E\u0448\u0438\u0431\u043A\u0438:
+dialog.confirm.title=\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044F
 dialog.confirm.save=\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u043D\u0435 \u0431\u044B\u043B\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u044B, \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C?
 dialog.confirm.remove=\u0412\u044B \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C %s?
 dialog.button.add=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
+dialog.button.ok=\u041E\u041A
 dialog.button.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
 dialog.button.cancel=\u041E\u0442\u043C\u0435\u043D\u0430
 dialog.button.edit=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C
 dialog.button.remove=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
 dialog.button.clear=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C
 dialog.button.copy=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C
-
+dialog.button.yes=\u0414\u0430
+dialog.button.no=\u041D\u0435\u0442

 # main.fxml
 main.title=\u0422\u043E\u0440\u0433\u043E\u0439\u0434
@@ -78,6 +101,7 @@ main.menu.settings.parameters=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u
 main.menu.settings.filter=\u0424\u0438\u043B\u044C\u0442\u0440
 main.tab.routes=\u041C\u0430\u0440\u0448\u0440\u0443\u0442\u044B
 main.tab.search=\u041F\u043E\u0438\u0441\u043A
+main.tab.route=\u0422\u0435\u043A\u0443\u0449\u0438\u0439 \u043C\u0430\u0440\u0448\u0440\u0443\u0442

 # add item dialog
 dialog.item.title=\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u043E\u0432\u043E\u0433\u043E \u0442\u043E\u0432\u0430\u0440\u0430
@@ -88,6 +112,18 @@ dialog.group.title=\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435
 dialog.group.id=ID:
 dialog.group.type=\u0422\u0438\u043F:

+#profile.fxml
+profile.name=\u041A\u041C\u0414\u0420:
+profile.balance=\u0411\u0430\u043B\u0430\u043D\u0441:
+profile.system=\u0421\u0438\u0441\u0442\u0435\u043C\u0430:
+profile.station=\u0421\u0442\u0430\u043D\u0446\u0438\u044F:
+profile.docked=\u0412 \u0434\u043E\u043A\u0435:
+profile.ship.cargo=\u0422\u0440\u044E\u043C:
+profile.ship.tank=\u0422\u043E\u043F\u043B\u0438\u0432\u043D\u044B\u0439 \u0431\u0430\u043A:
+profile.ship.mass=\u041C\u0430\u0441\u0441\u0430:
+profile.ship.engine=\u0414\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044C:
+profile.ship.jump=\u0414\u0430\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u043F\u0440\u044B\u0436\u043A\u0430, LY:
+
 # items.fxml

 # itemDesc.fxml
@@ -131,6 +167,10 @@ router.button.top=TOP 100
 router.pane.total=\u0418\u0442\u043E\u0433\u043E
 router.pane.total.profit=\u041F\u0440\u0438\u0431\u044B\u043B\u044C:
 router.pane.missions=\u041C\u0438\u0441\u0441\u0438\u0438
+router.search.type=\u0422\u0438\u043F \u043F\u043E\u0438\u0441\u043A\u0430:
+router.search.byTime=\u041D\u0430\u0438\u043C\u0435\u043D\u044C\u0448\u0435\u0435 \u0432\u0440\u0435\u043C\u044F, \u0447
+router.search.byProfit=\u041D\u0430\u0438\u0431\u043E\u043B\u044C\u0448\u0430\u044F \u043F\u0440\u0438\u0431\u044B\u043B\u044C, \u041A\u0440/\u0447
+router.search.full=\u0413\u043B\u0443\u0431\u043E\u043A\u0438\u0439 \u043F\u043E\u0438\u0441\u043A

 # settings.fxml
 settings.title=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B
@@ -142,6 +182,20 @@ settings.emdn.auto=\u041E\u0431\u043D\u043E\u0432\u043B\u044F\u0442\u044C \u0430
 settings.performance=\u041F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C
 settings.performance.segmentSize=\u041C\u0430\u0440\u0448\u0440\u0443\u0442\u043E\u0432 \u0432 \u0441\u0435\u0433\u043C\u0435\u043D\u0442\u0435 (0 - \u0430\u0432\u0442\u043E):
 settings.performance.limit=\u041A\u043E\u043B-\u0432\u043E \u043C\u0430\u0440\u0448\u0440\u0443\u0442\u043E\u0432 \u043D\u0430 \u0432\u044B\u0432\u043E\u0434:
+settings.edce.on=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C
+settings.edce.interval=\u0418\u043D\u0442\u0435\u0440\u0432\u0430\u043B, \u0441\u0435\u043A.
+settings.performance.jumps=\u041F\u0440\u044B\u0436\u043A\u043E\u0432:
+settings.performance.landings=\u041F\u043E\u0441\u0430\u0434\u043E\u043A:
+settings.search=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u043F\u043E\u0438\u0441\u043A\u0430
+settings.search.fuelPrice=\u0421\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C 1\u0442 \u0442\u043E\u043F\u043B\u0438\u0432\u0430:
+settings.search.pathType=\u0422\u0438\u043F \u043C\u0430\u0440\u0448\u0440\u0443\u0442\u043E\u0432:
+settings.search.times.jump=\u0412\u0440\u0435\u043C\u044F \u0433\u0438\u043F\u0435\u0440\u043F\u0440\u044B\u0436\u043A\u0430:
+settings.search.times.landing=\u0412\u0440\u0435\u043C\u044F \u043F\u043E\u0441\u0430\u0434\u043A\u0438:
+settings.search.times.takeoff=\u0412\u0440\u0435\u043C\u044F \u0432\u0437\u043B\u0435\u0442\u0430:
+settings.search.times.recharge=\u0412\u0440\u0435\u043C\u044F \u043F\u0435\u0440\u0435\u0437\u0430\u0440\u044F\u0434\u043A\u0438 FSD:
+settings.search.times.orbital=\u0412\u0440\u0435\u043C\u044F \u043E\u0440\u0431\u0438\u0442\u0430\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u043E\u043B\u0435\u0442\u0430:
+settings.hotkeys=\u0413\u043E\u0440\u044F\u0447\u0438\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0438
+settings.hotkeys.complete=\u0422\u043E\u0447\u043A\u0430 \u043C\u0430\u0440\u0448\u0440\u0443\u0442\u0430 \u0434\u043E\u0441\u0442\u0438\u0433\u043D\u0443\u0442\u0430:

 # sEditor.fxml
 sEditor.title=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0437\u0432\u0435\u0437\u0434\u043D\u044B\u0445 \u0441\u0438\u0441\u0442\u0435\u043C
@@ -155,6 +209,15 @@ filter.radius=\u0420\u0430\u0434\u0438\u0443\u0441(LY):
 filter.distance=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F \u0434\u043E \u0441\u0442\u0430\u043D\u0446\u0438\u0438(Ls):
 filter.services=\u0421\u0435\u0440\u0432\u0438\u0441\u044B:
 filter.excludes=\u0418\u0441\u043A\u043B\u044E\u0447\u0430\u0435\u043C\u044B\u0435 \u0441\u0442\u0430\u043D\u0446\u0438\u0438:
+filter.stations=\u0424\u0438\u043B\u044C\u0442\u0440\u044B \u043D\u0430 \u0442\u043E\u0432\u0430\u0440\u044B:
+filter.stations.global=\u0413\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u044B\u0439 \u0444\u0438\u043B\u044C\u0442\u0440
+
+# vFilter.fxml
+filter.stations.legalOnly=\u0422\u043E\u043B\u044C\u043A\u043E \u043B\u0435\u0433\u0430\u043B\u044C\u043D\u044B\u0435
+filter.stations.notBuy=\u041D\u0435 \u043F\u043E\u043A\u0443\u043F\u0430\u0442\u044C
+filter.stations.notSell=\u041D\u0435 \u043F\u0440\u043E\u0434\u0430\u0432\u0430\u0442\u044C
+filter.stations.label.notBuy=\u041D\u0435 \u043F\u043E\u043A\u0443\u043F\u0430\u0442\u044C:
+filter.stations.label.notSell=\u041D\u0435 \u043F\u0440\u043E\u0434\u0430\u0432\u0430\u0442\u044C:

 # analyzer progress
 analyzer.orders.title=\u041F\u043E\u0438\u0441\u043A \u0437\u0430\u043A\u0430\u0437\u043E\u0432
@@ -187,4 +250,22 @@ missions.label.starport=\u041A\u043E\u0441\u043C\u043E\u043F\u043E\u0440\u0442:
 missions.label.cargo=\u0413\u0440\u0443\u0437:
 missions.label.quantity=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E:
 missions.label.leftTime=\u0412\u0440\u0435\u043C\u044F:
-missions.label.reward=\u041D\u0430\u0433\u0440\u0430\u0434\u0430:
+missions.label.reward=\u041D\u0430\u0433\u0440\u0430\u0434\u0430:
+missions.delivery.text=\u0414\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C %d \u043A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440\u043E\u0432 \u043D\u0430 %s \u0434\u043E %s
+missions.courier.text=\u0414\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u043D\u0430 %s \u0434\u043E %s
+missions.supply.text=\u041A\u0443\u043F\u0438\u0442\u044C \u0438 \u0434\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C %d %s \u043D\u0430 %s \u0434\u043E %s
+
+#helper
+helper.system=\u0421\u0438\u0441\u0442\u0435\u043C\u0430:
+helper.station=\u0421\u0442\u0430\u043D\u0446\u0438\u044F:
+helper.time=\u0412\u0440\u0435\u043C\u044F:
+helper.refuel=\u0417\u0430\u043F\u0440\u0430\u0432\u0438\u0442\u044C:
+helper.sell=\u041F\u0440\u043E\u0434\u0430\u0442\u044C:
+helper.buy=\u041A\u0443\u043F\u0438\u0442\u044C:
+helper.missions=\u0421\u0434\u0430\u0442\u044C \u043C\u0438\u0441\u0441\u0438\u0438:
+helper.stations=\u0421\u0442\u0430\u043D\u0446\u0438\u0438:
+helper.items=\u0422\u043E\u0432\u0430\u0440\u044B:
+
+#messages
+message.wrongNumber=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B \u0442\u043E\u043B\u044C\u043A\u043E \u0446\u0438\u0444\u0440\u044B
+message.wrongDuration=\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u043F\u0435\u0440\u0438\u043E\u0434\u0430, \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u0444\u043E\u0440\u043C\u0430\u0442 1w1d1h1m1s
--- a/client/src/main/resources/lang/locale_ru_RU_FULL.properties
+++ b/client/src/main/resources/lang/locale_ru_RU_FULL.properties
@@ -58,6 +58,23 @@ economic.TOURISM=\u0422\u0443\u0440\u0438\u0437\u043C
 economic.COLONY=\u041A\u043E\u043B\u043E\u043D\u0438\u044F
 economic.NONE=\u041D\u0435\u0442

+power.DUVAL=Aisling Duval
+power.DELAINE=Archon Delaine
+power.LAVIGNY_DUVAL=Arissa Lavigny-Duval
+power.PATREUS=Denton Patreus
+power.MAHON=Edmund Mahon
+power.WINTERS=Felicia Winters
+power.YONG_RUI=Li Yong-Rui
+power.ANTAL=Pranav Antal
+power.HUDSON=Zachary Hudson
+power.TORVAL=Zemina Torval
+power.NONE=\u041D\u0435\u0442
+
+power.states.CONTROL=\u041A\u043E\u043D\u0442\u0440\u043E\u043B\u0438\u0440\u0443\u0435\u0442\u0441\u044F
+power.states.EXPLOITED=\u042D\u043A\u0441\u043F\u043B\u0443\u0430\u0442\u0438\u0440\u0443\u0435\u0442\u0441\u044F
+power.states.EXPANSION=\u042D\u043A\u0441\u043F\u0430\u043D\u0441\u0438\u044F
+power.states.NONE=\u041D\u0435\u0442
+
 item.group.chemicals=\u0425\u0438\u043C\u0438\u043A\u0430\u0442\u044B
 item.explosives=\u0412\u0437\u0440\u044B\u0432\u0447\u0430\u0442\u043A\u0430
 item.hydrogenfuel=\u0412\u043E\u0434\u043E\u0440\u043E\u0434\u043D\u043E\u0435 \u0442\u043E\u043F\u043B\u0438\u0432\u043E
@@ -178,4 +195,7 @@ item.landmines=\u041C\u0438\u043D\u044B
 item.nonlethalweapons=\u041D\u0435\u043B\u0435\u0442\u0430\u043B\u044C\u043D\u043E\u0435 \u043E\u0440\u0443\u0436\u0438\u0435
 item.personalweapons=\u041B\u0438\u0447\u043D\u043E\u0435 \u043E\u0440\u0443\u0436\u0438\u0435
 item.reactivearmour=\u0420\u0435\u0430\u043A\u0442\u0438\u0432\u043D\u0430\u044F \u0437\u0430\u0449\u0438\u0442\u0430
-item.group.ships=\u041A\u043E\u0440\u0430\u0431\u043B\u0438
+item.group.ships=\u041A\u043E\u0440\u0430\u0431\u043B\u0438
+
+#messages
+message.wrongDuration=\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u043F\u0435\u0440\u0438\u043E\u0434\u0430, \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u0444\u043E\u0440\u043C\u0430\u0442 1\u043D1\u04341\u04471\u043C1\u0441
--- a/client/src/main/resources/view/db/dbeditor.fxml
+++ b/client/src/main/resources/view/db/dbeditor.fxml
@@ -10,10 +10,10 @@
    <Tab text="%market.items">
        <fx:include fx:id="items" source="items.fxml"/>
    </Tab>
-    <Tab text="Системы">
+    <Tab text="%market.systems">
        <fx:include fx:id="systems" source="systems.fxml"/>
    </Tab>
-    <Tab text="Станции">
+    <Tab text="%market.stations">
        <fx:include fx:id="stations" source="stations.fxml"/>
    </Tab>
 </TabPane>
--- a/client/src/main/resources/view/db/items.fxml
+++ b/client/src/main/resources/view/db/items.fxml
@@ -18,19 +18,19 @@
            <TableColumn minWidth="200" text="%market.item.name">
                <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
            </TableColumn>
-            <TableColumn fx:id="group" minWidth="120" text="Группа" editable="false">
+            <TableColumn fx:id="group" minWidth="120" text="%market.group" editable="false">
                <cellValueFactory><PropertyValueFactory property="group"/></cellValueFactory>
            </TableColumn>
-            <TableColumn fx:id="factions" minWidth="145" text="Запрещено в">
+            <TableColumn fx:id="factions" minWidth="145" text="%market.item.illegal">
                <cellValueFactory><PropertyValueFactory property="illegalFactions"/></cellValueFactory>
            </TableColumn>
-            <TableColumn fx:id="governments" minWidth="145" text="Запрещено в">
+            <TableColumn fx:id="governments" minWidth="145" text="%market.item.illegal">
                <cellValueFactory><PropertyValueFactory property="illegalGovernments"/></cellValueFactory>
            </TableColumn>
-            <TableColumn fx:id="legalFactions" minWidth="145" text="Разрешено в">
+            <TableColumn fx:id="legalFactions" minWidth="145" text="%market.item.legal">
                <cellValueFactory><PropertyValueFactory property="legalFactions"/></cellValueFactory>
            </TableColumn>
-            <TableColumn fx:id="legalGovernments" minWidth="145" text="Разрешено в">
+            <TableColumn fx:id="legalGovernments" minWidth="145" text="%market.item.legal">
                <cellValueFactory><PropertyValueFactory property="legalGovernments"/></cellValueFactory>
            </TableColumn>
        </columns>
@@ -40,8 +40,8 @@
        <contextMenu>
            <ContextMenu>
                <items>
-                    <MenuItem text="Добавить" onAction="#add" />
-                    <MenuItem text="Удалить" onAction="#remove" />
+                    <MenuItem text="%dialog.button.add" onAction="#add" />
+                    <MenuItem text="%dialog.button.remove" onAction="#remove" />
                </items>
            </ContextMenu>
        </contextMenu>
--- a/client/src/main/resources/view/db/stations.fxml
+++ b/client/src/main/resources/view/db/stations.fxml
@@ -13,10 +13,10 @@
      fx:controller="ru.trader.db.controllers.StationsController">
    <TableView fx:id="tblStations" editable="true" VBox.vgrow="ALWAYS" prefWidth="800">
        <columns>
-            <TableColumn minWidth="100" text="Система">
+            <TableColumn minWidth="100" text="%market.system">
                <cellValueFactory><PropertyValueFactory property="system"/></cellValueFactory>
            </TableColumn>
-            <TableColumn minWidth="200" text="Название">
+            <TableColumn minWidth="200" text="%market.station.name">
                <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
            </TableColumn>
            <TableColumn fx:id="type" minWidth="100" text="%market.station.type">
@@ -34,10 +34,10 @@
            <TableColumn fx:id="subEconomic" minWidth="100" text="%market.economic">
                <cellValueFactory><WritablePropertyValueFactory property="subEconomic"/></cellValueFactory>
            </TableColumn>
-            <TableColumn minWidth="100" text="Дистанция">
+            <TableColumn minWidth="100" text="%market.station.distance">
                <cellValueFactory><WritablePropertyValueFactory property="distance"/></cellValueFactory>
            </TableColumn>
-            <TableColumn fx:id="services" minWidth="100" text="Сервисы">
+            <TableColumn fx:id="services" minWidth="100" text="%market.station.services">
                <cellValueFactory><PropertyValueFactory property="services"/></cellValueFactory>
            </TableColumn>
        </columns>
@@ -47,9 +47,9 @@
        <contextMenu>
            <ContextMenu>
                <items>
-                    <MenuItem text="Добавить" onAction="#add" />
-                    <MenuItem text="Редактировать" onAction="#edit" />
-                    <MenuItem text="Удалить" onAction="#remove" />
+                    <MenuItem text="%dialog.button.add" onAction="#add" />
+                    <MenuItem text="%dialog.button.edit" onAction="#edit" />
+                    <MenuItem text="%dialog.button.remove" onAction="#remove" />
                </items>
            </ContextMenu>
        </contextMenu>
--- a/client/src/main/resources/view/db/systems.fxml
+++ b/client/src/main/resources/view/db/systems.fxml
@@ -13,7 +13,7 @@
      fx:controller="ru.trader.db.controllers.SystemsController">
    <TableView fx:id="tblSystems" editable="true" VBox.vgrow="ALWAYS" prefWidth="800">
        <columns>
-            <TableColumn minWidth="200" text="Название">
+            <TableColumn minWidth="200" text="%market.system.name">
                <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
            </TableColumn>
            <TableColumn minWidth="60" text="X">
@@ -31,10 +31,10 @@
            <TableColumn fx:id="government" minWidth="100" text="%market.government">
                <cellValueFactory><WritablePropertyValueFactory property="government"/></cellValueFactory>
            </TableColumn>
-            <TableColumn fx:id="power" minWidth="100" text="Сила">
+            <TableColumn fx:id="power" minWidth="100" text="%market.power">
                <cellValueFactory><WritablePropertyValueFactory property="power"/></cellValueFactory>
            </TableColumn>
-            <TableColumn fx:id="powerState" minWidth="100" text="Статус">
+            <TableColumn fx:id="powerState" minWidth="100" text="%market.powerState">
                <cellValueFactory><WritablePropertyValueFactory property="powerState"/></cellValueFactory>
            </TableColumn>

@@ -45,9 +45,9 @@
        <contextMenu>
            <ContextMenu>
                <items>
-                    <MenuItem text="Добавить" onAction="#add" />
-                    <MenuItem text="Редактировать" onAction="#edit" />
-                    <MenuItem text="Удалить" onAction="#remove" />
+                    <MenuItem text="%dialog.button.add" onAction="#add" />
+                    <MenuItem text="%dialog.button.edit" onAction="#edit" />
+                    <MenuItem text="%dialog.button.remove" onAction="#remove" />
                </items>
            </ContextMenu>
        </contextMenu>
--- a/client/src/main/resources/view/filter.fxml
+++ b/client/src/main/resources/view/filter.fxml
@@ -48,7 +48,7 @@
        </VBox>
        <ListView fx:id="excludes" GridPane.rowIndex="7" GridPane.columnIndex="1" maxHeight="120"/>

-    <Label text="Фильтры на товары:" GridPane.rowIndex="8" />
+    <Label text="%filter.stations" GridPane.rowIndex="8" />
    <VBox GridPane.rowIndex="9" spacing="4">
        <TextField fx:id="vFilterSystemText" minWidth="180"/>
        <ComboBox fx:id="vFilterStation" minWidth="180"/>
@@ -58,7 +58,7 @@
            <Button prefWidth="30" onAction="#removeVendorFilter"><graphic><Glyph text="FontAwesome|MINUS"/></graphic></Button>
            <Button prefWidth="30" onAction="#cleanVendorFilters"><graphic><Glyph text="FontAwesome|TRASH_ALT"/></graphic></Button>
        </HBox>
-        <Button prefWidth="180" text="Глобальный фильтр" onAction="#editDefaultVendorFilter"/>
+        <Button prefWidth="180" text="%filter.stations.global" onAction="#editDefaultVendorFilter"/>
    </VBox>
    <ListView fx:id="vFilters" GridPane.rowIndex="9" GridPane.columnIndex="1" maxHeight="120"/>

--- a/client/src/main/resources/view/helper.fxml
+++ b/client/src/main/resources/view/helper.fxml
@@ -23,7 +23,7 @@
            <Label fx:id="stationDistance" text="123456 ls" styleClass="text-small"/>
        </VBox>
    </HBox>
-    <HBox fx:id="refuelGroup"><Label text="Заправить:" /><Label fx:id="refuel" /></HBox>
+    <HBox fx:id="refuelGroup"><Label text="%helper.refuel" /><Label fx:id="refuel" /></HBox>
    <HBox>
        <ToggleButton fx:id="infoBtn" minWidth="30">
            <graphic><Glyph text="FontAwesome|INFO"/></graphic>
@@ -33,19 +33,19 @@
        </Button>
    </HBox>
    <VBox fx:id="ordersGroup" maxHeight="240">
-        <Label text="Продать:" />
+        <Label text="%helper.sell" />
        <ListView fx:id="sellOrders"/>
-        <Label text="Купить:" />
+        <Label text="%helper.buy" />
        <ListView fx:id="buyOrders"/>
    </VBox>
    <VBox fx:id="missionsGroup" maxHeight="120">
-        <Label text="Сдать миссии:" />
+        <Label text="%helper.missions" />
        <ListView fx:id="missions"/>
    </VBox>
    <VBox fx:id="infoGroup" maxHeight="240">
-        <Label text="Станции:" />
+        <Label text="%helper.stations" />
        <ListView fx:id="stations"/>
-        <Label text="Товары:" />
+        <Label text="%helper.items" />
        <ListView fx:id="sellOffers"/>
    </VBox>
    <padding>
--- a/client/src/main/resources/view/items.fxml
+++ b/client/src/main/resources/view/items.fxml
@@ -12,7 +12,7 @@
      fx:controller="ru.trader.controllers.ItemsController">
    <TableView fx:id="tblItems" editable="true" VBox.vgrow="ALWAYS" prefWidth="1195.0">
        <columns>
-            <TableColumn editable="true" minWidth="200.0" text="%market.item.name">
+            <TableColumn editable="true" minWidth="200.0" text="%market.item">
                <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
            </TableColumn>
            <TableColumn editable="true" resizable="false" text="%market.offer.buy">
--- a/client/src/main/resources/view/main.fxml
+++ b/client/src/main/resources/view/main.fxml
@@ -62,7 +62,7 @@
           <Tab text="%main.tab.search">
               <fx:include source="search.fxml"/>
           </Tab>
-           <Tab fx:id="track" text="Текущий маршрут">
+           <Tab fx:id="track" text="%main.tab.route">
               <fx:include source="routeTrack.fxml"/>
           </Tab>
       </TabPane>
--- a/client/src/main/resources/view/offers.fxml
+++ b/client/src/main/resources/view/offers.fxml
@@ -19,7 +19,7 @@
    </columnConstraints>

    <VBox GridPane.rowSpan="2" GridPane.vgrow="ALWAYS" minWidth="270">
-        <TitledPane text="%market.system.name"  collapsible="false">
+        <TitledPane text="%market.system"  collapsible="false">
            <HBox><TextField fx:id="systemText" HBox.hgrow="ALWAYS" /><Button minWidth="30" onAction="#currentSystem"><graphic><Glyph text="FontAwesome|MAP_MARKER"/></graphic></Button></HBox>
        </TitledPane>
        <TitledPane VBox.vgrow="ALWAYS" text="%market.stations" collapsible="false">
@@ -69,7 +69,7 @@
              <TableView fx:id="tblSell" editable="true">
                  <rowFactory><OfferDecoratedRow /></rowFactory>
                  <columns>
-                      <TableColumn minWidth="230.0" text="%market.item.name">
+                      <TableColumn minWidth="230.0" text="%market.item">
                          <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
                      </TableColumn>
                      <TableColumn minWidth="110.0" text="%market.offer.price" onEditCommit="#editPrice">
@@ -118,7 +118,7 @@
              <TableView fx:id="tblBuy" editable="true">
                  <rowFactory><OfferDecoratedRow /></rowFactory>
                  <columns>
-                      <TableColumn minWidth="230.0" text="%market.item.name">
+                      <TableColumn minWidth="230.0" text="%market.item">
                          <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
                      </TableColumn>
                      <TableColumn minWidth="110.0" text="%market.offer.price" editable="true" onEditCommit="#editPrice">
--- a/client/src/main/resources/view/profile.fxml
+++ b/client/src/main/resources/view/profile.fxml
@@ -13,35 +13,35 @@
        <Insets left="5" right="5" top="5" bottom="5"/>
    </padding>

-    <Label text="Имя:" />
+    <Label text="%profile.name" />
    <TextField fx:id="name" />
    <StackPane>
        <HBox fx:id="profileInfo" spacing="4">
-            <Label text="Баланс:" />
+            <Label text="%profile.balance" />
            <NumberField fx:id="balance" />
-            <Label text="Система:" />
-            <TextField fx:id="systemText" />
-            <Button fx:id="btnAddSystem" minWidth="30">
-                <graphic><Glyph text="FontAwesome|EDIT"/></graphic>
-            </Button>
-            <Label text="Станция:" />
-            <ComboBox fx:id="station" />
-            <Button fx:id="btnAddStation" minWidth="30">
-                <graphic><Glyph text="FontAwesome|EDIT"/></graphic>
-            </Button>
-            <Label text="В доке:" />
+            <Label text="%profile.system" />
+            <HBox>
+                <TextField fx:id="systemText" />
+                <Button fx:id="btnAddSystem" minWidth="30"><graphic><Glyph text="FontAwesome|EDIT"/></graphic></Button>
+            </HBox>
+            <Label text="%profile.station" />
+            <HBox>
+                <ComboBox fx:id="station" />
+                <Button fx:id="btnAddStation" minWidth="30"><graphic><Glyph text="FontAwesome|EDIT"/></graphic></Button>
+            </HBox>
+            <Label text="%profile.docked" />
            <CheckBox fx:id="docked" />
        </HBox>
        <HBox fx:id="shipInfo" spacing="4">
-            <Label text="Трюм:" />
+            <Label text="%profile.ship.cargo" />
            <NumberField fx:id="cargo" maxWidth="60"/>
-            <Label text="Топливный бак:" />
+            <Label text="%profile.ship.tank" />
            <NumberField fx:id="tank"  maxWidth="60"/>
-            <Label text="Масса:" />
+            <Label text="%profile.ship.mass" />
            <NumberField fx:id="mass" maxWidth="60"/>
-            <Label text="Двигатель:" />
+            <Label text="%profile.ship.engine" />
            <ComboBox fx:id="engine" maxWidth="60"/>
-            <Label text="Дальность прыжка, LY:" />
+            <Label text="%profile.ship.jump" />
            <Label fx:id="jumpRange"/>
        </HBox>
    </StackPane>
--- a/client/src/main/resources/view/routeSearch.fxml
+++ b/client/src/main/resources/view/routeSearch.fxml
@@ -6,7 +6,8 @@
 <VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
      fx:controller="ru.trader.controllers.RouteSearchController">
    <TitledPane text="%router.pane.route" minHeight="80" collapsible="false">
-        <VBox spacing="4">
+    <HBox>
+        <VBox spacing="4" HBox.hgrow="ALWAYS">
            <HBox spacing="10" alignment="CENTER">
                <HBox spacing="2" alignment="BASELINE_LEFT">
                    <Label text="%router.pane.route.from" />
@@ -20,14 +21,20 @@
                    <ComboBox fx:id="toStation" minWidth="140"/>
                    <Button minWidth="30" onAction="#loop"><graphic><Glyph text="FontAwesome|RETWEET"/></graphic></Button>
                </HBox>
-                <CheckBox fx:id="cbFast" text="%router.pane.route.fast"/>
-                <CheckBox fx:id="cbFullScan" selected="true" text="Глубокий поиск"/>
            </HBox>
            <HBox spacing="10" alignment="CENTER">
                <Button prefWidth="80" text="%router.button.search" onAction="#search" />
                <Button prefWidth="80" text="%router.button.top" onAction="#searchTop" />
            </HBox>
        </VBox>
+        <VBox spacing="4" maxWidth="200">
+            <Label text="%router.search.type" />
+            <fx:define><ToggleGroup fx:id="searchType" /></fx:define>
+            <RadioButton fx:id="rbByTime" text="%router.search.byTime" toggleGroup="$searchType"/>
+            <RadioButton text="%router.search.byProfit" selected="true" toggleGroup="$searchType"/>
+            <CheckBox fx:id="cbFullScan" selected="true" text="%router.search.full"/>
+        </VBox>
+    </HBox>
    </TitledPane>
    <TitledPane text="%router.pane.missions" collapsible="false">
        <HBox spacing="10">
--- a/client/src/main/resources/view/routeTrack.fxml
+++ b/client/src/main/resources/view/routeTrack.fxml
@@ -19,17 +19,17 @@
        <ColumnConstraints minWidth="220" />
    </columnConstraints>

-    <VBox GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="3">
-        <HBox><Label text="Система:" /><Label fx:id="system" /></HBox>
-        <HBox><Label text="Станция:" /><Label fx:id="station" /></HBox>
-        <HBox><Label text="Время:" /><Label fx:id="time" /></HBox>
-        <HBox fx:id="refuelGroup"><Label text="Заправить:" /><Label fx:id="refuel" /></HBox>
+    <VBox GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="3" spacing="4">
+        <HBox spacing="4"><Label text="%helper.system" /><Label fx:id="system" /></HBox>
+        <HBox spacing="4"><Label text="%helper.station" /><Label fx:id="station" /></HBox>
+        <HBox spacing="4"><Label text="%helper.time" /><Label fx:id="time" /></HBox>
+        <HBox fx:id="refuelGroup" spacing="4"><Label text="%helper.refuel" /><Label fx:id="refuel" /></HBox>
    </VBox>

-    <Label GridPane.rowIndex="1" GridPane.columnIndex="0" text="Продать:" />
+    <Label GridPane.rowIndex="1" GridPane.columnIndex="0" text="%helper.sell" />
    <ListView GridPane.rowIndex="2" GridPane.columnIndex="0" fx:id="sellOrders" maxHeight="150"/>

-    <Label GridPane.rowIndex="1" GridPane.columnIndex="1" text="Купить:" />
+    <Label GridPane.rowIndex="1" GridPane.columnIndex="1" text="%helper.buy" />
    <ListView GridPane.rowIndex="2" GridPane.columnIndex="1" fx:id="buyOrders" maxHeight="150"/>

    <VBox GridPane.rowIndex="2" GridPane.columnIndex="2" spacing="4" alignment="TOP_RIGHT">
@@ -38,7 +38,7 @@
        <Button prefWidth="30" onAction="#clearOrders"><graphic><Glyph text="FontAwesome|TRASH"/></graphic></Button>
    </VBox>

-    <Label GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2" text="Миссии:" />
+    <Label GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2" text="%helper.missions" />
    <StackPane GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="2" maxHeight="150">
        <HBox fx:id="missionsGroup">
            <ListView fx:id="missionsList" HBox.hgrow="ALWAYS"/>
--- a/client/src/main/resources/view/router.fxml
+++ b/client/src/main/resources/view/router.fxml
@@ -87,13 +87,13 @@
    <VBox HBox.hgrow="ALWAYS">
        <TableView fx:id="tblOrders" VBox.vgrow="ALWAYS">
            <columns>
-                <TableColumn minWidth="140.0" text="%market.system.name">
+                <TableColumn minWidth="140.0" text="%market.system">
                    <cellValueFactory><PropertyValueFactory property="system"/></cellValueFactory>
                </TableColumn>
                <TableColumn minWidth="150.0" text="%market.order.seller">
                    <cellValueFactory><PropertyValueFactory property="station"/></cellValueFactory>
                </TableColumn>
-                <TableColumn minWidth="140.0" text="%market.item.name">
+                <TableColumn minWidth="140.0" text="%market.item">
                    <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
                </TableColumn>
                <TableColumn minWidth="80.0" text="%market.offer.price">
--- a/client/src/main/resources/view/sEditor.fxml
+++ b/client/src/main/resources/view/sEditor.fxml
@@ -61,10 +61,10 @@
            <TableColumn fx:id="clnGovernment" minWidth="100" text="%market.government">
                <cellValueFactory><PropertyValueFactory property="government"/></cellValueFactory>
            </TableColumn>
-            <TableColumn fx:id="clnPower" minWidth="100" text="Сила">
+            <TableColumn fx:id="clnPower" minWidth="100" text="%market.power">
                <cellValueFactory><PropertyValueFactory property="power"/></cellValueFactory>
            </TableColumn>
-            <TableColumn fx:id="clnPowerState" minWidth="100" text="Статус">
+            <TableColumn fx:id="clnPowerState" minWidth="100" text="%market.powerState">
                <cellValueFactory><PropertyValueFactory property="powerState"/></cellValueFactory>
            </TableColumn>
            <TableColumn fx:id="clnX" minWidth="60.0" text="x">
--- a/client/src/main/resources/view/search.fxml
+++ b/client/src/main/resources/view/search.fxml
@@ -52,13 +52,13 @@
    </TitledPane>
    <TableView fx:id="tblResults" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">
        <columns>
-            <TableColumn minWidth="200.0" text="%market.system.name">
+            <TableColumn minWidth="200.0" text="%market.system">
                <cellValueFactory><PropertyValueFactory property="system"/></cellValueFactory>
            </TableColumn>
-            <TableColumn minWidth="200.0" text="%market.station.name">
+            <TableColumn minWidth="200.0" text="%market.station">
                <cellValueFactory><PropertyValueFactory property="station"/></cellValueFactory>
            </TableColumn>
-            <TableColumn minWidth="180.0" text="%market.item.name">
+            <TableColumn minWidth="180.0" text="%market.item">
                <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
            </TableColumn>
            <TableColumn minWidth="110.0" text="%market.offer.price">
--- a/client/src/main/resources/view/settings.fxml
+++ b/client/src/main/resources/view/settings.fxml
@@ -19,32 +19,32 @@
        <NumberField fx:id="emdnUpdateTime" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="4" />
 -->
    <Label text="EDCE" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"/>
-    <Label text="Включить" GridPane.rowIndex="1"/>
+    <Label text="%settings.edce.on" GridPane.rowIndex="1"/>
    <CheckBox fx:id="edceActive" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-    <Label text="Интервал" GridPane.rowIndex="2" />
+    <Label text="%settings.edce.interval" GridPane.rowIndex="2" />
    <NumberField fx:id="edceInterval" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="2" />
    <Label text="%settings.performance" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"  GridPane.rowIndex="3"/>
-    <Label text="Прыжков:" GridPane.rowIndex="4" />
+    <Label text="%settings.performance.jumps" GridPane.rowIndex="4" />
    <NumberField fx:id="jumps" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-    <Label text="Посадок:" GridPane.rowIndex="5" />
+    <Label text="%settings.performance.landings" GridPane.rowIndex="5" />
    <NumberField fx:id="lands" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-    <Label text="Количество маршрутов:" GridPane.rowIndex="6" />
+    <Label text="%settings.performance.limit" GridPane.rowIndex="6" />
    <NumberField fx:id="routesCount" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-    <Label text="Параметры поиска" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"  GridPane.rowIndex="7"/>
-    <Label text="Стоимость 1т топлива:" GridPane.rowIndex="8" />
+    <Label text="%settings.search" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"  GridPane.rowIndex="7"/>
+    <Label text="%settings.search.fuelPrice" GridPane.rowIndex="8" />
    <NumberField fx:id="fuelPrice" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="8" />
-    <Label text="Тип маршрутов:" GridPane.rowIndex="9" />
+    <Label text="%settings.search.pathType" GridPane.rowIndex="9" />
    <ComboBox fx:id="pathPriority" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="9" />
-    <Label text="Время гиперпрыжка:" GridPane.rowIndex="10" />
+    <Label text="%settings.search.times.jump" GridPane.rowIndex="10" />
    <NumberField fx:id="jumpTime" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="10" />
-    <Label text="Время посадки:" GridPane.rowIndex="11" />
+    <Label text="%settings.search.times.landing" GridPane.rowIndex="11" />
    <NumberField fx:id="landingTime" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="11" />
-    <Label text="Время взлета:" GridPane.rowIndex="12" />
+    <Label text="%settings.search.times.takeoff" GridPane.rowIndex="12" />
    <NumberField fx:id="takeoffTime" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="12" />
-    <Label text="Время перезарядки FSD:" GridPane.rowIndex="13" />
+    <Label text="%settings.search.times.recharge" GridPane.rowIndex="13" />
    <NumberField fx:id="rechargeTime" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="13" />
-    <Label text="Горячие клавиши" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"  GridPane.rowIndex="14"/>
-    <Label text="Точка маршрута достигнута:" GridPane.rowIndex="15" />
+    <Label text="%settings.hotkeys" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"  GridPane.rowIndex="14"/>
+    <Label text="%settings.hotkeys.complete" GridPane.rowIndex="15" />
    <TextField fx:id="completeKeyText" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="15" />

 </GridPane>
--- a/client/src/main/resources/view/topOrders.fxml
+++ b/client/src/main/resources/view/topOrders.fxml
@@ -15,7 +15,7 @@
      prefWidth="725">
    <TableView fx:id="tblOrders" editable="true">
        <columns>
-            <TableColumn minWidth="160.0" text="%market.item.name">
+            <TableColumn minWidth="160.0" text="%market.item">
                <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
            </TableColumn>
            <TableColumn minWidth="160.0" text="%market.order.seller">
--- a/client/src/main/resources/view/vEditor.fxml
+++ b/client/src/main/resources/view/vEditor.fxml
@@ -70,7 +70,7 @@
    </VBox>
    <TableView fx:id="items" GridPane.rowIndex="4" prefWidth="575" maxHeight="560" editable="true" GridPane.columnIndex="1">
        <columns>
-            <TableColumn minWidth="200.0" text="%market.item.name" editable="false">
+            <TableColumn minWidth="200.0" text="%market.item" editable="false">
                <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
            </TableColumn>
            <TableColumn fx:id="buy" minWidth="90.0" text="%market.offer.sell">
--- a/client/src/main/resources/view/vFilter.fxml
+++ b/client/src/main/resources/view/vFilter.fxml
@@ -3,19 +3,19 @@
 <VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ru.trader.controllers.VendorFilterController"
              styleClass="dialog" spacing="10">
        <HBox spacing="10">
-            <CheckBox fx:id="cbSkipIllegal" text="Только легальные"/>
-            <CheckBox fx:id="cbDontSell" text="Не покупать"/>
-            <CheckBox fx:id="cbDontBuy" text="Не продавать"/>
+            <CheckBox fx:id="cbSkipIllegal" text="%filter.stations.legalOnly"/>
+            <CheckBox fx:id="cbDontSell" text="%filter.stations.notBuy"/>
+            <CheckBox fx:id="cbDontBuy" text="%filter.stations.notSell"/>
        </HBox>

        <VBox spacing="4">
-            <Label text="Не покупать:"/>
+            <Label text="%filter.stations.label.notBuy"/>
            <ScrollPane maxHeight="200" maxWidth="400">
                <GridPane fx:id="sellCbs" hgap="5" vgap="5"/>
            </ScrollPane>
        </VBox>
        <VBox spacing="4">
-            <Label text="Не продавать:"/>
+            <Label text="%filter.stations.label.notSell"/>
            <ScrollPane maxHeight="200" maxWidth="400">
                <GridPane fx:id="buyCbs" hgap="5" vgap="5"/>
            </ScrollPane>