CWS-TOOLING: integrate CWS qadocinfo

12 files changed, 358 insertions, 117 deletions

diff --git a/testautomation/writer/tools/includes/w_locale_strings2.inc b/testautomation/writer/tools/includes/w_locale_strings2.inc
index b5b8718f17d4..bde88232aaf4 100755
--- a/testautomation/writer/tools/includes/w_locale_strings2.inc
+++ b/testautomation/writer/tools/includes/w_locale_strings2.inc
@@ -39,8 +39,8 @@
 function wGetLanguageGuessString(sValue as string, iLanguageCount as integer) as string 'function for getting strings out of this file
 
     'Variables:
-    DIM WordPreSet          AS string 'string as it shoud be for words
-    DIM ParagraphPreSet     AS string 'string as it shoud be for paragraphs
+    DIM WordPreSet as string 'string as it shoud be for words
+    DIM ParagraphPreSet as string 'string as it shoud be for paragraphs
 
     '///already covered Office languages: ///'
     '///english     01 ///'
@@ -53,8 +53,8 @@ function wGetLanguageGuessString(sValue as string, iLanguageCount as integer) as
     '///swedish     46 ///'
     '///polish      48 ///'
     '///german      49 ///'
-    '///german      55 ///'    
-    
+    '///german      55 ///'
+
     '///already covered languages in the test document: ///'
     '///Case 1: english ///'
     '///Case 2: portugese///'
@@ -67,7 +67,7 @@ function wGetLanguageGuessString(sValue as string, iLanguageCount as integer) as
     '///Case 9: swedish///'
     '///Case 10: polish///'
     '///Case 11: german///'
-    
+
     Select Case iSprache        'Detecting Office language
         Case 01         'Case 01:  english
         '-----------------------------------------------------------------------
@@ -334,7 +334,7 @@ function wGetLanguageGuessString(sValue as string, iLanguageCount as integer) as
         Select Case iLanguageCount
             Case 1: WordPreSet      = "a palavra é Inglês (EUA)"
                     ParagraphPreSet = "O parágrafo é Inglês (EUA)"
-			Case 2: WordPreSet      = "a palavra é Português (Brasil)"			
+			Case 2: WordPreSet      = "a palavra é Português (Brasil)"
                     ParagraphPreSet = "O parágrafo é Português (Portugal)"
 			Case 3: WordPreSet  	= "a palavra é Russo"
                     ParagraphPreSet = "O parágrafo é Russo"
@@ -354,7 +354,7 @@ function wGetLanguageGuessString(sValue as string, iLanguageCount as integer) as
                     ParagraphPreSet = "O parágrafo é Polonês"
 			Case 11:WordPreSet      = "a palavra é Alemão (Alemanha)"
                     ParagraphPreSet = "O parágrafo é Alemão (Alemanha)"
-        end select                
+        end select
         '-----------------------------------------------------------------------
         case else
             'if Office language is not already covered: warning appears.
@@ -368,6 +368,6 @@ function wGetLanguageGuessString(sValue as string, iLanguageCount as integer) as
             wGetLanguageGuessString = WordPreSet
         elseif sValue = "ParagraphPreSet" then
             wGetLanguageGuessString = ParagraphPreSet
-        endif
+        end if
 
 end function
diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc
index 4da337d22a19..01d2b6044d80 100755
--- a/testautomation/writer/tools/includes/w_tool1.inc
+++ b/testautomation/writer/tools/includes/w_tool1.inc
@@ -30,7 +30,7 @@
 '*
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : fredrik.haegg@sun.com
 '*
 '* short description : Put description here
 '*
diff --git a/testautomation/writer/tools/includes/w_tool2.inc b/testautomation/writer/tools/includes/w_tool2.inc
index 6b44258b6a4b..45e4d48831aa 100755
--- a/testautomation/writer/tools/includes/w_tool2.inc
+++ b/testautomation/writer/tools/includes/w_tool2.inc
@@ -30,7 +30,7 @@
 '*
 '/************************************************************************
 '*                                                                **
-'* owner : helge.delfs@sun.com                                    **
+'* owner : fredrik.haegg@sun.com                                    **
 '*                                                                **
 '* short description : Description of file                        **
 '*                                                                **
diff --git a/testautomation/writer/tools/includes/w_tool3.inc b/testautomation/writer/tools/includes/w_tool3.inc
index 269e41175751..aca483504537 100755
--- a/testautomation/writer/tools/includes/w_tool3.inc
+++ b/testautomation/writer/tools/includes/w_tool3.inc
@@ -30,7 +30,7 @@
 '*
 '/************************************************************************
 '*                                                                **
-'* owner : helge.delfs@sun.com                                    **
+'* owner : fredrik.haegg@sun.com                                    **
 '*                                                                **
 '* short description : Description of file                        **
 '*                                                                **
@@ -60,7 +60,6 @@
 '*                                                                **
 '\******************************************************************
 
-
 sub InTabelleKontrollieren
    Call wTypeKeys ("<Home>")
    Call wTypeKeys ("<Tab><Shift End>")
@@ -164,6 +163,11 @@ sub AufSortierungPruefen(i as integer)
    Call wTypeKeys "<Shift Mod1 Right>"
    Wait 100
    EditCopy
