From: Jerome St-Louis <jerome@ecere.com>
Date: Wed, 19 Mar 2014 06:47:23 +0000 (-0400)
Subject: i18n: (#858) Fixed directory layout to really match what Launchpad expects
X-Git-Tag: 0.44.10PR1~526
X-Git-Url: https://ecere.com/cgi-bin/gitweb.cgi?p=sdk;a=commitdiff_plain;h=53739dedd7b57936d350399e7fdbf503e23a702a

i18n: (#858) Fixed directory layout to really match what Launchpad expects
---

diff --git a/compiler/bootstrap/ecs/bootstrap/ecs.c b/compiler/bootstrap/ecs/bootstrap/ecs.c
index 547c319..76a67a7 100644
--- a/compiler/bootstrap/ecs/bootstrap/ecs.c
+++ b/compiler/bootstrap/ecs/bootstrap/ecs.c
@@ -2483,10 +2483,10 @@ struct __ecereNameSpace__ecere__com__IteratorPointer * pointer;
 
 extern void ComputeModuleClasses(struct __ecereNameSpace__ecere__com__Instance * module);
 
-extern unsigned int __ecereNameSpace__ecere__sys__MakeDir(char *  path);
-
 extern char *  __ecereNameSpace__ecere__sys__PathCat(char *  string, char *  addedPath);
 
+extern unsigned int __ecereNameSpace__ecere__sys__MakeDir(char *  path);
+
 extern void FreeContext(struct Context * context);
 
 extern void FreeExcludedSymbols(struct __ecereNameSpace__ecere__sys__OldList * excludedSymbols);
@@ -2932,6 +2932,7 @@ struct __ecereNameSpace__ecere__com__Instance * potFile;
 char potFileName[797];
 
 strcpy(potFileName, "locale");
+__ecereNameSpace__ecere__sys__PathCat(potFileName, projectName);
 __ecereNameSpace__ecere__sys__MakeDir(potFileName);
 __ecereNameSpace__ecere__sys__PathCat(potFileName, projectName);
 __ecereNameSpace__ecere__sys__ChangeExtension(potFileName, "pot", potFileName);
diff --git a/compiler/ecc/Makefile b/compiler/ecc/Makefile
index f1f492a..24759a1 100644
--- a/compiler/ecc/Makefile
+++ b/compiler/ecc/Makefile
@@ -64,12 +64,12 @@ OBJECTS = $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
 SOURCES = $(ECSOURCES)
 
 RESOURCES = \
-	locale/ecc-es.mo \
-	locale/ecc-he.mo \
-	locale/ecc-ru.mo \
-	locale/ecc-vi.mo \
-	locale/ecc-zh_CN.mo \
-	locale/ecc-pt_BR.mo
+	locale/ecc/es.mo \
+	locale/ecc/he.mo \
+	locale/ecc/pt_BR.mo \
+	locale/ecc/ru.mo \
+	locale/ecc/vi.mo \
+	locale/ecc/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -118,7 +118,7 @@ ifndef STATIC_LIBRARY_TARGET
 ifndef NOSTRIP
 	$(STRIP) $(STRIPOPT) $(TARGET)
 endif
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ecc-es.mo locale/ecc-he.mo locale/ecc-ru.mo locale/ecc-vi.mo locale/ecc-zh_CN.mo locale/ecc-pt_BR.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ecc/es.mo locale/ecc/he.mo locale/ecc/pt_BR.mo locale/ecc/ru.mo locale/ecc/vi.mo locale/ecc/zh_CN.mo "locale/ecc"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -143,11 +143,21 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/compiler/ecc/ecc.epj b/compiler/ecc/ecc.epj
index c02a7c3..838bf6a 100644
--- a/compiler/ecc/ecc.epj
+++ b/compiler/ecc/ecc.epj
@@ -97,12 +97,17 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "ecc-es.mo",
-            "ecc-he.mo",
-            "ecc-ru.mo",
-            "ecc-vi.mo",
-            "ecc-zh_CN.mo",
-            "ecc-pt_BR.mo"
+            {
+               "Folder" : "ecc",
+               "Files" : [
+                  "es.mo",
+                  "he.mo",
+                  "pt_BR.mo",
+                  "ru.mo",
+                  "vi.mo",
+                  "zh_CN.mo"
+               ]
+            }
          ]
       }
    ]
diff --git a/compiler/ecc/locale/ecc.pot b/compiler/ecc/locale/ecc/ecc.pot
similarity index 100%
rename from compiler/ecc/locale/ecc.pot
rename to compiler/ecc/locale/ecc/ecc.pot
diff --git a/compiler/ecc/locale/ecc-es.mo b/compiler/ecc/locale/ecc/es.mo
similarity index 100%
rename from compiler/ecc/locale/ecc-es.mo
rename to compiler/ecc/locale/ecc/es.mo
diff --git a/compiler/ecc/locale/ecc-es.po b/compiler/ecc/locale/ecc/es.po
similarity index 100%
rename from compiler/ecc/locale/ecc-es.po
rename to compiler/ecc/locale/ecc/es.po
diff --git a/compiler/ecc/locale/ecc-he.mo b/compiler/ecc/locale/ecc/he.mo
similarity index 100%
rename from compiler/ecc/locale/ecc-he.mo
rename to compiler/ecc/locale/ecc/he.mo
diff --git a/compiler/ecc/locale/ecc-he.po b/compiler/ecc/locale/ecc/he.po
similarity index 100%
rename from compiler/ecc/locale/ecc-he.po
rename to compiler/ecc/locale/ecc/he.po
diff --git a/compiler/ecc/locale/ecc-pt_BR.mo b/compiler/ecc/locale/ecc/pt_BR.mo
similarity index 100%
rename from compiler/ecc/locale/ecc-pt_BR.mo
rename to compiler/ecc/locale/ecc/pt_BR.mo
diff --git a/compiler/ecc/locale/ecc-pt_BR.po b/compiler/ecc/locale/ecc/pt_BR.po
similarity index 100%
rename from compiler/ecc/locale/ecc-pt_BR.po
rename to compiler/ecc/locale/ecc/pt_BR.po
diff --git a/compiler/ecc/locale/ecc-ru.mo b/compiler/ecc/locale/ecc/ru.mo
similarity index 100%
rename from compiler/ecc/locale/ecc-ru.mo
rename to compiler/ecc/locale/ecc/ru.mo
diff --git a/compiler/ecc/locale/ecc-ru.po b/compiler/ecc/locale/ecc/ru.po
similarity index 100%
rename from compiler/ecc/locale/ecc-ru.po
rename to compiler/ecc/locale/ecc/ru.po
diff --git a/compiler/ecc/locale/ecc-vi.mo b/compiler/ecc/locale/ecc/vi.mo
similarity index 100%
rename from compiler/ecc/locale/ecc-vi.mo
rename to compiler/ecc/locale/ecc/vi.mo
diff --git a/compiler/ecc/locale/ecc-vi.po b/compiler/ecc/locale/ecc/vi.po
similarity index 100%
rename from compiler/ecc/locale/ecc-vi.po
rename to compiler/ecc/locale/ecc/vi.po
diff --git a/compiler/ecc/locale/ecc-zh_CN.mo b/compiler/ecc/locale/ecc/zh_CN.mo
similarity index 100%
rename from compiler/ecc/locale/ecc-zh_CN.mo
rename to compiler/ecc/locale/ecc/zh_CN.mo
diff --git a/compiler/ecc/locale/ecc-zh_CN.po b/compiler/ecc/locale/ecc/zh_CN.po
similarity index 100%
rename from compiler/ecc/locale/ecc-zh_CN.po
rename to compiler/ecc/locale/ecc/zh_CN.po
diff --git a/compiler/ecp/Makefile b/compiler/ecp/Makefile
index c93a2ad..859319f 100644
--- a/compiler/ecp/Makefile
+++ b/compiler/ecp/Makefile
@@ -64,11 +64,11 @@ OBJECTS = $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
 SOURCES = $(ECSOURCES)
 
 RESOURCES = \
-	locale/ecp-es.mo \
-	locale/ecp-he.mo \
-	locale/ecp-ru.mo \
-	locale/ecp-zh_CN.mo \
-	locale/ecp-pt_BR.mo
+	locale/ecp/es.mo \
+	locale/ecp/he.mo \
+	locale/ecp/pt_BR.mo \
+	locale/ecp/ru.mo \
+	locale/ecp/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -117,7 +117,7 @@ ifndef STATIC_LIBRARY_TARGET
 ifndef NOSTRIP
 	$(STRIP) $(STRIPOPT) $(TARGET)
 endif
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ecp-es.mo locale/ecp-he.mo locale/ecp-ru.mo locale/ecp-zh_CN.mo locale/ecp-pt_BR.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ecp/es.mo locale/ecp/he.mo locale/ecp/pt_BR.mo locale/ecp/ru.mo locale/ecp/zh_CN.mo "locale"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -142,11 +142,21 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/compiler/ecp/ecp.epj b/compiler/ecp/ecp.epj
index bee3813..cabe17d 100644
--- a/compiler/ecp/ecp.epj
+++ b/compiler/ecp/ecp.epj
@@ -100,11 +100,11 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "ecp-es.mo",
-            "ecp-he.mo",
-            "ecp-ru.mo",
-            "ecp-zh_CN.mo",
-            "ecp-pt_BR.mo"
+            "locale/ecp/es.mo",
+            "locale/ecp/he.mo",
+            "locale/ecp/pt_BR.mo",
+            "locale/ecp/ru.mo",
+            "locale/ecp/zh_CN.mo"
          ]
       }
    ]
