vitomation01: Local merge with CWS automationdev300m76cat0

23 files changed, 428 insertions, 79 deletions

diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index 7a73842c62eb..b8e3ccc2d896 100755
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
@@ -205,7 +205,11 @@ testcase tFF_Navigator
     elseif iSprache = 49 then
 	    if FilterNavigator.getSelText <> "WIE '*value*'" then
             warnlog "The text is not right in the filter navigator. It have to be WIE '*value*' but it is " + FilterNavigator.getSelText
-        endif    
+        endif
+    elseif iSprache = 50 then
+       if FilterNavigator.getSelText <> "LIKE '*value*'" then
+             warnlog "The text is not right in the filter navigator. It have to be LIKE '*value*' but it is " + FilterNavigator.getSelText
+       endif
     elseif iSprache = 81 then
     
     elseif iSprache = 82 then
diff --git a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
index 98faef122a4c..0cab687d2f50 100755
--- a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
+++ b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
@@ -52,6 +52,12 @@ testcase tLanguageTest_1
         sKeyTypeTChinese   = "Numerisch"
         sKeyTypeJapanese   = "Numerisch"
         sKeyTypeKoren      = "Numerisch"
+    case 50   :' Slovenian
+        sKeyTypeEnglishUSA = "Alfanumerično"
+        sKeyTypeSChinese   = "Nabor znakov"
+        sKeyTypeTChinese   = "Numerično"
+        sKeyTypeJapanese   = "Nabor znakov"
+        sKeyTypeKoren      = "Nabor znakov"
     case 55   :' Brazilian
         sKeyTypeEnglishUSA = "Alfanumérico"
         sKeyTypeSChinese   = "Conjunto de caracteres"
@@ -273,6 +279,12 @@ testcase tLanguageTest_2
         sKeyTypeTChinese   = "Numerisch"
         sKeyTypeJapanese   = "Numerisch"
         sKeyTypeKoren      = "Numerisch"
+    case 50   :' Slovenian
+        sKeyTypeEnglishUSA = "Alfanumerično"
+        sKeyTypeSChinese   = "Nabor znakov"
+        sKeyTypeTChinese   = "Numerično"
+        sKeyTypeJapanese   = "Nabor znakov"
+        sKeyTypeKoren      = "Nabor znakov"
     case 55   :' Brazilian
         sKeyTypeEnglishUSA = "numérico"
         sKeyTypeSChinese   = "numérico"
@@ -494,6 +506,8 @@ testcase tStrokeSort
         sKeyTypeSChinese      =  "Stroke"
     case 49   :  ' German
         sKeyTypeSChinese      =  "Stroke"
+    case 50   :  ' Slovenian
+        sKeyTypeSChinese      =  "Poteza"
     case 55   :  ' Brazilian
         sKeyTypeSChinese      =  "Traço"
     case 81   :  ' Japanese
@@ -582,6 +596,8 @@ testcase tPinyinSort
         sKeyTypeSChinese      =  "Pinyin"
     case 49   :  ' German
         sKeyTypeSChinese      =  "Pinyin"
+    case 50   :  ' Slovenian
+        sKeyTypeSChinese      =  "Pinjin"
     case 55   :  ' Brazilian
         sKeyTypeSChinese      =  "Pinyin"
     case 81   :  ' Japanese
diff --git a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
index 39c42fe75b8e..5b03be6151cb 100755
--- a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
+++ b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
@@ -204,6 +204,7 @@ testcase tRubyDialog_4
     case 39   :  sCharacterStyle = "Testo Ruby"
     case 46   :  sCharacterStyle = "Rubytext"
     case 49   :  sCharacterStyle = "Rubys"
+    case 50   :  sCharacterStyle = "Rubys"
     case 55   :  sCharacterStyle = "Rubys"
     case 81   :  sCharacterStyle = "ふりがな"
     case 82   :  sCharacterStyle = "윗주 달기" ' not sure TBO
@@ -251,6 +252,7 @@ testcase tRubyDialog_5
     case 39   :  sCharacterStyle = "Testo Ruby"
     case 46   :  sCharacterStyle = "Rubytext"
     case 49   :  sCharacterStyle = "Rubys"
+    case 50   :  sCharacterStyle = "Rubys"
     case 55   :  sCharacterStyle = "Rubys"
     case 81   :  sCharacterStyle = "ふりがな"
     case 82   :  sCharacterStyle = "윗주 달기" ' not sure TBO was "덧말"
diff --git a/testautomation/framework/optional/includes/configuration.inc b/testautomation/framework/optional/includes/configuration.inc
index 68c0aaf79082..fba0a6fe6bae 100755
--- a/testautomation/framework/optional/includes/configuration.inc
+++ b/testautomation/framework/optional/includes/configuration.inc
@@ -253,8 +253,8 @@ testcase tToolsOptionsAPIConfiguration
         case 07   : iJump =  0      ' Russian
         case 30   : iJump =  0      ' Greek
         case 31   : iJump =  0      ' Netherlands
-        case 33   : iJump = 0      ' French
-        case 34   : iJump = 0      ' Spanish
+        case 33   : iJump = 0       ' French
+        case 34   : iJump = 0       ' Spanish
         case 35   : iJump =  0      ' Finnish
         case 36   : iJump =  0      ' Hungaria
         case 37   : iJump =  0      ' Catalan
@@ -263,20 +263,21 @@ testcase tToolsOptionsAPIConfiguration
         case 43   : iJump =  0      ' Slowak
         case 44   : iJump =  0      ' English (GB)
         case 45   : iJump =  0      ' Danish
-        case 46   : iJump =  0     ' Swedish
+        case 46   : iJump =  0      ' Swedish
         case 47   : iJump =  0      ' Norwegian
         case 48   : iJump =  0      ' Polish
         case 49   : iJump =  1      ' German
         case 51   : iJump =  0      ' Slowak
-        case 55   : iJump =  0     ' Portuguese (Brazil)
-        case 66   : iJump =  0     ' Thai
+        case 50   : iJump =  0      ' Slovenian
+        case 55   : iJump =  0      ' Portuguese (Brazil)
+        case 66   : iJump =  0      ' Thai
         case 81   : iJump =  0      ' Japanese ' disabled, because locale dependant!
         case 82   : iJump =  0      ' Korean   ' disabled, because locale dependant!
         case 86   : iJump =  0      ' Chinese (simplified)  ' disabled, because locale dependant!
         case 88   : iJump =  0      ' Chinese (traditional) ' disabled, because locale dependant!
         case 90   : iJump =  0      ' Turkish
         case 91   : iJump =  0      ' Hindi
-        case 96   : iJump =  0     ' Arab
+        case 96   : iJump =  0      ' Arab
         case 97   : iJump =  0      ' Hebrew
         case else : qaErrorlog "The work-dir can't changed to the internal office-work-dir! Please insert the language in this list!"
             iJump =  0
diff --git a/testautomation/framework/tools/includes/CJK_tools.inc b/testautomation/framework/tools/includes/CJK_tools.inc
index bea675f69bc3..e905b55bbebc 100755
--- a/testautomation/framework/tools/includes/CJK_tools.inc
+++ b/testautomation/framework/tools/includes/CJK_tools.inc
@@ -211,6 +211,23 @@ function fGetCountryName( CountryID as Integer ) as String
             QAErrorLog "Now, the test does not support for the language " +iSprache
             fGetCountryName = ""
         end select
+    case 50   :        ' Slovenian
+       select case CountryID
+       case 1:  fGetCountryName = "angleški (ZDA)"
+       case 33: fGetCountryName = "francoski (Francija)"
+       case 34: fGetCountryName = "španski (Španija)"
+       case 39: fGetCountryName = "italijanski (Italija)"
+       case 46: fGetCountryName = "švedski (Švedska)"
+       case 49: fGetCountryName = "nemški (Nemčija)"
+       case 55: fGetCountryName = "portugalski (Brazilija)"
+       case 81: fGetCountryName = "japonski"
+       case 82: fGetCountryName = "korejski (RK)"
+       case 86: fGetCountryName = "kitajski (poenostavljeni)"
+       case 88: fGetCountryName = "kitajski (tradicionalni)"
+       case else :
+           QAErrorLog "Now, the test does not support for the language " +iSprache
+           fGetCountryName = ""
+       end select
     case 55   :        ' Portuguese
         select case CountryID
         case 1:  fGetCountryName = "Inglês (EUA)"