+   if GetClipboardText = Trennzeichen then
+       QaErrorLog "#i94661# - Marked the Separator-Sign, correcting now."
+       Call wTypeKeys "<Right><Shift Mod1 Right>"
+       EditCopy
+   end if
    if Left$(GetClipboardText,3) <> "AAA" then Warnlog "Entry in 1.Column/1.Row incorrect"
    if i <> 1 then
     Call wTypeKeys "<Mod1 Right>", 3
@@ -178,6 +182,11 @@ sub AufSortierungPruefen(i as integer)
    Call wTypeKeys "<Shift Mod1 Right>"
    Wait 100
    EditCopy
+   if GetClipboardText = Trennzeichen then
+       QaErrorLog "#i94661# - Marked the Separator-Sign, correcting now."
+       Call wTypeKeys "<Home><Shift Mod1 Right>"
+       EditCopy
+   end if
    if Left$(GetClipboardText,3) <> "AAA" then Warnlog "Entry in 1.Column/2.Row incorrect"
    if i <> 1 then
     Call wTypeKeys "<Mod1 Right>", 3
@@ -187,6 +196,11 @@ sub AufSortierungPruefen(i as integer)
    Call wTypeKeys "<Shift Mod1 Right>"
    Wait 100
    EditCopy
+   if GetClipboardText = Trennzeichen then
+       QaErrorLog "#i94661# - Marked the Separator-Sign, correcting now."
+       Call wTypeKeys "<Right><Shift Mod1 Right>"
+       EditCopy
+   end if
    if Left$(GetClipboardText,3) <> "DDD" then Warnlog "Entry in 2.Column/2.Row incorrect"
    Call wTypeKeys "<Down><Home>"
    if i <> 1 then
@@ -197,6 +211,11 @@ sub AufSortierungPruefen(i as integer)
    Call wTypeKeys "<Shift Mod1 Right>"
    Wait 100
    EditCopy
+   if GetClipboardText = Trennzeichen then
+       QaErrorLog "#i94661# - Marked the Separator-Sign, correcting now."
+       Call wTypeKeys "<Right><Shift Mod1 Right>"
+       EditCopy
+   end if
    if Left$(GetClipboardText,3) <> "AAA" then Warnlog "Entry in 4.Column/3.Row incorrect"
 end sub
 
@@ -207,10 +226,20 @@ sub AbSortierungPruefen(i as integer)
    Call wTypeKeys "<Shift Mod1 Right>"
    Wait 100
    EditCopy
+   if GetClipboardText = Trennzeichen then
+       QaErrorLog "#i94661# - Marked the Separator-Sign, correcting now."
+       Call wTypeKeys "<Right><Shift Mod1 Right>"
+       EditCopy
+   end if
    if Left$(GetClipboardText,3) <> "CCC" then Warnlog "Entry in 1.Column/1.Row incorrect"
    Call wTypeKeys "<Down><Shift Mod1 Left>"
    Wait 100
    EditCopy
+   if GetClipboardText = Trennzeichen then
+       QaErrorLog "#i94661# - Marked the Separator-Sign, correcting now."
+       Call wTypeKeys "<Home><Shift Mod1 Right>"
+       EditCopy
+   end if
    if Left$(GetClipboardText,3) <> "CCC" then Warnlog "Entry in 1.Column/2.Row incorrect"
    if i <> 1 then
     Call wTypeKeys "<Mod1 Right>" , 4
@@ -220,12 +249,23 @@ sub AbSortierungPruefen(i as integer)
    Call wTypeKeys "<Shift Mod1 Right>"
    Wait 100
    EditCopy
+   if GetClipboardText = Trennzeichen then
+       QaErrorLog "#i94661# - Marked the Separator-Sign, correcting now."
+       Call wTypeKeys "<MOD1 Left>", 2
+       Call wTypeKeys "<Shift MOD1 Right>"
+       EditCopy
+   end if
    if Left$(GetClipboardText,3) <> "BBB" then Warnlog "Entry in 2.Column/2.Row incorrect"
    Call wTypeKeys "<Left><Up>"
    Call wTypeKeys "<Right>"
    Call wTypeKeys "<Shift Mod1 Left>"
    Wait 100
    EditCopy
+   if GetClipboardText = Trennzeichen then
+       QaErrorLog "#i94661# - Marked the Separator-Sign, correcting now."
+       Call wTypeKeys "<Right><Shift Mod1 Right>"
+       EditCopy
+   end if
    if Left$(GetClipboardText,3) <> "EEE" then Warnlog "Entry in 2.Column/1.Row incorrect"
    if i <> 1 then
     Call wTypeKeys "<Mod1 Right>", 6
@@ -238,6 +278,11 @@ sub AbSortierungPruefen(i as integer)
    end if
    Wait 100
    EditCopy
+   if GetClipboardText = Trennzeichen then
+       QaErrorLog "#i94661# - Marked the Separator-Sign, correcting now."
+       Call wTypeKeys "<Right><Shift Mod1 Right>"
+       EditCopy
+   end if
    if Left$(GetClipboardText,3) <> "AAA" then Warnlog "Entry in 2.Column/1.Row incorrect"
 end sub
 
@@ -295,7 +340,7 @@ sub TrennzeichenSetzen ( Trennstring as String )
         Case ";"
             RegularExpressions.Check
             SearchFor.SetText "\t"
-    
+
         Case "|"
             RegularExpressions.Check
             SearchFor.SetText "\t"
