From 964b51250310197f2d30c1fb20d3bd1e437aeed0 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Sat, 24 Dec 2011 05:33:48 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:tamtam/tamtam

---
diff --git a/NEWS b/NEWS
index f2540f5..a266824 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+62
+
+* Avoid creating empty .xo files in setup.py with sugar-toolkit-0.94+
+* Adjust layout to support 800x480 screens of Olidata laptops
+
 61
 
 * TamTam* appears untranslated #3202
diff --git a/common/Tooltips.py b/common/Tooltips.py
index d4e9b1f..61b496b 100644
--- a/common/Tooltips.py
+++ b/common/Tooltips.py
@@ -55,7 +55,7 @@ class Tooltips:
         self.Edit["2drumMuteButton"] = _("Left click to mute, right click to solo")
 
         self.ALGO = {}
-        self.ALGO["XYButton1"] = _('-- Rhythm density, |  Rhythm regularity' )
+        self.ALGO["XYButton1"] = _('-- Rhythm density, | Rhythm regularity' )
         self.ALGO["XYButton2"] = _('-- Pitch regularity, | Pitch maximum step' )
         self.ALGO["XYButton3"] = _('-- Average duration, | Silence probability')
         self.ALGO["drunk"] = _('Drunk')
--
cgit v0.9.1