diff --git a/testautomation/framework/tools/input/i18ndata.txt b/testautomation/framework/tools/input/i18ndata.txt
index 5e10d47c33c9..f8b9f88410a9 100755
--- a/testautomation/framework/tools/input/i18ndata.txt
+++ b/testautomation/framework/tools/input/i18ndata.txt
@@ -15,6 +15,7 @@
 46=swedish
 48=polish
 49=german
+50=slovenian
 55=portuguese brazilian
 81=japanese
 82=korean
@@ -36,6 +37,7 @@
 46=sv
 48=pl
 49=de
+50=sl
 55=pt-BR
 81=ja
 82=ko
diff --git a/testautomation/global/input/officeinfo.txt b/testautomation/global/input/officeinfo.txt
index 51528f3241a6..6896fc5b16f0 100755
--- a/testautomation/global/input/officeinfo.txt
+++ b/testautomation/global/input/officeinfo.txt
@@ -1,6 +1,5 @@
 [Current program versions]
-StarOffice=9
-StarSuite=9
 OpenOffice.org=3.3
 BrOffice.org=3.3
+Oracle Open Office=3.2
 
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 46dccba381c0..7be9633bb395 100755
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -115,19 +115,21 @@ sub GetIniInformation
     end if
     '--------
 
-    call GetTheInstallationType            ' gNetzInst and gNetzOfficePath will be set if StarOffice is a Network-Installation
-    gOfficeBasisPath = getOfficeBasisPath()
-    gOOoStartupTimeOut = fgetOOoStartupTimeOut()
-    gOOoShutdownTimeOut = fgetOOoShutdownTimeOut()
-    call sCheckValgrindStatus()
-    gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current")
-    sTemp = ConvertPath (gTestToolPath + gPrivateEnvironmentLocation + "inc/privateenvironment.inc")
-    if fileExists(sTemp) then
-        use sTemp
-        call getUseFilesPrivateEnvironment
-    else
-        gPrivateEnvironmentLocation = ""
-    end if
+   call GetTheInstallationType            ' gNetzInst and gNetzOfficePath will be set if StarOffice is a Network-Installation
+   gOfficeBasisPath = getOfficeBasisPath()
+   gOOoStartupTimeOut = fgetOOoStartupTimeOut()
+   gOOoShutdownTimeOut = fgetOOoShutdownTimeOut()
+   call sCheckValgrindStatus()
+    ' set a global path for custom scripts, like basepath, but outside of current environment
+   gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current")
+    if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then
+        if NOT fileExists(gPrivateEnvironmentLocation) then
+            qaErrorLog "[PrivateEnvironment] defined in: '"+gTesttoolIni+"', but the path '"+gPrivateEnvironmentLocation+"'does not exist!"
+        else
+            gPrivateEnvironmentLocation = ""
+        end if
+       gPrivateEnvironmentLocation = ""
+   end if
 end sub
 
 '-------------------------------------------------------------------------
@@ -287,6 +289,7 @@ sub GetLanguageInformation
 
     gISOLang = sLanOutIni
 
+<<<<<<< local
     select case lcase ( sLanOutIni )
     case "en_us", "en-us", "en" : iSprache = 01        ' English (USA)
     case "pt_pt", "pt-pt", "pt" : iSprache = 03        ' Portuguese
@@ -334,6 +337,55 @@ sub GetLanguageInformation
         warnlog "- sLanOutIni = " & sLanOutIni & " (fallback mode; unknown language)"
         warnlog "- iSprache has been set 01!"
     end select
+=======
+     select case lcase ( sLanOutIni )
+         case "en_us", "en-us", "en" : iSprache = 01        ' English (USA)
+         case "pt_pt", "pt-pt", "pt" : iSprache = 03        ' Portuguese
+         case "ru_ru", "ru-ru", "ru" : iSprache = 07        ' Russian
+         case "el_gr", "el-gr", "el" : iSprache = 30        ' Greek
+         case "nl_nl", "nl-nl", "nl" : iSprache = 31        ' Dutch
+         case "fr_fr", "fr-fr", "fr" : iSprache = 33        ' French
+         case "es_es", "es-es", "es" : iSprache = 34        ' Spanish
+         case "fi_fi", "fi-fi", "fi" : iSprache = 35        ' Finnish
+         case "hu_hu", "hu-hu", "hu" : iSprache = 36        ' Hungaria
+         case "ca_ad", "ca-ad", "ca" : iSprache = 37        ' Catalan
+         case "it_it", "it-it", "it" : iSprache = 39        ' Italian
+         case "cs_cz", "cs-cz", "cs" : iSprache = 42        ' Czech
+         case "sk_sk", "sk-sk", "sk" : iSprache = 43        ' Slowak
+         case "en_gb", "en-gb"       : iSprache = 44        ' English (GB)
+         case "da_dk", "da-dk", "da" : iSprache = 45        ' Danish
+         case "sv_se", "sv-se", "sv" : iSprache = 46        ' Swedish
+         case "no_no", "no-no", "no" : iSprache = 47        ' Norwegian
+         case "pl_pl", "pl-pl", "pl" : iSprache = 48        ' Polish
+         case "de_de", "de-de", "de" : iSprache = 49        ' German
+         case "sl_si", "sl-si", "sl" : iSprache = 50        ' Slovenian
+		 case "sr_rs", "sr-rs", "sr" : iSprache = 51        ' Serbian (Cyrillic)
+         case "sh_rs", "sh-rs", "sh" : iSprache = 52        ' Serbian (Latin)		 
+         case "pt_br", "pt-br", "br" : iSprache = 55        ' Portuguese (Brazil)
+         case "th_th", "th-th", "th" : iSprache = 66        ' Thai
+         case "ja_jp", "ja-jp", "ja" : iSprache = 81        ' Japanese
+         case "ko_kr", "ko-kr", "ko" : iSprache = 82        ' Korean
+         case "vi_vi", "vi-vi", "vi" : iSprache = 84        ' Vietnamese
+         case "zh_cn", "zh-cn", "zh" : iSprache = 86        ' Chinese (simplified)
+         case "zh_tw", "zh-tw"       : iSprache = 88        ' Chinese (traditional)
+         case "tr_tr", "tr-tr", "tr" : iSprache = 90        ' Turkish
+         case "hi_in", "hi-in", "hi" : iSprache = 91        ' Hindi
+         case "ar_ar", "ar-ar", "ar" : iSprache = 96        ' Arabic
+         case "he_he", "he-he", "he" : iSprache = 97        ' Hebrew
+         case "zz_zz", "zz-zz", "zz" : iSprache = 01        ' unknown
+                                       warnlog "iniinfo.inc::GetLanguageInformation()"
+                                       warnlog "- sLanOutIni = " & sLanOutIni & " (unknown language)"
+                                       warnlog "- iSprache has been set 01!"
+         case ""                     : iSprache = 01        ' empty
+                                       warnlog "iniinfo.inc::GetLanguageInformation()"
+                                       warnlog "- empty sLanOutIni = " & sLanOutIni
+                                       warnlog "- iSprache has been set 01!"
+         case else                   : iSprache = 01
+                                       warnlog "iniinfo.inc::GetLanguageInformation()"
+                                       warnlog "- sLanOutIni = " & sLanOutIni & " (fallback mode; unknown language)"
+                                       warnlog "- iSprache has been set 01!"
+     end select
+>>>>>>> other
 
     if iSprache = 81 OR iSprache = 82 OR iSprache = 86 OR iSprache = 88 then
         bAsianLan = TRUE
@@ -353,6 +405,7 @@ end sub
 function ConvertLanguage ( Sprache as String ) as Integer
     '/// Sets international language code for the whole language name.
 
