--- rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/10/04 07:43:11	1.40
+++ rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/10/04 22:34:30	1.45
@@ -1,10 +1,10 @@
-# $Id: smeserver-locale.spec,v 1.39 2008/10/03 21:44:21 slords Exp $
+# $Id: smeserver-locale.spec,v 1.44 2008/10/04 15:38:05 snetram Exp $
 
 Summary: SME Server localisation module
 %define name smeserver-locale
 Name: %{name}
 %define version 1.4.0
-%define release 17
+%define release 20
 %define package_summary SME Server localisation module
 %define group Applications/System
 %define package_locales bg da de el es fr hu id it nl pt pt_BR sl sv tr
@@ -26,7 +26,7 @@ Patch10: smeserver-locale-1.4.0-locale-2
 Patch11: smeserver-locale-1.4.0-locale-2008-09-27.patch
 Patch12: smeserver-locale-1.4.0-locale-2008-09-30.patch
 Patch13: smeserver-locale-1.4.0-locale-2008-10-03.patch
-Patch14: smeserver-locale-1.4.0-removeReferrencesToWiki.patch
+Patch14: smeserver-locale-1.4.0-locale-2008-10-04.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -38,11 +38,23 @@ AutoReqProv: no
 SME Server localisation module
 
 %changelog
+* Sat Oct 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 1.4.0-20
+- Reverting all changes made Oct 4, as they should be made through Pootle
+- Applying Pootle patch, fixing [SME: 4618] and [SME: 4616]
+
+* Sat Oct 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 1.4.0-19
+- Apply 4 Oct locale patch
+
+* Sat Oct 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 1.4.0-18
+- Remove colored highlights from German locale [SME: 4618]
+- Fix changelog entry in previous entry for [SME: 4616]
+
 * Sat Oct 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 1.4.0-17
-- Apply locale patch to fix many translation bugs [SME: 4616]
+- Remove references to the wiki from the German locale [SME: 4616]
+- Fix bug referrence in previous changelog entry [SME: 4617]
 
 * Fri Oct 3 2008 Shad L. Lords <slords@mail.com> - 1.4.0-16
-- Apply locale patch to fix many translation bugs [SME: 4651]
+- Apply locale patch to fix many translation bugs [SME: 4615]
 
 * Tue Sep 30 2008 Stephen Noble <support@dungog.net> - 1.4.0-15
 - Apply locale patch