diff --git a/compiler/ecp/locale/ecp.pot b/compiler/ecp/locale/ecp/ecp.pot
similarity index 100%
rename from compiler/ecp/locale/ecp.pot
rename to compiler/ecp/locale/ecp/ecp.pot
diff --git a/compiler/ecp/locale/ecp-es.mo b/compiler/ecp/locale/ecp/es.mo
similarity index 100%
rename from compiler/ecp/locale/ecp-es.mo
rename to compiler/ecp/locale/ecp/es.mo
diff --git a/compiler/ecp/locale/ecp-es.po b/compiler/ecp/locale/ecp/es.po
similarity index 100%
rename from compiler/ecp/locale/ecp-es.po
rename to compiler/ecp/locale/ecp/es.po
diff --git a/compiler/ecp/locale/ecp-he.mo b/compiler/ecp/locale/ecp/he.mo
similarity index 100%
rename from compiler/ecp/locale/ecp-he.mo
rename to compiler/ecp/locale/ecp/he.mo
diff --git a/compiler/ecp/locale/ecp-he.po b/compiler/ecp/locale/ecp/he.po
similarity index 100%
rename from compiler/ecp/locale/ecp-he.po
rename to compiler/ecp/locale/ecp/he.po
diff --git a/compiler/ecp/locale/ecp-pt_BR.mo b/compiler/ecp/locale/ecp/pt_BR.mo
similarity index 100%
rename from compiler/ecp/locale/ecp-pt_BR.mo
rename to compiler/ecp/locale/ecp/pt_BR.mo
diff --git a/compiler/ecp/locale/ecp-pt_BR.po b/compiler/ecp/locale/ecp/pt_BR.po
similarity index 100%
rename from compiler/ecp/locale/ecp-pt_BR.po
rename to compiler/ecp/locale/ecp/pt_BR.po
diff --git a/compiler/ecp/locale/ecp-ru.mo b/compiler/ecp/locale/ecp/ru.mo
similarity index 100%
rename from compiler/ecp/locale/ecp-ru.mo
rename to compiler/ecp/locale/ecp/ru.mo
diff --git a/compiler/ecp/locale/ecp-ru.po b/compiler/ecp/locale/ecp/ru.po
similarity index 100%
rename from compiler/ecp/locale/ecp-ru.po
rename to compiler/ecp/locale/ecp/ru.po
diff --git a/compiler/ecp/locale/ecp-zh_CN.mo b/compiler/ecp/locale/ecp/zh_CN.mo
similarity index 100%
rename from compiler/ecp/locale/ecp-zh_CN.mo
rename to compiler/ecp/locale/ecp/zh_CN.mo
diff --git a/compiler/ecp/locale/ecp-zh_CN.po b/compiler/ecp/locale/ecp/zh_CN.po
similarity index 100%
rename from compiler/ecp/locale/ecp-zh_CN.po
rename to compiler/ecp/locale/ecp/zh_CN.po
diff --git a/compiler/ecs/Makefile b/compiler/ecs/Makefile
index 49b401c..7522244 100644
--- a/compiler/ecs/Makefile
+++ b/compiler/ecs/Makefile
@@ -64,11 +64,11 @@ OBJECTS = $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
 SOURCES = $(ECSOURCES)
 
 RESOURCES = \
-	locale/ecs-es.mo \
-	locale/ecs-he.mo \
-	locale/ecs-ru.mo \
-	locale/ecs-zh_CN.mo \
-	locale/ecs-pt_BR.mo
+	locale/ecs/es.mo \
+	locale/ecs/he.mo \
+	locale/ecs/pt_BR.mo \
+	locale/ecs/ru.mo \
+	locale/ecs/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -117,7 +117,7 @@ ifndef STATIC_LIBRARY_TARGET
 ifndef NOSTRIP
 	$(STRIP) $(STRIPOPT) $(TARGET)
 endif
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ecs-es.mo locale/ecs-he.mo locale/ecs-ru.mo locale/ecs-zh_CN.mo locale/ecs-pt_BR.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ecs/es.mo locale/ecs/he.mo locale/ecs/pt_BR.mo locale/ecs/ru.mo locale/ecs/zh_CN.mo "locale/ecs"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -142,11 +142,21 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/compiler/ecs/ecs.ec b/compiler/ecs/ecs.ec
index 2388575..6b1fbbf 100644
--- a/compiler/ecs/ecs.ec
+++ b/compiler/ecs/ecs.ec
@@ -1989,6 +1989,7 @@ class SymbolgenApp : Application
                //strcpy(potFileName, output);
                //StripExtension(potFileName);
                strcpy(potFileName, "locale");
+               PathCat(potFileName, projectName);
                MakeDir(potFileName);
                PathCat(potFileName, projectName);
                ChangeExtension(potFileName, "pot", potFileName);
diff --git a/compiler/ecs/ecs.epj b/compiler/ecs/ecs.epj
index 71d842b..dd03473 100644
--- a/compiler/ecs/ecs.epj
+++ b/compiler/ecs/ecs.epj
@@ -86,11 +86,16 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "ecs-es.mo",
-            "ecs-he.mo",
-            "ecs-ru.mo",
-            "ecs-zh_CN.mo",
-            "ecs-pt_BR.mo"
+            {
+               "Folder" : "ecs",
+               "Files" : [
+                  "es.mo",
+                  "he.mo",
+                  "pt_BR.mo",
+                  "ru.mo",
+                  "zh_CN.mo"
+               ]
+            }
          ]
       }
    ]
diff --git a/compiler/ecs/locale/ecs.pot b/compiler/ecs/locale/ecs/ecs.pot
similarity index 100%
rename from compiler/ecs/locale/ecs.pot
rename to compiler/ecs/locale/ecs/ecs.pot
diff --git a/compiler/ecs/locale/ecs-es.mo b/compiler/ecs/locale/ecs/es.mo
similarity index 100%
rename from compiler/ecs/locale/ecs-es.mo
rename to compiler/ecs/locale/ecs/es.mo
diff --git a/compiler/ecs/locale/ecs-es.po b/compiler/ecs/locale/ecs/es.po
similarity index 100%
rename from compiler/ecs/locale/ecs-es.po
rename to compiler/ecs/locale/ecs/es.po
diff --git a/compiler/ecs/locale/ecs-he.mo b/compiler/ecs/locale/ecs/he.mo
similarity index 100%
rename from compiler/ecs/locale/ecs-he.mo
rename to compiler/ecs/locale/ecs/he.mo
diff --git a/compiler/ecs/locale/ecs-he.po b/compiler/ecs/locale/ecs/he.po
similarity index 100%
rename from compiler/ecs/locale/ecs-he.po
rename to compiler/ecs/locale/ecs/he.po
diff --git a/compiler/ecs/locale/ecs-pt_BR.mo b/compiler/ecs/locale/ecs/pt_BR.mo
similarity index 100%
rename from compiler/ecs/locale/ecs-pt_BR.mo
rename to compiler/ecs/locale/ecs/pt_BR.mo
diff --git a/compiler/ecs/locale/ecs-pt_BR.po b/compiler/ecs/locale/ecs/pt_BR.po
similarity index 100%
rename from compiler/ecs/locale/ecs-pt_BR.po
rename to compiler/ecs/locale/ecs/pt_BR.po
diff --git a/compiler/ecs/locale/ecs-ru.mo b/compiler/ecs/locale/ecs/ru.mo
similarity index 100%
rename from compiler/ecs/locale/ecs-ru.mo
rename to compiler/ecs/locale/ecs/ru.mo
diff --git a/compiler/ecs/locale/ecs-ru.po b/compiler/ecs/locale/ecs/ru.po
similarity index 100%
rename from compiler/ecs/locale/ecs-ru.po
rename to compiler/ecs/locale/ecs/ru.po
diff --git a/compiler/ecs/locale/ecs-zh_CN.mo b/compiler/ecs/locale/ecs/zh_CN.mo
similarity index 100%
rename from compiler/ecs/locale/ecs-zh_CN.mo
rename to compiler/ecs/locale/ecs/zh_CN.mo
diff --git a/compiler/ecs/locale/ecs-zh_CN.po b/compiler/ecs/locale/ecs/zh_CN.po
similarity index 100%
rename from compiler/ecs/locale/ecs-zh_CN.po
rename to compiler/ecs/locale/ecs/zh_CN.po
diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile
index a3d3539..69105f5 100644
--- a/compiler/libec/Makefile
+++ b/compiler/libec/Makefile
@@ -100,9 +100,9 @@ SOURCES = $(ECSOURCES) \
 	../bootstrap/bsl.c
 
 RESOURCES = \