+<<<<<<< local
     select case lCase ( Sprache )
     case "deutsch", "german"                              : ConvertLanguage = 49
     case "englisch", "english"                            : ConvertLanguage = 01
@@ -383,11 +436,44 @@ function ConvertLanguage ( Sprache as String ) as Integer
     case "catalan", "katalanisch"                         : ConvertLanguage = 99
     case "slovenian", "slovenisch"                        : ConvertLanguage = 386
     end select
+=======
+   select case lCase ( Sprache )
+      case "deutsch", "german"                              : ConvertLanguage = 49
+      case "englisch", "english"                            : ConvertLanguage = 01
+      case "portugisisch", "portugiesisch", "portuguese"    : ConvertLanguage = 03
+      case "russisch", "russian"                            : ConvertLanguage = 07
+      case "czech", "tschechisch"                           : ConvertLanguage = 29
+      case "griechisch", "greek"                            : ConvertLanguage = 30
+      case "niederlaendisch", "hollaendisch", "netherlands" : ConvertLanguage = 31
+      case "franzoesisch", "french"                         : ConvertLanguage = 33
+      case "spanisch", "spanish"                            : ConvertLanguage = 34
+      case "finisch", "finnish"                             : ConvertLanguage = 35
+      case "hungaria", "ungarisch"                          : ConvertLanguage = 36
+      case "italienisch", "italian"                         : ConvertLanguage = 39
+	  case "slowak", "slovakisch"                           : ConvertLanguage = 43	  
+      case "daenisch", "danish"                             : ConvertLanguage = 45
+      case "schwedisch", "swedish"                          : ConvertLanguage = 46
+      case "norwegian", "norwegisch"                        : ConvertLanguage = 47
+      case "polnisch", "polish"                             : ConvertLanguage = 48
+      case "slovenian", "slovenisch"                        : ConvertLanguage = 50
+	  case "serbisch kyrillisch", "serbian cyrillic"        : ConvertLanguage = 51
+	  case "serbisch latein", "serbian latin"               : ConvertLanguage = 52	  
+      case "japanisch", "japanese"                          : ConvertLanguage = 81
+      case "koreanisch", "korean"                           : ConvertLanguage = 82
+      case "vietnamesisch", "vietnamese"                    : ConvertLanguage = 84
+      case "chinesisch", "chinese"                          : ConvertLanguage = 86
+      case "chinesisch trad.", "chinese trad."              : ConvertLanguage = 88
+      case "tuerkisch", "turkish"                           : ConvertLanguage = 90
+      case "arabisch", "arab"                               : ConvertLanguage = 96
+      case "catalan", "katalanisch"                         : ConvertLanguage = 99
+   end select
+>>>>>>> other
 end function
 
 '-------------------------------------------------------------------------
 
 function GetLanguageText ( iLan ) as String
+<<<<<<< local
     '/// Sets the language name for the international language-code.
     select case iLan
     case 01   : GetLanguageText = "English (USA)"
@@ -426,11 +512,52 @@ function GetLanguageText ( iLan ) as String
     case 386  : GetlanguageText = "Slovenian"
     case else : GetLanguageText = "detection failed"
     end select
+=======
+'/// Sets the language name for the international language-code.
+   select case iLan
+      case 01   : GetLanguageText = "English (USA)"
+      case 03   : GetLanguageText = "Portuguese"
+      case 07   : GetLanguageText = "Russian"
+      case 30   : GetLanguageText = "Greek"
+      case 31   : GetLanguageText = "Dutch"
+      case 33   : GetLanguageText = "French"
+      case 34   : GetLanguageText = "Spanish"
+      case 35   : GetLanguageText = "Finnish"
+      case 36   : GetLanguageText = "Hungarian"
+      case 37   : GetLanguageText = "Catalan"
+      case 39   : GetLanguageText = "Italian"
+      case 42   : GetLanguageText = "Czech"
+      case 43   : GetLanguageText = "Slowak"
+      case 44   : GetLanguageText = "English (GB)"
+      case 45   : GetLanguageText = "Danish"
+      case 46   : GetLanguageText = "Swedish"
+      case 47   : GetLanguageText = "Norwegian"
+      case 48   : GetLanguageText = "Polnish"
+      case 49   : GetLanguageText = "German"
+      case 50   : GetlanguageText = "Slovenian"
+      case 51   : GetlanguageText = "Serbian (Cyrillic)"
+      case 52   : GetlanguageText = "Serbian (Latin)"	  
+      case 55   : GetLanguageText = "Portuguese (Brazil)"
+      case 66   : GetLanguageText = "Thai"
+      case 81   : GetLanguageText = "Japanese"
+      case 82   : GetLanguageText = "Korean"
+      case 84   : GetLanguageText = "Vietnamese"
+      case 86   : GetLanguageText = "Chinese (simplified)"
+      case 88   : GetLanguageText = "Chinese (traditional)"
+      case 90   : GetLanguageText = "Turkish"
+      case 91   : GetLanguageText = "Hindi"
+      case 96   : GetLanguageText = "Arabic"
+      case 97   : GetLanguageText = "Hebrew"
+      case 99   : GetLanguageText = "Unknown"
+      case else : GetLanguageText = "detection failed"
+   end select
+>>>>>>> other
 end function
 
 '-------------------------------------------------------------------------
 
 function ConvertLanguage2 ( sSprache as String, optional bExact ) as Integer
+<<<<<<< local
     '/// Sets the international language code for the international language shortcut.
     '/// <i>optional <b>bExact</i></b>: If language not available, 'shut up' and return '0'
     select case lCase ( sSprache )
@@ -481,6 +608,57 @@ function ConvertLanguage2 ( sSprache as String, optional bExact ) as Integer
             end if
         end if
     end select
+=======
+'/// Sets the international language code for the international language shortcut.
+'/// <i>optional <b>bExact</i></b>: If language not available, 'shut up' and return '0'
+   select case lCase ( sSprache )
+         case "en_us", "en-us", "en" : ConvertLanguage2 = 01        ' English (USA)
+         case "pt_pt", "pt-pt", "pt" : ConvertLanguage2 = 03        ' Portuguese
+         case "ru_ru", "ru-ru", "ru" : ConvertLanguage2 = 07        ' Russian
+         case "el_gr", "el-gr", "el" : ConvertLanguage2 = 30        ' Greek
+         case "nl_nl", "nl-nl", "nl" : ConvertLanguage2 = 31        ' Dutch
+         case "fr_fr", "fr-fr", "fr" : ConvertLanguage2 = 33        ' French
+         case "es_es", "es-es", "es" : ConvertLanguage2 = 34        ' Spanish
+         case "fi_fi", "fi-fi", "fi" : ConvertLanguage2 = 35        ' Finnish
+         case "hu_hu", "hu-hu", "hu" : ConvertLanguage2 = 36        ' Hungaria
+         case "ca_ad", "ca-ad", "ca" : ConvertLanguage2 = 37        ' Catalan
+         case "it_it", "it-it", "it" : ConvertLanguage2 = 39        ' Italian
+         case "cs_cz", "cs-cz", "cs" : ConvertLanguage2 = 42        ' Czech
+         case "sk_sk", "sk-sk", "sk" : ConvertLanguage2 = 43        ' Slowak
+         case "en_gb", "en-gb"       : ConvertLanguage2 = 44        ' English (GB)
+         case "da_dk", "da-dk", "da" : ConvertLanguage2 = 45        ' Danish
+         case "sv_se", "sv-se", "sv" : ConvertLanguage2 = 46        ' Swedish
+         case "no_no", "no-no", "no" : ConvertLanguage2 = 47        ' Norwegian
+         case "pl_pl", "pl-pl", "pl" : ConvertLanguage2 = 48        ' Polish
+         case "de_de", "de-de", "de" : ConvertLanguage2 = 49        ' German
+         case "sl_si", "sl-si", "sl" : ConvertLanguage2 = 50        ' Slovenian
+         case "sr_rs", "sr_rs", "sr" : ConvertLanguage2 = 51        ' Serbian (Cyrillic)
+         case "sh_rs", "sh_rs", "sh" : ConvertLanguage2 = 52        ' Serbian (Latin)		 
+         case "pt_br", "pt-br", "br" : ConvertLanguage2 = 55        ' Portuguese (Brazil)
+         case "th_th", "th-th", "th" : ConvertLanguage2 = 66        ' Thai
+         case "ja_jp", "ja-jp", "ja" : ConvertLanguage2 = 81        ' Japanese
+         case "ko_kr", "ko-kr", "ko" : ConvertLanguage2 = 82        ' Korean
+         case "vi_vi", "vi_vi", "vi" : ConvertLanguage2 = 84        ' Vietnamese
+         case "zh_cn", "zh-cn", "zh" : ConvertLanguage2 = 86        ' Chinese (simplified)
+         case "zh_tw", "zh-tw"       : ConvertLanguage2 = 88        ' Chinese (traditional)
+         case "tr_tr", "tr-tr", "tr" : ConvertLanguage2 = 90        ' Turkish
+         case "hi_in", "hi-in", "hi" : ConvertLanguage2 = 91        ' Hindi
+         case "ar_ar", "ar-ar", "ar" : ConvertLanguage2 = 96        ' Arabic
+         case "he_he", "he-he", "he" : ConvertLanguage2 = 97        ' Hebrew
+         case "zz_zz", "zz-zz", "zz" : ConvertLanguage2 = 01        ' unknown
+         case else                   : if isMissing (bExact) then
+                                         printlog "iniinfo.inc::ConvertLanguage2(): Unknown systemlanguage '" & sSprache & "'!"
+                                         printlog "Default will be set to 01!"
+                                         ConvertLanguage2 = 01
+                                        else
+                                         printlog "iniinfo.inc::ConvertLanguage2(): Unknown systemlanguage '" & sSprache & "'!"
+                                         if bExact = TRUE then
+                                           printlog "Default will be set to 00!"
+                                           ConvertLanguage2 = 00
+                                         end if
+                                       end if
+   end select
+>>>>>>> other
 end function
 
 '-------------------------------------------------------------------------
