Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS1
-rw-r--r--NEWS7
-rw-r--r--TODO4
-rw-r--r--activity/activity.info2
-rw-r--r--activity/newbad.activity-flipsticks.svg91
-rw-r--r--montage.py3
-rw-r--r--po/FlipSticks.pot138
-rw-r--r--theme.py74
8 files changed, 174 insertions, 146 deletions
diff --git a/AUTHORS b/AUTHORS
index 253f250..0261dae 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
Ed Stoner <ed@whsd.net>
+Aleksey Lim <alsroot@member.fsf.org>
diff --git a/NEWS b/NEWS
index ee54448..c6f700b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+2
+
+* OLPC#4740 Implement collaboration
+* OLPC#6892 GPL requirements
+* OLPC#9183 COPYING file is missed
+* OLPC#9166 adapt to non-XO screen resolution
+
1
* Initial version (ed@whsd.net)
diff --git a/TODO b/TODO
index ea999b1..14fe376 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
mesh working
- - share with neighboorhood should make animation available on mesh
- - other users should be able to join
+ d share with neighboorhood should make animation available on mesh
+ d other users should be able to join
lesson plans
diff --git a/activity/activity.info b/activity/activity.info
index 6e65bb4..6f34a73 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,6 +3,6 @@ name = FlipSticks
service_name = org.worldwideworkshop.olpc.FlipSticks
class = activity.flipsticksActivity
icon = activity-flipsticks
-activity_version = 1
+activity_version = 2
show_launcher = yes
license = GPLv2+
diff --git a/activity/newbad.activity-flipsticks.svg b/activity/newbad.activity-flipsticks.svg
deleted file mode 100644
index 7721fa3..0000000
--- a/activity/newbad.activity-flipsticks.svg
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
- <!ENTITY stroke_color "#010101">
- <!ENTITY fill_color "#FFFFFF">
-]>
-<svg version="1.1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="60.818" height="55.881" viewBox="0 0 60.818 55.881"
- overflow="visible" enable-background="new 0 0 60.818 55.881" xml:space="preserve">
-<g id="Layer_2">
-</g>
-<g id="Layer_1">
- <g>
- <g>
- <path d="M0.5,0.5v54.881h54.804V0.5H0.5z M42.44,4h2.868v4.983H42.44V4z M36.074,4h2.866v4.983h-2.866V4z M23.341,4h2.867v4.983
- h-2.867V4z M16.975,4h2.866v4.983h-2.866V4z M10.609,4h2.866v4.983h-2.866V4z M4,4h3.109v4.983H4V4z M4,12.483h28.427v31.521H4
- V12.483z M7.109,51.881H4v-4.377h3.109V51.881z M13.475,51.881h-2.866v-4.377h2.866V51.881z M19.841,51.881h-2.866v-4.377h2.866
- V51.881z M26.208,51.881h-2.867v-4.377h2.867V51.881z M32.574,51.881h-2.866v-4.377h2.866V51.881z M32.574,8.983h-2.866V4h2.866
- V8.983z M38.94,51.881h-2.866v-4.377h2.866V51.881z M45.309,51.881H42.44v-4.377h2.868V51.881z M51.804,51.881h-2.995v-4.377
- h2.995V51.881z M51.804,44.004H35.927V12.483h15.877V44.004z M51.804,8.983h-2.995V4h2.995V8.983z M17.821,14.194
- c-7.018,0-12.728,6.14-12.728,13.687c0,7.546,5.709,13.686,12.728,13.686c7.018,0,12.727-6.14,12.727-13.686
- C30.548,20.333,24.838,14.194,17.821,14.194z M17.821,38.066c-5.088,0-9.228-4.569-9.228-10.186
- c0-5.617,4.14-10.187,9.228-10.187s9.227,4.57,9.227,10.187C27.048,33.497,22.909,38.066,17.821,38.066z M19.299,23.941
- c0,1.567,1.229,2.843,2.741,2.843c1.511,0,2.741-1.275,2.741-2.843s-1.229-2.842-2.741-2.842
- C20.529,21.099,19.299,22.374,19.299,23.941z M23.781,23.941c0,1.016-0.781,1.843-1.741,1.843s-1.741-0.827-1.741-1.843
- c0-1.016,0.781-1.842,1.741-1.842S23.781,22.926,23.781,23.941z M16.193,23.941c0-1.567-1.229-2.842-2.741-2.842
- c-1.51,0-2.739,1.275-2.739,2.842s1.229,2.843,2.739,2.843C14.963,26.784,16.193,25.509,16.193,23.941z M11.713,23.941
- c0-1.016,0.78-1.842,1.739-1.842c0.96,0,1.741,0.827,1.741,1.842c0,1.016-0.781,1.843-1.741,1.843
- C12.493,25.784,11.713,24.958,11.713,23.941z M17.885,32.835c-2.48-0.12-4.214-2.413-4.687-3.113l-1.658,1.119
- c0.604,0.895,2.839,3.827,6.249,3.991c2.453,0.118,4.833-1.198,7.075-3.914l-1.542-1.273
- C21.503,31.848,19.674,32.921,17.885,32.835z M51.788,41.149v-3.5c-5.088,0-9.227-4.569-9.227-10.186
- c0-5.617,4.139-10.188,9.227-10.188v-3.5c-7.018,0-12.727,6.14-12.727,13.688C39.062,35.009,44.771,41.149,51.788,41.149z
- M50.16,23.525c0-1.568-1.229-2.844-2.738-2.844c-1.512,0-2.741,1.276-2.741,2.844c0,1.567,1.229,2.842,2.741,2.842
- C48.932,26.367,50.16,25.092,50.16,23.525z M45.681,23.525c0-1.017,0.781-1.844,1.741-1.844c0.958,0,1.738,0.827,1.738,1.844
- c0,1.016-0.78,1.842-1.738,1.842C46.462,25.367,45.681,24.541,45.681,23.525z M51.801,34.365l-0.025-2
- c-2.604,0.033-4.445-2.379-4.948-3.119l-1.654,1.123C45.816,31.318,48.197,34.411,51.801,34.365z"/>
- </g>
- <g>
- <path fill="none" stroke="#000000" d="M0.5,0.5v54.881h54.804V0.5H0.5z M42.44,4h2.868v4.983H42.44V4z M36.074,4h2.866v4.983
- h-2.866V4z M23.341,4h2.867v4.983h-2.867V4z M16.975,4h2.866v4.983h-2.866V4z M10.609,4h2.866v4.983h-2.866V4z M4,4h3.109v4.983
- H4V4z M4,12.483h28.427v31.521H4V12.483z M7.109,51.881H4v-4.377h3.109V51.881z M13.475,51.881h-2.866v-4.377h2.866V51.881z
- M19.841,51.881h-2.866v-4.377h2.866V51.881z M26.208,51.881h-2.867v-4.377h2.867V51.881z M32.574,51.881h-2.866v-4.377h2.866
- V51.881z M32.574,8.983h-2.866V4h2.866V8.983z M38.94,51.881h-2.866v-4.377h2.866V51.881z M45.309,51.881H42.44v-4.377h2.868
- V51.881z M51.804,51.881h-2.995v-4.377h2.995V51.881z M51.804,44.004H35.927V12.483h15.877V44.004z M51.804,8.983h-2.995V4h2.995
- V8.983z M17.821,14.194c-7.018,0-12.728,6.14-12.728,13.687c0,7.546,5.709,13.686,12.728,13.686
- c7.018,0,12.727-6.14,12.727-13.686C30.548,20.333,24.838,14.194,17.821,14.194z M17.821,38.066
- c-5.088,0-9.228-4.569-9.228-10.186c0-5.617,4.14-10.187,9.228-10.187s9.227,4.57,9.227,10.187
- C27.048,33.497,22.909,38.066,17.821,38.066z M19.299,23.941c0,1.567,1.229,2.843,2.741,2.843c1.511,0,2.741-1.275,2.741-2.843
- s-1.229-2.842-2.741-2.842C20.529,21.099,19.299,22.374,19.299,23.941z M23.781,23.941c0,1.016-0.781,1.843-1.741,1.843
- s-1.741-0.827-1.741-1.843c0-1.016,0.781-1.842,1.741-1.842S23.781,22.926,23.781,23.941z M16.193,23.941
- c0-1.567-1.229-2.842-2.741-2.842c-1.51,0-2.739,1.275-2.739,2.842s1.229,2.843,2.739,2.843
- C14.963,26.784,16.193,25.509,16.193,23.941z M11.713,23.941c0-1.016,0.78-1.842,1.739-1.842c0.96,0,1.741,0.827,1.741,1.842
- c0,1.016-0.781,1.843-1.741,1.843C12.493,25.784,11.713,24.958,11.713,23.941z M17.885,32.835
- c-2.48-0.12-4.214-2.413-4.687-3.113l-1.658,1.119c0.604,0.895,2.839,3.827,6.249,3.991c2.453,0.118,4.833-1.198,7.075-3.914
- l-1.542-1.273C21.503,31.848,19.674,32.921,17.885,32.835z M51.788,41.149v-3.5c-5.088,0-9.227-4.569-9.227-10.186
- c0-5.617,4.139-10.188,9.227-10.188v-3.5c-7.018,0-12.727,6.14-12.727,13.688C39.062,35.009,44.771,41.149,51.788,41.149z
- M50.16,23.525c0-1.568-1.229-2.844-2.738-2.844c-1.512,0-2.741,1.276-2.741,2.844c0,1.567,1.229,2.842,2.741,2.842
- C48.932,26.367,50.16,25.092,50.16,23.525z M45.681,23.525c0-1.017,0.781-1.844,1.741-1.844c0.958,0,1.738,0.827,1.738,1.844
- c0,1.016-0.78,1.842-1.738,1.842C46.462,25.367,45.681,24.541,45.681,23.525z M51.801,34.365l-0.025-2
- c-2.604,0.033-4.445-2.379-4.948-3.119l-1.654,1.123C45.816,31.318,48.197,34.411,51.801,34.365z"/>
- </g>
- </g>
-</g>
-<g id="Layer_3">
- <polyline fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" points="54.152,15.419 54.152,54.17 1.651,54.17 1.651,1.669
- 54.152,1.669 54.152,15.419 "/>
- <path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" d="M60.818,30.336"/>
-</g>
-<g id="Layer_4">
- <path fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" d="M27.646,9.952c0.409,2.399-1.192,4.68-3.581,5.092
- c-2.387,0.411-4.654-1.2-5.063-3.599c-0.41-2.4,1.193-4.68,3.579-5.091C24.969,5.94,27.235,7.552,27.646,9.952z"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="25.067" y1="15.431" x2="27.226" y2="28.071"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="20.979" y1="18.345" x2="29.736" y2="16.833"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="30.719" y1="16.936" x2="36.044" y2="22.17"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="19.667" y1="17.971" x2="15.776" y2="24.991"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="23.174" y1="29.12" x2="31.431" y2="27.697"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="22.866" y1="30.065" x2="18.054" y2="37.75"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="31.888" y1="28.515" x2="39.915" y2="34.097"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="40.181" y1="34.355" x2="42.992" y2="40.625"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="44.099" y1="41.667" x2="48.082" y2="38.947"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="19.086" y1="38.948" x2="28.983" y2="37.354"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="30.082" y1="38.037" x2="29.345" y2="42.514"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="36.754" y1="23.001" x2="43.103" y2="20.344"/>
- <line fill="&fill_color;" stroke="&stroke_color;" stroke-width="3" x1="9.386" y1="29.209" x2="15.307" y2="25.819"/>
- <ellipse fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" cx="7.699" cy="50.284" rx="3.33" ry="3.484"/>
- <ellipse fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" cx="21.102" cy="50.284" rx="3.331" ry="3.484"/>
- <ellipse fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" cx="34.84" cy="50.284" rx="3.33" ry="3.484"/>
- <ellipse fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" cx="48.08" cy="50.284" rx="3.33" ry="3.484"/>
-</g>
-</svg>
diff --git a/montage.py b/montage.py
index db02a97..1f6f478 100644
--- a/montage.py
+++ b/montage.py
@@ -604,7 +604,6 @@ class View(gtk.EventBox):
self.middlepressed = False
self.rotatepressed = False
self.iconsdir = os.path.join(get_bundle_path(), 'icons')
- self.language = 'English'
# screen
@@ -706,7 +705,7 @@ class View(gtk.EventBox):
self.stickbuttons = {}
self.sticklabels = {}
for stickpartname in LABELLIST:
- label = gtk.Label(LANG[self.language][stickpartname])
+ label = gtk.Label(STRINGS[stickpartname])
label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(BUTTON_FOREGROUND))
self.sticklabels[stickpartname] = label
ebox = gtk.EventBox()
diff --git a/po/FlipSticks.pot b/po/FlipSticks.pot
index 33cbf4c..6c5ed70 100644
--- a/po/FlipSticks.pot
+++ b/po/FlipSticks.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-18 00:19+0000\n"
+"POT-Creation-Date: 2009-02-11 22:04+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,3 +19,139 @@ msgstr ""
#: activity/activity.info:2
msgid "FlipSticks"
msgstr ""
+
+#: montage.py:657
+msgid "Angle:"
+msgstr ""
+
+#: montage.py:677
+msgid "Size:"
+msgstr ""
+
+#: theme.py:50
+msgid "Size"
+msgstr ""
+
+#: theme.py:51
+msgid "Angle"
+msgstr ""
+
+#: theme.py:52
+msgid "Lesson Plans"
+msgstr ""
+
+#: theme.py:53
+msgid "lp-en"
+msgstr ""
+
+#: theme.py:54
+msgid "Export Frame One"
+msgstr ""
+
+#: theme.py:55
+msgid "Head"
+msgstr ""
+
+#: theme.py:56
+msgid "Neck"
+msgstr ""
+
+#: theme.py:57
+msgid "Right Shoulder"
+msgstr ""
+
+#: theme.py:58
+msgid "Upper Right Arm"
+msgstr ""
+
+#: theme.py:59
+msgid "Lower Right Arm"
+msgstr ""
+
+#: theme.py:60
+msgid "Right Hand"
+msgstr ""
+
+#: theme.py:61
+msgid "Left Shoulder"
+msgstr ""
+
+#: theme.py:62
+msgid "Upper Left Arm"
+msgstr ""
+
+#: theme.py:63
+msgid "Lower Left Arm"
+msgstr ""
+
+#: theme.py:64
+msgid "Left Hand"
+msgstr ""
+
+#: theme.py:65
+msgid "Torso"
+msgstr ""
+
+#: theme.py:66
+msgid "Right Hip"
+msgstr ""
+
+#: theme.py:67
+msgid "Upper Right Leg"
+msgstr ""
+
+#: theme.py:68
+msgid "Lower Right Leg"
+msgstr ""
+
+#: theme.py:69
+msgid "Right Foot"
+msgstr ""
+
+#: theme.py:70
+msgid "Left Hip"
+msgstr ""
+
+#: theme.py:71
+msgid "Upper Left Leg"
+msgstr ""
+
+#: theme.py:72
+msgid "Lower Left Leg"
+msgstr ""
+
+#: theme.py:73
+msgid "Left Foot"
+msgstr ""
+
+#: activity.py:54
+msgid "Montage"
+msgstr ""
+
+#: activity.py:58
+msgid "Lessons"
+msgstr ""
+
+#: activity.py:87
+msgid "Set frame"
+msgstr ""
+
+#: activity.py:92
+msgid "Clear frame"
+msgstr ""
+
+#: activity.py:97
+msgid "Reset"
+msgstr ""
+
+#: activity.py:126
+msgid "Play backward / Pause"
+msgstr ""
+
+#: activity.py:132
+msgid "Play forward / Pause"
+msgstr ""
+
+#: activity.py:151
+msgid "Snapshot"
+msgstr ""
diff --git a/theme.py b/theme.py
index 3d3b404..993c261 100644
--- a/theme.py
+++ b/theme.py
@@ -13,6 +13,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import gtk
+from gettext import gettext as _
from sugar.graphics import style
@@ -46,55 +47,30 @@ OLD_COLOR_BG_BUTTONS = (
(gtk.STATE_INSENSITIVE,"#027F01"),
)
-SPANISH = u'Espa\xf1ol'
-LANG = {'English':{'size':'Size',
- 'angle':'Angle',
- 'lessonplan':'Lesson Plans',
- 'lpdir':'lp-en',
- 'export':'Export Frame One',
- 'HEAD':'Head',
- 'NECK':'Neck',
- 'RIGHT SHOULDER':'Right Shoulder',
- 'UPPER RIGHT ARM':'Upper Right Arm',
- 'LOWER RIGHT ARM':'Lower Right Arm',
- 'RIGHT HAND':'Right Hand',
- 'LEFT SHOULDER':'Left Shoulder',
- 'UPPER LEFT ARM':'Upper Left Arm',
- 'LOWER LEFT ARM':'Lower Left Arm',
- 'LEFT HAND':'Left Hand',
- 'TORSO':'Torso',
- 'RIGHT HIP':'Right Hip',
- 'UPPER RIGHT LEG':'Upper Right Leg',
- 'LOWER RIGHT LEG':'Lower Right Leg',
- 'RIGHT FOOT':'Right Foot',
- 'LEFT HIP':'Left Hip',
- 'UPPER LEFT LEG':'Upper Left Leg',
- 'LOWER LEFT LEG':'Lower Left Leg',
- 'LEFT FOOT':'Left Foot'},
- SPANISH:{'size':u'Tama\xf1o',
- 'angle':u'\xe1ngulo',
- 'lessonplan':u'Planes de la lecci\xf3n',
- 'lpdir':'lp-en',
- 'export':'Un marco de la exportacion',
- 'HEAD':'Cabeza',
- 'NECK':'Cuello',
- 'RIGHT SHOULDER':'Hombro derecho',
- 'UPPER RIGHT ARM':'Brazo derecho superior',
- 'LOWER RIGHT ARM':'Bajar el brazo derecho',
- 'RIGHT HAND':'Mano derecha',
- 'LEFT SHOULDER':'Hombro izquierdo',
- 'UPPER LEFT ARM':'Brazo izquierdo superior',
- 'LOWER LEFT ARM':u'Un brazo izquierdo m\xe1s bajo',
- 'LEFT HAND':'Mano izquierda',
- 'TORSO':'Torso',
- 'RIGHT HIP':'Cadera derecha',
- 'UPPER RIGHT LEG':'Pierna derecha superior',
- 'LOWER RIGHT LEG':'Bajar la pierna derecha',
- 'RIGHT FOOT':'Pie derecho',
- 'LEFT HIP':'Cadera izquierda',
- 'UPPER LEFT LEG':'Pierna izquierda superior',
- 'LOWER LEFT LEG':u'Una pierna izquierda m\xe1s baja',
- 'LEFT FOOT':'Pie izquierdo'}}
+STRINGS = { 'size' : _('Size'),
+ 'angle' : _('Angle'),
+ 'lessonplan' : _('Lesson Plans'),
+ 'lpdir' : _('lp-en'),
+ 'export' : _('Export Frame One'),
+ 'HEAD' : _('Head'),
+ 'NECK' : _('Neck'),
+ 'RIGHT SHOULDER' : _('Right Shoulder'),
+ 'UPPER RIGHT ARM' : _('Upper Right Arm'),
+ 'LOWER RIGHT ARM' : _('Lower Right Arm'),
+ 'RIGHT HAND' : _('Right Hand'),
+ 'LEFT SHOULDER' : _('Left Shoulder'),
+ 'UPPER LEFT ARM' : _('Upper Left Arm'),
+ 'LOWER LEFT ARM' : _('Lower Left Arm'),
+ 'LEFT HAND' : _('Left Hand'),
+ 'TORSO' : _('Torso'),
+ 'RIGHT HIP' : _('Right Hip'),
+ 'UPPER RIGHT LEG' : _('Upper Right Leg'),
+ 'LOWER RIGHT LEG' : _('Lower Right Leg'),
+ 'RIGHT FOOT' : _('Right Foot'),
+ 'LEFT HIP' : _('Left Hip'),
+ 'UPPER LEFT LEG' : _('Upper Left Leg'),
+ 'LOWER LEFT LEG' : _('Lower Left Leg'),
+ 'LEFT FOOT' : _('Left Foot') }
PAD = 10
LOGO_WIDTH = 276
generated by cgit v0.9.1 at 2024-04-30 20:29:51 (GMT)