-	locale/ec-es.mo \
-	locale/ec-mr.mo \
-	locale/ec-zh_CN.mo
+	locale/ec/es.mo \
+	locale/ec/mr.mo \
+	locale/ec/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -156,7 +156,7 @@ ifndef STATIC_LIBRARY_TARGET
 ifndef NOSTRIP
 	$(STRIP) $(STRIPOPT) $(TARGET)
 endif
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ec-es.mo locale/ec-mr.mo locale/ec-zh_CN.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ec/es.mo locale/ec/mr.mo locale/ec/zh_CN.mo "locale/ec"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -393,11 +393,21 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/compiler/libec/ec.epj b/compiler/libec/ec.epj
index 97e9b2e..48eb8ec 100644
--- a/compiler/libec/ec.epj
+++ b/compiler/libec/ec.epj
@@ -136,9 +136,14 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "ec-es.mo",
-            "ec-mr.mo",
-            "ec-zh_CN.mo"
+            {
+               "Folder" : "ec",
+               "Files" : [
+                  "es.mo",
+                  "mr.mo",
+                  "zh_CN.mo"
+               ]
+            }
          ]
       }
    ]
diff --git a/compiler/libec/locale/ec.pot b/compiler/libec/locale/ec/ec.pot
similarity index 100%
rename from compiler/libec/locale/ec.pot
rename to compiler/libec/locale/ec/ec.pot
diff --git a/compiler/libec/locale/ec-es.mo b/compiler/libec/locale/ec/es.mo
similarity index 100%
rename from compiler/libec/locale/ec-es.mo
rename to compiler/libec/locale/ec/es.mo
diff --git a/compiler/libec/locale/ec-es.po b/compiler/libec/locale/ec/es.po
similarity index 100%
rename from compiler/libec/locale/ec-es.po
rename to compiler/libec/locale/ec/es.po
diff --git a/compiler/libec/locale/ec-mr.mo b/compiler/libec/locale/ec/mr.mo
similarity index 100%
rename from compiler/libec/locale/ec-mr.mo
rename to compiler/libec/locale/ec/mr.mo
diff --git a/compiler/libec/locale/ec-mr.po b/compiler/libec/locale/ec/mr.po
similarity index 100%
rename from compiler/libec/locale/ec-mr.po
rename to compiler/libec/locale/ec/mr.po
diff --git a/compiler/libec/locale/ec-zh_CN.mo b/compiler/libec/locale/ec/zh_CN.mo
similarity index 100%
rename from compiler/libec/locale/ec-zh_CN.mo
rename to compiler/libec/locale/ec/zh_CN.mo
diff --git a/compiler/libec/locale/ec-zh_CN.po b/compiler/libec/locale/ec/zh_CN.po
similarity index 100%
rename from compiler/libec/locale/ec-zh_CN.po
rename to compiler/libec/locale/ec/zh_CN.po
diff --git a/documentor/Makefile b/documentor/Makefile
index 97abd8f..9ee684b 100644
--- a/documentor/Makefile
+++ b/documentor/Makefile
@@ -71,9 +71,9 @@ OBJECTS = $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
 SOURCES = $(ECSOURCES)
 
 RESOURCES = \
-	locale/documentor-es.mo \
-	locale/documentor-zh_CN.mo \
-	locale/documentor-pt_BR.mo \
+	locale/documentor/es.mo \
+	locale/documentor/pt_BR.mo \
+	locale/documentor/zh_CN.mo \
 	../ide/res/actions/docOpen.png \
 	res/documentorIcon.png
 
@@ -122,7 +122,7 @@ ifndef NOSTRIP
 	$(STRIP) $(STRIPOPT) $(TARGET)
 endif
 	$(EAR) aw$(EARFLAGS) $(TARGET) res/documentorIcon.png ""
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/documentor-es.mo locale/documentor-zh_CN.mo locale/documentor-pt_BR.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/documentor/es.mo locale/documentor/pt_BR.mo locale/documentor/zh_CN.mo "locale/documentor"
 	$(EAR) aw$(EARFLAGS) $(TARGET) ../ide/res/actions/docOpen.png "actions"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
@@ -220,11 +220,21 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/documentor/documentor.epj b/documentor/documentor.epj
index ea4691a..62e0cb6 100644
--- a/documentor/documentor.epj
+++ b/documentor/documentor.epj
@@ -89,9 +89,14 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "documentor-es.mo",
-            "documentor-zh_CN.mo",
-            "documentor-pt_BR.mo"
+            {
+               "Folder" : "documentor",
+               "Files" : [
+                  "es.mo",
+                  "pt_BR.mo",
+                  "zh_CN.mo"
+               ]
+            }
          ]
       },
       {
diff --git a/documentor/locale/documentor.pot b/documentor/locale/documentor/documentor.pot
similarity index 100%
rename from documentor/locale/documentor.pot
rename to documentor/locale/documentor/documentor.pot
diff --git a/documentor/locale/documentor-es.mo b/documentor/locale/documentor/es.mo
similarity index 100%
rename from documentor/locale/documentor-es.mo
rename to documentor/locale/documentor/es.mo
diff --git a/documentor/locale/documentor-es.po b/documentor/locale/documentor/es.po
similarity index 100%
rename from documentor/locale/documentor-es.po
rename to documentor/locale/documentor/es.po
diff --git a/documentor/locale/documentor-pt_BR.mo b/documentor/locale/documentor/pt_BR.mo
similarity index 100%
rename from documentor/locale/documentor-pt_BR.mo
rename to documentor/locale/documentor/pt_BR.mo
diff --git a/documentor/locale/documentor-pt_BR.po b/documentor/locale/documentor/pt_BR.po
similarity index 100%
rename from documentor/locale/documentor-pt_BR.po
rename to documentor/locale/documentor/pt_BR.po
diff --git a/documentor/locale/documentor-zh_CN.mo b/documentor/locale/documentor/zh_CN.mo
similarity index 100%
rename from documentor/locale/documentor-zh_CN.mo
rename to documentor/locale/documentor/zh_CN.mo
diff --git a/documentor/locale/documentor-zh_CN.po b/documentor/locale/documentor/zh_CN.po
similarity index 100%
rename from documentor/locale/documentor-zh_CN.po
rename to documentor/locale/documentor/zh_CN.po
diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile
index 2fcf62f..a91c81c 100644
--- a/ear/cmd/Makefile
+++ b/ear/cmd/Makefile
@@ -64,9 +64,9 @@ OBJECTS = $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
 SOURCES = $(ECSOURCES)
 
 RESOURCES = \
-	locale/ear-es.mo \
-	locale/ear-ru.mo \
-	locale/ear-zh_CN.mo \
+	locale/ear/es.mo \
+	locale/ear/ru.mo \
+	locale/ear/zh_CN.mo \
 	../extract/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/extract$(E)
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
@@ -125,7 +125,7 @@ ifndef NOSTRIP
 	$(STRIP) $(STRIPOPT) $(TARGET)
 endif
 	$(EAR) aw$(EARFLAGS) $(TARGET) ../extract/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/extract$(E) ""
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ear-es.mo locale/ear-ru.mo locale/ear-zh_CN.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ear/es.mo locale/ear/ru.mo locale/ear/zh_CN.mo "locale"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -150,11 +150,21 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/ear/cmd/ear.epj b/ear/cmd/ear.epj
index d7fc1f1..53f9f80 100644
--- a/ear/cmd/ear.epj
+++ b/ear/cmd/ear.epj
@@ -48,9 +48,9 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "ear-es.mo",
-            "ear-ru.mo",
-            "ear-zh_CN.mo"
+            "locale/ear/es.mo",
+            "locale/ear/ru.mo",
+            "locale/ear/zh_CN.mo"
          ]
       },
       "../extract/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)/extract$(E)"
diff --git a/ear/cmd/locale/ear.pot b/ear/cmd/locale/ear/ear.pot
similarity index 100%
rename from ear/cmd/locale/ear.pot
rename to ear/cmd/locale/ear/ear.pot
diff --git a/ear/cmd/locale/ear-es.mo b/ear/cmd/locale/ear/es.mo
similarity index 100%
rename from ear/cmd/locale/ear-es.mo
rename to ear/cmd/locale/ear/es.mo
diff --git a/ear/cmd/locale/ear-es.po b/ear/cmd/locale/ear/es.po
similarity index 100%
rename from ear/cmd/locale/ear-es.po
rename to ear/cmd/locale/ear/es.po
diff --git a/ear/cmd/locale/ear-ru.mo b/ear/cmd/locale/ear/ru.mo
similarity index 100%
rename from ear/cmd/locale/ear-ru.mo
rename to ear/cmd/locale/ear/ru.mo
diff --git a/ear/cmd/locale/ear-ru.po b/ear/cmd/locale/ear/ru.po
similarity index 100%
rename from ear/cmd/locale/ear-ru.po
rename to ear/cmd/locale/ear/ru.po
diff --git a/ear/cmd/locale/ear-zh_CN.mo b/ear/cmd/locale/ear/zh_CN.mo
similarity index 100%
rename from ear/cmd/locale/ear-zh_CN.mo
rename to ear/cmd/locale/ear/zh_CN.mo
diff --git a/ear/cmd/locale/ear-zh_CN.po b/ear/cmd/locale/ear/zh_CN.po
similarity index 100%
rename from ear/cmd/locale/ear-zh_CN.po
rename to ear/cmd/locale/ear/zh_CN.po
diff --git a/ear/extract/Makefile b/ear/extract/Makefile
index 054709c..be6b716 100644
--- a/ear/extract/Makefile
+++ b/ear/extract/Makefile
@@ -91,11 +91,11 @@ RESOURCES1 = \
 	../../ecere/res/vanilla/ecere/places/networkServer.png \
 	../../ecere/res/vanilla/ecere/places/networkWorkgroup.png \
 	../../ecere/res/vanilla/ecere/status/folderOpen.png \