@@ -488,6 +666,7 @@ end function
 function ConvertCodeToLanguage ( sSprache as String ) as Integer
     '/// Converts the old language code to international language code
 
+<<<<<<< local
     select case lCase ( sSprache )
     case "1033" : ConvertCodeToLanguage = 01        ' English (USA)
     case "2070" : ConvertCodeToLanguage = 03        ' Portuguese
@@ -526,6 +705,46 @@ function ConvertCodeToLanguage ( sSprache as String ) as Integer
     case else   : printlog "iniinfo.inc::ConvertCodeToLanguage(): Num. Code could not be detect or is unknown and will be set to 01 (English (USA))!"
         ConvertCodeToLanguage = 01
     end select
+=======
+   select case lCase ( sSprache )
+         case "1033" : ConvertCodeToLanguage = 01        ' English (USA)
+         case "2070" : ConvertCodeToLanguage = 03        ' Portuguese
+         case "1049" : ConvertCodeToLanguage = 07        ' Russian
+         case "1032" : ConvertCodeToLanguage = 30        ' Greek
+         case "1043" : ConvertCodeToLanguage = 31        ' Dutch
+         case "1036" : ConvertCodeToLanguage = 33        ' French
+         case "3082" : ConvertCodeToLanguage = 34        ' Spanish
+         case "1034" : ConvertCodeToLanguage = 34        ' Spanish
+         case "1035" : ConvertCodeToLanguage = 35        ' Finnish
+         case "1038" : ConvertCodeToLanguage = 36        ' Hungaria
+         case "2099" : ConvertCodeToLanguage = 37        ' Catalan
+         case "1040" : ConvertCodeToLanguage = 39        ' Italian
+         case "1029" : ConvertCodeToLanguage = 42        ' Czech
+         case "1051" : ConvertCodeToLanguage = 43        ' Slowak
+         case "2057" : ConvertCodeToLanguage = 44        ' English (GB)
+         case "1030" : ConvertCodeToLanguage = 45        ' Danish
+         case "1053" : ConvertCodeToLanguage = 46        ' Swedish
+         case "2047" : ConvertCodeToLanguage = 47        ' Norwegian
+         case "1045" : ConvertCodeToLanguage = 48        ' Polish
+         case "1031" : ConvertCodeToLanguage = 49        ' German
+         case "1060" : ConvertCodeToLanguage = 50        ' Slovenian
+         case "    " : ConvertCodeToLanguage = 55        ' Portuguese (Brazil)
+         case "3098" : ConvertCodeToLanguage = 51        ' Serbian (Cyriliic)
+         case "2074" : ConvertCodeToLanguage = 52        ' Serbian (Latin)		 
+         case "    " : ConvertCodeToLanguage = 66        ' Thai
+         case "1041" : ConvertCodeToLanguage = 81        ' Japanese
+         case "1042" : ConvertCodeToLanguage = 82        ' Korean
+         case "1066" : ConvertCodeToLanguage = 84        ' Vietnamese
+         case "2052" : ConvertCodeToLanguage = 86        ' Chinese (simplified)
+         case "1028" : ConvertCodeToLanguage = 88        ' Chinese (traditional)
+         case "1055" : ConvertCodeToLanguage = 90        ' Turkish
+'         case "    " : ConvertCodeToLanguage = 91        ' Hindi
+         case "1025" : ConvertCodeToLanguage = 96        ' Arabic
+'         case "    " : ConvertCodeToLanguage = 97        ' Hebrew
+         case else   : printlog "iniinfo.inc::ConvertCodeToLanguage(): Num. Code could not be detect or is unknown and will be set to 01 (English (USA))!"
+                       ConvertCodeToLanguage = 01
+   end select
+>>>>>>> other
 end function
 
 '-------------------------------------------------------------------------
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index fa6975e525d3..fafb5f758a85 100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -104,35 +104,6 @@ sub GetUseFiles
         gTestToolPath = gRemotePath
     end if
     
-'/// Load private environment dependant settings
-'/// BaseDirectory is the setting from the TestTool application at Extra->Settings->Profile->Base directory
-'/// This path is available in the global variable: gTestToolPath
-'/// The private environment location directory is taken from the file BaseDirectory+errorlog/privateenvironment.txt
-'/// The default file is taken from cvs: qa/qatesttool/errorlog/privateenvironment.txt
-'/// The default content is: 
-'/// >[PrivateEnvironment]
-'/// >Current=global/private/
-'/// The path is defined relative to BaseDirectory and put into the global variable: gPrivateEnvironmentLocation
-'/// At the resulting path of BaseDirectory + gPrivateEnvironmentLocation + 'inc/' there has to exist the file: privateenvironment.inc
-'/// with at least the sub: getUseFilesPrivateEnvironment which will get executed
-
-    if (gPrivateEnvironmentLocation = "") then
-    sPrivateEnvironmentLocation = ConvertPath (gTestToolPath + "errorlog\privateenvironment.txt")
-    if fileExists(sPrivateEnvironmentLocation) then
-        gPrivateEnvironmentLocation = getIniValue(sPrivateEnvironmentLocation, "PrivateEnvironment", "Current")
-        ' TODO: remove trailing path character
-    else
-        gPrivateEnvironmentLocation = "global/private/"
-    end if
-    sTemp = ConvertPath (gTestToolPath + gPrivateEnvironmentLocation + "inc/privateenvironment.inc")
-    if fileExists(sTemp) then
-        use sTemp
-        call getUseFilesPrivateEnvironment
-    else
-        'qaErrorLog "Private Environment Control File Location specified in '" + sPrivateEnvironmentLocation + "', but the file doesn't exist: '" +sTemp+ "'"
-    end if
-    end if
-    
     ' Check if environment works with this OOo version
 '/// Control the behaviour of the environment via the file qa/qatesttool/global/version.txt:
 '/// [EnvironmentVersion]
diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc
index 49d3a836043a..bf1ba6a74416 100644
--- a/testautomation/global/system/includes/status.inc
+++ b/testautomation/global/system/includes/status.inc
@@ -271,8 +271,7 @@ sub hStatusWriteOutputFirstFile ()
         sPlat = "win"
     end if
 
-   slVersion() = Split(gProductName, " ")                         '(15)
-   sProduct = slVersion(0)
+    sProduct = gProductName                         '(15)
 
     ' major is from start to 'm'
     iPosA = 1
diff --git a/testautomation/global/tools/includes/optional/t_locale_strings1.inc b/testautomation/global/tools/includes/optional/t_locale_strings1.inc
index 12bc913d3bf4..d3e7708dbd30 100644..100755
--- a/testautomation/global/tools/includes/optional/t_locale_strings1.inc
+++ b/testautomation/global/tools/includes/optional/t_locale_strings1.inc
@@ -371,7 +371,33 @@ function fLocaleString (sReturn as string) as string
                        sLocaleNumFormLanEng     = "Englisch (USA)"
                        sLocaleNumFormLanLith    = "Litauisch"
                        sLocaleNumFormLanDutch   = "Niederländisch (Niederlande)"
-                       
+
+        case 50     : sLocaleTableHeading      = "Glava tabele" ' Slovenian
+                      sLocaleTableContents     = "Vsebina tabele"
+                      sLocaleNumber            = "Število"
+                      sLocaleText              = "Besedilo"
+                      sLocaleCurrency          = "Valuta"
+                      sLocaleDate              = "Datum"
+                      sLocaleTime              = "Čas"
+                      sLocalePercent           = "Odstotek"
+                      sLocaleScientific        = "Znanstveno"
+                      sLocaleFraction          = "Ulomek"
+                      sLocaleBoolean           = "Dvojiška vrednost"
+                      sLocaleTable             = "Tabela"
+                      sLocaleCurrencyValue     = "10,00 €"
+                      sLocaleDateValue         = "31.03.06"
+                      sLocaleDateOutput	    = "31.03.06"
+                      sLocaleTimeInput         = "15:42"
+                      sLocaleTimeValue         = "15:42:00"
+                      slocalePercentValue	    = "14,00%"
+                      sLocaleScientificValue   = "1,00E+008"
+                      sLocaleBooleanValue      = "TRUE"
+                      sLocaleLocaleSettings    = "angleški (ZDA)"
+                      sLocaleScriptType        = "Zahodni"
+                      sLocaleNumFormLanEng     = "angleški (ZDA)"
+                      sLocaleNumFormLanLith    = "litovski"
+                      sLocaleNumFormLanDutch   = "nizozemski (Nizozemska)"
+
           case 55   :  sLocaleTableHeading      = "Título da tabela"      ' Brazil (Portuguese)
                        sLocaleTableContents     = "Conteudo da table"
                        sLocaleNumber            = "Número"
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
index 674ddd7e65e2..0bd7ae50525f 100644..100755
--- a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
@@ -93,6 +93,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "3D-Settings"
               case 46   : fGetToolbarName   = "3D-Settings"
               case 49   : fGetToolbarName   = "3D-Einstellungen"
+              case 50   : fGetToolbarName   = "Nastavitve 3D"
               case 55   : fGetToolbarName   = "3D-Settings"
               case 81   : fGetToolbarName   = "3D-Settings"
               case 82   : fGetToolbarName   = "3D-Settings"
@@ -110,6 +111,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Align"
               case 46   : fGetToolbarName   = "Align"
               case 49   : fGetToolbarName   = "Ausrichten"
+              case 50   : fGetToolbarName   = "Poravnava"
               case 55   : fGetToolbarName   = "Align"
               case 81   : fGetToolbarName   = "Align"
               case 82   : fGetToolbarName   = "Align"
@@ -127,6 +129,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Basic Shapes"
               case 46   : fGetToolbarName   = "Basic Shapes"
               case 49   : fGetToolbarName   = "Standardformen"
+              case 50   : fGetToolbarName   = "Osnovni liki"
               case 55   : fGetToolbarName   = "Basic Shapes"
               case 81   : fGetToolbarName   = "Basic Shapes"
               case 82   : fGetToolbarName   = "Basic Shapes"
@@ -144,6 +147,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Block Arrows"
               case 46   : fGetToolbarName   = "Block Arrows"
               case 49   : fGetToolbarName   = "Blockpfeile"
+              case 50   : fGetToolbarName   = "Votle puščice"
               case 55   : fGetToolbarName   = "Block Arrows"
               case 81   : fGetToolbarName   = "Block Arrows"
               case 82   : fGetToolbarName   = "Block Arrows"
@@ -161,6 +165,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Bullets and Numbering"
               case 46   : fGetToolbarName   = "Bullets and Numbering"
               case 49   : fGetToolbarName   = "Nummerierung und Aufzählungszeichen"
+              case 50   : fGetToolbarName   = "Oznake in oštevilčevanje"
               case 55   : fGetToolbarName   = "Bullets and Numbering"
               case 81   : fGetToolbarName   = "Bullets and Numbering"
               case 82   : fGetToolbarName   = "Bullets and Numbering"
@@ -178,6 +183,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Database Form Design"
               case 46   : fGetToolbarName   = "Database Form Design"
               case 49   : fGetToolbarName   = "Datenbank Formularentwurf"
+              case 50   : fGetToolbarName   = "Oblikovanje obrazca zbirke podatkov"
               case 55   : fGetToolbarName   = "Database Form Design"
               case 81   : fGetToolbarName   = "Database Form Design"
               case 82   : fGetToolbarName   = "Database Form Design"
@@ -195,6 +201,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Drawing"
               case 46   : fGetToolbarName   = "Drawing"
               case 49   : fGetToolbarName   = "Zeichnen"
+              case 50   : fGetToolbarName   = "Risba"
               case 55   : fGetToolbarName   = "Drawing"
               case 81   : fGetToolbarName   = "Drawing"
               case 82   : fGetToolbarName   = "Drawing"
@@ -212,6 +219,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Drawing Object Properties"
               case 46   : fGetToolbarName   = "Drawing Object Properties"
               case 49   : fGetToolbarName   = "Zeichnungsobjekt-Eigenschaften"
+              case 50   : fGetToolbarName   = "Lastnosti risanega predmeta"
               case 55   : fGetToolbarName   = "Drawing Object Properties"
               case 81   : fGetToolbarName   = "Drawing Object Properties"
               case 82   : fGetToolbarName   = "Drawing Object Properties"
@@ -229,6 +237,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Form Design"
               case 46   : fGetToolbarName   = "Form Design"
               case 49   : fGetToolbarName   = "Formular Entwurf"
+              case 50   : fGetToolbarName   = "Oblikovanje obrazca"
               case 55   : fGetToolbarName   = "Form Design"
               case 81   : fGetToolbarName   = "Form Design"
               case 82   : fGetToolbarName   = "Form Design"
@@ -246,6 +255,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Formatting"
               case 46   : fGetToolbarName   = "Formatting"
               case 49   : fGetToolbarName   = "Format"
+              case 50   : fGetToolbarName   = "Oblikovanje"
               case 55   : fGetToolbarName   = "Formatting"
               case 81   : fGetToolbarName   = "Formatting"
               case 82   : fGetToolbarName   = "Formatting"
@@ -263,6 +273,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Frame"
               case 46   : fGetToolbarName   = "Frame"
               case 49   : fGetToolbarName   = "Rahmen"
+              case 50   : fGetToolbarName   = "Okvir"
               case 55   : fGetToolbarName   = "Frame"
               case 81   : fGetToolbarName   = "Frame"
               case 82   : fGetToolbarName   = "Frame"
@@ -280,6 +291,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Insert"
               case 46   : fGetToolbarName   = "Insert"
               case 49   : fGetToolbarName   = "Einfügen"
+              case 50   : fGetToolbarName   = "Vstavi"
               case 55   : fGetToolbarName   = "Insert"
               case 81   : fGetToolbarName   = "Insert"
               case 82   : fGetToolbarName   = "Insert"
