diff --git a/.gitattributes b/.gitattributes
index 6836c8685d..f2cc326157 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3006,17 +3006,16 @@ examples/lazintfimage/fadein1.lpr svneol=native#text/pascal
examples/lazintfimage/mainunit1.lfm svneol=native#text/plain
examples/lazintfimage/mainunit1.lrs svneol=native#text/pascal
examples/lazintfimage/mainunit1.pas svneol=native#text/pascal
-examples/lazresexploer/ResExploer.ico -text svneol=unset#image/ico
-examples/lazresexploer/ResExploer.lpi svneol=native#text/plain
-examples/lazresexploer/ResExploer.lpr svneol=native#text/plain
-examples/lazresexploer/ResExploer.res -text
-examples/lazresexploer/languages/ResExploer.po svneol=native#text/plain
-examples/lazresexploer/languages/ResExploer.ru.po svneol=native#text/plain
-examples/lazresexploer/reaboutunit.lfm svneol=native#text/plain
-examples/lazresexploer/reaboutunit.pas svneol=native#text/plain
-examples/lazresexploer/reconstsunit.pas svneol=native#text/plain
-examples/lazresexploer/remainunit.lfm svneol=native#text/plain
-examples/lazresexploer/remainunit.pas svneol=native#text/plain
+examples/lazresexplorer/languages/resexplorer.po svneol=native#text/plain
+examples/lazresexplorer/reaboutunit.lfm svneol=native#text/plain
+examples/lazresexplorer/reaboutunit.pas svneol=native#text/plain
+examples/lazresexplorer/reconstsunit.pas svneol=native#text/plain
+examples/lazresexplorer/remainunit.lfm svneol=native#text/plain
+examples/lazresexplorer/remainunit.pas svneol=native#text/plain
+examples/lazresexplorer/resexplorer.ico -text svneol=unset#image/ico
+examples/lazresexplorer/resexplorer.lpi svneol=native#text/plain
+examples/lazresexplorer/resexplorer.lpr svneol=native#text/pascal
+examples/lazresexplorer/resexplorer.res -text
examples/lclversion/lclversionexample.lpi svneol=native#text/plain
examples/lclversion/lclversionexample.lpr svneol=native#text/plain
examples/lclversion/unit1.lfm svneol=native#text/plain
diff --git a/examples/lazresexploer/ResExploer.lpi b/examples/lazresexploer/ResExploer.lpi
deleted file mode 100644
index af0c8c4c86..0000000000
--- a/examples/lazresexploer/ResExploer.lpi
+++ /dev/null
@@ -1,313 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/lazresexploer/languages/ResExploer.po b/examples/lazresexploer/languages/ResExploer.po
deleted file mode 100644
index 09fb6aea3f..0000000000
--- a/examples/lazresexploer/languages/ResExploer.po
+++ /dev/null
@@ -1,199 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
-
-#: reconstsunit.sabout
-msgctxt "reconstsunit.sabout"
-msgid "About..."
-msgstr ""
-
-#: reconstsunit.sbuilddate
-msgid "Build date : "
-msgstr ""
-
-#: reconstsunit.scarbonwidgetset
-msgid "Carbon widget set"
-msgstr ""
-
-#: reconstsunit.sexit
-msgctxt "reconstsunit.sexit"
-msgid "Exit"
-msgstr ""
-
-#: reconstsunit.sfile
-msgctxt "reconstsunit.sfile"
-msgid "File"
-msgstr ""
-
-#: reconstsunit.sfpcversion
-msgid "FPC version : "
-msgstr ""
-
-#: reconstsunit.sfpguiwidgetset
-msgid "FpGUI widget set"
-msgstr ""
-
-#: reconstsunit.sgtk2widgetset
-msgid "GTK 2 widget set"
-msgstr ""
-
-#: reconstsunit.sgtkwidgetset
-msgid "GTK widget set"
-msgstr ""
-
-#: reconstsunit.shelp
-msgctxt "reconstsunit.shelp"
-msgid "Help"
-msgstr ""
-
-#: reconstsunit.simage
-msgctxt "reconstsunit.simage"
-msgid "Image"
-msgstr ""
-
-#: reconstsunit.slclversion
-msgid "LCL Version: "
-msgstr ""
-
-#: reconstsunit.slicense
-msgid "This program is free software under GNU GPL 2 license, see COPYING file"
-msgstr ""
-
-#: reconstsunit.sopen
-msgctxt "reconstsunit.sopen"
-msgid "Open..."
-msgstr ""
-
-#: reconstsunit.sotherguiwidgetset
-msgid "Other gui"
-msgstr ""
-
-#: reconstsunit.sqtwidgetset
-msgid "QT widget set"
-msgstr ""
-
-#: reconstsunit.sresourceexplorer
-msgid "Resource explorer"
-msgstr ""
-
-#: reconstsunit.ssaveresource
-msgctxt "reconstsunit.ssaveresource"
-msgid "Save resource..."
-msgstr ""
-
-#: reconstsunit.sstrings
-msgid "Strings"
-msgstr ""
-
-#: reconstsunit.stargetcpu
-msgid "Target CPU : "
-msgstr ""
-
-#: reconstsunit.stargetos
-msgid "Target OS : "
-msgstr ""
-
-#: reconstsunit.swin32_64widgetset
-msgid "Win32/Win64 widget set"
-msgstr ""
-
-#: reconstsunit.swincewidgetset
-msgid "WinCE widget set"
-msgstr ""
-
-#: TREABOUTFORM.CAPTION
-msgid "reAboutForm"
-msgstr ""
-
-#: TREABOUTFORM.LABEL2.CAPTION
-msgid "by Lagunov A.A. (alexs)"
-msgstr ""
-
-#: TREABOUTFORM.LBLAPPNAME.CAPTION
-msgctxt "TREABOUTFORM.LBLAPPNAME.CAPTION"
-msgid "App name"
-msgstr ""
-
-#: TREABOUTFORM.LBLBUILDDATE.CAPTION
-msgid "Build date :"
-msgstr ""
-
-#: TREABOUTFORM.LBLFPCVERSION.CAPTION
-msgid "FPC Version :"
-msgstr ""
-
-#: TREABOUTFORM.LBLLCLVERSION.CAPTION
-msgid "LCL Version :"
-msgstr ""
-
-#: TREABOUTFORM.LBLLICENSE.CAPTION
-msgctxt "TREABOUTFORM.LBLLICENSE.CAPTION"
-msgid "App name"
-msgstr ""
-
-#: TREABOUTFORM.LBLTARGCPU.CAPTION
-msgid "Target CPU :"
-msgstr ""
-
-#: TREABOUTFORM.LBLTARGETOS.CAPTION
-msgid "Target OS :"
-msgstr ""
-
-#: TREABOUTFORM.LBLWIDGETNAME.CAPTION
-msgid "Widget Name"
-msgstr ""
-
-#: TREMAINFORM.CAPTION
-msgid "reMainForm"
-msgstr ""
-
-#: TREMAINFORM.FILEEXIT.CAPTION
-msgctxt "TREMAINFORM.FILEEXIT.CAPTION"
-msgid "Exit"
-msgstr ""
-
-#: TREMAINFORM.FILEOPEN.CAPTION
-msgctxt "TREMAINFORM.FILEOPEN.CAPTION"
-msgid "Open..."
-msgstr ""
-
-#: TREMAINFORM.FILESAVE.CAPTION
-msgctxt "TREMAINFORM.FILESAVE.CAPTION"
-msgid "Save resource..."
-msgstr ""
-
-#: TREMAINFORM.HLPABOUT.CAPTION
-msgctxt "TREMAINFORM.HLPABOUT.CAPTION"
-msgid "About..."
-msgstr ""
-
-#: TREMAINFORM.MENUITEM1.CAPTION
-msgctxt "TREMAINFORM.MENUITEM1.CAPTION"
-msgid "File"
-msgstr ""
-
-#: TREMAINFORM.MENUITEM2.CAPTION
-msgctxt "TREMAINFORM.MENUITEM2.CAPTION"
-msgid "Help"
-msgstr ""
-
-#: TREMAINFORM.MENUITEM5.CAPTION
-msgid "-"
-msgstr ""
-
-#: TREMAINFORM.TABIMAGE.CAPTION
-msgctxt "TREMAINFORM.TABIMAGE.CAPTION"
-msgid "Image"
-msgstr ""
-
-#: TREMAINFORM.TABSTRING.CAPTION
-msgid "String"
-msgstr ""
-
-#: TREMAINFORM.TOOLBAR1.CAPTION
-msgid "ToolBar1"
-msgstr ""
-
-#: TREMAINFORM.TOOLBUTTON3.CAPTION
-msgid "ToolButton3"
-msgstr ""
-
diff --git a/examples/lazresexploer/languages/ResExploer.ru.po b/examples/lazresexploer/languages/ResExploer.ru.po
deleted file mode 100644
index 0f576c5203..0000000000
--- a/examples/lazresexploer/languages/ResExploer.ru.po
+++ /dev/null
@@ -1,199 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
-
-#: reconstsunit.sabout
-msgctxt "reconstsunit.sabout"
-msgid "About..."
-msgstr "О программе..."
-
-#: reconstsunit.sbuilddate
-msgid "Build date : "
-msgstr "Дата сборки : "
-
-#: reconstsunit.scarbonwidgetset
-msgid "Carbon widget set"
-msgstr ""
-
-#: reconstsunit.sexit
-msgctxt "reconstsunit.sexit"
-msgid "Exit"
-msgstr "Закрыть"
-
-#: reconstsunit.sfile
-msgctxt "reconstsunit.sfile"
-msgid "File"
-msgstr "Файл"
-
-#: reconstsunit.sfpcversion
-msgid "FPC version : "
-msgstr "Версия FPC : "
-
-#: reconstsunit.sfpguiwidgetset
-msgid "FpGUI widget set"
-msgstr ""
-
-#: reconstsunit.sgtk2widgetset
-msgid "GTK 2 widget set"
-msgstr ""
-
-#: reconstsunit.sgtkwidgetset
-msgid "GTK widget set"
-msgstr ""
-
-#: reconstsunit.shelp
-msgctxt "reconstsunit.shelp"
-msgid "Help"
-msgstr "Справка"
-
-#: reconstsunit.simage
-msgctxt "reconstsunit.simage"
-msgid "Image"
-msgstr "Изображение"
-
-#: reconstsunit.slclversion
-msgid "LCL Version: "
-msgstr "Версия LCL : "
-
-#: reconstsunit.slicense
-msgid "This program is free software under GNU GPL 2 license, see COPYING file"
-msgstr "Эта свободная программа и распространяется по лицензией GPL 2. (см. файл COPYING)"
-
-#: reconstsunit.sopen
-msgctxt "reconstsunit.sopen"
-msgid "Open..."
-msgstr "Открыть..."
-
-#: reconstsunit.sotherguiwidgetset
-msgid "Other gui"
-msgstr ""
-
-#: reconstsunit.sqtwidgetset
-msgid "QT widget set"
-msgstr ""
-
-#: reconstsunit.sresourceexplorer
-msgid "Resource explorer"
-msgstr "Обзор ресурсов"
-
-#: reconstsunit.ssaveresource
-msgctxt "reconstsunit.ssaveresource"
-msgid "Save resource..."
-msgstr "Сохранить ресурс..."
-
-#: reconstsunit.sstrings
-msgid "Strings"
-msgstr "Строки"
-
-#: reconstsunit.stargetcpu
-msgid "Target CPU : "
-msgstr "Целевой процессор : "
-
-#: reconstsunit.stargetos
-msgid "Target OS : "
-msgstr "Целевая ОС : "
-
-#: reconstsunit.swin32_64widgetset
-msgid "Win32/Win64 widget set"
-msgstr ""
-
-#: reconstsunit.swincewidgetset
-msgid "WinCE widget set"
-msgstr ""
-
-#: TREABOUTFORM.CAPTION
-msgid "reAboutForm"
-msgstr ""
-
-#: TREABOUTFORM.LABEL2.CAPTION
-msgid "by Lagunov A.A. (alexs)"
-msgstr ""
-
-#: TREABOUTFORM.LBLAPPNAME.CAPTION
-msgctxt "TREABOUTFORM.LBLAPPNAME.CAPTION"
-msgid "App name"
-msgstr ""
-
-#: TREABOUTFORM.LBLBUILDDATE.CAPTION
-msgid "Build date :"
-msgstr ""
-
-#: TREABOUTFORM.LBLFPCVERSION.CAPTION
-msgid "FPC Version :"
-msgstr ""
-
-#: TREABOUTFORM.LBLLCLVERSION.CAPTION
-msgid "LCL Version :"
-msgstr ""
-
-#: TREABOUTFORM.LBLLICENSE.CAPTION
-msgctxt "TREABOUTFORM.LBLLICENSE.CAPTION"
-msgid "App name"
-msgstr ""
-
-#: TREABOUTFORM.LBLTARGCPU.CAPTION
-msgid "Target CPU :"
-msgstr ""
-
-#: TREABOUTFORM.LBLTARGETOS.CAPTION
-msgid "Target OS :"
-msgstr ""
-
-#: TREABOUTFORM.LBLWIDGETNAME.CAPTION
-msgid "Widget Name"
-msgstr ""
-
-#: TREMAINFORM.CAPTION
-msgid "reMainForm"
-msgstr ""
-
-#: TREMAINFORM.FILEEXIT.CAPTION
-msgctxt "TREMAINFORM.FILEEXIT.CAPTION"
-msgid "Exit"
-msgstr "Закрыть"
-
-#: TREMAINFORM.FILEOPEN.CAPTION
-msgctxt "TREMAINFORM.FILEOPEN.CAPTION"
-msgid "Open..."
-msgstr "Открыть..."
-
-#: TREMAINFORM.FILESAVE.CAPTION
-msgctxt "TREMAINFORM.FILESAVE.CAPTION"
-msgid "Save resource..."
-msgstr "Сохранить ресурс..."
-
-#: TREMAINFORM.HLPABOUT.CAPTION
-msgctxt "TREMAINFORM.HLPABOUT.CAPTION"
-msgid "About..."
-msgstr "О программе..."
-
-#: TREMAINFORM.MENUITEM1.CAPTION
-msgctxt "TREMAINFORM.MENUITEM1.CAPTION"
-msgid "File"
-msgstr "Файл"
-
-#: TREMAINFORM.MENUITEM2.CAPTION
-msgctxt "TREMAINFORM.MENUITEM2.CAPTION"
-msgid "Help"
-msgstr "Справка"
-
-#: TREMAINFORM.MENUITEM5.CAPTION
-msgid "-"
-msgstr ""
-
-#: TREMAINFORM.TABIMAGE.CAPTION
-msgctxt "TREMAINFORM.TABIMAGE.CAPTION"
-msgid "Image"
-msgstr "Изображение"
-
-#: TREMAINFORM.TABSTRING.CAPTION
-msgid "String"
-msgstr ""
-
-#: TREMAINFORM.TOOLBAR1.CAPTION
-msgid "ToolBar1"
-msgstr ""
-
-#: TREMAINFORM.TOOLBUTTON3.CAPTION
-msgid "ToolButton3"
-msgstr ""
-
diff --git a/examples/lazresexplorer/languages/resexplorer.po b/examples/lazresexplorer/languages/resexplorer.po
new file mode 100644
index 0000000000..e7485fdae5
--- /dev/null
+++ b/examples/lazresexplorer/languages/resexplorer.po
@@ -0,0 +1,95 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: reconstsunit.sabout
+msgid "About..."
+msgstr ""
+
+#: reconstsunit.sbuilddate
+msgid "Build date : "
+msgstr ""
+
+#: reconstsunit.scarbonwidgetset
+msgid "Carbon widget set"
+msgstr ""
+
+#: reconstsunit.sexit
+msgid "Exit"
+msgstr ""
+
+#: reconstsunit.sfile
+msgid "File"
+msgstr ""
+
+#: reconstsunit.sfpcversion
+msgid "FPC version : "
+msgstr ""
+
+#: reconstsunit.sfpguiwidgetset
+msgid "FpGUI widget set"
+msgstr ""
+
+#: reconstsunit.sgtk2widgetset
+msgid "GTK 2 widget set"
+msgstr ""
+
+#: reconstsunit.sgtkwidgetset
+msgid "GTK widget set"
+msgstr ""
+
+#: reconstsunit.shelp
+msgid "Help"
+msgstr ""
+
+#: reconstsunit.simage
+msgid "Image"
+msgstr ""
+
+#: reconstsunit.slclversion
+msgid "LCL Version: "
+msgstr ""
+
+#: reconstsunit.slicense
+msgid "This program is free software under GNU GPL 2 license, see COPYING file"
+msgstr ""
+
+#: reconstsunit.sopen
+msgid "Open..."
+msgstr ""
+
+#: reconstsunit.sotherguiwidgetset
+msgid "Other gui"
+msgstr ""
+
+#: reconstsunit.sqtwidgetset
+msgid "QT widget set"
+msgstr ""
+
+#: reconstsunit.sresourceexplorer
+msgid "Resource explorer"
+msgstr ""
+
+#: reconstsunit.ssaveresource
+msgid "Save resource..."
+msgstr ""
+
+#: reconstsunit.sstrings
+msgid "Strings"
+msgstr ""
+
+#: reconstsunit.stargetcpu
+msgid "Target CPU : "
+msgstr ""
+
+#: reconstsunit.stargetos
+msgid "Target OS : "
+msgstr ""
+
+#: reconstsunit.swin32_64widgetset
+msgid "Win32/Win64 widget set"
+msgstr ""
+
+#: reconstsunit.swincewidgetset
+msgid "WinCE widget set"
+msgstr ""
+
diff --git a/examples/lazresexploer/reaboutunit.lfm b/examples/lazresexplorer/reaboutunit.lfm
similarity index 100%
rename from examples/lazresexploer/reaboutunit.lfm
rename to examples/lazresexplorer/reaboutunit.lfm
diff --git a/examples/lazresexploer/reaboutunit.pas b/examples/lazresexplorer/reaboutunit.pas
similarity index 100%
rename from examples/lazresexploer/reaboutunit.pas
rename to examples/lazresexplorer/reaboutunit.pas
diff --git a/examples/lazresexploer/reconstsunit.pas b/examples/lazresexplorer/reconstsunit.pas
similarity index 97%
rename from examples/lazresexploer/reconstsunit.pas
rename to examples/lazresexplorer/reconstsunit.pas
index b1e0f93620..f8cd4aa404 100644
--- a/examples/lazresexploer/reconstsunit.pas
+++ b/examples/lazresexplorer/reconstsunit.pas
@@ -59,7 +59,7 @@ var
Lang, FallbackLang: String;
begin
GetLanguageIDs(Lang,FallbackLang); // in unit gettext
- TranslateUnitResourceStrings('reConstsUnit','languages'+DirectorySeparator+'ResExploer.%s.po', Lang,FallbackLang);
+ TranslateUnitResourceStrings('reConstsUnit','languages'+DirectorySeparator+'resexplorer.%s.po', Lang,FallbackLang);
end;
initialization
diff --git a/examples/lazresexploer/remainunit.lfm b/examples/lazresexplorer/remainunit.lfm
similarity index 100%
rename from examples/lazresexploer/remainunit.lfm
rename to examples/lazresexplorer/remainunit.lfm
diff --git a/examples/lazresexploer/remainunit.pas b/examples/lazresexplorer/remainunit.pas
similarity index 100%
rename from examples/lazresexploer/remainunit.pas
rename to examples/lazresexplorer/remainunit.pas
diff --git a/examples/lazresexploer/ResExploer.ico b/examples/lazresexplorer/resexplorer.ico
similarity index 100%
rename from examples/lazresexploer/ResExploer.ico
rename to examples/lazresexplorer/resexplorer.ico
diff --git a/examples/lazresexplorer/resexplorer.lpi b/examples/lazresexplorer/resexplorer.lpi
new file mode 100644
index 0000000000..83207fc618
--- /dev/null
+++ b/examples/lazresexplorer/resexplorer.lpi
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/lazresexploer/ResExploer.lpr b/examples/lazresexplorer/resexplorer.lpr
similarity index 95%
rename from examples/lazresexploer/ResExploer.lpr
rename to examples/lazresexplorer/resexplorer.lpr
index 46c1e62b55..19d93455d5 100644
--- a/examples/lazresexploer/ResExploer.lpr
+++ b/examples/lazresexplorer/resexplorer.lpr
@@ -10,7 +10,7 @@ uses
Forms, reMainUnit, reAboutUnit, reConstsUnit
{ you can add units after this };
-{$R ResExploer.res}
+{$R resexplorer.res}
begin
Application.Initialize;
diff --git a/examples/lazresexploer/ResExploer.res b/examples/lazresexplorer/resexplorer.res
similarity index 100%
rename from examples/lazresexploer/ResExploer.res
rename to examples/lazresexplorer/resexplorer.res