@@ -593,7 +638,7 @@ sub sNavigatorInBrauchbarenZustand
        next j
    end if
 
-Wait 500
+    Wait 500
     Auswahlliste.Select 2
     Auswahlliste.TypeKeys "+"
     Inhaltsansicht.Click
@@ -652,11 +697,11 @@ sub wOpenContextMenu ( optional FocusParam as boolean)
 				Case "WRITER"
 					Kontext "DocumentWriter"
 					Call DocumentWriter.OpenContextMenu true
-	
+
 				Case "MASTERDOC"
 					Kontext "DocumentMasterDoc"
 					Call DocumentMasterDoc.OpenContextMenu true
-	
+
 			end select
 		else
 			Select Case gApplication
@@ -669,5 +714,5 @@ sub wOpenContextMenu ( optional FocusParam as boolean)
 					Call DocumentMasterDoc.OpenContextMenu
 			end select
 		end if
-	end if		
+	end if
 end sub
diff --git a/testautomation/writer/tools/includes/w_tool4.inc b/testautomation/writer/tools/includes/w_tool4.inc
index 11684778455e..6a477100c295 100755
--- a/testautomation/writer/tools/includes/w_tool4.inc
+++ b/testautomation/writer/tools/includes/w_tool4.inc
@@ -30,7 +30,7 @@
 '*
 '/************************************************************************
 '*                                                                **
-'* owner : helge.delfs@sun.com                                    **
+'* owner : fredrik.haegg@sun.com                                    **
 '*                                                                **
 '* short description : Misc tools for writer tests                **
 '*                                                                **
@@ -46,14 +46,13 @@
 '*                                                                **
 '\******************************************************************
 
-
 function CountItemsInNavigatorGroup(Group as integer) as Integer
     Dim j as integer,SelectInNavigator as integer
     'First, select the Navigator depending on the application
     Kontext "Navigator"
     If Not Navigator.Exists then EditNavigator
     Kontext "NavigatorWriter"
-    
+
     'In Navigator, close all groups and set focus to first group
     Sleep 2
     if Auswahlliste.GetItemCount<12 then Inhaltsansicht.Click
@@ -65,7 +64,7 @@ function CountItemsInNavigatorGroup(Group as integer) as Integer
             Auswahlliste.TypeKeys "-"
         next j
     end if
-    
+
     Wait 500
     'Select group given by the function
     Auswahlliste.Select Group
@@ -104,7 +103,7 @@ end function
 
 function wSetZoom (  )
 	'/// This function sets the zoom size to 100% in a text document
-	
+
     ViewZoom
     Kontext "Massstab"
     Vergroesserung100.Check
@@ -119,7 +118,6 @@ end function
 function wGetSpellcheckDocumentName(xCategory as integer) as string
     Dim sTemp as string, sReturn as string
     '/// This function is to return the document to load in spellcheck test
-'       
     select case xCategory
         case 1:
             select case iSprache
@@ -147,7 +145,7 @@ function wGetSpellcheckDocumentName(xCategory as integer) as string
                     sTemp = Convertpath(gTesttoolpath + "writer\optional\input\linguistik\007.odt")
                 case else
                     sTemp = Convertpath(gTesttoolpath + "writer\optional\input\linguistik\0" & iSprache & ".odt")
-            end select    
+            end select
     end select
 
     if sReturn <> "None" then
@@ -157,15 +155,15 @@ function wGetSpellcheckDocumentName(xCategory as integer) as string
             sReturn = "Empty"
         end if
     end if
-    
+
     wGetSpellcheckDocumentName = sReturn
-    
+
 end function
 
 '*******************************************************************
 
 sub wToolsSpellcheckCheckWriter
-    '/// This function opens the spellcheck-dialog in all applications    
+    '/// This function opens the spellcheck-dialog in all applications
     Select Case Ucase(gApplication)
         Case "WRITER"		: ToolsSpellcheckWriter
         Case "MASTERDOC"	: ToolsSpellcheckWriter
@@ -190,7 +188,7 @@ sub wEnableAutoSpellcheck(sEnable as boolean)
 			Optionen.Check
 		Case false
 			Optionen.UnCheck
-	end select		
+	end select
 	Kontext "ExtrasOptionenDLG"
 	ExtrasOptionenDLG.Ok
 
@@ -205,9 +203,9 @@ sub wEnableHyphenation(sEnable as boolean)
     FormatParagraph
     Kontext
     Active.SetPage TabTextfluss
-    kontext "TabTextfluss"    
+    kontext "TabTextfluss"
     Select Case sEnable
-        case true        
+        case true
             Automatisch.Check
         case false
             Automatisch.UnCheck
diff --git a/testautomation/writer/tools/includes/w_tool5.inc b/testautomation/writer/tools/includes/w_tool5.inc
index 8f45e8609494..4ee5f4cf25ba 100644
--- a/testautomation/writer/tools/includes/w_tool5.inc
+++ b/testautomation/writer/tools/includes/w_tool5.inc
@@ -31,7 +31,7 @@
 '*
 '/************************************************************************
 '*                                                                **
-'* owner : helge.delfs@sun.com                                    **
+'* owner : fredrik.haegg@sun.com                                    **
 '*                                                                **
 '* short description : Description of file                        **
 '*                                                                **
diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc
index 642f351b7e32..704d2a60f6e9 100755
--- a/testautomation/writer/tools/includes/w_tool6.inc
+++ b/testautomation/writer/tools/includes/w_tool6.inc
@@ -31,9 +31,9 @@
 '*
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : fredrik.haegg@sun.com
 '*
-'* short description :
+'* short description : Tools for writer tests.
 '*
 '************************************************************************
 '*
@@ -67,7 +67,6 @@
 ' **                                                                **
 ' \*******************************************************************
 
-
 sub wOfficeRestart
     Dim i as integer
     Call sleep(5)
@@ -77,10 +76,9 @@ sub wOfficeRestart
     Call sleep(5)
 	' Close the backing windows
 	FileExit "SynchronMode", TRUE
-	
+
     Call hStartTheOffice
     Call sleep(5)
-    Call hNewDocument
 end sub
 
 '--------------------------------------------------------------
@@ -263,8 +261,8 @@ function wGetCharacterFont as String
         sleep (1)
         wGetCharacterFont = FontWest.GetSelText
         TabFont.Cancel
-        sleep (1)        
-        wasAsianLan = ActiveDeactivateAsianSupport (True)        
+        sleep (1)
+        wasAsianLan = ActiveDeactivateAsianSupport (True)
     endcatch
 end function
 
@@ -299,8 +297,8 @@ function wGetCharacterFontSize as String
         sleep (1)
         wGetCharacterFontSize = SizeWest.GetSelText
         TabFont.Cancel
-        sleep (1)        
-        wasAsianLan = ActiveDeactivateAsianSupport (True)        
+        sleep (1)
+        wasAsianLan = ActiveDeactivateAsianSupport (True)
     endcatch
 end function
 
@@ -333,7 +331,7 @@ sub ZeilenHoeheTesten ( Wert as Double )
     FormatRowHeight
     Kontext "ZellenHoehe"
     zWert = ZahlAusSpinnfield ( Hoehe.GetText )
-    if (LiberalMeasurement (Wert, zWert) <> TRUE) then QAErrorlog "Die Zeilenhöhe ist nicht "+ Wert + " sondern "+ zWert + " :-)"
+    if (LiberalMeasurement (Wert, zWert) <> TRUE) then QAErrorlog "#i94556# - Die Zeilenhöhe ist nicht "+ Wert + " sondern "+ zWert + "."
     ZellenHoehe.OK
 end sub
 
@@ -785,7 +783,7 @@ sub wSearchWriteableArea ()
                 Exit Do
             end if
         else
-            NowWriteable = True            
+            NowWriteable = True
             Exit Do
         end if
     Loop