@@ -297,6 +309,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "OLE-Object"
               case 46   : fGetToolbarName   = "OLE-Object"
               case 49   : fGetToolbarName   = "OLE Objekt"
+              case 50   : fGetToolbarName   = "Predmet OLE"
               case 55   : fGetToolbarName   = "OLE-Object"
               case 81   : fGetToolbarName   = "OLE-Object"
               case 82   : fGetToolbarName   = "OLE-Object"
@@ -314,6 +327,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Standard"
               case 46   : fGetToolbarName   = "Standard"
               case 49   : fGetToolbarName   = "Standard"
+              case 50   : fGetToolbarName   = "Standardno"
               case 55   : fGetToolbarName   = "Standard"
               case 81   : fGetToolbarName   = "Standard"
               case 82   : fGetToolbarName   = "Standard"
@@ -331,6 +345,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Table"
               case 46   : fGetToolbarName   = "Table"
               case 49   : fGetToolbarName   = "Tabelle"
+              case 50   : fGetToolbarName   = "Tabela"
               case 55   : fGetToolbarName   = "Table"
               case 81   : fGetToolbarName   = "Table"
               case 82   : fGetToolbarName   = "Table"
@@ -348,6 +363,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "Text Object"
               case 46   : fGetToolbarName   = "Text Object"
               case 49   : fGetToolbarName   = "Textobjekt"
+              case 50   : fGetToolbarName   = "Besedilni predmet"
               case 55   : fGetToolbarName   = "Text Object"
               case 81   : fGetToolbarName   = "Text Object"
               case 82   : fGetToolbarName   = "Text Object"
@@ -365,6 +381,7 @@ function fGetToolbarName(sToolbar) as String
               case 39   : fGetToolbarName   = "XML Form Design"
               case 46   : fGetToolbarName   = "XML Form Design"
               case 49   : fGetToolbarName   = "XML Formularentwurf"
+              case 50   : fGetToolbarName   = "Oblikovanje obrazca XML"
               case 55   : fGetToolbarName   = "XML Form Design"
               case 81   : fGetToolbarName   = "XML Form Design"
               case 82   : fGetToolbarName   = "XML Form Design"
diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc
index 1e622efda3d8..160de6dedff4 100644..100755
--- a/testautomation/global/tools/includes/required/t_doc2.inc
+++ b/testautomation/global/tools/includes/required/t_doc2.inc
@@ -119,6 +119,7 @@ function sMakeReadOnlyDocumentEditable() as boolean
     ' no action was required (that is: Document was not read-only)
 
     dim iTry as integer
+    dim iWait as integer
     dim rc as integer
     const CFN = "sMakeReadOnlyDocumentEditable::"
     
@@ -141,8 +142,27 @@ function sMakeReadOnlyDocumentEditable() as boolean
         wait( 1000 )
     endif
     ' ==========  Workaround end  ==========
-    
     Kontext "Standardbar"
+    iWait = 0
+    Do
+        if ( Bearbeiten.IsEnabled() ) then
+            try
+                if Bearbeiten.getState( 2 ) = 0 then
+                    exit do
+                endif
+            catch
+                if ( VERBOSE ) then printlog "Attempt " & iWait & " to make document readable failed"
+                iWait = iWait + 1
+                wait ( 1000 )
+            endcatch
+        else
+            if ( VERBOSE ) then printlog "Attempt " & iWait & " to make document readable failed"
+            iWait = iWait + 1
+            wait ( 1000 )
+        end if
+        if iWait >= 5 then exit do
+    Loop
+
     if ( Bearbeiten.IsEnabled() ) then
         
         if ( Bearbeiten.getState( 2 ) = 0 ) then
diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc
index 04996fcb3ad6..cd174c632a02 100644..100755
--- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc
+++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc
@@ -137,7 +137,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean)
         ExtensionString = "odg"
     end if
 
-    if iSprache = "1" OR iSprache = "33" OR iSprache = "34" OR iSprache = "36" OR iSprache = "39" OR iSprache = "46" OR iSprache = "48" OR iSprache = "49" OR iSprache = "55" then
+    if iSprache = "1" OR iSprache = "33" OR iSprache = "34" OR iSprache = "36" OR iSprache = "39" OR iSprache = "46" OR iSprache = "48" OR iSprache = "49" OR iSprache = "50" OR iSprache = "55" then
         sFileName = (ConvertPath ( gTesttoolPath + "graphics\required\input\rightfont" & iSprache & "." + ExtensionString ))
     elseif bAsianLan = true then
         Printlog "Language-file for Asian language " & iSprache & " is missing. Using standard instead."
@@ -179,6 +179,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean)
         case 46 : Vorn$ = Chr(8217) : Hinten$ = Chr(8217)
         case 48 : Vorn$ = Chr(8216) : Hinten$ = Chr(8217)
         case 49 : Vorn$ = Chr(8218) : Hinten$ = Chr(8216)
+        case 50 : Vorn$ = Chr(8216) : Hinten$ = Chr(8217)
         case 55 : Vorn$ = Chr(8216) : Hinten$ = Chr(8217)
         case 81, 82, 86, 88 : Vorn$ = Chr(8216) : Hinten$ = Chr(8217) ' Asian
         case else : Warnlog "- Nothing prepared for this language, but I run: take the warnlogs an insert the numbers here.: "+iSprache
@@ -202,6 +203,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean)
         case 46 : Vorn$ = Chr(8221) : Hinten$ = Chr(8221)
         case 48 : Vorn$ = Chr(8222) : Hinten$ = Chr(8221)
         case 49 : Vorn$ = Chr(8222) : Hinten$ = Chr(8220)
+        case 50 : Vorn$ = Chr(8220) : Hinten$ = Chr(8221)
         case 55 : Vorn$ = Chr(8220) : Hinten$ = Chr(8221)
         case 81, 82, 86, 88 : Vorn$ = Chr(8220) : Hinten$ = Chr(8221) ' Asian
         case else : Warnlog "- Nothing prepared for this language: "+iSprache
diff --git a/testautomation/graphics/optional/includes/global/g_find_replace.inc b/testautomation/graphics/optional/includes/global/g_find_replace.inc
index 8dbff683eb83..b57b28a2e12a 100644..100755
--- a/testautomation/graphics/optional/includes/global/g_find_replace.inc
+++ b/testautomation/graphics/optional/includes/global/g_find_replace.inc
@@ -69,6 +69,7 @@ testcase tiEditSearchAndReplace
          case 47 :        ' Norwegian
          case 48 : sExpression(1) = "programmu" : sExpression(2) = "programu"    ' Polish
          case 49 : sExpression(1) = "Texxt" : sExpression(2) = "Schrieb"         ' German
+         case 50 : sExpression(1) = "primer" : sExpression(2) = "napakka"        ' Slovenian
          case 55 : sExpression(1) = "esktava" : sExpression(2) = "norte"         ' Portuguese (Brazil)
          case 66 :        ' Thai
 '         case 81 : sExpression(1) = "���" : sExpression(2) = "���"       ' Japanese
diff --git a/testautomation/graphics/optional/includes/global/g_ole.inc b/testautomation/graphics/optional/includes/global/g_ole.inc
index 520aa38af8a2..438f09e1b97d 100644..100755
--- a/testautomation/graphics/optional/includes/global/g_ole.inc
+++ b/testautomation/graphics/optional/includes/global/g_ole.inc
@@ -341,7 +341,7 @@ testcase tiOpenOLECrash
     FileOpen
     sleep 1
     Kontext "OeffnenDlg"
-    printlog " Use file: graphics\\optional\\input\\generic_de.ppt "
+    printlog " Use file: graphics\optional\input\generic_de.ppt "
     oFile = ConvertPath (gTesttoolPath + "graphics\required\input\generic_de.ppt")
     Printlog "file:    '" + oFile + "'"
     Dateiname.SetText (oFile)
