Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-03-28 09:53:15 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-03-28 09:53:15 (GMT)
commit6ef09e56e0140184d4faa25afe11dbaadfe9fd0e (patch)
tree94d1f4b7c01246333f8d347f2c57f02b64e47cee
parent85bc44992582d53e1055dc8a285eda606767317d (diff)
parent4d1ab9b7ccd4c1402e5af738e487f7f2d3c4a302 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity
-rwxr-xr-xactivity/activity.info2
-rwxr-xr-xwebview.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/activity/activity.info b/activity/activity.info
index afcfcb0..ee31bf6 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Web
-activity_version = 12
+activity_version = 13
service_name = org.laptop.WebActivity
icon = activity-web
class = webactivity.WebActivity
diff --git a/webview.py b/webview.py
index 1aba1c8..827739d 100755
--- a/webview.py
+++ b/webview.py
@@ -19,6 +19,7 @@ from gettext import gettext as _
import gobject
import gtk
import logging
+from gettext import gettext as _
from sugar.graphics.filechooser import FileChooserDialog
from _sugar import Browser