Index: build/generator/build_locale.ezt
===================================================================
--- build/generator/build_locale.ezt	(Revision 38941)
+++ build/generator/build_locale.ezt	(Arbeitskopie)
@@ -4,11 +4,9 @@
 mkdir ..\..\%1\mo
 set exitcode=0
 [for pofiles]echo Running msgfmt on [pofiles.po]...
-python ..\..\build\strip-po-charset.py [pofiles.po] [pofiles.spo]
 if not errorlevel 0 goto err
-msgfmt.exe -c -o ..\..\%1\mo\[pofiles.mo] [pofiles.spo]
+msgfmt.exe -c -o ..\..\%1\mo\[pofiles.mo] [pofiles.po]
 if not errorlevel 0 goto err
-del [pofiles.spo]
 [end]
 goto end
 @rem **************************************************************************
Index: build/generator/gen_win.py
===================================================================
--- build/generator/gen_win.py	(Revision 38941)
+++ build/generator/gen_win.py	(Arbeitskopie)
@@ -1470,7 +1470,6 @@
   "Item class for holding po file info"
   def __init__(self, base):
     self.po = base + '.po'
-    self.spo = base + '.spo'
     self.mo = base + '.mo'
 
 # MSVC paths always use backslashes regardless of current platform
Index: build/strip-po-charset.py
===================================================================
--- build/strip-po-charset.py	(Revision 38941)
+++ build/strip-po-charset.py	(Arbeitskopie)
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# strip-po-charset.py
-#
-
-import sys
-
-def strip_po_charset(inp, out):
-
-    out.write(inp.read().replace("\"Content-Type: text/plain; charset=UTF-8\\n\"\n",""))
-
-def main():
-
-    if len(sys.argv) != 3:
-        print("Usage: %s <input (po) file> <output (spo) file>" % sys.argv[0])
-        print("")
-        print("Unsupported number of arguments; 2 required.")
-        sys.exit(1)
-
-    strip_po_charset(open(sys.argv[1],'r'), open(sys.argv[2],'w'))
-
-if __name__ == '__main__':
-    main()
Index: subversion/libsvn_subr/nls.c
===================================================================
--- subversion/libsvn_subr/nls.c	(Revision 38941)
+++ subversion/libsvn_subr/nls.c	(Arbeitskopie)
@@ -130,10 +130,12 @@
 #else /* ! WIN32 */
       bindtextdomain(PACKAGE_NAME, SVN_LOCALE_DIR);
     }
+#endif /* WIN32 */
+
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
   bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
 #endif /* HAVE_BIND_TEXTDOMAIN_CODESET */
-#endif /* WIN32 */
+
 #endif /* ENABLE_NLS */
 
   return err;
Index: subversion/svn_private_config.hw
===================================================================
--- subversion/svn_private_config.hw	(Revision 38941)
+++ subversion/svn_private_config.hw	(Arbeitskopie)
@@ -84,6 +84,8 @@
 #define dgettext(domain, x) (x)
 #endif
 
+#define HAVE_BIND_TEXTDOMAIN_CODESET
+
 #endif /* SVN_PRIVATE_CONFIG_HW */
 
 /* Inclusion of Berkeley DB header */