@@ -811,5 +809,3 @@ function fInsertFrame (x1 as Integer , y1 as Integer , x2 as Integer , y2 as Int
     wait 500
 
 end function
-
-
diff --git a/testautomation/writer/tools/includes/w_tool7.inc b/testautomation/writer/tools/includes/w_tool7.inc
index fb961aca444b..3df9241cd2f2 100644
--- a/testautomation/writer/tools/includes/w_tool7.inc
+++ b/testautomation/writer/tools/includes/w_tool7.inc
@@ -31,7 +31,7 @@
 '*
 '/************************************************************************
 '*
-'* owner :  helge.delfs@sun.com
+'* owner :  fredrik.haegg@sun.com
 '*
 '* short description : Functions mostly used for fields 
 '*
@@ -47,7 +47,6 @@
 '*
 '\***********************************************************************
 
-
 function fSetLocale(sLocaleSetting as String)  as String
 
  'This function is set Locale in Tools/Options/Language Settings / Languages
@@ -147,7 +146,7 @@ function fGetType(sType as String)  as String
           select case iSprache
               case 1:      	fGetType = "Date"
               case 7:		fGetTYpe = "Дата"
-              case 31:     	fGetType = "Datum"      
+              case 31:     	fGetType = "Datum"
               case 33:     	fGetType = "Date"
               case 34:     	fGetType = "Fecha"
               case 36:     	fGetType = "Dátum"
@@ -300,7 +299,6 @@ function fGetFieldContent( ) as String
 
 end function
 
-
 '----------------------------------------------------
 
 function fSetToBigSize( )
@@ -463,6 +461,6 @@ function fConvertBacklashToSlash (sTest) as String
 		s3$ = s3$ + s2$ + "/"
 	loop until s1$=""
 	fConvertBacklashToSlash = s3$ + s1$
-	
+
 end function
 
diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc
index d63760c60298..21a94cd1f3fe 100755
--- a/testautomation/writer/tools/includes/w_tools.inc
+++ b/testautomation/writer/tools/includes/w_tools.inc
@@ -64,8 +64,6 @@
 '*
 '\***********************************************************************
 
-
-
 sub wDokSchreiben ( OutputText , optional iLoop as Integer )
 Dim i as integer
 If lcase(OutputText) = "<mod1 a>" then
@@ -122,7 +120,6 @@ If IsMissing(iLoop) = True then iLoop = 1
         Call hTextrahmenErstellen (OutputText,35,35,50,20)
         case "IMPRESS"
         Call hTextrahmenErstellen (OutputText,35,35,50,20)
-
     end select
     wait 500
     next i
@@ -319,7 +316,6 @@ sub wFindSelectObjectBelow ( xStart%, yStart%, xEnde%, yEnde% )
         if (getMouseStyle <> 0) then i = 80
     wend
     
-    
     Case "MASTERDOC"
         Kontext "DocumentMasterDoc"
         DocumentMasterDoc.MouseDown xStart%, yStart%
@@ -329,10 +325,6 @@ sub wFindSelectObjectBelow ( xStart%, yStart%, xEnde%, yEnde% )
     wait 200
 end sub
 
-
-
-
-
 ' -----------------------------------------------------------------------
 
 function WortAusWoerterbuchLoeschen ( Aufnahme$ ) as Boolean
@@ -847,7 +839,7 @@ sub wRectangleToClipboard
     catch
         Warnlog "Unable to copy object. Maybe not selected!"
     endcatch
-    
+
     Call hCloseDocument
     gApplication = tempApplication
     Select Case gApplication
@@ -913,7 +905,7 @@ sub wOptionenUndo ( sOption$ )
         sTempSeparator = "."
     end if
     sTempUnit = Masseinheit.GetSelIndex
-    
+
     if sOption$ = "Laden" OR sOption$ = "Alle" then
         ' Update
         AufNachfrage.Check
@@ -1182,7 +1174,7 @@ function wStyleCreate( sStyleName as string, sType as string, optional NotFromSe
 
 	Kontext "Stylist"
 	If Not Stylist.Exists then FormatStylist
-    
+
 	select case sType
         case "Paragraph":	Absatzvorlagen.Click
         case "Character":	Zeichenvorlagen.Click
@@ -1254,7 +1246,7 @@ function wStyleSelect( sStyleName as string, optional sType as string ) as boole
             case "Numbering":	Numerierungsvorlagen.Click
         end select
     end if
-    
+
 	Sleep 1
     Vorlagenliste.Select 1
     wait 500
@@ -1355,7 +1347,7 @@ function wStyleSet( sStyleName as string, optional sType as string ) as boolean
             case "Numbering":	Numerierungsvorlagen.Click
         end select
     end if
-    
+
 	Sleep 1
     Vorlagenliste.Select 1
     wait 500
@@ -1400,11 +1392,10 @@ function wStyleGet( sStyleName as string, optional sType as string ) as boolean
             case "Numbering":	Numerierungsvorlagen.Click
         end select
     end if
-    
+
     wait 500
 	if Vorlagenliste.GetSelText = sStyleName then
 		wStyleGet = true
 	end if
 
 end function
-
diff --git a/testautomation/writer/tools/includes/w_tools_autocorrection.inc b/testautomation/writer/tools/includes/w_tools_autocorrection.inc
index f0d14f74002e..9dec2f0108ce 100644
--- a/testautomation/writer/tools/includes/w_tools_autocorrection.inc
+++ b/testautomation/writer/tools/includes/w_tools_autocorrection.inc
@@ -31,7 +31,7 @@
 '*
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : fredrik.haegg@sun.com
 '*
 '* short description : Test the AutoCorrect/AutoFormat/Word tools
 '*
@@ -41,7 +41,6 @@
 '*
 '\***********************************************************************
 
-
 function fAutocorrectOptions(Options as String)
     '/// Open Tools/Autocorrect/Autoformat diglog with tab page Options
     '///+ then choose the relevant Options and press 'space bar'
diff --git a/testautomation/writer/tools/includes/w_tools_drawing.inc b/testautomation/writer/tools/includes/w_tools_drawing.inc
index 45fde02959a9..b3099f0062fd 100644
--- a/testautomation/writer/tools/includes/w_tools_drawing.inc
+++ b/testautomation/writer/tools/includes/w_tools_drawing.inc
@@ -31,7 +31,7 @@
 '*
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : fredrik.haegg@sun.com
 '*
 '* short description : Test the AutoCorrect/AutoFormat/Word tools
 '*
@@ -41,7 +41,6 @@
 '*
 '\***********************************************************************
 
-
 function fPositionAndSize(Options as string)
 '/// Open Format/Position and Size diglog with Options.
     Kontext
@@ -73,4 +72,3 @@ function fFormatLine(Options as string)
 end function
 
 '-------------------------------------------------------------------------
-
diff --git a/testautomation/writer/tools/includes/w_tools_undo.inc b/testautomation/writer/tools/includes/w_tools_undo.inc
index 98bcbda981ab..80dd0a81bc4b 100644
--- a/testautomation/writer/tools/includes/w_tools_undo.inc
+++ b/testautomation/writer/tools/includes/w_tools_undo.inc
@@ -31,7 +31,7 @@
 '*
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : fredrik.haegg@sun.com
 '*
 '* short description : Tools for w_undo.bas
 '*
@@ -65,6 +65,8 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
 			Select Case iSprache
 				Case 01:	vTypeString = "Typing"
 				Case 49: 	vTypeString = "EinfÆgen"
+				Case 34:        vTypeString = "Escritura"
+				Case 86:        vTypeString = "键入"
 				Case else: QAErrorlog "Please adapt tests for current language! (" & CurrentUndoString(0) & ")"
 			end select
 		' Overwrite
@@ -72,6 +74,8 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
 			CurrentUndoString() = Split(UndoStringFromUndoList, ":")
 			Select Case iSprache
 				Case 01: vTypeString = "Overwrite"
+				Case 34: vTypeString = "Sobrescribir"
+				Case 86: vTypeString = "覆盖"
 				Case else: QAErrorlog "Please adapt tests for current language! (" & CurrentUndoString(0) & ")"
 			end select
 		' Replace
@@ -79,12 +83,16 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
 			CurrentUndoString() = Split(UndoStringFromUndoList, ":")
 			Select Case iSprache
 				Case 01: vTypeString = "Replace"
+				Case 34: vTypeString = "Reemplazar"
+				Case 86: vTypeString = "替换"
 				Case else: QAErrorlog "Please adapt tests for current language! (" & CurrentUndoString(0) & ")"
 			end select
 		' Delete
 		case 4:
 			Select Case iSprache
 				Case 01: if UndoStringFromUndoList <> "Delete multiple selection" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				Case 34: if UndoStringFromUndoList <> "Eliminar selección múltiple" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				Case 86: if UndoStringFromUndoList <> "删除 多项选择" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 				Case else: QAErrorlog "Please adapt tests for current language! (" & CurrentUndoString(0) & ")"
 			end select
 		' Replace all
@@ -93,6 +101,8 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
 				case "14 occurences of 'and'"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Replace: 14 occurrences of 'and'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				                Case 34: if UndoStringFromUndoList <> "Reemplazar: 6 ocurrencias de 'and'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入自动图文集" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 			end select
@@ -100,12 +110,16 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
 		case 6:
 			Select Case iSprache
 				Case 01: if UndoStringFromUndoList <> "Sort text" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				Case 34: if UndoStringFromUndoList <> "Ordenar texto" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				Case 86: if UndoStringFromUndoList <> "排序文字" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 				Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList
 			end select
 		' Convert text -> table
 		case 7:
 			Select Case iSprache
 				Case 01: if UndoStringFromUndoList <> "Convert text -> table" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				Case 34: if UndoStringFromUndoList <> "Convertir texto en tabla" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				Case 86: if UndoStringFromUndoList <> "文字转换成表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 				Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 			end select
 
@@ -115,12 +129,16 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
 				Case "New Paragraph"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "New Paragraph" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Párrafo nuevo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "新建段落" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "Delete Paragraph"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete paragraph" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar Párrafo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 段落" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 			end select
@@ -129,6 +147,8 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
 		case 9:
 			Select Case iSprache
 				Case 01: if UndoStringFromUndoList <> "Paste clipboard" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				Case 34: if UndoStringFromUndoList <> "Pegar del portapapeles" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				Case 86: if UndoStringFromUndoList <> "粘贴剪贴板" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 				Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 			end select
 
@@ -137,497 +157,693 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
 				Case "Accept"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Accept change: Insert 'This is a test'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Aplicar cambio: Insertar 'This is a test'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "接受修改：插入 'This is a test'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "Reject"
 					Select Case iSprache
-                         Case 01: if UndoStringFromUndoList <> "Reject change: Insert 'This is a test'" then 
-                                  elseif UndoStringFromUndoList = "Reject change: $1" then 
-                                      QaErrorlog "#i# - Bug with "
-                                  else
-                                      Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
-                                  end if
-						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
+                                                Case 01: if UndoStringFromUndoList <> "Reject change: Insert 'This is a test'" then 
+                                                         elseif UndoStringFromUndoList = "Reject change: $1" then 
+                                                             QaErrorlog "#i94489# - Bug with Undo - Reject."
+                                                         else
+                                                             Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                         end if
+                                                Case 34: if UndoStringFromUndoList = "Rechazar cambio: $1" then 
+                                                             QaErrorlog "#i94489# - Bug with Undo - Reject."
+                                                         else
+                                                             Warnlog "Tell script-writer issue i94489 seems to be fixed, or that a string has to be set to: " & UndoStringFromUndoList
+                                                         end if
+					        Case 86: if UndoStringFromUndoList = "拒绝修改：$1" then 
+                                                             QaErrorlog "#i94489# - Bug with Undo - Reject."
+                                                         else
+                                                             Warnlog "Tell script-writer issue i94489 seems to be fixed, or that a string has to be set to: " & UndoStringFromUndoList
+                                                         end if
+			                        Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertLineBreak"
 					Select Case iSprache
-						Case 01, 1: if UndoStringFromUndoList <> "Typing: 1 line break(s)" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Typing: 1 line break(s)" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Escritura: 1 salto(s) de línea" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "键入: 1 换行符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteLineBreak"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete 1 line break(s)" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar 1 salto(s) de línea" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 1 换行符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertColumnBreak"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert column break" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar salto de columna" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入分栏符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteColumnBreak"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete paragraph" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar Párrafo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 段落" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertPageBreak"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert page break" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar salto de página" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入分页符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeletePageBreak"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete paragraph" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar Párrafo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 段落" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertField"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert field" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar campo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 字段" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ChangedField"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Field changed" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Cambio modificado" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "字段已经被修改" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteField"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete field" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar campo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 字段" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertSpecialCharacter"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert special character" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar carácter especial" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 特殊字符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteSpecialCharacter"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Delete '#'" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Delete '#'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar '#'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 '#'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ApplyStyles"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Apply Styles: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Aplicar estilos: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "应用样式: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ChangeStyles"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Change style: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                Case 34: if UndoStringFromUndoList <> "Cambiar estilo: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "修改样式：AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DemoteOutline"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Demote outline" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Promote/demote outline" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                Case 34: if UndoStringFromUndoList <> "Aumentar/Disminuir nivel" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "升级/降级外框" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "PromoteOutline"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Promote/demote outline" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                Case 34: if UndoStringFromUndoList <> "Aumentar/Disminuir nivel" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "升级/降级外框" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertSection"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert section" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                Case 34: if UndoStringFromUndoList <> "Insertar área" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入区域" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ModifySection"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Modify section" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Modificar área" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "修改区域" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteSection"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete section" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                Case 34: if UndoStringFromUndoList <> "Eliminar área" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除区域" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertHyperlink"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert Hyperlink" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar hiperenlace" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入超链接" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertHyperlinkButton"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "insert URL button" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar botón URL" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 URL 按钮" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "HeaderFooter"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Header/footer changes" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertFootnote"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert footnote" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
-						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar nota al pie" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入脚注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+        					Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ModifyFootnote"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Modify footnote options" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Modificar opciones de nota al pie" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "修改脚注设置" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteFootnote"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete footnote" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar nota al pie" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 脚注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertCaption"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert caption: 'This capt...aracters'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar título: 'This capt...aracters'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入标题: 'This capt...aracters'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertAutotext"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert AutoText" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar AutoTexto" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入自动图文集" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertBookmark"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert bookmark: I'm a bookmark" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar marcador: I'm a bookmark" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入书签: I'm a bookmark" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "RenameBookmark"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Rename bookmark: 'I'm a bookmark' -> 'a book'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList & " -> #i33498"
+						Case 34: if UndoStringFromUndoList <> "marcador renombrado: 'I'm a bookmark' -> 'a book'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList & " -> #i33498"
+						Case 86: if UndoStringFromUndoList <> "重命名书签: 'I'm a bookmark' -> 'a book'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList & " -> #i33498"
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteBookmark"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete bookmark: a book" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Borrar marcador: a book" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除书签: a book" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertNote"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert note" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar nota" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 批注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteNote"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete note" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar nota" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 批注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertScript"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert script" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar secuencia de comandos" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 脚本" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteScript"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete script" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar secuencia de comandos" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 脚本" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertIndexEntry"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert index entry" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar entrada de índice" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入索引条目" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteIndexEntry"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete 'IndexEntry'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar 'IndexEntry'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 'IndexEntry'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
-
 				Case "InsertBibliographyEntry"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert bibliography entry" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar entrada de bibliografía" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 文献目录条目" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteBibliographyEntry"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete bibliography entry" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar entrada de bibliografía" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 文献目录条目" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertFrame"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert frame" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar marco" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 框架" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "RenameFrame"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Rename frame: 'MyFrame' -> 'MyRenamedFrame'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
-						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Rename frame: 'MyFrame' -> 'MyRenamedFrame'" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if InStr(UndoStringFromUndoList, "renombrado") then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 框架" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList
 					end select
 
 				Case "DeleteFrame"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete frame" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                Case 34: if UndoStringFromUndoList <> "Eliminar marco" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除框对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertTable"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert table: 'Table1'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar tabla: 'Tabla1'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入表格: '表格1'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertRow"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Insert Row" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Insert Row" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar fila" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入行" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertColumn"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Insert Column" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Insert Column" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar columna" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入列" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteRow"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Delete row" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Delete row" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Borrar fila" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除行" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteColumn"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Delete column" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Delete column" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Borrar columna" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除列" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
-
 				Case "FormatCell"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Format cell" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Formatear celda" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "格式化单元格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ApplyTableAttributes"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Apply table attributes" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Aplicar atributos de la tabla" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "应用表格属性" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "MergeTable"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Merge table" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "unir tablas" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "合并表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ConvertTable"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Convert text -> table" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Convertir texto en tabla" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "文字转换成表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "SortTable"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Sort table" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Ordenar tabla" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "排序表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "SplitTable"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Split Table" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Dividir tabla" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "拆分表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteTable"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete table: 'AnotherTable'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList & " -> #i33497"
+						Case 34: if UndoStringFromUndoList <> "Eliminar tabla 'AnotherTable'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList & " -> #i33497"
+						Case 86: if UndoStringFromUndoList <> "删除 表格: 'AnotherTable'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList & " -> #i33497"
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertRuler"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert horizontal ruler" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar regla horizontal" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入水平标尺" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertGraphic"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Insert graphics" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
-						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
-					end select
+                                                Case 01: if (UndoStringFromUndoList = "Insert graphics") OR (UndoStringFromUndoList = "Insert picture") then
+                                                         else
+                                                             Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                         end if
+                                                Case 34: if (UndoStringFromUndoList = "Insertar gráficos") OR (UndoStringFromUndoList = "Insertar imagen") then
+                                                         else
+                                                             Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                         end if
+					        Case 86: if (UndoStringFromUndoList = "插入 图形") OR (UndoStringFromUndoList = "插入 图片") then
+                                                         else
+                                                             Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                         end if
+		              	                Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
+				        end select
 
 				Case "DeleteGraphic"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Delete picture" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Delete graphics" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar imagen" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除图形" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ReplaceGraphic"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Replace picture" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Replace graphics" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Reemplazar imagen" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "替换图形" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertObject"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert OLE-object" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar Objeto OLE" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 OLE 对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteObject"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete OLE-object" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar Objeto OLE" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 OLE 对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertFloatingFrame"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert OLE-object" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar Objeto OLE" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 OLE 对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteFloatingFrame"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete OLE-object" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar Objeto OLE" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 OLE 对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "InsertDocument"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Insert file" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Insert file" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar archivo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入文件" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "APGS"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Asian Phonetic Guides Setting" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Asian Phonetic Guides Setting" then QaErrorLog "#i94534# - Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Aplicar símbolos fonéticos" then QaErrorLog "#i94534# - Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "加上拼音或注音符号" then QaErrorLog "#i94534# - Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "AutoCorrect"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "AutoCorrect" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                Case 34: if UndoStringFromUndoList <> "AutoCorrección" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "自动更正" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "AutoFormat"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "AutoFormat" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                Case 34: if UndoStringFromUndoList <> "Formateado automático" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "自动格式" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
-                 Case "FreeForm"
+                                Case "FreeForm"
 				    Select Case iSprache
-                        Case 01: if UndoStringFromUndoList <> "Insert Polyline with 3 corners" then 
-                                        elseif UndoStringFromUndoList = "Insert Polyline with %2 corners" then 
-                                            QaErrorlog "#i# - Bug with "
-                                        else
-                                            Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
-                                        end if
-						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
-					end select
+                                        Case 01: if UndoStringFromUndoList <> "Insert Polyline with 3 corners" then
+                                                     if UndoStringFromUndoList = "Insert Polyline with %2 corners" then
+                                                         QaErrorlog "#i94530# - Bug with Undo-History for Polygon-Line-tool. " + UndoStringFromUndoList
+                                                     else
+                                                         Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                     end if
+                                                 end if
+                                        Case 34: if UndoStringFromUndoList <> "Insertar Polilínea con 3 puntos" then
+                                                     if UndoStringFromUndoList = "Insertar Polilínea con %2 puntos" then
+                                                         QaErrorlog "#i94530# - Bug with Undo-History for Polygon-Line-tool. " + UndoStringFromUndoList
+                                                     else
+                                                         Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                     end if
+                                                 end if
+                                        Case 86: if UndoStringFromUndoList <> "插入 有 3 个角的折线" then
+                                                     if UndoStringFromUndoList = "插入 有 %2 个角的折线" then
+                                                         QaErrorlog "#i94530# - Bug with Undo-History for Polygon-Line-tool. " + UndoStringFromUndoList
+                                                     else
+                                                         Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                     end if
+                                                 end if
+				        Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
+			            end select
 
 				Case "DrawGroup"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Group draw objects" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                                Case 34: if UndoStringFromUndoList <> "Agrupar objetos de dibujo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "组合绘图对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DrawUnGroup"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Ungroup drawing objects" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Ungroup drawing objects" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Resolver objeto de grupo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "取消组合绘图对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "RenameGroup"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Rename 2 Rectangles" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Rename 2 Rectangles" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "组合绘图对象" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "DeleteGroup"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Delete 2 Rectangles" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar 2 Rectángulos" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 2 矩形" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "Autocheck/Spellcheck"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Replace: 'Testp' -> 'teste'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Replace: 'Testp' -> 'Test'" then QaErrorLog "#i94489# - Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList = "Sobrescribir: $1" then
+						         elseif InStr(UndoStringFromUndoList, "'Testp'") then 
+							     QaErrorLog "#i94489# - Wrong text in Undo-List: " & UndoStringFromUndoList
+							 end if
+						Case 86: if UndoStringFromUndoList = "覆盖: $1" then
+						             QaErrorLog "#i94489# - Wrong text in Undo-List: " & UndoStringFromUndoList
+						         elseif InStr(UndoStringFromUndoList, "'Testp'") then 
+							     QaErrorlog "#i94489# - Bug fixed: " & UndoStringFromUndoList
+							 end if
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ControlInsert"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Insert Control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Insertar Campo de control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "插入 控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
-				Case "ControlResize"
+				Case "ControlMove"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Resize Control" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Move Control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Desplazar Campo de control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "移动 控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
-				Case "ControlMove"
+				Case "ControlResize"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Move Control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Resize Control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Modificar el tamaño de Campo de control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "更改大小 控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ControlReplace"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Replace Control" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Replace Control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Reemplazar campo de control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "替换控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
-
 				Case "ControlChange"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Set property 'Name'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Establecer propiedad 'Name'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "设置属性 'Name'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "ControlDelete"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Delete control" then QAErrorlog "#i42852#Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Delete Control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "Eliminar Campo de control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "删除 控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
 				Case "Header/Footer"
 					Select Case iSprache
 						Case 01: if UndoStringFromUndoList <> "Header/footer changed" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 34: if UndoStringFromUndoList <> "" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 86: if UndoStringFromUndoList <> "" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
-
 				Case else
 					Warnlog "Wrong string for this function!"
 
-
 			end select
 
+        case 11:  'Delete ' ###'
+            Select Case iSprache
+				Case 01: if UndoStringFromUndoList <> "Delete ' ###'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+                                Case 34: if UndoStringFromUndoList <> "Eliminar 'g'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				Case 86: if UndoStringFromUndoList <> "插入自动图文集" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+				Case else: QAErrorlog "Please adapt tests for current language! (" & CurrentUndoString(0) & ")"
+			end select
 
 		case else:
 			QAErrorlog "Wrong type!"