diff --git a/checkin_notes b/checkin_notes
index ae892b848b..04bc7aca6e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4367,3 +4367,19 @@ Rom    May 27 2008
     win_build/installerv2/redist/Windows/x64/
         boinccas.dll
         boinccas95.dll
+
+Eric   May 27 2008
+    - clientgui:  renamed locale files from "BOINC Manager.*" to
+        "BOINC-Manager.*"
+    - Added Makefile to locale/client to install the BOINC Manager.po files
+        into $(datadir)/locale (typically $(prefix)/share/locale)
+
+    clientgui/
+        BOINCGUIApp.cpp
+    locale/
+        client/
+            Makefile.am
+            */
+                BOINC Manager.po (renamed BOINC-Manager.po)
+                BOINC Manager.mo (renamed BOINC-Manager.mo)
+
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 1f002e6c57..3ae860ad2f 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -306,7 +306,7 @@ bool CBOINCGUIApp::OnInit() {
         );
     }
     m_pLocale->AddCatalogLookupPathPrefix(wxT("locale"));
-    m_pLocale->AddCatalog(wxT("BOINC Manager"));
+    m_pLocale->AddCatalog(wxT("BOINC-Manager"));
 
     InitSupportedLanguages();
 
diff --git a/locale/client/Makefile.am b/locale/client/Makefile.am
new file mode 100644
index 0000000000..5a9c4c9503
--- /dev/null
+++ b/locale/client/Makefile.am
@@ -0,0 +1,51 @@
+include $(top_srcdir)/Makefile.incl
+
+datadir = $(prefix)/share/locale 
+
+locale_dirs = \
+        af_ZA \
+	ar \
+	be \
+	bg \
+	ca \
+	cs \
+	cs_CZ \
+	da \
+	de \
+	el \
+	en_US \
+	es \
+	eu \
+	fi \
+	fr \
+	hr \
+	hu \
+	it \
+	ja \
+	ko_KR \
+	lt \
+	lv \
+	nb \
+	nl \
+	pl \
+	pt \
+	pt_BR \
+	ro \
+	ru \
+	sk \
+	sl \
+	sv_SE \
+	tr \
+	uk \
+	zh_CN \
+	zh_TW
+
+install-exec-hook:
+	mydir=$(DESTDIR)$(datadir) ;\
+	for ldir in $(locale_dirs) ; do \
+	  $(INSTALL) -d $$mydir/$$ldir ; \
+	  if [ -f $$ldir/BOINC-Manager.po ] ; then \
+	    $(INSTALL) $$ldir/BOINC-Manager.po $$mydir/$$ldir/BOINC-Manager.po ; \
+	  fi ;\
+	done
+
diff --git a/locale/client/ar/BOINC Manager.mo b/locale/client/ar/BOINC-Manager.mo
similarity index 100%
rename from locale/client/ar/BOINC Manager.mo
rename to locale/client/ar/BOINC-Manager.mo
diff --git a/locale/client/ar/BOINC Manager.po b/locale/client/ar/BOINC-Manager.po
similarity index 100%
rename from locale/client/ar/BOINC Manager.po
rename to locale/client/ar/BOINC-Manager.po
diff --git a/locale/client/be/BOINC Manager.mo b/locale/client/be/BOINC-Manager.mo
similarity index 100%
rename from locale/client/be/BOINC Manager.mo
rename to locale/client/be/BOINC-Manager.mo
diff --git a/locale/client/be/BOINC Manager.po b/locale/client/be/BOINC-Manager.po
similarity index 100%
rename from locale/client/be/BOINC Manager.po
rename to locale/client/be/BOINC-Manager.po
diff --git a/locale/client/bg/BOINC Manager.mo b/locale/client/bg/BOINC-Manager.mo
similarity index 100%
rename from locale/client/bg/BOINC Manager.mo
rename to locale/client/bg/BOINC-Manager.mo
diff --git a/locale/client/bg/BOINC Manager.po b/locale/client/bg/BOINC-Manager.po
similarity index 100%
rename from locale/client/bg/BOINC Manager.po
rename to locale/client/bg/BOINC-Manager.po
diff --git a/locale/client/ca/BOINC Manager.mo b/locale/client/ca/BOINC-Manager.mo
similarity index 100%
rename from locale/client/ca/BOINC Manager.mo
rename to locale/client/ca/BOINC-Manager.mo
diff --git a/locale/client/ca/BOINC Manager.po b/locale/client/ca/BOINC-Manager.po
similarity index 100%
rename from locale/client/ca/BOINC Manager.po
rename to locale/client/ca/BOINC-Manager.po
diff --git a/locale/client/cs/BOINC Manager.mo b/locale/client/cs/BOINC-Manager.mo
similarity index 100%
rename from locale/client/cs/BOINC Manager.mo
rename to locale/client/cs/BOINC-Manager.mo
diff --git a/locale/client/cs/BOINC Manager.po b/locale/client/cs/BOINC-Manager.po
similarity index 100%
rename from locale/client/cs/BOINC Manager.po
rename to locale/client/cs/BOINC-Manager.po
diff --git a/locale/client/da/BOINC Manager.mo b/locale/client/da/BOINC-Manager.mo
similarity index 100%
rename from locale/client/da/BOINC Manager.mo
rename to locale/client/da/BOINC-Manager.mo
diff --git a/locale/client/da/BOINC Manager.po b/locale/client/da/BOINC-Manager.po
similarity index 100%
rename from locale/client/da/BOINC Manager.po
rename to locale/client/da/BOINC-Manager.po
diff --git a/locale/client/de/BOINC Manager.mo b/locale/client/de/BOINC-Manager.mo
similarity index 100%
rename from locale/client/de/BOINC Manager.mo
rename to locale/client/de/BOINC-Manager.mo
diff --git a/locale/client/de/BOINC Manager.po b/locale/client/de/BOINC-Manager.po
similarity index 100%
rename from locale/client/de/BOINC Manager.po
rename to locale/client/de/BOINC-Manager.po
diff --git a/locale/client/el/BOINC Manager.mo b/locale/client/el/BOINC-Manager.mo
similarity index 100%
rename from locale/client/el/BOINC Manager.mo
rename to locale/client/el/BOINC-Manager.mo
diff --git a/locale/client/el/BOINC Manager.po b/locale/client/el/BOINC-Manager.po
similarity index 100%
rename from locale/client/el/BOINC Manager.po
rename to locale/client/el/BOINC-Manager.po
diff --git a/locale/client/en_US/BOINC Manager.mo b/locale/client/en_US/BOINC-Manager.mo
similarity index 100%
rename from locale/client/en_US/BOINC Manager.mo
rename to locale/client/en_US/BOINC-Manager.mo
diff --git a/locale/client/en_US/BOINC Manager.po b/locale/client/en_US/BOINC-Manager.po
similarity index 100%
rename from locale/client/en_US/BOINC Manager.po
rename to locale/client/en_US/BOINC-Manager.po
diff --git a/locale/client/es/BOINC Manager.mo b/locale/client/es/BOINC-Manager.mo
similarity index 100%
rename from locale/client/es/BOINC Manager.mo
rename to locale/client/es/BOINC-Manager.mo
diff --git a/locale/client/es/BOINC Manager.po b/locale/client/es/BOINC-Manager.po
similarity index 100%
rename from locale/client/es/BOINC Manager.po
rename to locale/client/es/BOINC-Manager.po
diff --git a/locale/client/fi/BOINC Manager.mo b/locale/client/fi/BOINC-Manager.mo
similarity index 100%
rename from locale/client/fi/BOINC Manager.mo
rename to locale/client/fi/BOINC-Manager.mo
diff --git a/locale/client/fi/BOINC Manager.po b/locale/client/fi/BOINC-Manager.po
similarity index 100%
rename from locale/client/fi/BOINC Manager.po
rename to locale/client/fi/BOINC-Manager.po
diff --git a/locale/client/fr/BOINC Manager.mo b/locale/client/fr/BOINC-Manager.mo
similarity index 100%
rename from locale/client/fr/BOINC Manager.mo
rename to locale/client/fr/BOINC-Manager.mo
diff --git a/locale/client/fr/BOINC Manager.po b/locale/client/fr/BOINC-Manager.po
similarity index 100%
rename from locale/client/fr/BOINC Manager.po
rename to locale/client/fr/BOINC-Manager.po
diff --git a/locale/client/hr/BOINC Manager.mo b/locale/client/hr/BOINC-Manager.mo
similarity index 100%
rename from locale/client/hr/BOINC Manager.mo
rename to locale/client/hr/BOINC-Manager.mo
diff --git a/locale/client/hr/BOINC Manager.po b/locale/client/hr/BOINC-Manager.po
similarity index 100%
rename from locale/client/hr/BOINC Manager.po
rename to locale/client/hr/BOINC-Manager.po
diff --git a/locale/client/hu/BOINC Manager.mo b/locale/client/hu/BOINC-Manager.mo
similarity index 100%
rename from locale/client/hu/BOINC Manager.mo
rename to locale/client/hu/BOINC-Manager.mo
diff --git a/locale/client/hu/BOINC Manager.po b/locale/client/hu/BOINC-Manager.po
similarity index 100%
rename from locale/client/hu/BOINC Manager.po
rename to locale/client/hu/BOINC-Manager.po
diff --git a/locale/client/it/BOINC Manager.mo b/locale/client/it/BOINC-Manager.mo
similarity index 100%
rename from locale/client/it/BOINC Manager.mo
rename to locale/client/it/BOINC-Manager.mo
diff --git a/locale/client/it/BOINC Manager.po b/locale/client/it/BOINC-Manager.po
similarity index 100%
rename from locale/client/it/BOINC Manager.po
rename to locale/client/it/BOINC-Manager.po
diff --git a/locale/client/ja/BOINC Manager.mo b/locale/client/ja/BOINC-Manager.mo
similarity index 100%
rename from locale/client/ja/BOINC Manager.mo
rename to locale/client/ja/BOINC-Manager.mo
diff --git a/locale/client/ja/BOINC Manager.po b/locale/client/ja/BOINC-Manager.po
similarity index 100%
rename from locale/client/ja/BOINC Manager.po
rename to locale/client/ja/BOINC-Manager.po
diff --git a/locale/client/ja/BOINC Manager.win98.mo b/locale/client/ja/BOINC-Manager.win98.mo
similarity index 100%
rename from locale/client/ja/BOINC Manager.win98.mo
rename to locale/client/ja/BOINC-Manager.win98.mo
diff --git a/locale/client/ja/BOINC Manager.win98.po b/locale/client/ja/BOINC-Manager.win98.po
similarity index 100%
rename from locale/client/ja/BOINC Manager.win98.po
rename to locale/client/ja/BOINC-Manager.win98.po
diff --git a/locale/client/ko_KR/BOINC Manager.mo b/locale/client/ko_KR/BOINC-Manager.mo
similarity index 100%
rename from locale/client/ko_KR/BOINC Manager.mo
rename to locale/client/ko_KR/BOINC-Manager.mo
diff --git a/locale/client/ko_KR/BOINC Manager.po b/locale/client/ko_KR/BOINC-Manager.po
similarity index 100%
rename from locale/client/ko_KR/BOINC Manager.po
rename to locale/client/ko_KR/BOINC-Manager.po
diff --git a/locale/client/lt/BOINC Manager.mo b/locale/client/lt/BOINC-Manager.mo
similarity index 100%
rename from locale/client/lt/BOINC Manager.mo
rename to locale/client/lt/BOINC-Manager.mo
diff --git a/locale/client/lt/BOINC Manager.po b/locale/client/lt/BOINC-Manager.po
similarity index 100%
rename from locale/client/lt/BOINC Manager.po
rename to locale/client/lt/BOINC-Manager.po
diff --git a/locale/client/lv/BOINC Manager.mo b/locale/client/lv/BOINC-Manager.mo
similarity index 100%
rename from locale/client/lv/BOINC Manager.mo
rename to locale/client/lv/BOINC-Manager.mo
diff --git a/locale/client/lv/BOINC Manager.po b/locale/client/lv/BOINC-Manager.po
similarity index 100%
rename from locale/client/lv/BOINC Manager.po
rename to locale/client/lv/BOINC-Manager.po
diff --git a/locale/client/nl/BOINC Manager.mo b/locale/client/nl/BOINC-Manager.mo
similarity index 100%
rename from locale/client/nl/BOINC Manager.mo
rename to locale/client/nl/BOINC-Manager.mo
diff --git a/locale/client/nl/BOINC Manager.po b/locale/client/nl/BOINC-Manager.po
similarity index 100%
rename from locale/client/nl/BOINC Manager.po
rename to locale/client/nl/BOINC-Manager.po
diff --git a/locale/client/pl/BOINC Manager.mo b/locale/client/pl/BOINC-Manager.mo
similarity index 100%
rename from locale/client/pl/BOINC Manager.mo
rename to locale/client/pl/BOINC-Manager.mo
diff --git a/locale/client/pl/BOINC Manager.po b/locale/client/pl/BOINC-Manager.po
similarity index 100%
rename from locale/client/pl/BOINC Manager.po
rename to locale/client/pl/BOINC-Manager.po
diff --git a/locale/client/pt/BOINC Manager.mo b/locale/client/pt/BOINC-Manager.mo
similarity index 100%
rename from locale/client/pt/BOINC Manager.mo
rename to locale/client/pt/BOINC-Manager.mo
diff --git a/locale/client/pt/BOINC Manager.po b/locale/client/pt/BOINC-Manager.po
similarity index 100%
rename from locale/client/pt/BOINC Manager.po
rename to locale/client/pt/BOINC-Manager.po
diff --git a/locale/client/pt_BR/BOINC Manager.mo b/locale/client/pt_BR/BOINC-Manager.mo
similarity index 100%
rename from locale/client/pt_BR/BOINC Manager.mo
rename to locale/client/pt_BR/BOINC-Manager.mo
diff --git a/locale/client/pt_BR/BOINC Manager.po b/locale/client/pt_BR/BOINC-Manager.po
similarity index 100%
rename from locale/client/pt_BR/BOINC Manager.po
rename to locale/client/pt_BR/BOINC-Manager.po
diff --git a/locale/client/ro/BOINC Manager.mo b/locale/client/ro/BOINC-Manager.mo
similarity index 100%
rename from locale/client/ro/BOINC Manager.mo
rename to locale/client/ro/BOINC-Manager.mo
diff --git a/locale/client/ro/BOINC Manager.po b/locale/client/ro/BOINC-Manager.po
similarity index 100%
rename from locale/client/ro/BOINC Manager.po
rename to locale/client/ro/BOINC-Manager.po
diff --git a/locale/client/ru/BOINC Manager.mo b/locale/client/ru/BOINC-Manager.mo
similarity index 100%
rename from locale/client/ru/BOINC Manager.mo
rename to locale/client/ru/BOINC-Manager.mo
diff --git a/locale/client/ru/BOINC Manager.po b/locale/client/ru/BOINC-Manager.po
similarity index 100%
rename from locale/client/ru/BOINC Manager.po
rename to locale/client/ru/BOINC-Manager.po
diff --git a/locale/client/sk/BOINC Manager.mo b/locale/client/sk/BOINC-Manager.mo
similarity index 100%
rename from locale/client/sk/BOINC Manager.mo
rename to locale/client/sk/BOINC-Manager.mo
diff --git a/locale/client/sk/BOINC Manager.po b/locale/client/sk/BOINC-Manager.po
similarity index 100%
rename from locale/client/sk/BOINC Manager.po
rename to locale/client/sk/BOINC-Manager.po
diff --git a/locale/client/sv_SE/BOINC Manager.mo b/locale/client/sv_SE/BOINC-Manager.mo
similarity index 100%
rename from locale/client/sv_SE/BOINC Manager.mo
rename to locale/client/sv_SE/BOINC-Manager.mo
diff --git a/locale/client/sv_SE/BOINC Manager.po b/locale/client/sv_SE/BOINC-Manager.po
similarity index 100%
rename from locale/client/sv_SE/BOINC Manager.po
rename to locale/client/sv_SE/BOINC-Manager.po
diff --git a/locale/client/zh_CN/BOINC Manager.mo b/locale/client/zh_CN/BOINC-Manager.mo
similarity index 100%
rename from locale/client/zh_CN/BOINC Manager.mo
rename to locale/client/zh_CN/BOINC-Manager.mo
diff --git a/locale/client/zh_CN/BOINC Manager.po b/locale/client/zh_CN/BOINC-Manager.po
similarity index 100%
rename from locale/client/zh_CN/BOINC Manager.po
rename to locale/client/zh_CN/BOINC-Manager.po
diff --git a/locale/client/zh_TW/Boinc Manager.mo b/locale/client/zh_TW/BOINC-Manager.mo
similarity index 100%
rename from locale/client/zh_TW/Boinc Manager.mo
rename to locale/client/zh_TW/BOINC-Manager.mo
diff --git a/locale/client/zh_TW/Boinc Manager.po b/locale/client/zh_TW/BOINC-Manager.po
similarity index 100%
rename from locale/client/zh_TW/Boinc Manager.po
rename to locale/client/zh_TW/BOINC-Manager.po