12 files changed, 92 insertions, 30 deletions

diff --git a/wizards/source/depot/CommonLang.xba b/wizards/source/depot/CommonLang.xba
index 7e609416cfa4..a1cb283dab14 100644
--- a/wizards/source/depot/CommonLang.xba
+++ b/wizards/source/depot/CommonLang.xba
@@ -86,6 +86,7 @@ Public sInterval as String
 Public ShortMonths(11,1)
 Public iStep as Integer
 Public sDepotCurrency as String
+Public iValueCol as Integer
 
 Public DlgReference as Object
 Public DlgTransaction as Object	
@@ -99,8 +100,8 @@ Public TransactTitle(1 To 2)
 Public NullList()
 Public sStartupWelcome$, sStartupChooseMarket$, sStartupHint$
 
-Public sMarket(6,9) as String
-Public sCountryMarket(6,9) as String
+Public sMarket(7,10) as String
+Public sCountryMarket(7,10) as String
 
 Public cDlgCaption1$, cDlgCaption2$
 Public sMsgError$, sMsgNoName$, sMsgNoQuantity$, sMsgNoDividend$, sMsgNoExchangeRate$
@@ -199,6 +200,7 @@ Sub LocalizedCurrencies()
 		sCountryMarket(0,7) = "FR"
 		sCountryMarket(0,8) = "40C"
 		sCountryMarket(0,9) = "59/9"
+		sCountryMarket(0,10) = "1"
 
 		sCountryMarket(1,0) = "Euro"
 		sCountryMarket(1,1) = chr(8364)
@@ -209,6 +211,7 @@ Sub LocalizedCurrencies()
 		sCountryMarket(1,7) = "IT"
 		sCountryMarket(1,8) = "410"
 		sCountryMarket(1,9) = "44"
+		sCountryMarket(1,10) = "1"
 
 		sCountryMarket(2,0) = "Euro"
 		sCountryMarket(2,1) = chr(8364)
@@ -219,6 +222,7 @@ Sub LocalizedCurrencies()
 		sCountryMarket(2,7) = "ES"
 		sCountryMarket(2,8) = "40A"
 		sCountryMarket(2,9) = "44"
+		sCountryMarket(2,10) = "1"
 
 		sCountryMarket(3,0) = "Dansk krone"
 		sCountryMarket(3,1) = "kr"
@@ -229,6 +233,7 @@ Sub LocalizedCurrencies()
 		sCountryMarket(3,7) = "DK"
 		sCountryMarket(3,8) = "406"
 		sCountryMarket(3,9) = "44"
+		sCountryMarket(3,10) = "1"
 
 		sCountryMarket(4,0) = "Svensk krona"
 		sCountryMarket(4,1) = "kr"
@@ -239,6 +244,7 @@ Sub LocalizedCurrencies()
 		sCountryMarket(4,7) = "SE"
 		sCountryMarket(4,8) = "41D"
 		sCountryMarket(4,9) = "44"
+		sCountryMarket(4,10) = "1"
 
 		' Taiwan Dollar
 		sCountryMarket(5,0) = "新臺幣"
@@ -250,6 +256,7 @@ Sub LocalizedCurrencies()
 		sCountryMarket(5,7) = "TW"	
 		sCountryMarket(5,8) = "404"
 		sCountryMarket(5,9) = "44"
+		sCountryMarket(5,10) = "1"		
 
 		' Chinese Yuan
 		sCountryMarket(6,0) = "人民币"
@@ -261,17 +268,19 @@ Sub LocalizedCurrencies()
 		sCountryMarket(6,7) = "CN"	
 		sCountryMarket(6,8) = "804"
 		sCountryMarket(6,9) = "44"
-
+		sCountryMarket(6,10) = "1"
+		
 		' korean Won
-'		sCountryMarket(7,0) = "한국 원"
-'		sCountryMarket(7,1) = ""
-'		sCountryMarket(7,2) = ""
-'		sCountryMarket(7,3) = ""
-'		sCountryMarket(7,5) = ""
-'		sCountryMarket(7,6) = "ko"
-'		sCountryMarket(7,7) = "KR"			
-'		sCountryMarket(7,8) = "412"
-'		sCountryMarket(7,9) = ""
+		sCountryMarket(7,0) = "한국 원화"
+		sCountryMarket(7,1) = "￦"
+		sCountryMarket(7,2) = "서울"
+		sCountryMarket(7,3) = "http://kr.finance.yahoo.com/d/quotes.csv?s=<StockID>.KS&f=snl1d1t1c1ohgv&e=.csv"
+		sCountryMarket(7,5) = "종목 코드"
+		sCountryMarket(7,6) = "ko"
+		sCountryMarket(7,7) = "KR"			
+		sCountryMarket(7,8) = "412"
+		sCountryMarket(7,9) = "44"
+		sCountryMarket(7,10) = "2"
 
 
 '		sCountryMarket(5,0) = "Российский рубль"