diff --git a/testautomation/graphics/optional/includes/global/gallery.inc b/testautomation/graphics/optional/includes/global/gallery.inc
index c1f8e741cd44..8398395c3653 100644..100755
--- a/testautomation/graphics/optional/includes/global/gallery.inc
+++ b/testautomation/graphics/optional/includes/global/gallery.inc
@@ -469,6 +469,7 @@ testcase tGallery_GalleryView_Preview
         case 46     :   jpeg_bkg =  2    : iAnimation =  1   :   iSound = 17
         case 48     :   jpeg_bkg =  2    : iAnimation =  1   :   iSound = 17
         case 49     :   jpeg_bkg = 12   : iAnimation =  1   :   iSound = 16
+        case 50     :   jpeg_bkg = 12   : iAnimation =  1   :   iSound = 16
         case 55     :   jpeg_bkg = 21   : iAnimation =  1   :   iSound = 28
         case 81     :   jpeg_bkg = 21   : iAnimation =  1   :   iSound = 10  'FHA TODO: Find out the right numbers for Asian languages.
         case 82     :   jpeg_bkg =  1    : iAnimation = 17  :   iSound = 12
@@ -489,6 +490,7 @@ testcase tGallery_GalleryView_Preview
         case 46     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2
         case 48     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2
         case 49     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2
+        case 50     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2
         case 55     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2
         case 81     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2  'FHA TODO: Find out the right numbers for Asian languages.
         case 82     :   jpeg_bkg =  1   :   iAnimation =  5     :   iSound =  2
@@ -651,6 +653,7 @@ testcase tGallery_GalleryView_Insert
         case 46     :   jpeg_bkg = 1     :   iAnimation =  2
         case 48     :   jpeg_bkg = 3     :   iAnimation =  1
         case 49     :   jpeg_bkg = 1     :   iAnimation =  2
+        case 50     :   jpeg_bkg = 1     :   iAnimation =  2
         case 55     :   jpeg_bkg = 8     :   iAnimation =  1
         case 81     :   jpeg_bkg = 1     :   iAnimation =  3
         case 82     :   jpeg_bkg = 1     :   iAnimation = 17
@@ -671,6 +674,7 @@ testcase tGallery_GalleryView_Insert
         case 46   : jpeg_bkg =  1 : iAnimation =  2
         case 48   : jpeg_bkg =  3 : iAnimation =  1
         case 49   : jpeg_bkg =  1 : iAnimation =  2
+        case 50   : jpeg_bkg =  1 : iAnimation =  2
         case 55   : jpeg_bkg =  6 : iAnimation =  1
         case 81   : jpeg_bkg =  1 : iAnimation =  3
         case 82   : jpeg_bkg =  1 : iAnimation =  1
@@ -859,6 +863,7 @@ testcase tGallery_GalleryView_Delete
     case 39   : jpeg_bkg = 10  :   iAnimation = 1   :  iSound = 27
     case 46   : jpeg_bkg = 1    :   iAnimation = 2   :  iSound = 18
     case 49   : jpeg_bkg = 1    :   iAnimation = 2   :  iSound = 17
+    case 50   : jpeg_bkg = 1    :   iAnimation = 2   :  iSound = 17
     case 55   : jpeg_bkg = 8    :   iAnimation = 1   :  iSound = 30
     case 81   : jpeg_bkg = 1    :   iAnimation = 3   :  iSound = 10
     case 82   : jpeg_bkg = 1    :   iAnimation = 17 :  iSound = 12
diff --git a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc
index 5e8e5c1f0fdb..293418b76c2b 100644..100755
--- a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc
@@ -324,13 +324,14 @@ testcase tViewNavigator
     Szenarien.Click
     Szenarien.Click
     '/// Check that the dragmodus has 3 modes
-    printlog " Check that the dragmodus has 3 modes"
-    Dragmodus.OpenMenu
-    waitslot(1000)
-    if hMenuItemGetCount <> 3 then
-        warnlog "Not enough modes for dragmodus"
-    end if
-    hMenuSelectNr (0)
+    qaerrorlog "Dragmodus disabled because of unreliability"
+'    printlog " Check that the dragmodus has 3 modes"
+'    Dragmodus.OpenMenu
+'    waitslot(1000)
+'    if hMenuItemGetCount <> 3 then
+'        warnlog "Not enough modes for dragmodus"
+'    end if
+'    hMenuSelectNr (0)
     '/// Close Navigator
     printlog " Close Navigator"
     Kontext "Navigator"
diff --git a/testautomation/writer/optional/includes/regexp/search.inc b/testautomation/writer/optional/includes/regexp/search.inc
index a44b6a69372c..ce3d946fe3b9 100755
--- a/testautomation/writer/optional/includes/regexp/search.inc
+++ b/testautomation/writer/optional/includes/regexp/search.inc
@@ -170,6 +170,7 @@ testcase tCallDialog
       case 39 : Shortcut = "<Mod1 f>"
       case 46 : Shortcut = "<Mod1 f>"
       case 49 : Shortcut = "<Mod1 f>"
+      case 50 : Shortcut = "<Mod1 f>"
       case 55 : Shortcut = "<Mod1 f>"
 	  case 81 : Shortcut = "<Mod1 f>"
       case 82 : Shortcut = "<Mod1 f>"
@@ -474,6 +475,7 @@ testcase tUnderline_Search
             case 39: ToggleAttribute(27,"True")
             case 46: ToggleAttribute(30,"True")            
             case 49: ToggleAttribute(28,"True")
+            case 50: ToggleAttribute(15,"True")
             case 55: ToggleAttribute(29,"True")
             case 88: ToggleAttribute(13,"True")
             case else : QAErrorlog "Please adapt test for this language!"
@@ -490,6 +492,7 @@ testcase tUnderline_Search
             case 39: ToggleAttribute(35,"True")             ' Sottolineato
             case 46: ToggleAttribute(40,"True")             ' Understruken
             case 49: ToggleAttribute(37,"True")             ' Unterstrichen
+            case 50: ToggleAttribute(24,"True")             ' Podčrtano
             case 55: ToggleAttribute(38,"True")             ' Sublinhado
             case 88: ToggleAttribute(13,"True")
             case else : QAErrorlog "Please adapt test for this language!"
@@ -525,6 +528,7 @@ testcase tUnderline_Replace
             case 39: ToggleAttribute(27,"True")
             case 46: ToggleAttribute(30,"True")            
             case 49: ToggleAttribute(28,"True")
+            case 50: ToggleAttribute(15,"True")
             case 55: ToggleAttribute(29,"True")
             case 88: ToggleAttribute(13,"True")
             case else : QAErrorlog "Please adapt test for this language!"
@@ -541,6 +545,7 @@ testcase tUnderline_Replace
             case 39: ToggleAttribute(35,"True")             ' Sottolineato
             case 46: ToggleAttribute(40,"True")             ' Understruken
             case 49: ToggleAttribute(37,"True")             ' Unterstrichen
+            case 50: ToggleAttribute(24,"True")             ' Podčrtano
             case 55: ToggleAttribute(38,"True")             ' Sublinhado
             case 88: ToggleAttribute(13,"True")
             case else : QAErrorlog "Please adapt test for this language!"
@@ -788,6 +793,7 @@ testcase tParagraphStyle_Search
         Case 39 : Such_Text = "Intestazione"
         Case 46 : Such_Text = "Överskrift"
         Case 49 : Such_Text = "Überschrift"          'Suchen  Absatzformat "Überschrift"
+        Case 50 : Such_Text = "Naslov"
         Case 55 : Such_Text = "Título Principal"
         Case 81 : Such_Text = "見出し"
         Case 86 : Such_Text = "标题"
@@ -1625,6 +1631,7 @@ sub Meldungs_Test
         Case 39 : Text_In_Meldung = sProduct & " Writer ha cercato fino alla fine del documento. Volete continuare dall'inizio del documento?"
         Case 46 : Text_In_Meldung = sProduct & " Writer har sökt till slutet av dokument. Vill du fortsätta sökningen i början av dokumentet?"
         Case 49 : Text_In_Meldung = sProduct & " Writer hat bis zum Ende des Dokumentes gesucht. Möchten Sie die Suche am Dokumentanfang fortsetzen?"
