Bug Fix: Fixed spelling Marker > Market (Issue #479)

Merge develop

changelog.txt

@@ -553,7 +553,7 @@ New Features:
 -Added Dark Nimbus look and feel
 -Added toggle all for Tracker skill points filter dialog
 -Include hidden stockpiles in Export (Issue #211)
--Added Outbid delta column to the Marker Order tool (Issue #204)
+-Added Outbid delta column to the Market Order tool (Issue #204)
 -Added Group column to the Market Orders tool (Issue #220)
 -Added Market Price/Margin/Profit columns to the Market Orders tool (Issue #222)
 -Highlight Market Orders prior to expiring (Issue #219)
@@ -1522,7 +1522,7 @@ ________________________________________________________________________________
 _3.1.4__________________________________________________________________________
 
 Bug Fixes:
--All Marker Order/Journal/Transaction history deleted on update
+-All Market Order/Journal/Transaction history deleted on update
 
 ________________________________________________________________________________
 _3.1.3__________________________________________________________________________

src/main/java/net/nikr/eve/jeveasset/data/profile/ProfileData.java

@@ -442,7 +442,7 @@ public synchronized void updateEventLists(Date addedDate) {
 			if (!owner.isShowOwner()) {
 				continue;
 			}
-			//Marker Orders
+			//Market Orders
 			//If owner is corporation overwrite the character orders (to use the "right" owner)
 			if (owner.isCorporation()) {
 				marketOrders.addAll(owner.getMarketOrders());

src/main/java/net/nikr/eve/jeveasset/gui/tabs/orders/MarketOrdersTab.java

@@ -488,7 +488,7 @@ private void updateESI() {
 		}
 		final Date currentUpdate = Settings.get().getPublicMarketOrdersNextUpdate();
 		OutbidProcesserOutput output = new OutbidProcesserOutput();
-		final PublicMarkerOrdersUpdateTask updateTask = new PublicMarkerOrdersUpdateTask(input, output);
+		final PublicMarketOrdersUpdateTask updateTask = new PublicMarketOrdersUpdateTask(input, output);
 		TaskDialog taskDialog = new TaskDialog(program, updateTask, false, false, false, StatusPanel.UpdateType.PUBLIC_MARKET_ORDERS, new TaskDialog.TasksCompletedAdvanced() {
 			@Override
 			public void tasksCompleted(TaskDialog taskDialog) {
@@ -721,13 +721,13 @@ public void saveSettings(final String msg) {
 		}
 	}
 
-	private static class PublicMarkerOrdersUpdateTask extends UpdateTask {
+	private static class PublicMarketOrdersUpdateTask extends UpdateTask {
 
 		private final OutbidProcesserInput input;
 		private final OutbidProcesserOutput output;
 
-		public PublicMarkerOrdersUpdateTask(OutbidProcesserInput input, OutbidProcesserOutput output) {
-			super(DialoguesUpdate.get().publicMarkerOrders());
+		public PublicMarketOrdersUpdateTask(OutbidProcesserInput input, OutbidProcesserOutput output) {
+			super(DialoguesUpdate.get().publicMarketOrders());
 			this.input = input;
 			this.output = output;
 		}

src/main/java/net/nikr/eve/jeveasset/i18n/DialoguesUpdate.java

@@ -70,7 +70,7 @@ public DialoguesUpdate(final Locale locale) {
 	public abstract String skills();
 	public abstract String mining();
 	public abstract String structures();
-	public abstract String publicMarkerOrders();
+	public abstract String publicMarketOrders();
 	public abstract String step1();
 	public abstract String step2();
 	public abstract String step3();

src/main/resources/net/nikr/eve/jeveasset/i18n/DialoguesUpdate.properties

@@ -30,7 +30,7 @@ bookmarks=Bookmarks
 skills=Skills
 mining=Mining
 structures=Structures
-publicMarkerOrders=Public Marker Orders
+publicMarketOrders=Public Market Orders
 step1=Accounts
 step2=Data
 step3=Dynamic Data

src/main/resources/net/nikr/eve/jeveasset/i18n/TabsOrders.properties

@@ -114,4 +114,4 @@ updateOutbidFileBuy=Buy
 updateOutbidFileSell=Sell
 updateOutbidWhen={0}
 updateOutbidUpdating=Updating...
-updateTitle=Public Marker Orders
+updateTitle=Public Market Orders