From aec661b33e0de041423f2debf0e5c0b1f0476212 Mon Sep 17 00:00:00 2001 From: Pootle daemon Date: Sun, 17 Jan 2010 16:02:28 +0000 Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-toolkit/mainline --- diff --git a/configure.ac b/configure.ac index aa4618f..8e0c26e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([sugar-toolkit],[0.87.1],[],[sugar-toolkit]) +AC_INIT([sugar-toolkit],[0.87.3],[],[sugar-toolkit]) AC_PREREQ([2.59]) diff --git a/po/sugar-toolkit.pot b/po/sugar-toolkit.pot deleted file mode 100644 index aad88d1..0000000 --- a/po/sugar-toolkit.pot +++ /dev/null @@ -1,154 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-24 00:07+0530\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - -#: ../src/sugar/activity/activity.py:120 -msgid "Share with:" -msgstr "" - -#: ../src/sugar/activity/activity.py:122 -msgid "Private" -msgstr "" - -#: ../src/sugar/activity/activity.py:123 -msgid "My Neighborhood" -msgstr "" - -#: ../src/sugar/activity/activity.py:130 -msgid "Keep" -msgstr "" - -#: ../src/sugar/activity/activity.py:136 -msgid "Stop" -msgstr "" - -#: ../src/sugar/activity/activity.py:251 -msgid "Undo" -msgstr "" - -#: ../src/sugar/activity/activity.py:256 -msgid "Redo" -msgstr "" - -#: ../src/sugar/activity/activity.py:266 -msgid "Copy" -msgstr "" - -#: ../src/sugar/activity/activity.py:271 -msgid "Paste" -msgstr "" - -#: ../src/sugar/activity/activity.py:297 -msgid "Activity" -msgstr "" - -#: ../src/sugar/activity/activity.py:469 -#, python-format -msgid "%s Activity" -msgstr "" - -#: ../src/sugar/activity/activity.py:856 -msgid "Keep error" -msgstr "" - -#: ../src/sugar/activity/activity.py:857 -msgid "Keep error: all changes will be lost" -msgstr "" - -#: ../src/sugar/activity/activity.py:860 -msgid "Don't stop" -msgstr "" - -#: ../src/sugar/activity/activity.py:863 -msgid "Stop anyway" -msgstr "" - -#: ../src/sugar/graphics/alert.py:166 ../src/sugar/graphics/alert.py:209 -msgid "Cancel" -msgstr "" - -#: ../src/sugar/graphics/alert.py:170 ../src/sugar/graphics/alert.py:247 -msgid "Ok" -msgstr "" - -#: ../src/sugar/graphics/alert.py:219 -msgid "Continue" -msgstr "" - -#: ../src/sugar/util.py:181 -msgid " and " -msgstr "" - -#: ../src/sugar/util.py:182 -msgid ", " -msgstr "" - -#. TRANS: Indicating something that just happened, eg. "just now", "moments ago" -#: ../src/sugar/util.py:185 -msgid "Seconds ago" -msgstr "" - -#. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago", -#. "[2 minutes] in the past", or "[3 years, 1 month] earlier" -#: ../src/sugar/util.py:189 -#, python-format -msgid "%s ago" -msgstr "" - -#. TRANS: Relative dates (eg. 1 month and 5 days). -#: ../src/sugar/util.py:202 -#, python-format -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" - -#: ../src/sugar/util.py:203 -#, python-format -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" - -#: ../src/sugar/util.py:204 -#, python-format -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" - -#: ../src/sugar/util.py:205 -#, python-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" - -#: ../src/sugar/util.py:206 -#, python-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" - -#: ../src/sugar/util.py:207 -#, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py index a3db42e..d4892d0 100644 --- a/src/sugar/activity/activity.py +++ b/src/sugar/activity/activity.py @@ -280,9 +280,6 @@ class Activity(Window, gtk.Container): self._jobject = None self._read_file_called = False - settings = gtk.settings_get_default() - settings.set_property("gtk-font-name", "%s %f" % (style.FONT_FACE, style.FONT_SIZE)) - self._session = _get_session() self._session.register(self) self._session.connect('quit-requested', diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py index ee0fd92..c195572 100644 --- a/src/sugar/activity/activityfactory.py +++ b/src/sugar/activity/activityfactory.py @@ -244,13 +244,17 @@ class ActivityCreationHandler(gobject.GObject): self._handle.object_id, self._handle.uri) + dev_null = file('/dev/null', 'w') environment_dir = None - if os.path.exists('/etc/olpc-security'): + rainbow_found = subprocess.call(['which', 'rainbow-run'], + stdout=dev_null, stderr=dev_null) == 0 + use_rainbow = rainbow_found and os.path.exists('/etc/olpc-security') + if use_rainbow: environment_dir = tempfile.mkdtemp() - command = ['/usr/bin/sudo', '-E', '--', - '/usr/bin/rainbow-run', + command = ['sudo', '-E', '--', + 'rainbow-run', '-v', '-v', - '-a', '/usr/bin/rainbow-sugarize', + '-a', 'rainbow-sugarize', '-s', '/var/spool/rainbow/2', '-f', '1', '-f', '2', diff --git a/src/sugar/activity/main.py b/src/sugar/activity/main.py index 93f34e6..ef4d001 100644 --- a/src/sugar/activity/main.py +++ b/src/sugar/activity/main.py @@ -28,6 +28,7 @@ import dbus.glib import sugar from sugar.activity import activityhandle from sugar.bundle.activitybundle import ActivityBundle +from sugar.graphics import style from sugar import logger @@ -96,6 +97,12 @@ def main(): gtk.icon_theme_get_default().append_search_path(bundle.get_icons_path()) + # This code can be removed when we grow an xsettings daemon (the GTK+ + # init routines will then automatically figure out the font settings) + settings = gtk.settings_get_default() + settings.set_property('gtk-font-name', + '%s %f' % (style.FONT_FACE, style.FONT_SIZE)) + locale_path = None if 'SUGAR_LOCALEDIR' in os.environ: locale_path = os.environ['SUGAR_LOCALEDIR'] -- cgit v0.9.1