diff options
| author | root <root@F14jerry.home.vonau.ca> | 2013-03-10 19:54:41 (GMT) |
|---|---|---|
| committer | root <root@F14jerry.home.vonau.ca> | 2013-03-10 19:54:41 (GMT) |
| commit | a9de3ce7b071aa40c36a885eed24a0cadd0131c9 (patch) | |
| tree | 61bed0b5940102642e2634cb83bc16b3fb8905b0 | |
| parent | c8aa96aff4edb1f833f38ba445a6d87b8c97d066 (diff) | |
| parent | d5358dda7f3f07e0f4eb0085af76fbe1459f4642 (diff) | |
Merge branch 'dextrose4-au' into jvonau-au-oob
| -rwxr-xr-x | examples/setAU-ARM.sh | 1 | ||||
| -rwxr-xr-x | examples/setAU.sh | 1 | ||||
| -rw-r--r-- | modules/sugar/kspost.52.gconf-dextrose4au.inc | 3 | ||||
| -rw-r--r-- | sub-files/abc123-Bold.ttf | bin | 0 -> 673744 bytes | |||
| -rw-r--r-- | sub-files/abc123-Regular.ttf | bin | 701600 -> 715024 bytes |
5 files changed, 5 insertions, 0 deletions
diff --git a/examples/setAU-ARM.sh b/examples/setAU-ARM.sh index e5a75cb..515158b 100755 --- a/examples/setAU-ARM.sh +++ b/examples/setAU-ARM.sh @@ -22,6 +22,7 @@ mkdir -p $INSTALL_ROOT/home/olpc/.sugar/default/ # add DejaVuOlpc-Regular.ttf to image mkdir $INSTALL_ROOT/usr/share/fonts/abc123 cp $GITDIR/sub-files/abc123-Regular.ttf $INSTALL_ROOT/usr/share/fonts/abc123/ +cp $GITDIR/sub-files/abc123-Bold.ttf $INSTALL_ROOT/usr/share/fonts/abc123/ cat << EOF > $INSTALL_ROOT/etc/fonts/conf.d/52-abc123.conf <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> diff --git a/examples/setAU.sh b/examples/setAU.sh index b43f83b..be2d43c 100755 --- a/examples/setAU.sh +++ b/examples/setAU.sh @@ -20,6 +20,7 @@ tar -jxvf $GITDIR/au.org.laptop.FirefoxEnGBActivity.tar.bz2 -C $INSTALL_ROOT/hom # add DejaVuOlpc-Regular.ttf to image mkdir $INSTALL_ROOT/usr/share/fonts/abc123 cp $GITDIR/sub-files/abc123-Regular.ttf $INSTALL_ROOT/usr/share/fonts/abc123/ +cp $GITDIR/sub-files/abc123-Bold.ttf $INSTALL_ROOT/usr/share/fonts/abc123/ cat << EOF > $INSTALL_ROOT/etc/fonts/conf.d/52-abc123.conf <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> diff --git a/modules/sugar/kspost.52.gconf-dextrose4au.inc b/modules/sugar/kspost.52.gconf-dextrose4au.inc index 0656d4e..5de3635 100644 --- a/modules/sugar/kspost.52.gconf-dextrose4au.inc +++ b/modules/sugar/kspost.52.gconf-dextrose4au.inc @@ -34,3 +34,6 @@ gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults #sdxo#1143 Restore Sugar GUI to configure hidden SSIDs gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --set /desktop/sugar/extensions/network/configure_hidden_ssids_feature_available --type bool True + +#sdxo#1570 global text-to-speech should use en_rp +gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --set /desktop/sugar/frame/chosen_text_to_speech --type string 'en_uk-rp' diff --git a/sub-files/abc123-Bold.ttf b/sub-files/abc123-Bold.ttf Binary files differnew file mode 100644 index 0000000..6ded2df --- /dev/null +++ b/sub-files/abc123-Bold.ttf diff --git a/sub-files/abc123-Regular.ttf b/sub-files/abc123-Regular.ttf Binary files differindex 1b85b5e..1105eb7 100644 --- a/sub-files/abc123-Regular.ttf +++ b/sub-files/abc123-Regular.ttf |