X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Changelog;h=4d8b4e3e7fe3b120a7821ef0e7f0eaf1c166d138;hb=537865c42013d811862964645c952f4cbbad1f8f;hp=299bbdc7c4059e1e8da500a4e6b9e193af9acf04;hpb=1249bb00fff01530ab2980c14b8d4505e3264632;p=gosa.git

diff --git a/Changelog b/Changelog
index 299bbdc7c..4d8b4e3e7 100644
--- a/Changelog
+++ b/Changelog
@@ -1,9 +1,20 @@
 GOsa2 changelog
 ===============
 
+* gosa 2.5.11a
+  - Added chinese translation
+  - Fixed language detection and removed line wraps in tab headers
+  - Fixed french translation
+
 * gosa 2.5.11
   - Add workaround for failing is_php4() when using PHP5
     with "zend.ze1_compatibility_mode" set to "On"
+  - Backported new sieve filter editor from trunk
+  - Backported new setup from trunk
+  - Fixed double loaded pages in gecko based browsers when js
+    is activated
+  - Replaced a set of PHP <? short tag occurences
+  - Updated locales (de/fr)
 
 * gosa 2.5.10
   - Included hook to make use of dynamic uid-bases