diff options
author | Pootle daemon <pootle@sugarlabs.org> | 2009-09-23 13:33:06 (GMT) |
---|---|---|
committer | Pootle daemon <pootle@sugarlabs.org> | 2009-09-23 13:33:06 (GMT) |
commit | 01f030f1cceabebd1118904d417042689f7b2148 (patch) | |
tree | 3f705d1b6f0072fd988ed84b94be9bbc52ecc703 /tasetup.py | |
parent | 635f8362d22e9e920c45f77f52f9f0d57cf4e0cc (diff) | |
parent | 49fae193659f81ba32dc69385c68fb07519c9429 (diff) |
Fix conflicts in French and Spanish translations
Diffstat (limited to 'tasetup.py')
-rw-r--r-- | tasetup.py | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -106,8 +106,6 @@ selectors = ( ('keyboard','keyboard','num'), ('nop','userdefined','onearg',100), ('myfunc','myfunc','myfunc',_('x'),100), - ('hres','hres','num'), - ('vres','vres','num'), ('push','push','onearg'), ('pop','pop','num'), ('printheap','heap','noarg2'), @@ -115,9 +113,11 @@ selectors = ( ('leftpos','leftpos','num'), ('toppos','toppos','num'), ('rightpos','rightpos','num'), - ('bottompos','bottompos','num'))), + ('bottompos','bottompos','num'), + ('hres','hres','num'), + ('vres','vres','num'))), ('flow', 55, - (('wait','wait','onearg',10), + (('wait','wait','onearg',1), ('forever','forever','forever'), ('repeat','repeat','repeat',4), ('if','if','if'), @@ -347,7 +347,7 @@ def load_image(path, dir, file): return gtk.gdk.pixbuf_new_from_file(os.path.join(datapath, file+'.png')) except: try: - print "trying ... " + os.path.join(path, dir, file+'.png') + # print "trying ... " + os.path.join(path, dir, file+'.png') return gtk.gdk.pixbuf_new_from_file(os.path.join(path, \ dir, \ file+'.png')) |