-	locale/extract-es.mo \
-	locale/extract-he.mo
+	locale/extract/es.mo \
+	locale/extract/he.mo
 RESOURCES2 = \
-	locale/extract-ru.mo \
-	locale/extract-zh_CN.mo
+	locale/extract/ru.mo \
+	locale/extract/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -211,7 +211,7 @@ endif
 	$(EAR) aw$(EARFLAGS) $(TARGET) ../../ecere/res/vanilla/ecere/elements/optionBoxSelected.png ../../ecere/res/vanilla/ecere/elements/optionBoxSelectedDown.png ../../ecere/res/vanilla/ecere/elements/optionBoxUp.png "ecere/elements"
 	$(EAR) aw$(EARFLAGS) $(TARGET) ../../ecere/res/vanilla/ecere/places/driveRemote.png ../../ecere/res/vanilla/ecere/places/folder.png ../../ecere/res/vanilla/ecere/places/folderRemote.png ../../ecere/res/vanilla/ecere/places/networkServer.png ../../ecere/res/vanilla/ecere/places/networkWorkgroup.png "ecere/places"
 	$(EAR) aw$(EARFLAGS) $(TARGET) ../../ecere/res/vanilla/ecere/status/folderOpen.png "ecere/status"
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/extract-es.mo locale/extract-he.mo locale/extract-ru.mo locale/extract-zh_CN.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/extract/es.mo locale/extract/he.mo locale/extract/ru.mo locale/extract/zh_CN.mo "locale"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -235,11 +235,21 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/ear/extract/extract.epj b/ear/extract/extract.epj
index 69fd938..bbc1405 100644
--- a/ear/extract/extract.epj
+++ b/ear/extract/extract.epj
@@ -211,10 +211,10 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "extract-es.mo",
-            "extract-he.mo",
-            "extract-ru.mo",
-            "extract-zh_CN.mo"
+            "locale/extract/es.mo",
+            "locale/extract/he.mo",
+            "locale/extract/ru.mo",
+            "locale/extract/zh_CN.mo"
          ]
       }
    ]
diff --git a/ear/extract/locale/extract-es.mo b/ear/extract/locale/extract/es.mo
similarity index 100%
rename from ear/extract/locale/extract-es.mo
rename to ear/extract/locale/extract/es.mo
diff --git a/ear/extract/locale/extract-es.po b/ear/extract/locale/extract/es.po
similarity index 100%
rename from ear/extract/locale/extract-es.po
rename to ear/extract/locale/extract/es.po
diff --git a/ear/extract/locale/extract.pot b/ear/extract/locale/extract/extract.pot
similarity index 100%
rename from ear/extract/locale/extract.pot
rename to ear/extract/locale/extract/extract.pot
diff --git a/ear/extract/locale/extract-he.mo b/ear/extract/locale/extract/he.mo
similarity index 100%
rename from ear/extract/locale/extract-he.mo
rename to ear/extract/locale/extract/he.mo
diff --git a/ear/extract/locale/extract-he.po b/ear/extract/locale/extract/he.po
similarity index 100%
rename from ear/extract/locale/extract-he.po
rename to ear/extract/locale/extract/he.po
diff --git a/ear/extract/locale/extract-ru.mo b/ear/extract/locale/extract/ru.mo
similarity index 100%
rename from ear/extract/locale/extract-ru.mo
rename to ear/extract/locale/extract/ru.mo
diff --git a/ear/extract/locale/extract-ru.po b/ear/extract/locale/extract/ru.po
similarity index 100%
rename from ear/extract/locale/extract-ru.po
rename to ear/extract/locale/extract/ru.po
diff --git a/ear/extract/locale/extract-zh_CN.mo b/ear/extract/locale/extract/zh_CN.mo
similarity index 100%
rename from ear/extract/locale/extract-zh_CN.mo
rename to ear/extract/locale/extract/zh_CN.mo
diff --git a/ear/extract/locale/extract-zh_CN.po b/ear/extract/locale/extract/zh_CN.po
similarity index 100%
rename from ear/extract/locale/extract-zh_CN.po
rename to ear/extract/locale/extract/zh_CN.po
diff --git a/ecere/Makefile b/ecere/Makefile
index a15f395..f4f6aad 100644
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -376,13 +376,13 @@ RESOURCES3 = \
 	$(RES)status/audioVolumeHigh.png \
 	$(RES)status/folderOpen.png \
 	$(RES)unicode/derivedGeneralCategoryStripped.txt \
-	locale/ecere-es.mo \
-	locale/ecere-hu.mo \
-	locale/ecere-mr.mo \
-	locale/ecere-nl.mo \
-	locale/ecere-pt_BR.mo \
-	locale/ecere-ru.mo \
-	locale/ecere-zh_CN.mo
+	locale/ecere/es.mo \
+	locale/ecere/hu.mo \
+	locale/ecere/mr.mo \
+	locale/ecere/nl.mo \
+	locale/ecere/pt_BR.mo \
+	locale/ecere/ru.mo \
+	locale/ecere/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -584,7 +584,7 @@ endif
 	$(EAR) aw$(EARFLAGS) $(TARGET) $(RES)places/driveRemote.png $(RES)places/folder.png $(RES)places/folderRemote.png $(RES)places/networkServer.png $(RES)places/networkWorkgroup.png $(RES)places/brokenFolder.png "places"
 	$(EAR) aw$(EARFLAGS) $(TARGET) $(RES)status/audioVolumeHigh.png $(RES)status/folderOpen.png "status"
 	$(EAR) aw$(EARFLAGS) $(TARGET) $(RES)unicode/derivedGeneralCategoryStripped.txt "unicode"
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ecere-es.mo locale/ecere-hu.mo locale/ecere-mr.mo locale/ecere-nl.mo locale/ecere-pt_BR.mo locale/ecere-ru.mo locale/ecere-zh_CN.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ecere/es.mo locale/ecere/hu.mo locale/ecere/mr.mo locale/ecere/nl.mo locale/ecere/pt_BR.mo locale/ecere/ru.mo locale/ecere/zh_CN.mo "locale/ecere"
 else
 	$(AR) rcs $(TARGET) @$(OBJ)objects.lst $(LIBS)
 endif
diff --git a/ecere/Makefile.ecereCOM b/ecere/Makefile.ecereCOM
index 14ce21c..5ebd4bd 100644
--- a/ecere/Makefile.ecereCOM
+++ b/ecere/Makefile.ecereCOM
@@ -322,6 +322,9 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
 ifdef SHARED_LIBRARY_TARGET
 ifdef LINUX_TARGET
@@ -334,7 +337,6 @@ endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/ecere/Makefile.installer b/ecere/Makefile.installer
index 1d80008..49c2644 100644
--- a/ecere/Makefile.installer
+++ b/ecere/Makefile.installer
@@ -345,13 +345,13 @@ RESOURCES3 = \
 	$(RES)status/audioVolumeHigh.png \
 	$(RES)status/folderOpen.png \
 	$(RES)unicode/derivedGeneralCategoryStripped.txt \
-	locale/ecere-es.mo \
-	locale/ecere-hu.mo \
-	locale/ecere-mr.mo \
-	locale/ecere-nl.mo \
-	locale/ecere-pt_BR.mo \
-	locale/ecere-ru.mo \
-	locale/ecere-zh_CN.mo
+	locale/ecere/es.mo \
+	locale/ecere/hu.mo \
+	locale/ecere/mr.mo \
+	locale/ecere/nl.mo \
+	locale/ecere/pt_BR.mo \
+	locale/ecere/ru.mo \
+	locale/ecere/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -540,7 +540,7 @@ endif
 	$(EAR) aw$(EARFLAGS) $(TARGET) $(RES)places/driveRemote.png $(RES)places/folder.png $(RES)places/folderRemote.png $(RES)places/networkServer.png $(RES)places/networkWorkgroup.png $(RES)places/brokenFolder.png "places"
 	$(EAR) aw$(EARFLAGS) $(TARGET) $(RES)status/audioVolumeHigh.png $(RES)status/folderOpen.png "status"
 	$(EAR) aw$(EARFLAGS) $(TARGET) $(RES)unicode/derivedGeneralCategoryStripped.txt "unicode"
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ecere-es.mo locale/ecere-hu.mo locale/ecere-mr.mo locale/ecere-nl.mo locale/ecere-pt_BR.mo locale/ecere-ru.mo locale/ecere-zh_CN.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ecere/es.mo locale/ecere/hu.mo locale/ecere/mr.mo locale/ecere/nl.mo locale/ecere/pt_BR.mo locale/ecere/ru.mo locale/ecere/zh_CN.mo "locale/ecere"
 else
 	$(AR) rcs $(TARGET) @$(OBJ)objects.lst $(LIBS)
 endif