+        Case 50 : Text_In_Meldung = sProduct & " Writer je preiskal do konca dokumenta. Ali želite nadaljevati na začetku?"
 		Case 55 : Text_In_Meldung = sProduct & " Writer pesquisou até o final do documento. Deseja continuar do início?"
         Case 81 : Text_In_Meldung = sProduct & " Writer は、文書末まで検索しました。文書の始めに戻って続行しますか。"
         Case 82 : Text_In_Meldung = sProduct & " Writer가 문서의 끝까지 검색했습니다. 문서의 시작부분에서 검색을 계속하겠습니까?"
diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc
index 6c571c34a8bf..013b4bb857ec 100755
--- a/testautomation/writer/required/includes/w_002_.inc
+++ b/testautomation/writer/required/includes/w_002_.inc
@@ -658,7 +658,7 @@ endcase
 '---------------------------------------------------
 
 testcase tEditAutotext
-    Dim k as integer
+    Dim j as integer
     Dim i as integer
     Dim CurrentEntryNr as integer
     Dim unxAutotextCategorie as integer
@@ -678,6 +678,7 @@ testcase tEditAutotext
     end if
 
     PrintLog "Click Categories"
+    Kontext "Autotext"
     Bereiche.Click
     
     Kontext "BereicheBearbeitenAutoText"
@@ -881,8 +882,7 @@ testcase tEditAutotext
         if GetDocumentCount = 1 then
             Warnlog "The autotext has been edited in current document!"
         else
-            hUseAsyncSlot( "FileClose" )
-            
+            hUseAsyncSlot( "FileClose" )            
             Kontext "Active"
             PrintLog "A message that module has been changed should come up"
             if Active.Exists then
@@ -891,11 +891,6 @@ testcase tEditAutotext
                 Warnlog "Though changing the text module the document could be closed without a query!"
             end if
         end if
-        if wDeleteAutotext("DummyAutotext") = false then
-            Warnlog "Unable to delete created autotext"
-        end if
-        Kontext "Autotext"
-        if Autotext.Exists then Autotext.Close
     catch
         Warnlog "Menu Autotext->'Edit' disabled !"
         Kontext "Active"
@@ -909,15 +904,17 @@ testcase tEditAutotext
                 endcatch
             end if
         end if
-        Kontext "Autotext"
-        PrintLog "Close 'Autotext' dialog"
-        Autotext.Close
-        if wDeleteAutotext("DummyAutotext") = false then
-            Warnlog "Unable to delete created autotext"
-        end if
-        
     endcatch
 
+    PrintLog "Close 'Autotext' dialog"
+    Kontext "Autotext"
+    if Autotext.Exists then Autotext.Close
+    if wDeleteAutotext("DummyAutotext") = false then
+        Warnlog "Unable to delete created autotext"
+    end if
+    Kontext "Autotext"
+    if Autotext.Exists then Autotext.Close
+
     PrintLog "Close active document"
     Call hCloseDocument
 endcase
diff --git a/testautomation/writer/required/includes/w_011_.inc b/testautomation/writer/required/includes/w_011_.inc
index 15b8036826be..ce6498a4408f 100755
--- a/testautomation/writer/required/includes/w_011_.inc
+++ b/testautomation/writer/required/includes/w_011_.inc
@@ -452,6 +452,8 @@ testcase tZORest
     Call hNewDocument
     printlog "Insert a draw object ( rectangle )"
     Call wZeichenobjektEinfuegen ( "Rechteck", 30, 30, 50, 60 )
+    ' Set focus to document
+    Call gMouseMove2 ( 50, 25 )
     Call gMouseClick ( 50, 25 )
     printlog "Select drawing object with shortcut 'Shift F4'"
     Call wTypeKeys ( "<Shift F4>" )
diff --git a/testautomation/writer/tools/includes/w_locale_strings2.inc b/testautomation/writer/tools/includes/w_locale_strings2.inc
index a679ecbabc04..73b987fb2c7e 100644..100755
--- a/testautomation/writer/tools/includes/w_locale_strings2.inc
+++ b/testautomation/writer/tools/includes/w_locale_strings2.inc
@@ -47,6 +47,7 @@ function wGetLanguageGuessString(sValue as string, iLanguageCount as integer) as
     '///swedish     46 ///'
     '///polish      48 ///'
     '///german      49 ///'
+    '///slovenian      50 ///'
     '///german      55 ///'
 
     '///already covered languages in the test document: ///'
@@ -324,6 +325,32 @@ function wGetLanguageGuessString(sValue as string, iLanguageCount as integer) as
             ParagraphPreSet = "Absatz ist Deutsch (Deutschland)"
         end select
         '-----------------------------------------------------------------------
+    Case 50        'Case 50: slovenian
+       Select Case iLanguageCount
+       Case 1: WordPreSet      = "Jezik besede je angleški (ZDA)"
+           ParagraphPreSet = "Jezik odstavka je angleški (ZDA)"
+       Case 2: WordPreSet      = "Jezik besede je portugalski (Portugalska)"
+           ParagraphPreSet = "Jezik odstavka je portugalski (Portugalska)"
+       Case 3: WordPreSet      = "Jezik besede je ruski"
+           ParagraphPreSet = "Jezik odstavka je ruski"
+       Case 4: WordPreSet      = "Jezik besede je nizozemski (Nizozemska)"
+           ParagraphPreSet = "Jezik odstavka je nizozemski (Nizozemska)"
+       Case 5: WordPreSet      = "Jezik besede je francoski (Francija)"
+           ParagraphPreSet = "Jezik odstavka je francoski (Francija)"
+       Case 6: WordPreSet      = "Jezik besede je španski (Španija)"
+           ParagraphPreSet = "Jezik odstavka je španski (Španija)"
+       Case 7: WordPreSet      = "Jezik besede je madžarski"
+           ParagraphPreSet = "Jezik odstavka je madžarski"
+       Case 8: WordPreSet      = "Jezik besede je italijanski (Italija)"
+           ParagraphPreSet = "Jezik odstavka je italijanski (Italija)"
+       Case 9: WordPreSet      = "Jezik besede je švedski (Švedska)"
+           ParagraphPreSet = "Jezik odstavka je švedski (Švedska)"
+       Case 10:WordPreSet      = "Jezik besede je poljski"
+           ParagraphPreSet = "Jezik odstavka je poljski"
+       Case 11:WordPreSet      = "Jezik besede je nemški (Nemčija)"
+           ParagraphPreSet = "Jezik odstavka je nemški (Nemčija)"
+       end select
+       '-----------------------------------------------------------------------
     Case 55        'Case 55: Portuguese (Brazil)
         Select Case iLanguageCount
         Case 1: WordPreSet      = "a palavra é Inglês (EUA)"
diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc
index 2131b1bd7dfd..34b83bc5e97b 100644..100755
--- a/testautomation/writer/tools/includes/w_tool1.inc
+++ b/testautomation/writer/tools/includes/w_tool1.inc
@@ -434,6 +434,8 @@ end sub
 '----------------------------------------------------------------
 
 sub sAutopilot_ListboxCombobox(WhichBox as String)
+    Dim iCount as integer
+    iCount = 1
     Kontext "AutoPilotListComboBox"
     if AutoPilotListComboBox.Exists then
         printlog "  -Autopilot-Listbox Page 1"
@@ -441,6 +443,18 @@ sub sAutopilot_ListboxCombobox(WhichBox as String)
         if TabListboxData.Exists then
             Call DialogTest( TabListBoxData )
             DataSource.Select 1
+            Do
+                if iCount >= 15 then exit do
+                try
+                    Table.Select 1
+                    exit do
+                catch
+                    wait 500
+                    printlog "  - attempt " & i & " to select table"
+                    iCount = iCount + 1
+                endcatch
+            Loop
+            
             if Table.GetItemCount > 0 then
                 Table.Select 1
             else