Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPootle daemon <pootle@pootle.sugarlabs.org>2011-12-24 05:33:48 (GMT)
committer Pootle daemon <pootle@pootle.sugarlabs.org>2011-12-24 05:33:48 (GMT)
commit964b51250310197f2d30c1fb20d3bd1e437aeed0 (patch)
tree135c30f4315f99802e5d838be690729d0773e553
parent0176821ef50d5f8b8a72e9790784bdbcfbb5e373 (diff)
parenta02d92fc161ab29c597bc0d9af6e32866c6daa6d (diff)
Merge branch 'master' of git.sugarlabs.org:tamtam/tamtam
-rw-r--r--NEWS5
-rw-r--r--common/Tooltips.py2
2 files changed, 6 insertions, 1 deletions
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')