diff --git a/ide/compileroptionsdlg.pp b/ide/compileroptionsdlg.pp
index 22b8841383..0985fd5d1e 100644
--- a/ide/compileroptionsdlg.pp
+++ b/ide/compileroptionsdlg.pp
@@ -2689,11 +2689,11 @@ begin
     if AButton=OtherUnitsPathEditBtn then begin
       OldPath:=edtOtherUnits.Text;
       Templates:=SetDirSeparators(
-            '$(LazarusDir)/lcl/units/$(TargetCPU)/$(TargetOS)'
-          +';$(LazarusDir)/lcl/units/$(TargetCPU)/$(TargetOS)/$(LCLWidgetType)'
-          +';$(LazarusDir)/components/units/$(TargetCPU)/$(TargetOS)'
+            '$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)'
+          +';$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)'
+          +';$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)'
           +';$(LazarusDir)/components/custom'
-          +';$(LazarusDir)/packager/units/$(TargetCPU)/$(TargetOS)'
+          +';$(LazarusDir)/packager/units/$(TargetCPU)-$(TargetOS)'
           );
     end else
     if AButton=IncludeFilesPathEditBtn then begin
@@ -2718,7 +2718,7 @@ begin
       Templates:=SetDirSeparators(
             '$(LazarusDir)/lcl/include'
           +';$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)'
-          +';$(LazarusDir)/include/'
+          +';$(LazarusDir)/include'
           );
     end else
       exit;
diff --git a/languages/lazaruside.fi.po b/languages/lazaruside.fi.po
index aef771a8a9..779eab427a 100644
--- a/languages/lazaruside.fi.po
+++ b/languages/lazaruside.fi.po
@@ -2280,7 +2280,7 @@ msgstr "Tiedostoa %s%s%s ei löytynyt.%s"
 
 #: lazarusidestrconsts:lisfilenotfounddoyouwanttocreateit
 msgid "File %s%s%s not found.%sDo you want to create it?%s"
-msgstr ""
+msgstr "Tiedostoa %s%s%s ei löytynyt.%sHaluatko luoda sen?%s"
 
 #: lazarusidestrconsts:lisfiledoesnotlooklikeatextfileopenitanyway
 msgid "File %s%s%s%sdoes not look like a text file.%sOpen it anyway?"
@@ -4732,7 +4732,7 @@ msgstr "puola (ISO 8859-2)"
 
 #: lazarusidestrconsts:rslanguageportugues
 msgid "Portuguese"
-msgstr ""
+msgstr "portugali"
 
 #: lazarusidestrconsts:dlgwrdpreview
 msgid "Preview"
@@ -6468,7 +6468,7 @@ msgstr ""
 
 #: lazarusidestrconsts:listhefilewasnotfoundignorewillgoonloadingtheproject
 msgid "The file %s%s%s%swas not found.%sIgnore will go on loading the project,%sAbort  will stop the loading."
-msgstr ""
+msgstr "Tiedostoa %s%s%s%sei löytynyt.%sOhita-näppäimen nainallus jatkaa projektin lataamista,%sKeskeytä-näppäin keskeyttää sen."
 
 #: lazarusidestrconsts:uefilerotext1
 msgid "The file \""
@@ -6648,7 +6648,7 @@ msgstr "Käännösyksikkö (unit) on jo nimeltään %s%s%s. Pascal:ssa tunnukset
 
 #: lazarusidestrconsts:lisprojaddtheunitnamealreadyexistsintheproject
 msgid "The unit name %s%s%s already exists in the project%swith file: %s%s%s."
-msgstr ""
+msgstr "Käännösyksikkö (unit) %s%s%s on jo olemassa projektissa%stiedostona: %s%s%s."
 
 #: lazarusidestrconsts:lisprojaddtheunitnamealreadyexistsintheselection
 msgid "The unit name %s%s%s already exists in the selection%swith file: %s%s%s."
@@ -7296,7 +7296,7 @@ msgstr ""
 
 #: lazarusidestrconsts:lisprojaddunitnamealreadyexists
 msgid "Unit name already exists"
-msgstr ""
+msgstr "Käännösyksikön (Unit) nimi on jo olemassa"
 
 #: lazarusidestrconsts:lisunitnotfound
 msgid "Unit not found"
diff --git a/packager/pkgoptionsdlg.pas b/packager/pkgoptionsdlg.pas
index 3f0bfc5be7..499b1f3521 100644
--- a/packager/pkgoptionsdlg.pas
+++ b/packager/pkgoptionsdlg.pas
@@ -169,11 +169,11 @@ begin
   if AButton=UnitPathButton then begin
     Templates:=SetDirSeparators(
            '$(PkgOutDir)'
-          +'$(LazarusDir)/lcl/units/$(TargetCPU)/$(TargetOS)'
-          +';$(LazarusDir)/lcl/units/$(TargetCPU)/$(TargetOS)/$(LCLWidgetType)'
-          +';$(LazarusDir)/components/units/$(TargetCPU)/$(TargetOS)'
+          +'$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)'
+          +';$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)'
+          +';$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)'
           +';$(LazarusDir)/components/custom'
-          +';$(LazarusDir)/packager/units/$(TargetCPU)/$(TargetOS)'
+          +';$(LazarusDir)/packager/units/$(TargetCPU)-$(TargetOS)'
           );
   end
   else if AButton=IncludePathButton then begin