diff --git a/ecere/Makefile.vanilla b/ecere/Makefile.vanilla
index 3ab964e..0be341e 100644
--- a/ecere/Makefile.vanilla
+++ b/ecere/Makefile.vanilla
@@ -1442,12 +1442,22 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS1))
 	$(call rmq,$(_OBJECTS2))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS1))
 	$(call rmq,$(ECOBJECTS2))
 	$(call rmq,$(COBJECTS1))
diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index 896af48..d28fad4 100644
--- a/ecere/ecere.epj
+++ b/ecere/ecere.epj
@@ -2388,13 +2388,18 @@ from wherever you obtained them.
       {
          "Folder" : "locale",
          "Files" : [
-            "locale/ecere-es.mo",
-            "locale/ecere-hu.mo",
-            "locale/ecere-mr.mo",
-            "locale/ecere-nl.mo",
-            "locale/ecere-pt_BR.mo",
-            "locale/ecere-ru.mo",
-            "locale/ecere-zh_CN.mo"
+            {
+               "Folder" : "ecere",
+               "Files" : [
+                  "locale/ecere/es.mo",
+                  "locale/ecere/hu.mo",
+                  "locale/ecere/mr.mo",
+                  "locale/ecere/nl.mo",
+                  "locale/ecere/pt_BR.mo",
+                  "locale/ecere/ru.mo",
+                  "locale/ecere/zh_CN.mo"
+               ]
+            }
          ],
          "Configurations" : [
             {
diff --git a/ecere/locale/ecere.pot b/ecere/locale/ecere/ecere.pot
similarity index 100%
rename from ecere/locale/ecere.pot
rename to ecere/locale/ecere/ecere.pot
diff --git a/ecere/locale/ecere-es.mo b/ecere/locale/ecere/es.mo
similarity index 100%
rename from ecere/locale/ecere-es.mo
rename to ecere/locale/ecere/es.mo
diff --git a/ecere/locale/ecere-es.po b/ecere/locale/ecere/es.po
similarity index 100%
rename from ecere/locale/ecere-es.po
rename to ecere/locale/ecere/es.po
diff --git a/ecere/locale/ecere-hu.mo b/ecere/locale/ecere/hu.mo
similarity index 100%
rename from ecere/locale/ecere-hu.mo
rename to ecere/locale/ecere/hu.mo
diff --git a/ecere/locale/ecere-hu.po b/ecere/locale/ecere/hu.po
similarity index 100%
rename from ecere/locale/ecere-hu.po
rename to ecere/locale/ecere/hu.po
diff --git a/ecere/locale/ecere-mr.mo b/ecere/locale/ecere/mr.mo
similarity index 100%
rename from ecere/locale/ecere-mr.mo
rename to ecere/locale/ecere/mr.mo
diff --git a/ecere/locale/ecere-mr.po b/ecere/locale/ecere/mr.po
similarity index 100%
rename from ecere/locale/ecere-mr.po
rename to ecere/locale/ecere/mr.po
diff --git a/ecere/locale/ecere-nl.mo b/ecere/locale/ecere/nl.mo
similarity index 100%
rename from ecere/locale/ecere-nl.mo
rename to ecere/locale/ecere/nl.mo
diff --git a/ecere/locale/ecere-nl.po b/ecere/locale/ecere/nl.po
similarity index 100%
rename from ecere/locale/ecere-nl.po
rename to ecere/locale/ecere/nl.po
diff --git a/ecere/locale/ecere-pt_BR.mo b/ecere/locale/ecere/pt_BR.mo
similarity index 100%
rename from ecere/locale/ecere-pt_BR.mo
rename to ecere/locale/ecere/pt_BR.mo
diff --git a/ecere/locale/ecere-pt_BR.po b/ecere/locale/ecere/pt_BR.po
similarity index 100%
rename from ecere/locale/ecere-pt_BR.po
rename to ecere/locale/ecere/pt_BR.po
diff --git a/ecere/locale/ecere-ru.mo b/ecere/locale/ecere/ru.mo
similarity index 100%
rename from ecere/locale/ecere-ru.mo
rename to ecere/locale/ecere/ru.mo
diff --git a/ecere/locale/ecere-ru.po b/ecere/locale/ecere/ru.po
similarity index 100%
rename from ecere/locale/ecere-ru.po
rename to ecere/locale/ecere/ru.po
diff --git a/ecere/locale/ecere-zh_CN.mo b/ecere/locale/ecere/zh_CN.mo
similarity index 100%
rename from ecere/locale/ecere-zh_CN.mo
rename to ecere/locale/ecere/zh_CN.mo
diff --git a/ecere/locale/ecere-zh_CN.po b/ecere/locale/ecere/zh_CN.po
similarity index 100%
rename from ecere/locale/ecere-zh_CN.po
rename to ecere/locale/ecere/zh_CN.po
diff --git a/ecere/src/sys/i18n.ec b/ecere/src/sys/i18n.ec
index 7a46b60..fba9ca4 100644
--- a/ecere/src/sys/i18n.ec
+++ b/ecere/src/sys/i18n.ec
@@ -64,9 +64,9 @@ public dllexport void LoadTranslatedStrings(Module module, char * name)
    }
 
    if(module.name)
-      sprintf(fileName, "<:%s>locale/%s-%s.mo", module.name, name, locale);
+      sprintf(fileName, "<:%s>locale/%s/%s.mo", module.name, name, locale);
    else
-      sprintf(fileName, ":locale/%s-%s.mo", name, locale);
+      sprintf(fileName, ":locale/%s/%s.mo", name, locale);
    f = FileOpen(fileName, read);
    if(!f)
    {
@@ -91,9 +91,9 @@ public dllexport void LoadTranslatedStrings(Module module, char * name)
    {
       // Attempt with generic language
       if(module.name)
-         sprintf(fileName, "<:%s>locale/%s-%s.mo", module.name, name, genericLocale);
+         sprintf(fileName, "<:%s>locale/%s/%s.mo", module.name, name, genericLocale);
       else
-         sprintf(fileName, ":locale/%s-%s.mo", name, genericLocale);
+         sprintf(fileName, ":locale/%s/%s.mo", name, genericLocale);
       f = FileOpen(fileName, read);
       if(!f)
       {
diff --git a/eda/drivers/sqlite/EDASQLite.epj b/eda/drivers/sqlite/EDASQLite.epj
index c43d8d6..f094855 100644
--- a/eda/drivers/sqlite/EDASQLite.epj
+++ b/eda/drivers/sqlite/EDASQLite.epj
@@ -139,11 +139,16 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "EDASQLite-es.mo",
-            "EDASQLite-he.mo",
-            "EDASQLite-ru.mo",
-            "EDASQLite-zh_CN.mo",
-            "EDASQLite-pt_BR.mo"
+            {
+               "Folder" : "EDASQLite",
+               "Files" : [
+                  "es.mo",
+                  "he.mo",
+                  "pt_BR.mo",
+                  "ru.mo",
+                  "zh_CN.mo"
+               ]
+            }
          ]
       }
    ]
diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile
index d274e11..0ef2852 100644
--- a/eda/drivers/sqlite/Makefile
+++ b/eda/drivers/sqlite/Makefile
@@ -73,11 +73,11 @@ SOURCES = $(ECSOURCES) \
 	$(if $(LINUX_TARGET),,sqlite3.c)
 
 RESOURCES = \
-	locale/EDASQLite-es.mo \
-	locale/EDASQLite-he.mo \
-	locale/EDASQLite-ru.mo \
-	locale/EDASQLite-zh_CN.mo \
-	locale/EDASQLite-pt_BR.mo
+	locale/EDASQLite/es.mo \
+	locale/EDASQLite/he.mo \
+	locale/EDASQLite/pt_BR.mo \
+	locale/EDASQLite/ru.mo \
+	locale/EDASQLite/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -170,7 +170,7 @@ ifndef STATIC_LIBRARY_TARGET
 ifndef NOSTRIP
 	$(STRIP) $(STRIPOPT) $(TARGET)
 endif
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/EDASQLite-es.mo locale/EDASQLite-he.mo locale/EDASQLite-ru.mo locale/EDASQLite-zh_CN.mo locale/EDASQLite-pt_BR.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/EDASQLite/es.mo locale/EDASQLite/he.mo locale/EDASQLite/pt_BR.mo locale/EDASQLite/ru.mo locale/EDASQLite/zh_CN.mo "locale/EDASQLite"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -202,11 +202,21 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/eda/drivers/sqlite/locale/EDASQLite.pot b/eda/drivers/sqlite/locale/EDASQLite/EDASQLite.pot
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite.pot
rename to eda/drivers/sqlite/locale/EDASQLite/EDASQLite.pot
diff --git a/eda/drivers/sqlite/locale/EDASQLite-es.mo b/eda/drivers/sqlite/locale/EDASQLite/es.mo
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite-es.mo
rename to eda/drivers/sqlite/locale/EDASQLite/es.mo
diff --git a/eda/drivers/sqlite/locale/EDASQLite-es.po b/eda/drivers/sqlite/locale/EDASQLite/es.po
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite-es.po
rename to eda/drivers/sqlite/locale/EDASQLite/es.po
diff --git a/eda/drivers/sqlite/locale/EDASQLite-he.mo b/eda/drivers/sqlite/locale/EDASQLite/he.mo
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite-he.mo
rename to eda/drivers/sqlite/locale/EDASQLite/he.mo
diff --git a/eda/drivers/sqlite/locale/EDASQLite-he.po b/eda/drivers/sqlite/locale/EDASQLite/he.po
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite-he.po
rename to eda/drivers/sqlite/locale/EDASQLite/he.po
diff --git a/eda/drivers/sqlite/locale/EDASQLite-pt_BR.mo b/eda/drivers/sqlite/locale/EDASQLite/pt_BR.mo
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite-pt_BR.mo
rename to eda/drivers/sqlite/locale/EDASQLite/pt_BR.mo
diff --git a/eda/drivers/sqlite/locale/EDASQLite-pt_BR.po b/eda/drivers/sqlite/locale/EDASQLite/pt_BR.po
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite-pt_BR.po
rename to eda/drivers/sqlite/locale/EDASQLite/pt_BR.po
diff --git a/eda/drivers/sqlite/locale/EDASQLite-ru.mo b/eda/drivers/sqlite/locale/EDASQLite/ru.mo
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite-ru.mo
rename to eda/drivers/sqlite/locale/EDASQLite/ru.mo
diff --git a/eda/drivers/sqlite/locale/EDASQLite-ru.po b/eda/drivers/sqlite/locale/EDASQLite/ru.po
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite-ru.po
rename to eda/drivers/sqlite/locale/EDASQLite/ru.po
diff --git a/eda/drivers/sqlite/locale/EDASQLite-zh_CN.mo b/eda/drivers/sqlite/locale/EDASQLite/zh_CN.mo
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite-zh_CN.mo
rename to eda/drivers/sqlite/locale/EDASQLite/zh_CN.mo
diff --git a/eda/drivers/sqlite/locale/EDASQLite-zh_CN.po b/eda/drivers/sqlite/locale/EDASQLite/zh_CN.po
similarity index 100%
rename from eda/drivers/sqlite/locale/EDASQLite-zh_CN.po
rename to eda/drivers/sqlite/locale/EDASQLite/zh_CN.po
diff --git a/eda/drivers/sqliteCipher/EDASQLiteCipher.epj b/eda/drivers/sqliteCipher/EDASQLiteCipher.epj
index ec80a2c..f073450 100644
--- a/eda/drivers/sqliteCipher/EDASQLiteCipher.epj
+++ b/eda/drivers/sqliteCipher/EDASQLiteCipher.epj
@@ -115,11 +115,16 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "EDASQLiteCipher-es.mo",
-            "EDASQLiteCipher-he.mo",
-            "EDASQLiteCipher-ru.mo",
-            "EDASQLiteCipher-zh_CN.mo",
-            "EDASQLiteCipher-pt_BR.mo"
+            {
+               "Folder" : "EDASQLiteCipher",
+               "Files" : [
+                  "es.mo",
+                  "he.mo",
+                  "pt_BR.mo",
+                  "ru.mo",
+                  "zh_CN.mo"
+               ]
+            }
          ]
       }
    ]
diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile
index a742895..71f2b03 100644
--- a/eda/drivers/sqliteCipher/Makefile
+++ b/eda/drivers/sqliteCipher/Makefile
@@ -74,11 +74,11 @@ SOURCES = $(ECSOURCES) \
 	sqlite3.c
 
 RESOURCES = \
-	locale/EDASQLiteCipher-es.mo \
-	locale/EDASQLiteCipher-he.mo \
-	locale/EDASQLiteCipher-ru.mo \
-	locale/EDASQLiteCipher-zh_CN.mo \
-	locale/EDASQLiteCipher-pt_BR.mo
+	locale/EDASQLiteCipher/es.mo \
+	locale/EDASQLiteCipher/he.mo \
+	locale/EDASQLiteCipher/pt_BR.mo \
+	locale/EDASQLiteCipher/ru.mo \
+	locale/EDASQLiteCipher/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -179,7 +179,7 @@ ifndef STATIC_LIBRARY_TARGET
 ifndef NOSTRIP
 	$(STRIP) $(STRIPOPT) $(TARGET)
 endif
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/EDASQLiteCipher-es.mo locale/EDASQLiteCipher-he.mo locale/EDASQLiteCipher-ru.mo locale/EDASQLiteCipher-zh_CN.mo locale/EDASQLiteCipher-pt_BR.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/EDASQLiteCipher/es.mo locale/EDASQLiteCipher/he.mo locale/EDASQLiteCipher/pt_BR.mo locale/EDASQLiteCipher/ru.mo locale/EDASQLiteCipher/zh_CN.mo "locale/EDASQLiteCipher"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -227,11 +227,21 @@ openssl_debug:
 	@$(call echo,OPENSSL_LIB_DIR $(OPENSSL_LIB_DIR))
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher.pot b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/EDASQLiteCipher.pot
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher.pot
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/EDASQLiteCipher.pot
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher-es.mo b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/es.mo
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher-es.mo
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/es.mo
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher-es.po b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/es.po
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher-es.po
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/es.po
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher-he.mo b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/he.mo
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher-he.mo
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/he.mo
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher-he.po b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/he.po
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher-he.po
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/he.po
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher-pt_BR.mo b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/pt_BR.mo
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher-pt_BR.mo
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/pt_BR.mo
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher-pt_BR.po b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/pt_BR.po
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher-pt_BR.po
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/pt_BR.po
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher-ru.mo b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/ru.mo
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher-ru.mo
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/ru.mo
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher-ru.po b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/ru.po
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher-ru.po
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/ru.po
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher-zh_CN.mo b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/zh_CN.mo
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher-zh_CN.mo
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/zh_CN.mo
diff --git a/eda/drivers/sqliteCipher/locale/EDASQLiteCipher-zh_CN.po b/eda/drivers/sqliteCipher/locale/EDASQLiteCipher/zh_CN.po
similarity index 100%
rename from eda/drivers/sqliteCipher/locale/EDASQLiteCipher-zh_CN.po
rename to eda/drivers/sqliteCipher/locale/EDASQLiteCipher/zh_CN.po
diff --git a/eda/libeda/EDA.epj b/eda/libeda/EDA.epj
index 523ee84..b3f7dbf 100644
--- a/eda/libeda/EDA.epj
+++ b/eda/libeda/EDA.epj
@@ -137,10 +137,15 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "EDA-es.mo",
-            "EDA-he.mo",
-            "EDA-ru.mo",
-            "EDA-zh_CN.mo"
+            {
+               "Folder" : "EDA",
+               "Files" : [
+                  "es.mo",
+                  "he.mo",
+                  "ru.mo",
+                  "zh_CN.mo"
+               ]
+            }
          ]
       }
    ]
diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile
index a8f5cf6..8934c55 100644
--- a/eda/libeda/Makefile
+++ b/eda/libeda/Makefile
@@ -77,10 +77,10 @@ OBJECTS = $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
 SOURCES = $(ECSOURCES)
 
 RESOURCES = \
-	locale/EDA-es.mo \
-	locale/EDA-he.mo \
-	locale/EDA-ru.mo \
-	locale/EDA-zh_CN.mo
+	locale/EDA/es.mo \
+	locale/EDA/he.mo \
+	locale/EDA/ru.mo \
+	locale/EDA/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -144,7 +144,7 @@ ifndef STATIC_LIBRARY_TARGET
 ifndef NOSTRIP
 	$(STRIP) $(STRIPOPT) $(TARGET)
 endif
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/EDA-es.mo locale/EDA-he.mo locale/EDA-ru.mo locale/EDA-zh_CN.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/EDA/es.mo locale/EDA/he.mo locale/EDA/ru.mo locale/EDA/zh_CN.mo "locale/EDA"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -244,8 +244,21 @@ $(OBJ)idList.o: $(OBJ)idList.c
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
-clean: objdir
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
+	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
+
+clean: cleantarget
 	$(call rmq,$(_OBJECTS))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
@@ -253,8 +266,8 @@ clean: objdir
 	$(call rmq,$(IMPORTS))
 	$(call rmq,$(SYMBOLS))
 
-realclean: objdir
+realclean: cleantarget
 	$(call rmrq,$(OBJ))
 
-distclean: objdir
+distclean: cleantarget
 	$(call rmrq,obj/)