@@ -311,7 +320,7 @@ Sub LocalizedCurrencies()
 		For n = 0 To Ubound(sCountryMarket(),1)
 			If sDocLanguage = sCountryMarket(n,6) and sDocCountry = sCountryMarket(n,7) Then
 				GlobListIndex = 6
-				For m = 0 To 9
+				For m = 0 To 10
 					sMarket(6,m) = sCountryMarket(n,m)
 				Next m
 				Exit For
diff --git a/wizards/source/depot/Currency.xba b/wizards/source/depot/Currency.xba
index 654e916e84fc..c432fecc2661 100644
--- a/wizards/source/depot/Currency.xba
+++ b/wizards/source/depot/Currency.xba
@@ -72,6 +72,7 @@ Dim bIsDocCountry as Boolean
 	End If
 	sCurStockIDLabel = sMarket(Index,5)
 	sCurExtension = sMarket(Index,8)
+	iValueCol = Val(sMarket(Index,10)
 	If Instr(sCurExtension,";") <> 0 Then
 		' Take the german extension as the stock place is Frankfurt
 		sCurExtension = "407"
diff --git a/wizards/source/depot/Depot.xba b/wizards/source/depot/Depot.xba
index 324fe2e4ba41..435280136818 100644
--- a/wizards/source/depot/Depot.xba
+++ b/wizards/source/depot/Depot.xba
@@ -4,7 +4,10 @@
 
 
 Sub Initialize(Optional bChooseMarketPlace as Boolean)
+Dim bEnableHistory as Boolean
 	GlobalScope.BasicLibraries.LoadLibrary("Tools")
+'	oMarketModel = GetControlModel(oDocument.Sheets(0), "CmdHistory")
+'	bEnableHistory = oMarketModel.Enabled
 	ToggleWindow(False)
 	Today = Date()
 	bDebugmode = False
@@ -22,6 +25,7 @@ Sub Initialize(Optional bChooseMarketPlace as Boolean)
 	sDocCountry = oDocLocale.Country
 	LoadLanguage()
 	ToggleWindow(True)
+'	oMarketModel.Enabled = bEnableHistory
 	If Not IsMissing(bChooseMarketPlace) Then
 		If bChoosemarketPlace Then
 			ChooseMarket()
diff --git a/wizards/source/depot/Internet.xba b/wizards/source/depot/Internet.xba
index 62522956fadc..d6d718561384 100644
--- a/wizards/source/depot/Internet.xba
+++ b/wizards/source/depot/Internet.xba
@@ -121,7 +121,7 @@ End Sub
 
 
 
-Function GetCurrentRate(sUrl as String, fValue As Double, iValueCol as Integer) as Boolean
+Function GetCurrentRate(sUrl as String, fValue As Double, iValueRow as Integer) as Boolean
 Dim sFilter As String
 Dim sOptions As String
 Dim oLinkSheet As Object
@@ -139,10 +139,10 @@ Dim sDate as String
 	
 	oLinkSheet.LinkMode = com.sun.star.sheet.SheetLinkMode.NONE
 	oLinkSheet.link(sUrl, "", sFilter, sOptions, 1 )
-	fValue = oLinkSheet.getCellByPosition(1, iValueCol).Value
+	fValue = oLinkSheet.getCellByPosition(iValueCol, iValueRow).Value
 	If fValue = 0 Then
 		Dim sValue as String
-		sValue = oLinkSheet.getCellByPosition(1, iValueCol).String
+		sValue = oLinkSheet.getCellByPosition(1, iValueRow).String
 		sValue = ReplaceString(sValue, ".",",")
 		fValue = Val(sValue)
 	End If
diff --git a/wizards/source/depot/Lang_de.xba b/wizards/source/depot/Lang_de.xba
index 630d9528ac62..d2b9362872e9 100644
--- a/wizards/source/depot/Lang_de.xba
+++ b/wizards/source/depot/Lang_de.xba
@@ -63,6 +63,7 @@ Sub LoadGermanLanguage()
 	sMarket(0,7) = "US"
 	sMarket(0,8) = "409"
 	sMarket(0,9) = "44"
+	sMarket(0,10) = "1"
 	
 	sMarket(1,0) = "Euro"
 	sMarket(1,1) = chr(8364)
@@ -73,6 +74,7 @@ Sub LoadGermanLanguage()
 	sMarket(1,7) = "DE;NL;PT;GR"
 	sMarket(1,8) = "407;413;816;408"
 	sMarket(1,9) = "59/9"
+	sMarket(1,10) = "1"
 
 	sMarket(2,0) = "Englisches Pfund"
 	sMarket(2,1) = "£"
@@ -83,6 +85,7 @@ Sub LoadGermanLanguage()
 	sMarket(2,7) = "GB"
 	sMarket(2,8) = "809"
 	sMarket(2,9) = "44"
+	sMarket(2,10) = "1"
 
 	sMarket(3,0) = "Japanischer Yen"
 	sMarket(3,1) = "¥"
@@ -93,6 +96,7 @@ Sub LoadGermanLanguage()
 	sMarket(3,7) = "JP"
 	sMarket(3,8) = "411"
 	sMarket(3,9) = ""
+	sMarket(3,10) = ""
 	
 	sMarket(4,0) = "Hongkong Dollar"
 	sMarket(4,1) = "HK$"
@@ -103,6 +107,7 @@ Sub LoadGermanLanguage()
 	sMarket(4,7) = "HK"	
 	sMarket(4,8) = "C04"
 	sMarket(4,9) = "44"
+	sMarket(4,10) = "1"
 
 	sMarket(5,0) = "Australischer Dollar"
 	sMarket(5,1) = "$"
@@ -113,6 +118,7 @@ Sub LoadGermanLanguage()
 	sMarket(5,7) = "AU"
 	sMarket(5,8) = "C09"
 	sMarket(5,9) = "44"
+	sMarket(5,10) = "1"
 
 ' ****************************End of the default subset*********************************
 	CompleteMarketList()
diff --git a/wizards/source/depot/Lang_en.xba b/wizards/source/depot/Lang_en.xba
index d648c3d1643e..fa8beb77dde4 100644
--- a/wizards/source/depot/Lang_en.xba
+++ b/wizards/source/depot/Lang_en.xba
@@ -9,7 +9,7 @@ Sub LoadEnglishLanguage()
 	sCancel = "Cancel"
 	sColumnHeader = "Column Header"
 	sInsertStockName = "Please enter shares in your portfolio."
-	sTitle = "<PRODUCTNAME><PRODUCTNAME>: Stocks Manager"
+	sTitle = "<PRODUCTNAME>: Stocks Manager"
 	sTitle = ReplaceString(sTitle, sProductName, "<PRODUCTNAME>")
 	sMsgError = "Input Error"
 	sMsgNoName = sInsertStockname
@@ -45,7 +45,7 @@ Sub LoadEnglishLanguage()
 	sNoInternetUpdate = "without Internet update"
 	sMarketPlace = "Stock exchange:"
 	sNoInternetDataAvailable = "No prices could be received from the Internet!"
-	sCheckInternetSettings = "Possible causes could be: <BR>Your Internet settings have to be modified. <BR>The <SYMBOL> entered for the stock was incorrect."
+	sCheckInternetSettings = "Possible causes could be: <BR>Your Internet settings have to be modified. <BR>The Symbol (e.g. Code, Ticker Symbol) entered for the stock was incorrect."
 	sCheckInternetSettings = ReplaceString(sCheckInternetSettings, chr(13), "<BR>")
 
 	sMsgEndDatebeforeNow = "The end date has to be before today's date."
@@ -63,6 +63,7 @@ Sub LoadEnglishLanguage()
 	sMarket(0,7) = "US"
 	sMarket(0,8) = "409"
 	sMarket(0,9) = "44"
+	sMarket(0,10) = "1"
 	
 	sMarket(1,0) = "Euro"
 	sMarket(1,1) = chr(8364)
@@ -73,6 +74,7 @@ Sub LoadEnglishLanguage()
 	sMarket(1,7) = "DE;NL;PT;GR"
 	sMarket(1,8) = "407;413;816;408"
 	sMarket(1,9) = "59/9"
+	sMarket(1,10) = "1"
 
 	sMarket(2,0) = "British Pound"
 	sMarket(2,1) = "£"
@@ -83,6 +85,7 @@ Sub LoadEnglishLanguage()
 	sMarket(2,7) = "GB"
 	sMarket(2,8) = "809"
 	sMarket(2,9) = "44"
+	sMarket(2,10) = "1"
 
 	sMarket(3,0) = "Japanese Yen"
 	sMarket(3,1) = "¥"
@@ -93,6 +96,7 @@ Sub LoadEnglishLanguage()
 	sMarket(3,7) = "JP"
 	sMarket(3,8) = "411"
 	sMarket(3,9) = ""
+	sMarket(3,10) = ""
 	
 	sMarket(4,0) = "Hong Kong Dollar"
 	sMarket(4,1) = "HK$"
@@ -103,6 +107,7 @@ Sub LoadEnglishLanguage()
 	sMarket(4,7) = "HK"	
 	sMarket(4,8) = "C04"
 	sMarket(4,9) = "44"
+	sMarket(4,10) = "1"
 
 	sMarket(5,0) = "Australian Dollar"
 	sMarket(5,1) = "$"
@@ -113,6 +118,7 @@ Sub LoadEnglishLanguage()
 	sMarket(5,7) = "AU"
 	sMarket(5,8) = "C09"
 	sMarket(5,9) = "44"
+	sMarket(5,10) = "1"
 
 ' ****************************End of the default subset*********************************
 	CompleteMarketList()
diff --git a/wizards/source/depot/Lang_es.xba b/wizards/source/depot/Lang_es.xba
index 5e0524bfc2ca..e02280744a1e 100644
--- a/wizards/source/depot/Lang_es.xba
+++ b/wizards/source/depot/Lang_es.xba
@@ -9,7 +9,7 @@ Sub LoadSpanishLanguage()
 	sCancel = "Cancelar"
 	sColumnHeader = "Título de columna"	
 	sInsertStockName = "Introduzca primero algunas acciones en su depósito."
-	sTitle = "<PRODUCTNAME><PRODUCTNAME>: Administración de acciones"
+	sTitle = "<PRODUCTNAME>: Administración de acciones"
 	sTitle = ReplaceString(sTitle, sProductName, "<PRODUCTNAME>")
 	sMsgError = "Error de entrada"
 	sMsgNoName = sInsertStockname
@@ -45,7 +45,7 @@ Sub LoadSpanishLanguage()
 	sNoInternetUpdate = "Sin actualización por Internet"
 	sMarketPlace = "Plaza bursátil:"
 	sNoInternetDataAvailable = "No se pudieron recibir las cotizaciones por Internet."
-	sCheckInternetSettings = "Las causas posibles son: <BR>Verifique su configuración de Internet. <BR>Ha indicado un <SYMBOL> incorrecto para la acción."
+	sCheckInternetSettings = "Causas posibles: <BR> Debe comprobar la configuración de Internet.<BR> Ha indicado un código incorrecto (p.ej. número, símbolo, etc.) para la acción."
 	sCheckInternetSettings = ReplaceString(sCheckInternetSettings, chr(13), "<BR>")
 
 	sMsgEndDatebeforeNow = "La fecha final debe ser anterior a la fecha de hoy."
@@ -63,6 +63,7 @@ Sub LoadSpanishLanguage()
 	sMarket(0,7) = "US"
 	sMarket(0,8) = "409"
 	sMarket(0,9) = "44"
+	sMarket(0,10) = "1"
 	
 	sMarket(1,0) = "Euro"
 	sMarket(1,1) = chr(8364)
@@ -73,6 +74,7 @@ Sub LoadSpanishLanguage()
 	sMarket(1,7) = "DE;NL;PT;GR"
 	sMarket(1,8) = "407;413;816;408"
 	sMarket(1,9) = "59/9"
+	sMarket(1,10) = "1"
 
 	sMarket(2,0) = "Libra esterlina"
 	sMarket(2,1) = "£"
@@ -83,6 +85,7 @@ Sub LoadSpanishLanguage()
 	sMarket(2,7) = "GB"
 	sMarket(2,8) = "809"
 	sMarket(2,9) = "44"
+	sMarket(2,10) = "1"
 
 	sMarket(3,0) = "Yen japonés"
 	sMarket(3,1) = "¥"
@@ -93,6 +96,7 @@ Sub LoadSpanishLanguage()
 	sMarket(3,7) = "JP"
 	sMarket(3,8) = "411"
 	sMarket(3,9) = ""
+	sMarket(3,10) = ""
 	
 	sMarket(4,0) = "Dólar hongkonés"
 	sMarket(4,1) = "HK$"
@@ -103,6 +107,7 @@ Sub LoadSpanishLanguage()
 	sMarket(4,7) = "HK"	
 	sMarket(4,8) = "C04"
 	sMarket(4,9) = "44"
+	sMarket(4,10) = "1"
 
 	sMarket(5,0) = "Dólar australiano"
 	sMarket(5,1) = "$"
@@ -113,6 +118,7 @@ Sub LoadSpanishLanguage()
 	sMarket(5,7) = "AU"
 	sMarket(5,8) = "C09"
 	sMarket(5,9) = "44"
+	sMarket(5,10) = "1"
 
 ' ****************************End of the default subset*********************************
 	CompleteMarketList()
diff --git a/wizards/source/depot/Lang_fr.xba b/wizards/source/depot/Lang_fr.xba
index dff6e0f5c3a8..f506c595be31 100644
--- a/wizards/source/depot/Lang_fr.xba
+++ b/wizards/source/depot/Lang_fr.xba
@@ -9,7 +9,7 @@ Sub LoadFrenchLanguage()
 	sCancel = "Annuler"
 	sColumnHeader = "En-tête de colonne"	
 	sInsertStockName = "Saisissez quelques actions dans votre portefeuille !"
-	sTitle = "<PRODUCTNAME><PRODUCTNAME> : Gestion d'actions"
+	sTitle = "<PRODUCTNAME> : Gestion d'actions"
 	sTitle = ReplaceString(sTitle, sProductName, "<PRODUCTNAME>")
 	sMsgError = "Erreur de saisie"
 	sMsgNoName = sInsertStockname
@@ -45,7 +45,7 @@ Sub LoadFrenchLanguage()
 	sNoInternetUpdate = "Sans mise à jour Internet"
 	sMarketPlace = "Place boursière :"
 	sNoInternetDataAvailable = "Réception des cours Internet impossible !"
-	sCheckInternetSettings = "Causes possibles : <BR>Problème de paramétrage Internet : vérifiez les paramètres ! <BR>Vous avez saisi le mauvais <SYMBOL> pour l'action."
+	sCheckInternetSettings = "Causes possibles : <BR> Problème de paramétrage Internet : vérifiez les paramètres !<BR> Vous avez saisi un identificateur (par ex. symbole ou code) incorrect pour l'action."
 	sCheckInternetSettings = ReplaceString(sCheckInternetSettings, chr(13), "<BR>")
 
 	sMsgEndDatebeforeNow = "La date spécifiée pour la fin doit précéder celle de ce jour !"
@@ -63,6 +63,7 @@ Sub LoadFrenchLanguage()
 	sMarket(0,7) = "US"
 	sMarket(0,8) = "409"
 	sMarket(0,9) = "44"
+	sMarket(0,10) = "1"
 	
 	sMarket(1,0) = "Euro"
 	sMarket(1,1) = chr(8364)
@@ -73,6 +74,7 @@ Sub LoadFrenchLanguage()
 	sMarket(1,7) = "DE;NL;PT;GR"
 	sMarket(1,8) = "407;413;816;408"
 	sMarket(1,9) = "59/9"
+	sMarket(1,10) = "1"
 
 	sMarket(2,0) = "Livre Sterling"
 	sMarket(2,1) = "£"
@@ -83,6 +85,7 @@ Sub LoadFrenchLanguage()
 	sMarket(2,7) = "GB"
 	sMarket(2,8) = "809"
 	sMarket(2,9) = "44"
+	sMarket(2,10) = "1"
 
 	sMarket(3,0) = "Yen Japonais"
 	sMarket(3,1) = "¥"
@@ -93,6 +96,7 @@ Sub LoadFrenchLanguage()
 	sMarket(3,7) = "JP"
 	sMarket(3,8) = "411"
 	sMarket(3,9) = ""
+	sMarket(3,10) = ""
 	
 	sMarket(4,0) = "Dollar de Hong Kong"
 	sMarket(4,1) = "HK$"
@@ -103,6 +107,7 @@ Sub LoadFrenchLanguage()
 	sMarket(4,7) = "HK"	
 	sMarket(4,8) = "C04"
 	sMarket(4,9) = "44"
+	sMarket(4,10) = "1"
 
 	sMarket(5,0) = "Dollar Australien"
 	sMarket(5,1) = "$"
@@ -113,6 +118,7 @@ Sub LoadFrenchLanguage()
 	sMarket(5,7) = "AU"
 	sMarket(5,8) = "C09"
 	sMarket(5,9) = "44"
+	sMarket(5,10) = "1"
 
 ' ****************************End of the default subset*********************************
 	CompleteMarketList()
diff --git a/wizards/source/depot/Lang_it.xba b/wizards/source/depot/Lang_it.xba
index 5ad83ebc415b..1b49ae2b8a8d 100644
--- a/wizards/source/depot/Lang_it.xba
+++ b/wizards/source/depot/Lang_it.xba
@@ -9,7 +9,7 @@ Sub LoadItalianLanguage()
 	sCancel = "Annulla"
 	sColumnHeader = "Intestazione colonna"
 	sInsertStockName = "Inserite un nome di azioni"
-	sTitle = "<PRODUCTNAME><PRODUCTNAME>: Gestione delle azioni"
+	sTitle = "<PRODUCTNAME>: Gestione delle azioni"
 	sTitle = ReplaceString(sTitle, sProductName, "<PRODUCTNAME>")
 	sMsgError = "Errore dati immessi"
 	sMsgNoName = sInsertStockname
@@ -45,7 +45,7 @@ Sub LoadItalianLanguage()
 	sNoInternetUpdate = "Senza aggiornamento Internet"
 	sMarketPlace = "Borsa:"
 	sNoInternetDataAvailable = "Impossibile ricevere le quotazioni Internet"
-	sCheckInternetSettings = "Possibili cause: <BR>le impostazioni Internet devono essere verificate. <BR>Avete indicato un <SYMBOL> errato per le azioni."
+	sCheckInternetSettings = "Possibili cause: <BR> le impostazioni Internet devono essere modificate.<BR> Avete indicato un indice (ad es. simbolo o codice) errato per le azioni."
 	sCheckInternetSettings = ReplaceString(sCheckInternetSettings, chr(13), "<BR>")
 
 	sMsgEndDatebeforeNow = "La data finale dev'essere anteriore alla data odierna."
@@ -63,6 +63,7 @@ Sub LoadItalianLanguage()
 	sMarket(0,7) = "US"
 	sMarket(0,8) = "409"
 	sMarket(0,9) = "44"
+	sMarket(0,10) = "1"
 	
 	sMarket(1,0) = "Euro"
 	sMarket(1,1) = chr(8364)
@@ -73,6 +74,7 @@ Sub LoadItalianLanguage()
 	sMarket(1,7) = "DE;NL;PT;GR"
 	sMarket(1,8) = "407;413;816;408"
 	sMarket(1,9) = "59/9"
+	sMarket(1,10) = "1"
 
 	sMarket(2,0) = "Sterlina inglese"
 	sMarket(2,1) = "£"
@@ -83,6 +85,7 @@ Sub LoadItalianLanguage()
 	sMarket(2,7) = "GB"
 	sMarket(2,8) = "809"
 	sMarket(2,9) = "44"
+	sMarket(2,10) = "1"
 
 	sMarket(3,0) = "Yen"
 	sMarket(3,1) = "¥"
@@ -93,6 +96,7 @@ Sub LoadItalianLanguage()
 	sMarket(3,7) = "JP"
 	sMarket(3,8) = "411"
 	sMarket(3,9) = ""
+	sMarket(3,10) = ""
 	
 	sMarket(4,0) = "Dollaro Hong Kong"
 	sMarket(4,1) = "HK$"
@@ -103,6 +107,7 @@ Sub LoadItalianLanguage()
 	sMarket(4,7) = "HK"	
 	sMarket(4,8) = "C04"
 	sMarket(4,9) = "44"
+	sMarket(4,10) = "1"
 
 	sMarket(5,0) = "Dollaro australiano"
 	sMarket(5,1) = "$"
@@ -113,6 +118,7 @@ Sub LoadItalianLanguage()
 	sMarket(5,7) = "AU"
 	sMarket(5,8) = "C09"
 	sMarket(5,9) = "44"
+	sMarket(5,10) = "1"
 
 ' ****************************End of the default subset*********************************
 	CompleteMarketList()
diff --git a/wizards/source/depot/Lang_sv.xba b/wizards/source/depot/Lang_sv.xba
index 7b695b5e4fab..4e9cb8f561d6 100644
--- a/wizards/source/depot/Lang_sv.xba
+++ b/wizards/source/depot/Lang_sv.xba
@@ -8,7 +8,7 @@ Sub LoadSwedishLanguage()
 	sCancel = "Avbryt"
 	sColumnHeader = "Kolumnhuvud"	
 	sInsertStockName = "Infoga först några aktier i Din portfölj!"
-	sTitle = "<PRODUCTNAME><PRODUCTNAME>: Aktieförvaltning"
+	sTitle = "<PRODUCTNAME>: Aktieförvaltning"
 	sTitle = ReplaceString(sTitle, sProductName, "<PRODUCTNAME>")
 	sMsgError = "Inmatningsfel"
 	sMsgNoName = sInsertStockname
@@ -44,7 +44,7 @@ Sub LoadSwedishLanguage()
 	sNoInternetUpdate = "utan Internet-uppdatering"
 	sMarketPlace = "Börs:"
 	sNoInternetDataAvailable = "Det gick inte att ta emot Internet-kurser!"
-	sCheckInternetSettings = "Detta kan bero på att: <BR>Dina Internet-inställningar måste ändras. <BR>Du har angivit en felaktig <SYMBOL> för aktien."
+	sCheckInternetSettings = "Detta kan bero på att: <BR> Dina Internet-inställningar måste ändras.<BR> Du har angivit ett felaktigt ID (t.ex. symbol, värdepappersnr.) för aktien."
 	sCheckInternetSettings = ReplaceString(sCheckInternetSettings, chr(13), "<BR>")
 
 	sMsgEndDatebeforeNow = "Slutdatum måste ligga före idag!"
@@ -62,6 +62,7 @@ Sub LoadSwedishLanguage()
 	sMarket(0,7) = "US"
 	sMarket(0,8) = "409"
 	sMarket(0,9) = "44"
+	sMarket(0,10) = "1"
 	
 	sMarket(1,0) = "Euro"
 	sMarket(1,1) = chr(8364)
@@ -72,6 +73,7 @@ Sub LoadSwedishLanguage()
 	sMarket(1,7) = "DE;NL;PT;GR"
 	sMarket(1,8) = "407;413;816;408"
 	sMarket(1,9) = "59/9"
+	sMarket(1,10) = "1"
 
 	sMarket(2,0) = "Engelskt pund"
 	sMarket(2,1) = "£"
@@ -82,6 +84,7 @@ Sub LoadSwedishLanguage()
 	sMarket(2,7) = "GB"
 	sMarket(2,8) = "809"
 	sMarket(2,9) = "44"
+	sMarket(2,10) = "1"
 
 	sMarket(3,0) = "Japansk yen"
 	sMarket(3,1) = "¥"
@@ -92,6 +95,7 @@ Sub LoadSwedishLanguage()
 	sMarket(3,7) = "JP"
 	sMarket(3,8) = "411"
 	sMarket(3,9) = ""
+	sMarket(3,10) = ""
 	
 	sMarket(4,0) = "Hongkongdollar"
 	sMarket(4,1) = "HK$"
@@ -102,6 +106,7 @@ Sub LoadSwedishLanguage()
 	sMarket(4,7) = "HK"	
 	sMarket(4,8) = "C04"
 	sMarket(4,9) = "44"
+	sMarket(4,10) = "1"
 
 	sMarket(5,0) = "Australisk dollar"
 	sMarket(5,1) = "$"
@@ -112,6 +117,7 @@ Sub LoadSwedishLanguage()
 	sMarket(5,7) = "AU"
 	sMarket(5,8) = "C09"
 	sMarket(5,9) = "44"
+	sMarket(5,10) = "1"
 
 ' ****************************End of the default subset*********************************
 	CompleteMarketList()
diff --git a/wizards/source/depot/Lang_tw.xba b/wizards/source/depot/Lang_tw.xba
index f8c48b8adf54..40a5bf8af043 100644
--- a/wizards/source/depot/Lang_tw.xba
+++ b/wizards/source/depot/Lang_tw.xba
@@ -9,7 +9,7 @@ Sub LoadChineseTradLanguage()
 	sCancel = "取消"
 	sColumnHeader = "欄標簽"	
 	sInsertStockName = "請先填入股票名稱!"
-	sTitle = "<PRODUCTNAME><PRODUCTNAME>: 股票管理"
+	sTitle = "<PRODUCTNAME>: 股票管理"
 	sTitle = ReplaceString(sTitle, sProductName, "<PRODUCTNAME>")
 	sMsgError = "輸入無效"
 	sMsgNoName = sInsertStockname
@@ -45,7 +45,7 @@ Sub LoadChineseTradLanguage()
 	sNoInternetUpdate = "不透過 internet 更新"
 	sMarketPlace = "證券交易所："
 	sNoInternetDataAvailable = "無法接受 Internet 股票價格!"
-	sCheckInternetSettings = "可能的原因： Internet 設定不正確，需要重新設定。 <BR>輸入了一個錯誤的股票 <SYMBOL> 。"
+	sCheckInternetSettings = "可能的原因：<BR>Internet 設定不正確，需要重新設定。<BR>輸入了一個錯誤的股票代碼。"
 	sCheckInternetSettings = ReplaceString(sCheckInternetSettings, chr(13), "<BR>")
 
 	sMsgEndDatebeforeNow = "到期日期必須是在今日之前！"
@@ -63,6 +63,7 @@ Sub LoadChineseTradLanguage()
 	sMarket(0,7) = "US"
 	sMarket(0,8) = "409"
 	sMarket(0,9) = "44"
+	sMarket(0,10) = "1"
 	
 	sMarket(1,0) = "歐元"
 	sMarket(1,1) = chr(8364)
@@ -73,6 +74,7 @@ Sub LoadChineseTradLanguage()
 	sMarket(1,7) = "DE;NL;PT;GR"
 	sMarket(1,8) = "407;413;816;408"
 	sMarket(1,9) = "59/9"
+	sMarket(1,10) = "1"
 
 	sMarket(2,0) = "英鎊"
 	sMarket(2,1) = "£"
@@ -83,6 +85,7 @@ Sub LoadChineseTradLanguage()
 	sMarket(2,7) = "GB"
 	sMarket(2,8) = "809"
 	sMarket(2,9) = "44"
+	sMarket(2,10) = "1"
 
 	sMarket(3,0) = "日元"
 	sMarket(3,1) = "¥"
@@ -93,6 +96,7 @@ Sub LoadChineseTradLanguage()
 	sMarket(3,7) = "JP"
 	sMarket(3,8) = "411"
 	sMarket(3,9) = ""
+	sMarket(3,10) = ""
 	
 	sMarket(4,0) = "港幣"
 	sMarket(4,1) = "HK$"
@@ -103,6 +107,7 @@ Sub LoadChineseTradLanguage()
 	sMarket(4,7) = "HK"	
 	sMarket(4,8) = "C04"
 	sMarket(4,9) = "44"
+	sMarket(4,10) = "1"
 
 	sMarket(5,0) = "澳元"
 	sMarket(5,1) = "$"
@@ -113,6 +118,7 @@ Sub LoadChineseTradLanguage()
 	sMarket(5,7) = "AU"
 	sMarket(5,8) = "C09"
 	sMarket(5,9) = "44"
+	sMarket(5,10) = "1"
 
 ' ****************************End of the default subset*********************************
 	CompleteMarketList()
diff --git a/wizards/source/depot/Lang_zh.xba b/wizards/source/depot/Lang_zh.xba
index 2a236df1f47d..4300b591f87d 100644
--- a/wizards/source/depot/Lang_zh.xba
+++ b/wizards/source/depot/Lang_zh.xba
@@ -9,7 +9,7 @@ Sub LoadChineseSimpleLanguage()
 	sCancel = "取消"
 	sColumnHeader = "列标题"
 	sInsertStockName = "请首先往您的帐号内输入一些股票名称！"
-	sTitle = "<PRODUCTNAME><PRODUCTNAME>：股票管理"
+	sTitle = "<PRODUCTNAME>：股票管理"
 	sTitle = ReplaceString(sTitle, sProductName, "<PRODUCTNAME>")
 	sMsgError = "输入错误"
 	sMsgNoName = sInsertStockname
@@ -45,7 +45,7 @@ Sub LoadChineseSimpleLanguage()
 	sNoInternetUpdate = "不通过国际互联网更新"
 	sMarketPlace = "交易所："
 	sNoInternetDataAvailable = "无法获得国际互联网上的行情！"
-	sCheckInternetSettings = "可能的原因是： 您的国际互联网设定不正确，需要重新设定。 <BR>输入了一个错误的股票<SYMBOL>。"
+	sCheckInternetSettings = "可能的原因是：<BR>您的国际互联网设定不正确，需要重新设定。<BR>输入了一个错误的股票号码。"
 	sCheckInternetSettings = ReplaceString(sCheckInternetSettings, chr(13), "<BR>")
 
 	sMsgEndDatebeforeNow = "终止日期必须在今天之前！"
@@ -63,6 +63,7 @@ Sub LoadChineseSimpleLanguage()
 	sMarket(0,7) = "US"
 	sMarket(0,8) = "409"
 	sMarket(0,9) = "44"
+	sMarket(0,10) = "1"
 	
 	sMarket(1,0) = "欧元"
 	sMarket(1,1) = chr(8364)
@@ -73,6 +74,7 @@ Sub LoadChineseSimpleLanguage()
 	sMarket(1,7) = "DE;NL;PT;GR"
 	sMarket(1,8) = "407;413;816;408"
 	sMarket(1,9) = "59/9"
+	sMarket(1,10) = "1"
 
 	sMarket(2,0) = "英镑"
 	sMarket(2,1) = "£"
@@ -83,6 +85,7 @@ Sub LoadChineseSimpleLanguage()
 	sMarket(2,7) = "GB"
 	sMarket(2,8) = "809"
 	sMarket(2,9) = "44"
+	sMarket(2,10) = "1"
 
 	sMarket(3,0) = "日元"
 	sMarket(3,1) = "¥"
@@ -93,6 +96,7 @@ Sub LoadChineseSimpleLanguage()
 	sMarket(3,7) = "JP"
 	sMarket(3,8) = "411"
 	sMarket(3,9) = ""
+	sMarket(3,10) = ""
 	
 	sMarket(4,0) = "港币"
 	sMarket(4,1) = "HK$"
@@ -103,6 +107,7 @@ Sub LoadChineseSimpleLanguage()
 	sMarket(4,7) = "HK"	
 	sMarket(4,8) = "C04"
 	sMarket(4,9) = "44"
+	sMarket(4,10) = "1"
 
 	sMarket(5,0) = "澳元"
 	sMarket(5,1) = "$"
@@ -113,6 +118,7 @@ Sub LoadChineseSimpleLanguage()
 	sMarket(5,7) = "AU"
 	sMarket(5,8) = "C09"
 	sMarket(5,9) = "44"
+	sMarket(5,10) = "1"
 
 ' ****************************End of the default subset*********************************
 	CompleteMarketList()