Voomra/trader
Archived
0
Fork 0
Code Activity

Merge branch 'jdk8u45' into fastfinder

Browse Source 
Conflicts:
	client/src/main/java/ru/trader/controllers/MainController.java
	client/src/main/java/ru/trader/controllers/PathsController.java
	client/src/main/java/ru/trader/controllers/RouterController.java
	client/src/main/java/ru/trader/controllers/Screeners.java
	client/src/main/java/ru/trader/controllers/SettingsController.java
This commit is contained in:
iMoHax
2015-08-03 15:52:39 +03:00
parent 4915118529 49fb50c45c
commit a4a9a46ffa
20 changed files with 349 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/main/resources/lang/locale_en_US.properties
View File

@@ -39,6 +39,7 @@ 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.save=Save
dialog.button.cancel=Cancel
dialog.button.edit=Edit
dialog.button.remove=Remove
dialog.button.clear=Clear
@@ -81,19 +82,12 @@ dialog.group.type=Type:
itemDesc.sellers=Sellers:
itemDesc.buyers=Buyers:
# oEditor.fxml
oEditor.sell=Sell:
oEditor.buy=Buy:
# offers.fxml
offers.text.distance=Distance:
offers.text.services=Services:
offers.pane.sell=Selling commodities
offers.pane.buy=Buying commodities
# orders.fxml
orders.title=Create orders
# topOrders.fxml
topOrders.title=TOP orders

8
client/src/main/resources/lang/locale_ru_RU.properties
View File

@@ -39,6 +39,7 @@ dialog.confirm.save=\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u043
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.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
@@ -82,19 +83,12 @@ dialog.group.type=\u0422\u0438\u043F:
itemDesc.sellers=\u041F\u0440\u043E\u0434\u0430\u0432\u0446\u044B:
itemDesc.buyers=\u041F\u043E\u043A\u0443\u043F\u0430\u0442\u0435\u043B\u0438:
# oEditor.fxml
oEditor.sell=\u041F\u0440\u043E\u0434\u0430\u0436\u0430:
oEditor.buy=\u041F\u043E\u043A\u0443\u043F\u043A\u0430:
# offers.fxml
offers.text.distance=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F:
offers.text.services=\u0421\u0435\u0440\u0432\u0438\u0441\u044B:
offers.pane.sell=\u041F\u0440\u043E\u0434\u0430\u0432\u0430\u0435\u043C\u044B\u0435 \u0442\u043E\u0432\u0430\u0440\u044B
offers.pane.buy=\u041F\u043E\u043A\u0443\u043F\u0430\u0435\u043C\u044B\u0435 \u0442\u043E\u0432\u0430\u0440\u044B
# orders.fxml
orders.title=\u0421\u043E\u0437\u0434\u0430\u043D\u0438\u0435 \u0437\u0430\u043A\u0430\u0437\u043E\u0432
# topOrders.fxml
topOrders.title=TOP \u0437\u0430\u043A\u0430\u0437\u043E\u0432