20 files changed, 11 insertions, 11 deletions
diff --git a/data/help/CMakeLists.txt b/data/help/CMakeLists.txt
index 2b823bcec..c949b481c 100644
--- a/data/help/CMakeLists.txt
+++ b/data/help/CMakeLists.txt
@@ -11,6 +11,6 @@ SET(FILES
     windows.txt
     )
 
-ADD_SUBDIRECTORY(ru_RU)
+ADD_SUBDIRECTORY(fr ru)
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help)
diff --git a/data/help/Makefile.am b/data/help/Makefile.am
index c228078db..293e3ba16 100644
--- a/data/help/Makefile.am
+++ b/data/help/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = ru_RU fr_FR
+SUBDIRS = fr ru
 
 helpdir = $(pkgdatadir)/data/help
 
diff --git a/data/help/fr_FR/CMakeLists.txt b/data/help/fr/CMakeLists.txt
index 1259ed0ad..5b14cc303 100644
--- a/data/help/fr_FR/CMakeLists.txt
+++ b/data/help/fr/CMakeLists.txt
@@ -10,6 +10,6 @@ SET(FILES
     teamtmw.txt
     windows.txt
     )
-ADD_SUBDIRECTORY(fr_FR)
+ADD_SUBDIRECTORY(fr)
 
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help/fr_FR)
-\ No newline at end of file
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help/fr)
+\ No newline at end of file
diff --git a/data/help/fr_FR/Makefile.am b/data/help/fr/Makefile.am
index 412a58de4..2b4fd75f9 100644
--- a/data/help/fr_FR/Makefile.am
+++ b/data/help/fr/Makefile.am
@@ -1,7 +1,7 @@
 
-helpfrFRdir = $(pkgdatadir)/data/help/fr_FR
+helpfrdir = $(pkgdatadir)/data/help/fr
 
-helpfrFR_DATA =				\
+helpfr_DATA =				\
 	about.txt			\
 	chatcommands.txt	\
 	commands.txt		\
@@ -14,5 +14,5 @@ helpfrFR_DATA =				\
 	windows.txt
 
 EXTRA_DIST =			\
-	$(helpfrFR_DATA) \
+	$(helpfr_DATA) \
 	CMakeLists.txt
diff --git a/data/help/fr_FR/about.txt b/data/help/fr/about.txt
index 32ce4a0f4..32ce4a0f4 100644
--- a/data/help/fr_FR/about.txt
+++ b/data/help/fr/about.txt
diff --git a/data/help/fr_FR/chatcommands.txt b/data/help/fr/chatcommands.txt
index 99b0ad504..99b0ad504 100644
--- a/data/help/fr_FR/chatcommands.txt
+++ b/data/help/fr/chatcommands.txt
diff --git a/data/help/fr_FR/commands.txt b/data/help/fr/commands.txt
index 9307d8b3b..9307d8b3b 100644
--- a/data/help/fr_FR/commands.txt
+++ b/data/help/fr/commands.txt
diff --git a/data/help/fr_FR/header.txt b/data/help/fr/header.txt
index c7b0a06bc..c7b0a06bc 100644
--- a/data/help/fr_FR/header.txt
+++ b/data/help/fr/header.txt
diff --git a/data/help/fr_FR/index.txt b/data/help/fr/index.txt
index 0678e0650..0678e0650 100644
--- a/data/help/fr_FR/index.txt
+++ b/data/help/fr/index.txt
diff --git a/data/help/fr_FR/skills.txt b/data/help/fr/skills.txt
index 13c57bba7..13c57bba7 100644
--- a/data/help/fr_FR/skills.txt
+++ b/data/help/fr/skills.txt
diff --git a/data/help/fr_FR/support.txt b/data/help/fr/support.txt
index 7e7550530..7e7550530 100644
--- a/data/help/fr_FR/support.txt
+++ b/data/help/fr/support.txt
diff --git a/data/help/fr_FR/team.txt b/data/help/fr/team.txt
index df85d1dd3..df85d1dd3 100644
--- a/data/help/fr_FR/team.txt
+++ b/data/help/fr/team.txt
diff --git a/data/help/fr_FR/teamtmw.txt b/data/help/fr/teamtmw.txt
index 21e9a44da..21e9a44da 100644
--- a/data/help/fr_FR/teamtmw.txt
+++ b/data/help/fr/teamtmw.txt
diff --git a/data/help/fr_FR/windows.txt b/data/help/fr/windows.txt
index 104bcd6dc..104bcd6dc 100644
--- a/data/help/fr_FR/windows.txt
+++ b/data/help/fr/windows.txt
diff --git a/data/help/ru_RU/CMakeLists.txt b/data/help/ru/CMakeLists.txt
index b36b0a945..43a36a32d 100644
--- a/data/help/ru_RU/CMakeLists.txt
+++ b/data/help/ru/CMakeLists.txt
@@ -5,4 +5,4 @@ SET(FILES
     team.txt
     )
 
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help/ru_RU)
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help/ru)
diff --git a/data/help/ru_RU/Makefile.am b/data/help/ru/Makefile.am
index 8668f6fd9..d620cb806 100644
--- a/data/help/ru_RU/Makefile.am
+++ b/data/help/ru/Makefile.am
@@ -1,12 +1,12 @@
 
-helpruRUdir = $(pkgdatadir)/data/help/ru_RU
+helprudir = $(pkgdatadir)/data/help/ru
 
-helpruRU_DATA =				\
+helpru_DATA =				\
 	chatcommands.txt	\
 	header.txt			\
 	index.txt			\
 	team.txt
 
 EXTRA_DIST =			\
-	$(helpruRU_DATA) \
+	$(helpru_DATA) \
 	CMakeLists.txt
diff --git a/data/help/ru_RU/chatcommands.txt b/data/help/ru/chatcommands.txt
index 9d1699686..9d1699686 100644
--- a/data/help/ru_RU/chatcommands.txt
+++ b/data/help/ru/chatcommands.txt
diff --git a/data/help/ru_RU/header.txt b/data/help/ru/header.txt
index 15b056745..15b056745 100644
--- a/data/help/ru_RU/header.txt
+++ b/data/help/ru/header.txt
diff --git a/data/help/ru_RU/index.txt b/data/help/ru/index.txt
index e65f5ea50..e65f5ea50 100644
--- a/data/help/ru_RU/index.txt
+++ b/data/help/ru/index.txt
diff --git a/data/help/ru_RU/team.txt b/data/help/ru/team.txt
index 93c5731f8..93c5731f8 100644
--- a/data/help/ru_RU/team.txt
+++ b/data/help/ru/team.txt