diff --git a/eda/libeda/locale/EDA.pot b/eda/libeda/locale/EDA/EDA.pot
similarity index 100%
rename from eda/libeda/locale/EDA.pot
rename to eda/libeda/locale/EDA/EDA.pot
diff --git a/eda/libeda/locale/EDA-es.mo b/eda/libeda/locale/EDA/es.mo
similarity index 100%
rename from eda/libeda/locale/EDA-es.mo
rename to eda/libeda/locale/EDA/es.mo
diff --git a/eda/libeda/locale/EDA-es.po b/eda/libeda/locale/EDA/es.po
similarity index 100%
rename from eda/libeda/locale/EDA-es.po
rename to eda/libeda/locale/EDA/es.po
diff --git a/eda/libeda/locale/EDA-he.mo b/eda/libeda/locale/EDA/he.mo
similarity index 100%
rename from eda/libeda/locale/EDA-he.mo
rename to eda/libeda/locale/EDA/he.mo
diff --git a/eda/libeda/locale/EDA-he.po b/eda/libeda/locale/EDA/he.po
similarity index 100%
rename from eda/libeda/locale/EDA-he.po
rename to eda/libeda/locale/EDA/he.po
diff --git a/eda/libeda/locale/EDA-ru.mo b/eda/libeda/locale/EDA/ru.mo
similarity index 100%
rename from eda/libeda/locale/EDA-ru.mo
rename to eda/libeda/locale/EDA/ru.mo
diff --git a/eda/libeda/locale/EDA-ru.po b/eda/libeda/locale/EDA/ru.po
similarity index 100%
rename from eda/libeda/locale/EDA-ru.po
rename to eda/libeda/locale/EDA/ru.po
diff --git a/eda/libeda/locale/EDA-zh_CN.mo b/eda/libeda/locale/EDA/zh_CN.mo
similarity index 100%
rename from eda/libeda/locale/EDA-zh_CN.mo
rename to eda/libeda/locale/EDA/zh_CN.mo
diff --git a/eda/libeda/locale/EDA-zh_CN.po b/eda/libeda/locale/EDA/zh_CN.po
similarity index 100%
rename from eda/libeda/locale/EDA-zh_CN.po
rename to eda/libeda/locale/EDA/zh_CN.po
diff --git a/epj2make/Makefile b/epj2make/Makefile
index 73b7459..37a1af6 100644
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -70,10 +70,10 @@ OBJECTS = $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
 SOURCES = $(ECSOURCES)
 
 RESOURCES = \
-	locale/epj2make-es.mo \
-	locale/epj2make-he.mo \
-	locale/epj2make-ru.mo \
-	locale/epj2make-zh_CN.mo \
+	locale/epj2make/es.mo \
+	locale/epj2make/he.mo \
+	locale/epj2make/ru.mo \
+	locale/epj2make/zh_CN.mo \
 	../crossplatform.mk
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
@@ -131,7 +131,7 @@ ifndef NOSTRIP
 	$(STRIP) $(STRIPOPT) $(TARGET)
 endif
 	$(EAR) aw$(EARFLAGS) $(TARGET) ../crossplatform.mk ""
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/epj2make-es.mo locale/epj2make-he.mo locale/epj2make-ru.mo locale/epj2make-zh_CN.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/epj2make/es.mo locale/epj2make/he.mo locale/epj2make/ru.mo locale/epj2make/zh_CN.mo "locale/epj2make"
 else
 	$(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -219,11 +219,21 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/epj2make/epj2make.epj b/epj2make/epj2make.epj
index 913f0d1..95985f5 100644
--- a/epj2make/epj2make.epj
+++ b/epj2make/epj2make.epj
@@ -100,10 +100,15 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "epj2make-es.mo",
-            "epj2make-he.mo",
-            "epj2make-ru.mo",
-            "epj2make-zh_CN.mo"
+            {
+               "Folder" : "epj2make",
+               "Files" : [
+                  "es.mo",
+                  "he.mo",
+                  "ru.mo",
+                  "zh_CN.mo"
+               ]
+            }
          ]
       },
       "../crossplatform.mk"
diff --git a/epj2make/locale/epj2make.pot b/epj2make/locale/epj2make/epj2make.pot
similarity index 100%
rename from epj2make/locale/epj2make.pot
rename to epj2make/locale/epj2make/epj2make.pot
diff --git a/epj2make/locale/epj2make-es.mo b/epj2make/locale/epj2make/es.mo
similarity index 100%
rename from epj2make/locale/epj2make-es.mo
rename to epj2make/locale/epj2make/es.mo
diff --git a/epj2make/locale/epj2make-es.po b/epj2make/locale/epj2make/es.po
similarity index 100%
rename from epj2make/locale/epj2make-es.po
rename to epj2make/locale/epj2make/es.po
diff --git a/epj2make/locale/epj2make-he.mo b/epj2make/locale/epj2make/he.mo
similarity index 100%
rename from epj2make/locale/epj2make-he.mo
rename to epj2make/locale/epj2make/he.mo
diff --git a/epj2make/locale/epj2make-he.po b/epj2make/locale/epj2make/he.po
similarity index 100%
rename from epj2make/locale/epj2make-he.po
rename to epj2make/locale/epj2make/he.po
diff --git a/epj2make/locale/epj2make-ru.mo b/epj2make/locale/epj2make/ru.mo
similarity index 100%
rename from epj2make/locale/epj2make-ru.mo
rename to epj2make/locale/epj2make/ru.mo
diff --git a/epj2make/locale/epj2make-ru.po b/epj2make/locale/epj2make/ru.po
similarity index 100%
rename from epj2make/locale/epj2make-ru.po
rename to epj2make/locale/epj2make/ru.po
diff --git a/epj2make/locale/epj2make-zh_CN.mo b/epj2make/locale/epj2make/zh_CN.mo
similarity index 100%
rename from epj2make/locale/epj2make-zh_CN.mo
rename to epj2make/locale/epj2make/zh_CN.mo
diff --git a/epj2make/locale/epj2make-zh_CN.po b/epj2make/locale/epj2make/zh_CN.po
similarity index 100%
rename from epj2make/locale/epj2make-zh_CN.po
rename to epj2make/locale/epj2make/zh_CN.po
diff --git a/ide/Makefile b/ide/Makefile
index 44162ab..483b59a 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -161,17 +161,17 @@ RESOURCES1 = \
 	$(RES)codeMarks/topFrameHalfError.png \
 	$(RES)others/mousePointer.png \
 	$(RES)status/software-update-available.png \
-	locale/ide-es.mo \
-	locale/ide-pt_BR.mo \
-	locale/ide-ru.mo \
-	locale/ide-vi.mo \
-	locale/ide-zh_CN.mo \
+	locale/ide/es.mo \
+	locale/ide/pt_BR.mo \
+	locale/ide/ru.mo \
+	locale/ide/vi.mo \
+	locale/ide/zh_CN.mo \
 	../LICENSE \
 	../extras/res/licenses/png.LICENSE \
 	../extras/res/licenses/tango.COPYING \
-	../extras/res/licenses/zlib.README
+	../extras/res/licenses/zlib.README \
+	../extras/res/licenses/sqlite.LICENSE
 RESOURCES2 = \
-	../extras/res/licenses/sqlite.LICENSE \
 	../extras/res/licenses/jpg.LICENSE \
 	../extras/res/licenses/ungif.LICENSE \
 	../extras/res/licenses/freetype.LICENSE \
@@ -280,7 +280,7 @@ endif
 	$(EAR) aw$(EARFLAGS) $(TARGET) $(RES)codeMarks/breakpoint.png $(RES)codeMarks/breakpointDisabled.png $(RES)codeMarks/breakpointHalf.png $(RES)codeMarks/breakpointHalfDisabled.png $(RES)codeMarks/cursor.png $(RES)codeMarks/cursorError.png $(RES)codeMarks/topFrame.png $(RES)codeMarks/topFrameError.png $(RES)codeMarks/topFrameHalf.png $(RES)codeMarks/topFrameHalfError.png "codeMarks"
 	$(EAR) aw$(EARFLAGS) $(TARGET) $(RES)others/mousePointer.png "others"
 	$(EAR) aw$(EARFLAGS) $(TARGET) $(RES)status/software-update-available.png "status"
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ide-es.mo locale/ide-pt_BR.mo locale/ide-ru.mo locale/ide-vi.mo locale/ide-zh_CN.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/ide/es.mo locale/ide/pt_BR.mo locale/ide/ru.mo locale/ide/vi.mo locale/ide/zh_CN.mo "locale/ide"
 	$(EAR) aw$(EARFLAGS) $(TARGET) ../LICENSE ../extras/res/licenses/png.LICENSE ../extras/res/licenses/tango.COPYING ../extras/res/licenses/zlib.README ../extras/res/licenses/sqlite.LICENSE ../extras/res/licenses/jpg.LICENSE ../extras/res/licenses/ungif.LICENSE ../extras/res/licenses/freetype.LICENSE ../extras/res/licenses/harfbuzz.LICENSE ../extras/res/licenses/upx.LICENSE "licenses"
 	$(EAR) aw$(EARFLAGS) $(TARGET) ../extras/res/licenses/MinGW-w64.LICENSE ../extras/res/licenses/tdm-gcc.LICENSE ../extras/res/licenses/ffi.LICENSE "licenses"
 	$(EAR) aw$(EARFLAGS) $(TARGET) ../extras/res/types/countryCode/es.png ../extras/res/types/countryCode/gb.png ../extras/res/types/countryCode/hu.png ../extras/res/types/countryCode/cn.png ../extras/res/types/countryCode/pt.png ../extras/res/types/countryCode/vn.png ../extras/res/types/countryCode/ru.png ../extras/res/types/countryCode/in.png ../extras/res/types/countryCode/nl.png ../extras/res/types/countryCode/il.png "countryCode"
@@ -700,14 +700,24 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
+	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+	$(call rmq,$(OBJ)symbols.lst)
+	$(call rmq,$(OBJ)objects.lst)
 	$(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+	$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
 	$(call rmq,$(_OBJECTS))
 ifdef WINDOWS_TARGET
 	$(call rmq,$(RCOBJECTS))
 endif
-	$(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
 	$(call rmq,$(ECOBJECTS))
 	$(call rmq,$(COBJECTS))
 	$(call rmq,$(BOWLS))
diff --git a/ide/ide.epj b/ide/ide.epj
index 71276c7..e63e384 100644
--- a/ide/ide.epj
+++ b/ide/ide.epj
@@ -331,11 +331,16 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "locale/ide-es.mo",
-            "locale/ide-pt_BR.mo",
-            "locale/ide-ru.mo",
-            "locale/ide-vi.mo",
-            "locale/ide-zh_CN.mo"
+            {
+               "Folder" : "ide",
+               "Files" : [
+                  "locale/ide/es.mo",
+                  "locale/ide/pt_BR.mo",
+                  "locale/ide/ru.mo",
+                  "locale/ide/vi.mo",
+                  "locale/ide/zh_CN.mo"
+               ]
+            }
          ]
       },
       {
diff --git a/ide/locale/ide-es.mo b/ide/locale/ide/es.mo
similarity index 100%
rename from ide/locale/ide-es.mo
rename to ide/locale/ide/es.mo
diff --git a/ide/locale/ide-es.po b/ide/locale/ide/es.po
similarity index 100%
rename from ide/locale/ide-es.po
rename to ide/locale/ide/es.po
diff --git a/ide/locale/ide.pot b/ide/locale/ide/ide.pot
similarity index 100%
rename from ide/locale/ide.pot
rename to ide/locale/ide/ide.pot
diff --git a/ide/locale/ide-pt_BR.mo b/ide/locale/ide/pt_BR.mo
similarity index 100%
rename from ide/locale/ide-pt_BR.mo
rename to ide/locale/ide/pt_BR.mo
diff --git a/ide/locale/ide-pt_BR.po b/ide/locale/ide/pt_BR.po
similarity index 100%
rename from ide/locale/ide-pt_BR.po
rename to ide/locale/ide/pt_BR.po
diff --git a/ide/locale/ide-ru.mo b/ide/locale/ide/ru.mo
similarity index 100%
rename from ide/locale/ide-ru.mo
rename to ide/locale/ide/ru.mo
diff --git a/ide/locale/ide-ru.po b/ide/locale/ide/ru.po
similarity index 100%
rename from ide/locale/ide-ru.po
rename to ide/locale/ide/ru.po
diff --git a/ide/locale/ide-vi.mo b/ide/locale/ide/vi.mo
similarity index 100%
rename from ide/locale/ide-vi.mo
rename to ide/locale/ide/vi.mo
diff --git a/ide/locale/ide-vi.po b/ide/locale/ide/vi.po
similarity index 100%
rename from ide/locale/ide-vi.po
rename to ide/locale/ide/vi.po
diff --git a/ide/locale/ide-zh_CN.mo b/ide/locale/ide/zh_CN.mo
similarity index 100%
rename from ide/locale/ide-zh_CN.mo
rename to ide/locale/ide/zh_CN.mo
diff --git a/ide/locale/ide-zh_CN.po b/ide/locale/ide/zh_CN.po
similarity index 100%
rename from ide/locale/ide-zh_CN.po
rename to ide/locale/ide/zh_CN.po
diff --git a/installer/Installer.epj b/installer/Installer.epj
index e3d2931..7774902 100644
--- a/installer/Installer.epj
+++ b/installer/Installer.epj
@@ -14894,10 +14894,15 @@
       {
          "Folder" : "locale",
          "Files" : [
-            "Installer-es.mo",
-            "Installer-ru.mo",
-            "Installer-zh_CN.mo",
-            "Installer-pt_BR.mo"
+            {
+               "Folder" : "Installer",
+               "Files" : [
+                  "es.mo",
+                  "pt_BR.mo",
+                  "ru.mo",
+                  "zh_CN.mo"
+               ]
+            }
          ]
       },
       {
diff --git a/installer/Makefile b/installer/Makefile
index 4ad1391..538127b 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -5212,10 +5212,10 @@ RESOURCES268 = \
 	tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/licenses/COPYING.MinGW-w64-runtime.txt \
 	tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/licenses/COPYING.MinGW-w64.txt \
 	tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/licenses/COPYING.winpthreads.txt \
-	locale/Installer-es.mo \
-	locale/Installer-ru.mo \
-	locale/Installer-zh_CN.mo \
-	locale/Installer-pt_BR.mo \
+	locale/Installer/es.mo \
+	locale/Installer/pt_BR.mo \
+	locale/Installer/ru.mo \
+	locale/Installer/zh_CN.mo \
 	../extras/res/types/countryCode/es.png \
 	../extras/res/types/countryCode/gb.png \
 	../extras/res/types/countryCode/hu.png \
@@ -5949,7 +5949,7 @@ endif
 	$(EAR) aw$(EARFLAGS) $(TARGET) tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxapofx1_0.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxapofx1_1.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxapofx1_2.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxapofx1_3.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxapofx1_4.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxapofx1_5.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxapofxd1_5.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxaudio2_8.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxinput.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxinput1_1.a "tdm/mingwrt/x86_64-w64-mingw32/lib32"
 	$(EAR) aw$(EARFLAGS) $(TARGET) tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxinput1_2.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxinput1_3.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxinput1_4.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/libxinput9_1_0.a tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/x86_64-w64-mingw32/lib32/txtmode.o "tdm/mingwrt/x86_64-w64-mingw32/lib32"
 	$(EAR) aw$(EARFLAGS) $(TARGET) tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/licenses/COPYING.LIB.txt tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/licenses/COPYING.MinGW-w64-runtime.txt tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/licenses/COPYING.MinGW-w64.txt tdm/mingw64-runtime-v3-tdm64-gcc48-svn6307/licenses/COPYING.winpthreads.txt "tdm/mingwrt/licenses"
-	$(EAR) aw$(EARFLAGS) $(TARGET) locale/Installer-es.mo locale/Installer-ru.mo locale/Installer-zh_CN.mo locale/Installer-pt_BR.mo "locale"
+	$(EAR) aw$(EARFLAGS) $(TARGET) locale/Installer/es.mo locale/Installer/pt_BR.mo locale/Installer/ru.mo locale/Installer/zh_CN.mo "locale/Installer"
 	$(EAR) aw$(EARFLAGS) $(TARGET) ../extras/res/types/countryCode/es.png ../extras/res/types/countryCode/gb.png ../extras/res/types/countryCode/hu.png ../extras/res/types/countryCode/cn.png ../extras/res/types/countryCode/pt.png ../extras/res/types/countryCode/vn.png ../extras/res/types/countryCode/ru.png ../extras/res/types/countryCode/in.png ../extras/res/types/countryCode/nl.png ../extras/res/types/countryCode/il.png "countryCode"
 else
 	$(AR) rcs $(TARGET) @$(OBJ)objects.lst $(LIBS)
diff --git a/installer/locale/Installer.pot b/installer/locale/Installer/Installer.pot
similarity index 100%
rename from installer/locale/Installer.pot
rename to installer/locale/Installer/Installer.pot
diff --git a/installer/locale/Installer-es.mo b/installer/locale/Installer/es.mo
similarity index 100%
rename from installer/locale/Installer-es.mo
rename to installer/locale/Installer/es.mo
diff --git a/installer/locale/Installer-es.po b/installer/locale/Installer/es.po
similarity index 100%
rename from installer/locale/Installer-es.po
rename to installer/locale/Installer/es.po
diff --git a/installer/locale/Installer-pt_BR.mo b/installer/locale/Installer/pt_BR.mo
similarity index 100%
rename from installer/locale/Installer-pt_BR.mo
rename to installer/locale/Installer/pt_BR.mo
diff --git a/installer/locale/Installer-pt_BR.po b/installer/locale/Installer/pt_BR.po
similarity index 100%
rename from installer/locale/Installer-pt_BR.po
rename to installer/locale/Installer/pt_BR.po
diff --git a/installer/locale/Installer-ru.mo b/installer/locale/Installer/ru.mo
similarity index 100%
rename from installer/locale/Installer-ru.mo
rename to installer/locale/Installer/ru.mo
diff --git a/installer/locale/Installer-ru.po b/installer/locale/Installer/ru.po
similarity index 100%
rename from installer/locale/Installer-ru.po
rename to installer/locale/Installer/ru.po
diff --git a/installer/locale/Installer-zh_CN.mo b/installer/locale/Installer/zh_CN.mo
similarity index 100%
rename from installer/locale/Installer-zh_CN.mo
rename to installer/locale/Installer/zh_CN.mo
diff --git a/installer/locale/Installer-zh_CN.po b/installer/locale/Installer/zh_CN.po
similarity index 100%
rename from installer/locale/Installer-zh_CN.po
rename to installer/locale/Installer/zh_CN.po