Bump version to 6.17.0.

This might lead to a slight speedup in sphinx, which seems to cache
unchanged files.

.gitignore

@@ -12,7 +12,12 @@ tmp
 cache
 
 log.txt
+errors.txt
+traceback.txt
 
+styles.txt
+
+/android
 /build
 /dist
 /dists
@@ -20,27 +25,18 @@ log.txt
 /jedit
 /lint.txt
 /renpy.code
-/traceback.txt
-/testing*
+/*testing*
 /screenshot*
-/errors.txt
-/styles.txt
-/Microsoft.VC90.CRT.manifest
-/console.exe
-/msvcr90.dll
-/python27.dll
 /renpy.exe
-/lib/windows-x86
-/lib/linux-x86_64
-/lib/linux-i686
-/lib/python2.7
+/lib
+/lib.old
 /doc
 /.pydevproject
 /.pydevproject.bak
 /.project
 /.settings
 /LICENSE.txt
-/template/README.html
+/templates/english/README.html
 /the_question/README.html
 /tutorial/README.html
 /renpy/angle/*.pyx
@@ -49,6 +45,10 @@ log.txt
 /module/build
 /module/gen
 /editra
+/launcher/game/theme
+/launcher/game/script_version.rpy
 
 dl
 renpy/vc_version.py
+.externalToolBuilders
+rapt-*

README.rst

@@ -0,0 +1,55 @@
+==============================
+The Ren'Py Visual Novel Engine
+==============================
+
+http://www.renpy.org
+
+
+Branches
+========
+
+Ren'Py development takes place on two branches, ``master`` and
+``devel``, as well as the occasional feature branch.
+
+Master
+-----
+
+The master branch contains code that can be run using the libraries in
+the latest (release or pre-release) version of Ren'Py. It's used for
+bugfixes and features that do not require C or Cython code to
+implement.
+
+After checking out master, run::
+
+    ./after_checkout.sh <path-to-renpy>
+
+to link in the libraries from the most recent Ren'Py. (On Windows, you
+will need to run this under msys or cygwin.)
+
+Ren'Py can then be run by running renpy.exe, renpy.sh, or renpy.app as
+appropriate.
+
+Devel
+-----
+
+The devel branch contains code that requires a recompile of modules
+implemented in C or Cython. Building devel requires you to have the
+prerequisite libraries installed. Then set RENPY_DEPS_INSTALLED to
+a \::-separated list of paths containing dependencies. For example::
+
+  export RENPY_DEPS_INSTALL=/usr::/usr/lib/x86_64-linux-gnu/
+
+Finally, change into the modules directory, and run::
+
+  python setup.py install
+
+Ren'Py can then be run by using python to run renpy.py.
+
+
+Contributing
+============
+
+For bug fixes, documentation improvements, and simple changes, just
+make a pull request. For more complex changes, it might make sense
+to file an issue so we can discuss the design.
+

add.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+
+import argparse
+import os
+import subprocess
+import sys
+
+from renpy import version_tuple #@UnresolvedImport
+
+version = ".".join(str(i) for i in version_tuple)
+short_version = ".".join(str(i) for i in version_tuple[:3])
+print "Version", version
+
+ap = argparse.ArgumentParser()
+
+ap.add_argument("--release", action="store_true")
+ap.add_argument("--prerelease", action="store_true")
+ap.add_argument("--experimental", action="store_true")
+ap.add_argument("--no-tag", "-n", action="store_true")
+
+args = ap.parse_args()
+
+if args.release:
+    links = [ "release", "prerelease", "experimental" ]
+    tag = True
+elif args.prerelease:
+    links = [ "prerelease", "experimental" ]
+    tag = True
+elif args.experimental:
+    links = [ "experimental" ]
+    tag = False
+else:
+    links = [ ]
+    tag = False
+
+
+def check_dirty():
+    if args.no_tag:
+        return
+
+    if subprocess.check_call([ "git", "diff", "--quiet", "HEAD" ]):
+        print "Directory not checked in: {}".format(os.getcwd())
+        sys.exit(1)
+
+os.chdir("/home/tom/ab/renpy")
+check_dirty()
+
+os.chdir("/home/tom/ab/renpy/android")
+check_dirty()
+subprocess.check_call([ "./add_renpy.sh", short_version ])
+
+if not args.no_tag:
+    subprocess.check_call([ "git", "tag", "-a", "rapt-" + version, "-m", "Tagging RAPT release." ])
+
+os.chdir("/home/tom/ab/renpy/dl")
+
+for i in links:
+    if os.path.exists(i):
+        os.unlink(i)
+    os.symlink(short_version, i)
+
+os.chdir("/home/tom/ab/renpy")
+
+if tag and not args.no_tag:
+    cmd = [ "git", "tag", "-a", version, "-m", "Ren'Py " + version ]
+    subprocess.check_call(cmd)
+
+os.chdir("/home/tom/ab/website")
+subprocess.check_call("./upload.sh")

add.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd ~/ab/website
-./upload.sh

after_checkout.sh

@@ -1,8 +1,15 @@
 #!/bin/bash
 
-ln -s ../help.html tutorial/README.html
-ln -s ../help.html the_question/README.html
-ln -s ../help.html template/README.html
+ROOT="$(dirname $(python -c "import os;print(os.path.realpath('$0'))"))"
 
-ln -s sphinx/source/license.rst LICENSE.txt
-ln -s sphinx/build/html doc
+ln -s "$ROOT/help.html" "$ROOT/tutorial/README.html"
+ln -s "$ROOT/help.html" "$ROOT/the_question/README.html"
+ln -s "$ROOT/help.html" "$ROOT/templates/english/README.html"
+
+ln -s "$ROOT/sphinx/source/license.rst" "$ROOT/LICENSE.txt"
+
+if [ "$1" != "" ]; then
+    ln -s "$1/lib" "$ROOT/lib"
+    ln -s "$1/renpy.app" "$ROOT"
+    ln -s "$1/renpy.exe" "$ROOT"
+fi

ansetup.py

@@ -1,4 +1,4 @@
-# This file sets up the normal python modules. It's used to help eclipse 
+# This file sets up the normal python modules. It's used to help eclipse
 # do type detection, by providing an importable version of the cython code.
 
 from distutils.core import setup

build_exe.py

@@ -1,111 +0,0 @@
-#!/usr/bin/env python
-
-import modulefinder
-import shutil
-from distutils.core import setup
-import py2exe #@UnresolvedImport @UnusedImport
-import sys
-import zipfile
-import traceback
-import os
-
-# The pythonpath on my system.
-sys.path.insert(0, 'c:\\msys\\1.0\\newbuild\\install\\bin')
-sys.path.insert(0, 'c:\\msys\\1.0\\newbuild\\install\\python')
-
-def move_from_dist(fn):
-    """
-    Moves the file `fn` from the dist directory to the main
-    directory. (This means we don't need symlinks on windows.)
-    """
-
-    if os.path.isdir(fn):
-        shutil.rmtree(fn)
-    elif os.path.exists(fn):
-        os.unlink(fn)
-
-    os.rename("dist/" + fn, fn)
-
-import renpy
-renpy.setup_modulefinder(modulefinder) #@UndefinedVariable
-
-def main():
-
-    sys.argv[1:] = [ 'py2exe', '-a', '--dll-excludes', 'w9xpopen.exe', ]
-
-    setup(name="Ren'Py",
-          windows=[ dict(script="renpy.py",
-                         dest_base="renpy",
-                         icon_resources=[ (1, "newicon.ico") ],
-                         ),
-                    ],
-
-          console=[ dict(script="renpy.py", dest_base="console") ],
-
-          zipfile='lib/windows-x86/renpy.code',
-
-          options={ 'py2exe' : { 'excludes' : [ 'doctest',
-                                                'pygame.macosx',
-                                                'pygame.surfarray',
-                                                'pygame.mixer',
-                                                'pygame.mixer_music',
-                                                '_ssl',
-                                                '_hashlib',
-                                                'win32con',
-                                                'win32api',
-                                                'Numeric',
-                                                'os2emxpath',
-                                                'macpath',
-                                                'multiprocessing',
-                                                '_multiprocessing',
-                                                ],
-                                 'optimize' : 2,
-                                 } },
-          )
-
-
-    zfold = zipfile.ZipFile("dist/lib/windows-x86/renpy.code")
-    zfnew = zipfile.ZipFile("dist/lib/windows-x86/renpy.code.new", "w", zipfile.ZIP_STORED)
-
-    seen = { }
-
-    for fn in zfold.namelist():
-        if fn.startswith("renpy/"):
-
-            # Keep around .pyo files that load pyd files.
-            pydfn = fn.replace("/", ".").replace(".pyo", ".pyd")
-            if not os.path.exists("dist/lib/windows-x86/" + pydfn):
-                continue
-
-        if fn in seen:
-            continue
-
-        if fn == "SDL_mixer.dll":
-            continue
-        
-        seen[fn] = True
-
-        zfnew.writestr(fn, zfold.read(fn))
-
-    zfold.close()
-    zfnew.close()
-
-    os.unlink("dist/lib/windows-x86/renpy.code")
-    os.rename("dist/lib/windows-x86/renpy.code.new", "dist/lib/windows-x86/renpy.code")
-
-    # Take these files from the old python.
-    shutil.copy("c:/Python26/Microsoft.VC90.CRT.manifest", "Microsoft.VC90.CRT.manifest")
-    shutil.copy("c:/Python26/msvcr90.dll", "msvcr90.dll")
-
-    move_from_dist("lib/windows-x86")
-    move_from_dist("console.exe")
-    move_from_dist("python27.dll")
-    move_from_dist("renpy.exe")
-
-
-try:
-    main()
-except:
-    traceback.print_exc()
-
-    

build_strings.py

@@ -1,79 +0,0 @@
-#!/usr/bin/env python
-
-import collections
-import glob
-import re
-import os
-
-# A map from string to filename, line number where the string is found.
-strings = collections.defaultdict(list)
-
-def process(fn):
-
-    lineno = 0
-    
-    for data in file(fn, "r"):
-
-        lineno += 1
-
-        matches = [ ]
-        
-        matches += re.finditer(r'\bu\"(\\"|[^"])+\"', data)
-        matches += re.finditer(r"\bu\'(\\'|[^'])+\'", data)
-
-        for m in matches:
-            s = m.group(0)[2:-1]
-
-            if "\\u" in s:
-                continue
-
-            if len(s) == 1:
-                continue
-            
-            strings[s].append("%s:%d" % (fn, lineno))
-
-if __name__ == "__main__":
-
-    files = [ ]
-
-    files += glob.glob("launcher/*.rpy")
-    files += glob.glob("common/*.rpy")
-    files += glob.glob("common/*.rpym")
-    files += glob.glob("common/_layout/*.rpym")
-    files += glob.glob("common/_compat/*.rpym")
-
-    if "launcher/strings.rpy" in files:
-        files.remove("launcher/strings.rpy")
-    
-    for fn in files:
-        process(fn)
-
-    converse = [ ]
-        
-    for k, v in strings.iteritems():
-        v = " ".join(sorted(v))
-        converse.append((v, k))
-
-    converse.sort()
-
-    f = file("launcher/strings.rpy", "w")
-
-    files = set(i for i in os.listdir("launcher") if i.endswith(".rpy"))
-    
-    print >>f, """\
-init python:
-    LAUNCHER_RPYS = %r
-
-    TRANSLATION_STRINGS = [
-""" % files
-    
-    for v, k in converse:
-        # print
-        # print "#:", v
-        # print "#, python-format"
-
-        print >>f, "        u\"%s\"," % unicode(k)
-
-    print >>f, """\
-    ]
-"""

common/00library.rpy

@@ -1,914 +0,0 @@
-# Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
-# See LICENSE.txt for license details.
-
-# This file consists of renpy functions that aren't expected to be
-# touched by the user too much. We reserve the _ prefix for names
-# defined in the library.
-
-init -1180 python:
-
-    # These are settings that the user can tweak to control the
-    # look of the main menu and the load/save/escape screens.
-
-    # basics: The version of Ren'Py this script is intended for, or
-    # None if it's intended for the current version.
-    config.script_version = None
-    
-    # The minimum version of the module we work with. Don't change
-    # this unless you know what you're doing.
-    config.module_version = 6007001
-
-    # Should we warn the user if the module is missing or has a bad
-    # version?
-    config.module_warning = False
-
-    # basics: A map from a string that's displayed by the interface to
-    # a translated value of that string.
-    config.translations = { }
-
-    # Used internally to maintain compatiblity with old
-    # translations of strings.
-    config.old_names = { }
-
-    # basics: True if the skip indicator should be shown.
-    config.skip_indicator = True
-
-    # basics: The width of a thumbnail.
-    config.thumbnail_width = 66
-
-    # basics: The height of a thumbnail.
-    config.thumbnail_height = 50
-
-    # basics: If not None, the default value of the fullscreen
-    # preference when the game is first run.
-    config.default_fullscreen = None
-
-    # basics: If not None, the default value of the text_cps
-    # preference when the game is first run.
-    config.default_text_cps = None        
-
-    # If not None, the default value of afm_time
-    config.default_afm_time = None
-
-    # If not None, the default value of afm_enable
-    config.default_afm_enable = None
-    
-    # Should we automatically define images?
-    config.automatic_images = None
-
-    # Prefixes to strip from automatic images.
-    config.automatic_images_strip = [ ]
-    
-    # A save to automatically load, if it exists.
-    config.auto_load = None
-
-    # Layers to clear when entering the menus.
-    config.menu_clear_layers = [ ]
-
-    # Should we start the game with scene black or just scene?
-    config.start_scene_black = False
-
-    # Voice and Sound samples.
-    config.sample_sound = None
-    config.sample_voice = None
-    
-    # This is updated to give the user an idea of where a save is
-    # taking place.
-    save_name = ''
-
-    # Should the window be shown during transitions?
-    _window_during_transitions = False
-
-    def _default_with_callback(trans, paired=None):
-        if (_window_during_transitions and not
-            renpy.context_nesting_level() and
-            not renpy.count_displayables_in_layer('transient')):
-
-            # narrator("", interact=False)
-            ui.window(style=style.say_window["empty"])
-            ui.null()
-            
-        return trans
-
-    config.with_callback = _default_with_callback
-
-
-    def _default_empty_window():
-        
-        who = _last_say_who
-
-        if who is not None:
-            who = eval(who)
-
-        if who is None:
-            who = narrator
-
-        if isinstance(who, NVLCharacter):
-            nvl_show_core()
-        else:
-            store.narrator("", interact=False)
-                
-    config.empty_window = _default_empty_window
-        
-    style.skip_indicator = Style(style.default, heavy=True, help='The skip indicator.')
-    style.skip_indicator.xpos = 10
-    style.skip_indicator.ypos = 10
-
-    # This is used to jump to a label with a transition.
-    def _intra_jumps_core(label, transition):
-        renpy.transition(getattr(config, transition))
-        renpy.jump(label)
-
-    _intra_jumps = renpy.curry(_intra_jumps_core)
-
-    # The function that's used to translate strings in the game menu.
-    def _(s):
-        """
-        Translates s into another language or something.
-        """
-
-        if s in config.translations:
-            return config.translations[s]
-
-        if s in config.old_names and config.old_names[s] in config.translations:
-            return config.translations[config.old_names[s]]
-
-        return s
-
-    config.extend_interjection = "{fast}"
-
-    def extend(what, interact=True):
-        who = _last_say_who
-
-        if who is not None:
-            who = eval(who)
-
-        if who is None:
-            who = narrator 
-            
-        if isinstance(who, basestring):
-            who = unknown.copy(who)
-
-        # This ensures extend works even with NVL mode.
-        who.do_extend()
-            
-        what = _last_say_what + config.extend_interjection + what
-            
-        renpy.exports.say(who, what, interact=interact)
-        store._last_say_what = what
-        
-    extend.record_say = False
-
-    # Are the windows currently hidden?
-    _windows_hidden = False
-
-    def toggle_skipping():
-
-        if not config.skipping:
-            config.skipping = "slow"
-        else:
-            config.skipping = None
-
-        if renpy.context()._menu:
-            renpy.jump("_noisy_return")
-        else:            
-            renpy.restart_interaction()
-
-    config.help = None
-            
-    def _help(help=None):
-
-        if help is None:
-            help = config.help
-
-        if help is None:
-            return
-
-        if renpy.has_label(help):
-            renpy.call_in_new_context(help)
-            return
-
-        _preferences.fullscreen = False
-
-        try:
-            import webbrowser
-            webbrowser.open_new("file:///" + config.basedir + "/" + help)
-        except:
-            pass
-
-    # Called to make a screenshot happen.
-    def _screenshot():
-        import os.path
-        import os
-        import __main__
-        
-        # Pick the directory to save into.
-        dest = config.renpy_base.rstrip("/")
-        
-        # Guess if we're an OSX App.
-        if dest.endswith("/Contents/Resources/autorun"):
-            # Go up 4 directories.
-            dest = os.path.dirname(dest)
-            dest = os.path.dirname(dest)
-            dest = os.path.dirname(dest)
-            dest = os.path.dirname(dest)
-            
-        # Try to pick a filename.
-        i = 1
-        while True:
-            fn = os.path.join(dest, config.screenshot_pattern % i)
-            if not os.path.exists(fn):
-                break
-            i += 1
-
-        try:
-            renpy.screenshot(fn)
-        except:
-            import traceback
-            traceback.print_exc()
-
-        if config.screenshot_callback is not None:
-            config.screenshot_callback(fn)
-
-    def _screenshot_callback(fn):
-        renpy.notify(_("Saved screenshot as %s.") % fn)
-
-    config.screenshot_callback = _screenshot_callback
-        
-    _predict_screens = [ ]
-        
-init -1180 python hide:
-    
-    import os
-    config.screenshot_pattern = os.environ.get("RENPY_SCREENSHOT_PATTERN", "screenshot%04d.png")
-
-    def dump_styles():
-        if config.developer:
-            renpy.style.write_text("styles.txt")
-
-    # This is run when entering the game menu.
-    config.game_menu_action = None
-            
-    def invoke_game_menu():
-        if renpy.context()._menu:
-            if renpy.context()._main_menu:
-                return
-            else:
-                renpy.jump("_noisy_return")
-        else:
-            if config.game_menu_action:
-                renpy.display.behavior.run(config.game_menu_action)
-            else:            
-                renpy.call_in_new_context('_game_menu')
-
-    def keymap_toggle_skipping():
-        if renpy.context()._menu:
-            return
-
-        toggle_skipping()
-            
-    def fast_skip():
-        if config.fast_skipping or config.developer:
-            config.skipping = "fast"
-
-        if renpy.context()._menu:
-            renpy.jump("_noisy_return")
-
-    def reload_game():
-        if not config.developer:
-            return
-
-        renpy.call_in_new_context("_save_reload_game")
-
-    def launch_editor():
-        if not config.developer:
-            return
-
-        filename, line = renpy.get_filename_line()
-        renpy.launch_editor([ filename ], line)
-        
-    # The default keymap. We might also want to put some of this into
-    # the launcher.
-    km = renpy.Keymap(
-        rollback = renpy.rollback,
-        screenshot = _screenshot,
-        toggle_fullscreen = renpy.toggle_fullscreen,
-        toggle_music = renpy.toggle_music,
-        toggle_skip = keymap_toggle_skipping,
-        fast_skip = fast_skip,
-        game_menu = invoke_game_menu,
-        hide_windows = renpy.curried_call_in_new_context("_hide_windows"),
-        launch_editor = launch_editor,
-        dump_styles = dump_styles,
-        reload_game = reload_game,
-        developer = renpy.curried_call_in_new_context("_developer"),
-        quit = renpy.quit_event,
-        iconify = renpy.iconify,
-        help = _help,
-        choose_renderer = renpy.curried_call_in_new_context("_choose_renderer"),
-        )
-
-    config.underlay = [ km ]
-
-    def skip_indicator():
-
-        ### skip_indicator default
-        # (text) The style and placement of the skip indicator.            
-
-        if config.skip_indicator is True:
-
-            if config.skipping == "slow" and config.skip_indicator:
-                ui.text(_(u"Skip Mode"), style='skip_indicator')
-
-            if config.skipping == "fast" and config.skip_indicator:
-                ui.text(_(u"Fast Skip Mode"), style='skip_indicator')
-
-            return
-
-        if not config.skip_indicator:
-            return
-
-        if not config.skipping:
-            return
-
-        ui.add(renpy.easy.displayable(config.skip_indicator))
-
-    config.overlay_functions.append(skip_indicator)
-
-    # Hyperlink functions. Duplicated in _errorhandling.rpym.
-    def hyperlink_styler(target):
-        return style.hyperlink_text
-
-    def hyperlink_function(target):
-        if target.startswith("http:"):
-            try:
-                import webbrowser
-                webbrowser.open(target)
-            except:
-                pass
-        else:
-            renpy.call_in_new_context(target)
-
-    style.default.hyperlink_functions = (hyperlink_styler, hyperlink_function, None)
-
-    # Prediction of screens.    
-    def predict():
-
-        for s in _predict_screens:
-            if renpy.has_screen(s):
-                renpy.predict_screen(s)
-
-        s = _game_menu_screen
-
-        if s is None:
-            return
-
-        if renpy.has_screen(s):
-            renpy.predict_screen(s)
-            return
-
-        if s.endswith("_screen"):
-            s = s[:-7]
-            if renpy.has_screen(s):
-                renpy.predict_screen(s)
-                return
-
-            
-    config.predict_callbacks.append(predict)
-            
-    def imagemap_auto_function(auto_param, variant):
-        rv = auto_param % variant
-
-        if renpy.loadable(rv):
-            return rv
-        else:
-            return None
-        
-        
-    config.imagemap_auto_function = imagemap_auto_function
-
-
-label _hide_windows:
-
-    if renpy.context()._menu:
-        return
-    
-    if _windows_hidden:
-        return
-
-    python:
-        _windows_hidden = True
-        ui.saybehavior(dismiss=['dismiss', 'hide_windows'])
-        ui.interact(suppress_overlay=True, suppress_window=True)
-        _windows_hidden = False
-
-    return
-
-    
-# This code here handles check for the correct version of the Ren'Py module.
-                         
-label _save_reload_game:
-    python hide:
-        renpy.take_screenshot((config.thumbnail_width, config.thumbnail_height))
-        renpy.music.stop()
-        
-        ui.add(Solid((0, 0, 0, 255)))
-        ui.text("Saving game...",
-                size=32, xalign=0.5, yalign=0.5, color=(255, 255, 255, 255))
-
-        renpy.pause(0)
-
-        renpy.save("_reload-1", "reload save game")
-        
-        ui.add(Solid((0, 0, 0, 255)))
-        ui.text("Reloading script...",
-                size=32, xalign=0.5, yalign=0.5, color=(255, 255, 255, 255))
-
-        renpy.pause(0)
-        
-        renpy.utter_restart()
-
-label _load_reload_game:
-    
-    if not renpy.can_load("_reload-1"):
-        return 
-
-    python hide:
-        renpy.rename_save("_reload-1", "_reload-2")
-
-        ui.add(Solid((0, 0, 0, 255)))
-        ui.text("Reloading game...",
-                size=32, xalign=0.5, yalign=0.5, color=(255, 255, 255, 255))
-
-        ui.pausebehavior(0)
-        ui.interact(suppress_underlay=True, suppress_overlay=True)
-        
-        renpy.load("_reload-2")
-
-    return
-
-init -1001:
-    image text = renpy.ParameterizedText(style="centered_text")
-
-    # Lock the library object.
-    $ config.locked = True
-
-
-# Implement config.default_fullscreen and config.default_text_cps.
-init 1180 python:
-
-    if not persistent._set_preferences:
-        persistent._set_preferences = True
-        
-        if config.default_fullscreen is not None:
-            _preferences.fullscreen = config.default_fullscreen
-
-        if config.default_text_cps is not None:
-            _preferences.text_cps = config.default_text_cps
-
-        if config.default_afm_time is not None:
-            _preferences.afm_time = config.default_afm_time
-            
-    if config.default_afm_enable is not None:
-        _preferences.afm_enable = config.default_afm_enable
-        _preferences.using_afm_enable = True
-    else:
-        _preferences.afm_enable = True
-        _preferences.using_afm_enable = False
-    
-
-        
-##############################################################################
-# Code that originated in 00gamemenu.rpy
-init -1180 python:
-
-    ######################################################################
-    # First up, we define a bunch of configuration variable, which the
-    # user can change.
-
-    # menus: Music to play when entering the game menu.
-    config.game_menu_music = None
-
-    # menus: Sound played when entering the library without clicking a
-    # button.
-    config.enter_sound = None
-
-    # menus: Sound played when leaving the library without clicking a
-    # button.
-    config.exit_sound = None
-
-    # menus: Transition that occurs when entering the game menu.
-    config.enter_transition = None
-
-    # menus: Transition that occurs when leaving the game menu.
-    config.exit_transition = None
-
-    # menus: Transition that's used when going from one screen to another.
-    config.intra_transition = None
-
-    # menus: Transition that's used when going from the main to the game
-    # menu.
-    config.main_game_transition = None
-
-    # menus: Transition that's used when going from the game to the main
-    # menu.
-    config.game_main_transition = None
-
-    # menus: Transition that's used at the end of the game, when returning
-    # to the main menu.
-    config.end_game_transition = None
-
-    # menus: Transition that's used at the end of the splash screen, when
-    # it is shown.
-    config.end_splash_transition = None
-
-    # Transition that's used after the game is loaded.
-    config.after_load_transition = None
-    
-    # basics: True if autosave should be used.
-    config.has_autosave = True
-
-    # basics: True if quicksave has been enabled.
-    config.has_quicksave = False
-
-    # A list of layers to clear when entering the main and game menus.
-    config.clear_layers = [ ]
-
-    # The _window_subtitle used inside menus.
-    config.menu_window_subtitle = ''
-    
-    # The screen that we go to when entering the game menu.
-    _game_menu_screen = None
-    
-    style.error_root = Style(style.default)
-    style.error_title = Style(style.default)
-    style.error_body = Style(style.default)
-
-    def _show_exception(title, message):
-
-        ui.window(style='error_root')
-        ui.vbox()
-
-        ui.text(title, style='error_title')
-        ui.text("")
-        ui.text(message, style='error_body')
-        ui.text("")
-        ui.text(_(u"Please click to continue."), style='error_body')
-
-        ui.close()
-
-        ui.saybehavior()
-
-        ui.interact()
-
-    def _enter_menu():
-        config.skipping = None
-        
-        renpy.movie_stop(only_fullscreen=True)
-        renpy.take_screenshot((config.thumbnail_width, config.thumbnail_height))
-
-        for i in config.menu_clear_layers:
-            renpy.scene(layer=i)
-        
-        renpy.context()._menu = True        
-        renpy.context()._main_menu = False
-        renpy.context_dynamic("main_menu")
-        renpy.context_dynamic("_window_subtitle")
-        renpy.context_dynamic("_window")
-        
-        store.main_menu = False
-        store._window_subtitle = config.menu_window_subtitle
-        store._window = False
-        
-        store.mouse_visible = True
-        store.suppress_overlay = True
-        ui.clear()
-
-        for i in config.clear_layers:
-            renpy.scene(layer=i)
-        
-# Run at the end of init, to set up autosaving based on the user's
-# choices.
-init 1180 python:
-
-    if config.has_autosave:
-        config.autosave_slots = 10
-    else:
-        config.autosave_frequency = None
-    
-# Factored this all into one place, to make our lives a bit easier.
-label _enter_game_menu:
-    $ _enter_menu()
-
-    $ renpy.transition(config.enter_transition)
-
-    if renpy.has_label("enter_game_menu"):
-        call expression "enter_game_menu" from _call_enter_game_menu_1
-
-    if config.game_menu_music:
-        $ renpy.music.play(config.game_menu_music, if_changed=True)
-
-    return
-
-# Entry points from the game into menu-space.
-label _game_menu(_game_menu_screen=_game_menu_screen):
-    if not _game_menu_screen:
-        return
-
-    $ renpy.play(config.enter_sound)
-    
-    call _enter_game_menu from _call__enter_game_menu_0
-    
-    if renpy.has_label("game_menu"):
-        jump expression "game_menu"
-
-    if renpy.has_screen(_game_menu_screen):
-        $ renpy.show_screen(_game_menu_screen)
-        $ ui.interact()
-        jump _noisy_return
-        
-    jump expression _game_menu_screen
-
-label _game_menu_save:
-    call _enter_game_menu from _call__enter_game_menu_1
-
-    if renpy.has_label("_save_screen"):
-        jump expression "_save_screen"
-    else:
-        jump expression "save_screen"
-
-label _game_menu_load:
-    call _enter_game_menu from _call__enter_game_menu_2
-
-    if renpy.has_label("_load_screen"):
-        jump expression "_load_screen"
-    else:
-        jump expression "load_screen"
-
-label _game_menu_preferences:
-    call _enter_game_menu from _call__enter_game_menu_3
-
-    if renpy.has_label("_prefs_screen"):
-        jump expression "_prefs_screen"
-    else:
-        jump expression "preferences_screen"
-
-label _quit:
-    $ renpy.quit()
-
-label _return_skipping:
-    $ config.skipping = "slow"
-    jump _return
-    
-# Make some noise, then return.
-label _noisy_return:
-    $ renpy.play(config.exit_sound)
-
-# Return to the game.
-label _return:
-
-    if renpy.context()._main_menu:
-        $ renpy.transition(config.game_main_transition)
-        jump _main_menu_screen
-
-    $ renpy.transition(config.exit_transition)
-
-    return
-
-label _confirm_quit:
-
-    if renpy.has_label("confirm_quit"):
-        jump expression "confirm_quit"
-    elif renpy.has_label("_compat_confirm_quit"):
-        jump expression "_compat_confirm_quit"
-    else:
-        jump expression "_quit_prompt"
-
-
-##############################################################################
-# Code that originated in 00mainmenu.rpy
-
-init -1180 python hide:
-
-    # menus: Music to play at the main menu.
-    config.main_menu_music = None
-
-    # advanced: Callbacks to run at start.
-    config.start_callbacks = [ ]
-
-
-# This fixes up the context, if necessary, then calls the real
-# after_load.
-label _after_load:
-    $ renpy.context()._menu = False
-    $ renpy.context()._main_menu = False
-
-    if config.after_load_transition:
-        $ renpy.transition(config.after_load_transition, force=True)
-    
-    if renpy.has_label("after_load"):
-        jump expression "after_load"
-    else:
-        return
-
-    
-# This is the true starting point of the program. Sssh... Don't
-# tell anyone.
-label _start:
-
-    python hide:
-        renpy.context()._menu = False
-        renpy.context()._main_menu = False
-        
-        for i in config.start_callbacks:
-            i()
-
-    $ renpy.block_rollback()
-
-    call _gl_test
-            
-    call _load_reload_game from _call__load_reload_game_1
-
-    if not _restart and config.auto_load and renpy.can_load(config.auto_load):
-        $ renpy.load(config.auto_load)
-
-    if config.start_scene_black:        
-        scene black
-    else:
-        scene
-        
-    if not _restart:
-        $ ui.pausebehavior(0)
-        $ ui.interact(suppress_underlay=True, suppress_overlay=True)
-
-    $ renpy.block_rollback()
-
-    $ _old_game_menu_screen = _game_menu_screen
-    $ _old_predict_screens = _predict_screens
-    $ _game_menu_screen = None
-    $ _predict_screens = [ 'main_menu' ]
-    
-    if renpy.has_label("splashscreen") and not _restart:
-        call expression "splashscreen" from _call_splashscreen_1
-
-    $ _game_menu_screen = _old_game_menu_screen
-    $ del _old_game_menu_screen
-        
-    $ renpy.block_rollback()
-
-    if config.main_menu_music:
-        $ renpy.music.play(config.main_menu_music, if_changed=True)
-    else:
-        $ renpy.music.stop()
-        
-    # Clean out any residual scene from the splashscreen.
-    if config.start_scene_black:
-        scene black
-    else:
-        scene
-
-
-    # This has to be python, to deal with a case where _restart may
-    # change across a shift-reload.
-    python:
-        if _restart is None:
-            renpy.transition(config.end_splash_transition)
-        else:
-            renpy.transition(_restart[0])
-            renpy.jump(_restart[1])
-        
-label _invoke_main_menu:
-
-    # Again, this has to be python.
-    python:
-        if _restart:
-            renpy.call_in_new_context(_restart[2])
-        else:
-            renpy.call_in_new_context("_main_menu")
-        
-        
-    # If the main menu returns, then start the game.
-    jump start
-
-# At this point, we've been switched into a new context. So we
-# initialize it.
-label _main_menu(_main_menu_screen="_main_menu_screen"):
-
-    $ _enter_menu()
-
-    python:
-        renpy.dynamic("_load_prompt")
-        _load_prompt = False
-
-        renpy.context()._main_menu = True
-        store.main_menu = True
-
-    jump expression _main_menu_screen
-        
-# This is called to show the main menu to the user.
-label _main_menu_screen:    
-
-    # Let the user completely override the main menu. (But please note
-    # it still lives in the menu context, rather than the game context.)
-    if renpy.has_label("main_menu"):
-        jump expression "main_menu"
-
-    # New name.
-    elif renpy.has_label("main_menu_screen"):
-        jump expression "main_menu_screen"
-
-    # Compatibility name.
-    elif renpy.has_label("_library_main_menu"):
-        jump expression "_library_main_menu"
-        
-    return
-
-init 1180 python hide:
-    
-    def create_automatic_images():
-    
-        seps = config.automatic_images
-
-        if seps is True:
-            seps = [ ' ', '/', '_' ]
-            
-        for dir, fn in renpy.loader.listdirfiles():
-
-            if fn.startswith("_"):
-                continue
-
-            # Only .png and .jpg
-            if not fn.lower().endswith(".png") and not fn.lower().endswith(".jpg"):
-                continue
-
-            # Strip the extension, replace slashes.
-            shortfn = fn[:-4].replace("\\", "/")
-            
-            # Determine the name.
-            name = ( shortfn, )
-            for sep in seps:
-                name = tuple(j for i in name for j in i.split(sep))
-
-            # Strip name components.
-            while name:
-                for i in config.automatic_images_strip:
-                    if name[0] == i:
-                        name = name[1:]
-                        break
-                else:
-                    break
-                
-            # Only names of 2 components or more.
-            if len(name) < 2:
-                continue
-            
-            # Reject if it already exists.
-            if name in renpy.display.image.images:
-                continue
-
-            renpy.image(name, fn)
-
-    if config.automatic_images:
-        create_automatic_images()
-
-
-# After init, make some changes based on if config.developer is True.
-init 1180 python hide:
-
-    if config.developer:
-        if config.debug_sound is None:
-            config.debug_sound = True
-        
-        renpy.load_module("_developer")
-
-
-
-# Entry point for the developer screen. The rest of it is loaded from
-# _developer.rpym
-label _developer:
-
-    if not config.developer:
-        return
-
-    $ _enter_menu()
-
-    jump expression "_developer_screen"
-
-
-# Translations.
-init -1180 python:
-
-    def _language_activate():
-
-        if persistent._language:
-            language = persistent._language 
-        else:
-            language = "translations"
-    
-        if renpy.loadable(language + ".rpt"):
-            config.translator = renpy.Translator(language)
-        else:
-            config.translator = None
-            
-    _language_activate()
-            

common/00menus.rpy

@@ -1,46 +0,0 @@
-# Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
-# See LICENSE.txt for license details.
-
-# Common stuff that's used by the various Ren'Py menus. This includes
-# the default definitions of config.main_menu and config.game_menu, as
-# well as the default definitions of the various preferences (and the objects
-# holding those preferences)
-
-init -1150 python:
-
-    config.main_menu = [
-        (u"Start Game", "start", "True"),
-        (u"Load Game", _intra_jumps("load_screen", "main_game_transition"), "True"),
-        (u"Preferences", _intra_jumps("preferences_screen", "main_game_transition"), "True"),
-        (u"Help", _help, "True", "config.help"),
-        (u"Quit", ui.jumps("_quit"), "True"),
-        ]
-
-    config.game_menu = [
-        ( None, u"Return", ui.jumps("_return"), 'True'),
-        ( "preferences", u"Preferences", _intra_jumps("preferences_screen", "intra_transition"), 'True' ),
-        ( "save", u"Save Game", _intra_jumps("save_screen", "intra_transition"), 'not main_menu' ),
-        ( "load", u"Load Game", _intra_jumps("load_screen", "intra_transition"), 'True'),
-        ( None, u"Main Menu", ui.callsinnewcontext("_main_menu_prompt"), 'not main_menu' ),
-        ( "help", u"Help", _help, "True", "config.help"),
-        ( None, u"Quit", ui.callsinnewcontext("_quit_prompt"), 'True' ),
-        ]
-
-label _quit_prompt:
-    $ renpy.loadsave.force_autosave()
-
-    if layout.yesno_prompt(None, layout.QUIT):
-        jump _quit
-    else:
-        return
-
-label _main_menu_prompt:
-    $ renpy.loadsave.force_autosave()
-
-    if layout.yesno_prompt(None, layout.MAIN_MENU):
-        $ renpy.full_restart(transition=config.game_main_transition)
-    else:
-        return
-
-    
- 

common/00musicroom.rpy

@@ -1,221 +0,0 @@
-# Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
-# See LICENSE.txt for license details.
-
-# This file contains the code to implement Ren'Py's music room function,
-# which consists of the ability to set up a playlist (the aforementioned
-# "music room"), and then a series of actions that let the player 
-# navigate through the music room.
-
-init -1135 python:
-
-    class __MusicRoomPlay(Action):
-        """
-        The action returned by MusicRoom.Play when called with a file.
-        """
-                
-        def __init__(self, mr, filename):
-            self.mr = mr
-            self.filename = filename
-            self.selected = self.get_selected()
-
-        def __call__(self):
-            self.mr.play(self.filename, 0)
-        
-        def get_sensitive(self):
-            return self.mr.is_unlocked(self.filename)
-            
-        def get_selected(self):
-            return renpy.music.get_playing(self.mr.channel) == self.filename
-        
-        def periodic(self, st):
-            if self.selected != self.get_selected():
-                renpy.restart_interaction()
-
-            return .1
-    
-    class MusicRoom(object):
-        """
-        :doc: music_room class
-        
-        A music room that contains a series of songs that can be unlocked
-        by the user, and actions that can play entries from the list in
-        order.
-        """
-        
-        def __init__(self, channel="music", fadeout=0.0, fadein=0.0):
-            """
-            `channel`
-                The channel that this music room will operate on.
-
-            `fadeout`
-                The number of seconds it takes to fade out the old
-                music when changing tracks.
-                
-            `fadein`
-                The number of seconds it takes to fade in the new
-                music when changing tracks.
-            """
-    
-            self.channel = channel
-            self.fadeout = fadeout
-            self.fadein = fadein
-            
-            # The list of strings giving the titles of songs that make up the
-            # playlist.
-            self.playlist = [ ]
-            
-            # A set of filenames, so we can quickly check if a valid filename
-            # has been provided.
-            self.filenames = set()
-            
-            # The set of songs that are always unlocked.
-            self.always_unlocked = set()
-            
-            
-        def add(self, filename, always_unlocked=False):
-            """
-            :doc: music_room method
-            
-            Adds the music file `filename` to this music room. The music room
-            will play unlocked files in the order that they are added to the
-            room.
-            
-            `always_unlocked`
-                If true, the music file will be always unlocked. This allows
-                the file to show up in the music room before it has been 
-                played in the game.
-            """
-            
-            self.playlist.append(filename)
-            self.filenames.add(filename)
-            
-            if always_unlocked:
-                self.always_unlocked.add(filename)
-                
-        def is_unlocked(self, filename):
-            """
-            :doc: music_room method
-            
-            Returns true if the filename has been unlocked (or is always
-            unlocked), and false if it is still locked.
-            """
-            
-            if filename in self.always_unlocked:
-                return True
-            
-            return renpy.seen_audio(filename)
-        
-        def unlocked_playlist(self):
-            """
-            Returns a list of filenames in the playlist that have been 
-            unlocked.
-            """
-            
-            return [ i for i in self.playlist if self.is_unlocked(i) ]
-        
-        def play(self, filename=None, offset=0):
-            """
-            Starts the music room playing. The file we start playing with is 
-            selected in two steps. 
-
-            If `filename` is an unlocked file, we start by playing it.
-            Otherwise, we start by playing the currently playing file, and if
-            that doesn't exist or isn't unlocked, we start with the first file.
-
-            We then apply `offset`. If `offset` is positive, we advance that many
-            files, otherwise we go back that many files.
-            
-            The selected file is then played.                
-        
-            """
-            
-            playlist = self.unlocked_playlist()
-            
-            if not playlist:
-                return
-            
-            if filename is None:
-                filename = renpy.music.get_playing(channel=self.channel)
-            
-            try:
-                idx = playlist.index(filename)
-            except ValueError:
-                idx = 0
-                
-            idx = (idx + offset) % len(playlist)
-            
-            playlist = playlist[idx:] + playlist[:idx]
-            
-            renpy.music.play(playlist, channel=self.channel, fadeout=self.fadeout, fadein=self.fadein)
-            
-        def stop(self):
-            """
-            Stops the music from playing.
-            """
-            
-            renpy.music.stop(channel=self.channel, fadeout=self.fadeout)
-            
-        def next(self):
-            """
-            Plays the next file in the playlist.
-            """
-
-            return self.play(None, 1)
-            
-        def previous(self):
-            """
-            Plays the previous file in the playlist.
-            """
-            
-            return self.play(None, -1)
-            
-        def Play(self, filename=None):
-            """
-            :doc: music_room method
-                        
-            Causes the music room to start playing. If `filename` is given, that
-            file begins playing. Otherwise, the currently playing file starts 
-            over (if it's unlocked), or the first file starts playing.
-
-            If `filename` is given, buttons with this action will be insensitive
-            while `filename` is locked, and will be selected when `filename`
-            is playing.
-            """
-                
-            if filename is None:
-                return self.play
-                
-            if filename not in self.filenames:
-                raise Exception("{0!r} is not a filename registered with this music room.".format(filename))
-            
-            return __MusicRoomPlay(self, filename)
-        
-        def Stop(self):
-            """
-            :doc: music_room method
-            
-            Stops the music.
-            """
-            
-            return self.stop
-            
-        
-        def Next(self):
-            """
-            :doc: music_room method
-            
-            An action that causes the music room to play the next unlocked file
-            in the playlist.
-            """
-            
-            return self.next
-        
-        def Previous(self):
-            """
-            :doc: music_room method
-            
-            An action that causes the music room to play the previous unlocked 
-            file in the playlist.
-            """
-            
-            return self.previous

common/00voice.rpy

@@ -1,131 +0,0 @@
-# Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
-# See LICENSE.txt for license details.
-
-# This extra contains a basic implementation of voice support. Right
-# now, voice is given its own toggle, and can either be turned on or
-# turned off. In the future, we'll probably provide some way of
-# toggling it on or off for individual characters.
-#
-# To use it, place a voice "<sndfile>" line before each voiced line of
-# dialogue.
-#
-#     voice "e_1001.ogg"
-#     e "Voice support lets you add the spoken word to your games."
-#
-# Normally, a voice is cancelled at the start of the next
-# interaction. If you want a voice to span interactions, call
-# voice_sustain.
-#
-#     voice "e_1002.ogg"
-#     e "Voice sustain is a technique that allows the same voice file.."
-#
-#     $ voice_sustain()
-#     e "...to play for two lines of dialogue."
-
-init -1120:
-
-    python:
-
-        _voice = object()
-        _voice.play = None
-        _voice.sustain = False
-        _voice.seen_in_lint = False
-
-        # Call this to specify the voice file that will be played for
-        # the user.
-        def voice(file, **kwargs):
-
-            if not config.has_voice:
-                return
-            
-            _voice.play = file
-            _last_voice_play = file 
-            
-        # Call this to specify that the currently playing voice file
-        # should be sustained through the current interaction.
-        def voice_sustain(ignored="", **kwargs):
-            if not config.has_voice:
-                return
-            
-            _voice.sustain = True
-
-        # Call this to replay the last bit of voice.
-        def voice_replay():
-            renpy.sound.play(_last_voice_play, channel="voice")
-
-        # Returns true if we can replay the voice.
-        def voice_can_replay():
-            return _last_voice_play != None
-            
-    python hide:
-
-        # basics: True if the game will have voice.
-        config.has_voice = True
-
-        # This is called on each interaction, to ensure that the
-        # appropriate voice file is played for the user.        
-        def voice_interact():
-            
-            if not config.has_voice:
-                return
-            
-            if _voice.play and not config.skipping:
-                renpy.sound.play(_voice.play, channel="voice")
-                store._last_voice_play = _voice.play        
-            elif not _voice.sustain:
-                renpy.sound.stop(channel="voice")
-                store._last_voice_play = _voice.play        
-
-            _voice.play = None
-            _voice.sustain = False
-        
-        config.start_interact_callbacks.append(voice_interact)
-        config.say_sustain_callbacks.append(voice_sustain)
-
-        def voice_afm_callback():
-            return not renpy.sound.is_playing(channel="voice")
-
-        config.afm_callback = voice_afm_callback
-                       
-python early hide:
-
-    def parse_voice(l):
-        fn = l.simple_expression()
-        if fn is None:
-            renpy.error('expected simple expression (string)')
-
-        if not l.eol():
-            renpy.error('expected end of line')
-
-        return fn
-
-    def execute_voice(fn):
-        fn = eval(fn)
-        voice(fn)
-
-    def lint_voice(fn):
-        _voice.seen_in_lint = True
-
-        fn = _try_eval(fn, 'voice filename')
-        if isinstance(fn, basestring) and not renpy.loadable(fn):
-            renpy.error('voice file %r is not loadable' % fn)
-
-    renpy.statements.register('voice',
-                              parse=parse_voice,
-                              execute=execute_voice,
-                              lint=lint_voice)
-
-    def parse_voice_sustain(l):
-        if not l.eol():
-            renpy.error('expected end of line')
-
-        return None
-
-    def execute_voice_sustain(parsed):
-        voice_sustain()
-
-    renpy.statements.register('voice sustain',
-                              parse=parse_voice_sustain,
-                              execute=execute_voice_sustain)
-
-

common/_layout/screen_yesno_prompt.rpym

@@ -1,12 +0,0 @@
-# Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
-# See LICENSE.txt for license details.
-
-init python hide:
-
-    layout.provides('yesno_prompt')
-
-    def yesno_prompt(screen, message):
-        rv = renpy.call_screen('yesno_prompt', message=message, yes_action=Return(True), no_action=Return(False))
-        return rv
-    
-    layout.yesno_prompt = yesno_prompt

console.bat

@@ -0,0 +1,2 @@
+lib\windows-i686\python.exe -OO renpy.py
+pause

distribute.py

@@ -1,124 +1,50 @@
-#!/home/tom/bin/renpython
-# Builds a distributions of Ren'Py.
+#!/home/tom/bin/renpython -O
+
+# Builds a distribution of Ren'Py.
 
 import sys
 import os
-import zipfile
-import tarfile
-import zlib
 import compileall
 import shutil
 import subprocess
-import time
 import argparse
 
 CWD = os.getcwdu()
 
-zlib.Z_DEFAULT_COMPRESSION = 9
+def copy_tutorial_file(src, dest):
+    """
+    Copies a file from src to dst. Lines between  "# tutorial-only" and
+    "# end-tutorial-only" comments are omitted from the copy.
+    """
 
-# Gets the data for the given file.
-def data(fn):
+    sf = open(src, "rb")
+    df = open(dest, "wb")
 
-    rv = file(fn, "rb").read()
+    # True if we want to copy the line.
+    copy = True
 
-    if fn.startswith("renpy.app"):
-        return rv
+    for l in sf:
+        if "# tutorial-only" in l:
+            copy = False
+        elif "# end-tutorial-only" in l:
+            copy = True
+        else:
+            if copy:
+                df.write(l)
 
-    if fn.endswith(".rpy") or fn.endswith(".rpym") or fn.endswith(".py") or fn.endswith(".txt"):
-        rv = rv.replace("\n", "\r\n")
-        rv = rv.replace("\r\r\n", "\r\n")
+    sf.close()
+    df.close()
 
-    return rv
-    
-
-def tarup(filename, prefix, files):
-
-    tf = tarfile.open(filename, "w:bz2")
-    tf.dereference = True
-
-    sys.stdout.write(filename)
-    sys.stdout.flush()
-
-    for fn in files:
-        sys.stdout.write(".")
-        sys.stdout.flush()
-        
-        tf.add(fn, prefix + "/" + fn, False)
-
-    sys.stdout.write("\n")
-        
-    tf.close()
-    
-
-# Creates a zip file.
-def zipup(filename, prefix, files):
-
-    zf = zipfile.ZipFile(filename, "w")
-
-    sys.stdout.write(filename)
-    sys.stdout.flush()
-
-    for fn in files:
-        sys.stdout.write(".")
-        sys.stdout.flush()
-
-        zi = zipfile.ZipInfo(prefix + "/" + fn)
-
-        st = os.stat(fn)
-
-        zi.date_time = time.gmtime(st.st_mtime)[:6]
-        zi.compress_type = zipfile.ZIP_DEFLATED
-        zi.create_system = 3
-        zi.external_attr = long(st.st_mode) << 16
-
-        zf.writestr(zi, data(fn))
-        
-    zf.close()
-
-    sys.stdout.write("\n")
-    sys.stdout.flush()
-    
-    
-
-def tree(root):
-
-    rv = [ ]
-
-    for dirname, dirs, filenames in os.walk(root):
-
-        if "saves" in dirs:
-            dirs.remove("saves")
-
-        if ".svn" in dirs:
-            dirs.remove(".svn")
-
-        if ".doctrees" in dirs:
-            dirs.remove(".doctrees")
-
-            
-        for f in filenames:
-            if f[-1] == '~' or f[0] == '.':
-                continue
-
-            if f.endswith(".bak") or f.endswith(".pyc"):
-                continue
-
-            if f == "semantic.cache":
-                continue
-
-            if "libSDL_mixer" in f or "mixer_music" in f:
-                continue
-
-            rv.append(dirname + "/" + f)
-
-    return rv
 
 def main():
 
+    if not sys.flags.optimize:
+        raise Exception("Not running with python optimization.")
+
     ap = argparse.ArgumentParser()
     ap.add_argument("version")
     ap.add_argument("--fast", action="store_true")
-    
+
     args = ap.parse_args()
 
     # Revision updating is done early, so we can do it even if the rest
@@ -131,81 +57,108 @@ def main():
     match_version = ".".join(str(i) for i in renpy.version_tuple[:2]) #@UndefinedVariable
     zip_version = ".".join(str(i) for i in renpy.version_tuple[:3]) #@UndefinedVariable
 
-    s = subprocess.check_output([ "git", "describe", "--dirty", "--match", match_version ])
+    s = subprocess.check_output([ "git", "describe", "--tags", "--dirty", "--match", match_version ])
     parts = s.strip().split("-")
     vc_version = int(parts[1])
-    
+
     if parts[-1] == "dirty":
         vc_version += 1
-    
+
     with open("renpy/vc_version.py", "w") as f:
         f.write("vc_version = {}".format(vc_version))
 
-    reload(sys.modules['renpy.vc_version']) #@UndefinedVariable
+    try:
+        reload(sys.modules['renpy.vc_version']) #@UndefinedVariable
+    except:
+        import renpy.vc_version # @UnusedImport
+
     reload(sys.modules['renpy'])
 
     # Check that the versions match.
     full_version = ".".join(str(i) for i in renpy.version_tuple) #@UndefinedVariable
-    if args.version != "experimental" and not full_version.startswith(args.version): 
-        raise Exception("The command-line and Ren'Py versions do not match.") 
+    if args.version != "experimental" \
+        and not args.version.startswith("renpy-nightly-") \
+        and not full_version.startswith(args.version):
 
-    print "Version {} ({})".format(args.version, full_version) 
-        
-    # Copy over the screens, to keep them up to date.
-    shutil.copy("tutorial/game/screens.rpy", "template/game/screens.rpy")
-
-    # Copy in the windows version of zsync
-    shutil.copy("../zsync.exe", "lib/windows-x86/zsync.exe")
-    shutil.copy("../zsyncmake.exe", "lib/windows-x86/zsyncmake.exe")
-
-    # Compile all the python files.
-    compileall.compile_dir("renpy/", ddir="renpy/", force=1, quiet=1)
-    
-    # Compile the various games
-    
-    if not args.fast:
-        for i in [ 'tutorial', 'launcher', 'template', 'the_question' ]:
-            print "Compiling", i
-            subprocess.check_call(["./renpy.sh", i, "compile" ])
+        raise Exception("The command-line and Ren'Py versions do not match.")
 
     # The destination directory.
     destination = os.path.join("dl", args.version)
-    
+
+    print "Version {} ({})".format(args.version, full_version)
+
+    # Copy over the screens, to keep them up to date.
+    copy_tutorial_file("tutorial/game/screens.rpy", "templates/english/game/screens.rpy")
+
+    # Compile all the python files.
+    compileall.compile_dir("renpy/", ddir="renpy/", force=1, quiet=1)
+
+    # Generate launcher/game/script_version.rpy
+    with open("launcher/game/script_version.rpy", "w") as f:
+        f.write("init -999 python:\n")
+        f.write("    config.script_version = {!r}\n".format(renpy.version_tuple[:3]))  # @UndefinedVariable
+
+    # Compile the various games.
+    if not args.fast:
+        for i in [ 'tutorial', 'launcher', 'templates/english', 'templates/japanese', 'the_question' ]:
+            print "Compiling", i
+            subprocess.check_call(["./renpy.sh", i, "quit" ])
+
+
+
     if not os.path.exists(destination):
         os.makedirs(destination)
 
     if args.fast:
 
         cmd = [
-            "./renpy.sh", 
-            "launcher", 
-            "distribute", 
-            "launcher", 
+            "./renpy.sh",
+            "launcher",
+            "distribute",
+            "launcher",
             "--package",
             "sdk",
-            "--destination", 
+            "--destination",
             destination,
             "--no-update",
             ]
 
     else:
         cmd = [
-            "./renpy.sh", 
-            "launcher", 
-            "distribute", 
-            "launcher", 
-            "--destination", 
+            "./renpy.sh",
+            "launcher",
+            "distribute",
+            "launcher",
+            "--destination",
             destination,
             ]
-        
+
     print
     subprocess.check_call(cmd)
 
+    # Kick off the rapt build.
+    if not args.fast:
+        out = open("/tmp/rapt_build.txt", "wb")
+
+        print("Building RAPT in the background.")
+
+        android = os.path.abspath("android")
+
+        rapt_build = subprocess.Popen([
+            os.path.join(android, "build_renpy.sh"),
+            zip_version
+            ],
+            cwd = android,
+            stdout=out,
+            stderr=out)
+    else:
+        rapt_build = None
+
     # Sign the update.
     if not args.fast:
-        subprocess.check_call([ 
-            "scripts/sign_update.py", 
-            "/home/tom/ab/keys/renpy_private.pem", 
+        subprocess.check_call([
+            "scripts/sign_update.py",
+            "/home/tom/ab/keys/renpy_private.pem",
             os.path.join(destination, "updates.json"),
             ])
 
@@ -215,53 +168,58 @@ def main():
 
     if not args.fast:
 
-        shutil.copy("renpy-ppc.zip", os.path.join(destination, "renpy-ppc.zip"))
+        # shutil.copy("renpy-ppc.zip", os.path.join(destination, "renpy-ppc.zip"))
 
         with open("7z.sfx", "rb") as f:
             sfx = f.read()
-    
+
         os.chdir(destination)
 
         if os.path.exists(sdk):
             shutil.rmtree(sdk)
-    
+
         subprocess.check_call([ "unzip", "-q", sdk + ".zip" ])
-    
+
         if os.path.exists(sdk + ".7z"):
             os.unlink(sdk + ".7z")
-        
+
         sys.stdout.write("Creating -sdk.7z")
-        
+
         p = subprocess.Popen([ "7z", "a", sdk +".7z", sdk], stdout=subprocess.PIPE)
         for i, _l in enumerate(p.stdout):
             if i % 10 != 0:
                 continue
-            
+
             sys.stdout.write(".")
             sys.stdout.flush()
 
         if p.wait() != 0:
             raise Exception("7z failed")
-    
+
         with open(sdk + ".7z", "rb") as f:
             data = f.read()
-            
+
         with open(sdk + ".7z.exe", "wb") as f:
             f.write(sfx)
             f.write(data)
-            
+
         os.unlink(sdk + ".7z")
         shutil.rmtree(sdk)
 
     else:
         os.chdir(destination)
-    
+
         if os.path.exists(sdk + ".7z.exe"):
             os.unlink(sdk + ".7z.exe")
-      
-    print  
-    print "Did you run me with renpython -OO?"
-    print "Did you update renpy.py and launcher/script_version.rpy?"
-    
+
+    print
+
+    if rapt_build:
+        code = rapt_build.wait()
+        if code:
+            print "RAPT build failed. The output is in /tmp/rapt_build.txt"
+        else:
+            print "RAPT build succeeded."
+
 if __name__ == "__main__":
     main()

dse/game/day_planner.rpy

@@ -1,137 +0,0 @@
-# This contains code for the new day planner. You probably
-# don't want to change this file, but it might make sense to
-# change many of the variables or styles defined here from
-# other files.
-
-init -100 python:
-
-    # The frame containing the day planner.
-    style.dp_frame = Style(style.frame)
-    style.dp_vbox = Style(style.vbox)
-    style.dp_hbox = Style(style.hbox)
-
-    # The frame and vbox containing a single choice.
-    style.dp_choices = Style(style.default)
-    style.dp_choices_vbox = Style(style.vbox) 
-    style.dp_choices.xalign = 0.5
-    
-    # Buttons.
-    style.dp_choice_button = Style(style.button)
-    style.dp_choice_button_text = Style(style.button_text)
-
-    style.dp_done_button = Style(style.button)
-    style.dp_done_button_text = Style(style.button_text)
-
-    # Labels.
-    style.dp_label = Style(style.label)
-    style.dp_label_text = Style(style.label_text)
-
-    # The title of the done button.
-    dp_done_title = "Done Planning"
-
-    # A map from period name to the information we know about that
-    # period.
-    __periods = { }
-
-    # The period we're updating.
-    __period = None
-    
-    class __Period(object):
-
-        def __init__(self, name, var):
-            self.name = name
-            self.var = var
-            self.acts = [ ]
-
-    def dp_period(name, var):
-        __periods[name] = store.__period = __Period(name, var)
-
-    __None = object()
-        
-    def dp_choice(name, value=__None, enable="True", show="True"):
-
-        if not __period:
-            raise Exception("Choices must be part of a defined period.")
-
-        if value is __None:
-            value = name
-        
-        __period.acts.append((name, value, enable, show))
-
-    def __set_noncurried(var, value):
-        setattr(store, var, value)
-        return True
-        
-    __set = renpy.curry(__set_noncurried)
-        
-
-label day_planner(periods):
-
-    python hide:
-        renpy.choice_for_skipping()
-    
-label day_planner_repeat:
-
-    if renpy.has_label("dp_callback"):
-        call dp_callback
-    
-    python hide:
-    
-        ui.window(style=style.dp_frame)
-        ui.vbox(style=style.dp_vbox)
-        ui.hbox(style=style.dp_hbox)
-
-        can_continue = True
-
-        for p in periods:
-
-            if p not in __periods:
-                raise Exception("Period %r was never defined." % p)
-
-            ui.window(style=style.dp_choices)
-            ui.vbox(style=style.dp_choices_vbox)
-            
-            p = __periods[p]
-            v = getattr(store, p.var)
-
-            layout.label(p.name, "dp")
-
-            valid_choice = False
-            
-            for name, value, enable, show in p.acts:
-                show = eval(show)
-                enable = eval(enable)
-
-                selected = (v == value)
-                
-                if show:
-                    layout.button(
-                        name, 
-                        "dp_choice",
-                        clicked=__set(p.var, value),
-                        selected=selected,
-                        enabled=enable,
-                        )
-
-                if show and enable and selected:
-                    valid_choice = True
-
-            if not valid_choice:
-                can_continue = False
-
-            ui.close()
-                    
-        ui.close() # hbox.
-
-        layout.button(
-            dp_done_title,
-            "dp_done",
-            clicked=ui.returns(False),
-            enabled=can_continue)
-
-        ui.close() # vbox
-
-    if ui.interact():
-        jump day_planner_repeat
-    else:
-        return

dse/game/event_dispatcher.rpy

@@ -1,328 +0,0 @@
-# The Ren'Py/DSE event dispatcher. This file contains the code that
-# actually supports the running of events. Specifically, it contains
-# code that determines which events are available, which events can
-# run, and to actually run the events that should be run during a
-# given period.
-
-# This isn't really intended to be user-changable.
-
-init -100 python:
-
-    # A list of all of the events that the system knowns about,
-    # it's filtered to determine which events should run when.
-    all_events = [ ]
-
-    # The base class for events. When constructed, an event
-    # automatically adds itself to all_events.
-    #
-    # The first parameter for this is a unique name for the event,
-    # which is also used as the label that is called when the
-    # event executes.
-    #
-    # All other parameters are expressions. These expressions can
-    # be either strings, or objects having an eval method. Many
-    # interesting objects are given below.
-    #
-    # Keyword arguments are also kept on the object. Currently,
-    # there is one useful keyword argument, priority. This
-    # controls the order in which events are in the event list.
-    # (Events with lower priority number are evaluated first. If a
-    # priority is not specified, it's 100.)
-    class event(object):
-
-        def __repr__(self):
-            return '<event ' + self.name + '>'
-
-        def __init__(self, name, *args, **kwargs):
-
-            self.name = name
-
-            exprs = [ ]
-
-            for i in args:
-                if isinstance(i, basestring):
-                    exprs.append(event.evaluate(i))
-                else:
-                    exprs.append(i)
-
-            self.exprs = exprs
-
-            self.priority = kwargs.get('priority', 100)
-
-            all_events.append(self)
-
-        # Checks to see if this event is valid. It's called with
-        # a list of events that have already checked out to be
-        # True, and returns True if this event checks out.
-        def check(self, valid):
-
-            for i in self.exprs:
-                if not i.eval(self.name, valid):
-                    return False
-
-            return True
-
-        def properties(self):
-
-            rv = { }
-
-            for i in self.exprs:
-                rv.update(i.properties())
-
-            return rv
-
-
-        # The base class for all of the event checks given below.
-        class event_check(object):
-
-            def properties(self):
-                return { }
-
-            def __invert__(self):
-                return event.false(self)
-
-            def __and__(self, other):
-                return event.and_op(self, other)
-
-            def __or__(self, other):
-                return event.or_op(self, other)
-
-
-        # This evaluates the expression given as an argument, and the
-        # returns true if it evaluates to true.
-        class evaluate(event_check):
-
-            def __init__(self, expr):
-                self.expr = expr
-
-            def eval(self, name, valid):
-                return eval(self.expr)
-
-        # If present as a condition to an event, an object of this
-        # type ensures that the event will only execute once.
-        class once(event_check):
-            def eval(self, name, valid):
-                return name not in events_executed
-
-        # Returns True if no event of higher priority can execute,
-        # and false otherwise. In general, solo events should be
-        # the lowest priority, and are run if nothing else is.
-        class solo(event_check):
-            def eval(self, name, valid):
-
-                # True if valid is empty.
-                return not valid
-
-        # Returns True if no event of higher priority can execute.
-        # This also prevents other events from executing.
-        class only(solo):
-
-            def properties(self):
-                return dict(only=True)
-
-
-        # Returns True if the given events have happend already,
-        # at any time in the game. False if at least one hasn't
-        # happened yet.
-        class happened(event_check):
-            def __init__(self, *events):
-                self.events = events
-
-            def eval(self, name, valid):
-                for i in self.events:
-                    if i not in events_executed:
-                        return False
-
-                return True
-
-        # Returns True probability of the time, where probability
-        # is a number between 0 and 1.
-        class random(event_check):
-
-            def __init__(self, probability):
-                self.probability = probability
-
-            def eval(self, name, valid):
-                return renpy.random.random() <= self.probability
-
-        # Chooses only one from the group.
-        class choose_one(event_check):
-
-            def __init__(self, group, group_count=1):
-                self.group = group
-                self.group_count = group_count
-
-            def eval(self, name, valid):
-                return True
-
-            def properties(self):
-                return dict(group=self.group,
-                            group_count=self.group_count)
-
-
-        # Evaluates its argument, and returns true if it is false
-        # and vice-versa.
-        class false(event_check):
-            def __init__(self, cond):
-                self.cond = cond
-
-            def eval(self, name, valid):
-                return not self.cond.eval(name, valid)
-
-        # Handles the and operator.
-        class and_op(event_check):
-
-            def __init__(self, *args):
-                self.args = args
-
-            def eval(self, name, valid):
-                for i in self.args:
-                    if not i.eval(name, valid):
-                        return False
-                return True
-
-        # Handles the or operator.
-        class or_op(event_check):
-
-            def __init__(self, *args):
-                self.args = args
-
-            def eval(self, name, valid):
-                for i in self.args:
-                    if i.eval(name, valid):
-                        return True
-                return False
-
-        # Returns True if all of the events given as arguments have
-        # happened yesterday or earlier, or False otherwise.
-        class depends(event_check):
-            def __init__(self, *events):
-                self.events = events
-
-            def eval(self, name, valid):
-                for i in self.events:
-                    if i not in events_executed_yesterday:
-                        return False
-
-                return True
-
-
-    # The number of periods to skip.
-    skip_periods = 0
-
-    # This returns True if the current period should be skipped,
-    # or False if the current period should execute. If it returns
-    # True, it decrements skip_periods.
-    def check_skip_period():
-
-        global skip_periods
-
-        if skip_periods:
-            skip_periods -= 1
-            return True
-        else:
-            return False
-
-    def __events_init():
-        store.events_executed = { }
-        store.events_executed_yesterday = { }
-
-    config.start_callbacks.append(__events_init)
-        
-
-# This should called at the end of a (game) day, to let things
-# like depends_yesterday to work.
-label events_end_day:
-
-    $ skip_periods = 0
-
-    python hide:
-
-        # We can't skip between days.
-        skip_periods = 0
-
-        for k in events_executed:
-            events_executed_yesterday[k] = True
-
-    return
-    
-# This is called once per period, to determine, and then execute, the
-# events that should be run for that period. 
-label events_run_period:
-
-    $ events = [ ]
-
-    python hide:
-
-        eobjs = [ ]
-        egroups = { }
-        eingroup = { }
-
-        for i in all_events:
-            if not i.check(eobjs):
-                continue
-                
-            eobjs.append(i)
-
-            props = i.properties()
-
-            if 'group' in props:
-                group = props['group']
-                count = props['group_count']
-
-                egroups.setdefault(group, [ ]).extend([ i ] * count)
-                eingroup[i] = group
-
-            if 'only' in props:
-                break
-
-        echosen = { }
-
-        for k in egroups:
-            echosen[k] = renpy.random.choice(egroups[k])
-            
-        for i in eobjs:
-
-            if i in eingroup and echosen[eingroup[i]] is not i:
-                continue
-            
-            events.append(i.name)
-
-
-    while not check_skip_period() and events:
-
-        $ _event = events.pop(0)
-        $ events_executed[_event] = True
-
-        call expression _event from call_expression_event_1
-
-    return
-
-# If this is jumped to, it will end the current period immediately,
-# and return control to the main program.
-label events_end_period:
-
-    $ skip_period = 1
-    return
-
-# If this is jumped to, it will end the current period and skip
-# the next period. Use this if, say, the user goes on a date that
-# takes up two time slots.
-label events_skip_period:
-
-    $ skip_period = 2
-    return
-
-        
-init 100:
-    python hide:
-        # Sort all events on priority.
-        all_events.sort(key=lambda i : i.priority)
-
-    python hide:
-
-        for i in all_events:
-            if not renpy.has_label(i.name):
-                raise Exception("'%s' is defined as an event somewhere in the game, but no label named '%s' was defined anywhere." % (i.name, i.name))
-    
-

dse/game/events.rpy

@@ -1,767 +0,0 @@
-# This file contains the events that will be part of the game. It's
-# expected that the user will add and remove events as appropriate
-# for this game.
-
-
-# Some characters that are used in events in the game.
-init:
-    $ t = Character('Teacher')
-    $ gg = Character('Glasses Girl', color=(192, 255, 192, 255))
-    $ sg = Character('Sporty Girl', color=(255, 255, 192, 255))
-    $ bg = Character('Both Girls')
-    $ narrator = Character(' ')
-    
-# First up, we define some simple events for the various actions, that
-# are run only if no higher-priority event is about to occur.
-
-init:
-    $ event("class", "act == 'class'", event.only(), priority=200)
-    $ event("class_bad", "act == 'class'", priority=210)
-    $ event("cut1", "act == 'cut'", event.choose_one('cut'), priority=200)
-    $ event("cut2", "act == 'cut'", event.choose_one('cut'), priority=200)
-    $ event("study", "act == 'study'", event.solo(), priority=200)
-    $ event("hang", "act == 'hang'", event.solo(), priority=200)
-    $ event("exercise", "act == 'exercise'", event.solo(), priority=200)    
-    $ event("play", "act == 'play'", event.solo(), priority=200)
-
-label class:
-
-    "I make it to class just in time, and proceed to listen to the
-     teacher droning on about a wide range of topics, none of which
-     are remotely interesting."
-
-    return
-
-# For test purposes only.
-label class_bad:
-
-    "You shouldn't be seeing this."
-
-    "This is because class was declared with event.only(), which
-     should suspend processing of further events."
-
-    "This is really for testing purposes only."
-
-    return
-
-label cut1:
-
-    "I cut class, and spend the morning goofing off instead."
-    $ intelligence -= 10
-
-    return
-
-label cut2:
-
-    "I cut class, and spend the morning playing computer games."
-
-    return
-
-label study:
-
-    "I head on down to the library, and start reading about the topics
-     I should have been reading about in class."
-
-    $ intelligence += 10
-    return
-
-label hang:
-
-    "I spend the afternoon hanging out with my friends, killing
-     some time."
-    
-    return
-
-label exercise:
-
-    "I decide to go out for a run through the town, to keep myself in
-     shape."
-
-    $ strength += 10
-    return
-
-label play:
-
-    "I pop a DVD into my video game console, and spend the evening
-     rolling small cities up into balls."
-
-    $ strength -= 10
-    return
-
-
-# Below here are special events that are triggered when certain
-# conditions are true. 
-
-# This is an introduction event, that runs once when we first go
-# to class. 
-
-init:
-    $ event("introduction", "act == 'class'", event.once(), event.only())
-
-label introduction:
-
-    "I run to school, and make it to my seat just as the bell
-     signalling the start of class rings."
-
-    t "Before we start, I have an announcement to make."
-
-    t "We will have two new students joining us. Girls, come on in."
-
-    "Two girls walk in, and stand in front of the class."
-
-    "They're twins."
-
-    "Identical twins."
-
-    "Identical black hair, and the same pretty face."
-
-    "Despite that, it's still fairly easy to tell them apart."
-
-    "The one on the left is wearing glasses."
-
-    "Not too thick, but enough to let me know she probably reads alot
-     of books."
-
-    "If I look a little closely, I can find another difference."
-
-    "The one on the right probably exercises a bit more."
-
-    "I can tell by the muscle tone in her legs."
-
-    "I realize that I'm staring at her legs, and quickly look up."
-
-    "Suddenly, I realize that she's been talking for all this town."
-
-    sg "... to this town. And we hope to be friends with all of you."
-
-    sg "Well, that's about it. Sis, do you have anything to say?"
-
-    "The girl with glasses pauses for a second, and then quickly says:"
-
-    gg "{size=-4}It's good to meet you all.{/size}"
-
-    "She stops, and goes back to not saying anything."
-
-    t "Well, if that's all, you can take your seats and we can start
-       the class."
-
-    "They do, and our teacher begins his lecture."
-
-    "I don't think anyone pays much attention to it, however."
-
-    return
-
-
-# These are the events with glasses girl.
-
-init:
-    # The glasses girl is studying in the library, but we do not
-    # talk to her.
-    #
-    # 
-    $ event("gg_studying",
-
-            # This takes place when the action is 'study'.
-            "act == 'study'",
-
-            # This will only take place if no higher-priority
-            # event will occur.
-            event.solo(),
-
-            # This takes place at least one day after seeing the
-            # introduction event.
-            event.depends("introduction"),
-
-            # This takes priority over the study event.
-            priority=190)
-
-    # She asks to borrow our pen. 
-    $ event("borrow_pen",
-
-            # This takes place when we go to study, and we have an int
-            # >= 50. 
-            "act == 'study' and intelligence >= 50",
-
-            # It runs only once.
-            event.once(),
-
-            # It requires the introduction event to have run at least
-            # one day before.
-            event.depends("introduction"))
-
-    # After the pen, she smiles when she sees us.
-    $ event("gg_smiling", "act == 'study'",
-            event.solo(), event.depends("borrow_pen"),
-            priority = 180)
-
-    # The bookslide.
-    $ event("bookslide", "act == 'study' and intelligence == 100",
-            event.once(), event.depends("borrow_pen"))
-
-    # She makes us cookies.
-    $ event("cookies", "act == 'study'",
-            event.once(), event.depends("bookslide"))
-
-    # Her solo ending.
-    $ event("gg_confess", "act == 'class'",
-            event.once(), event.depends("cookies"))
-
-    
-label gg_studying:
-
-    "I head to the library, to get some studying done."
-
-    "The glasses girl is there, but she's busy reading a book, taking
-     notes as she does so."
-
-    "I decide not to disturb her, and instead start reading my own
-     book."
-
-    $ intelligence += 10
-
-    return
-
-label borrow_pen:
-
-    "I head to the library, to get some studying done."
-
-    "The glasses girl is there, but she's busy reading a book."
-
-    "I decide not to disturb her, and instead start reading my own
-     book."
-
-    "Suddenly, I feel a tap on my shoulder."
-
-    "I look up, and see the glasses girl standing right next to me."
-
-    gg "Excuse me, but can I borrow your pen?"
-
-    gg "Mine ran out of ink."
-
-    "I dig through my bag, to find the pen I had stashed there."
-
-    "While I'm looking, I point out that she seems to come to the
-     library alot."
-
-    gg "Hm... I guess you're right."
-
-    gg "There's so much stuff here, and I want to know about it all."
-
-    gg "Surely, you must feel the same way, as you're here almost as
-        much as I am."
-
-    "I don't have the heart to tell her that I'm only here to study so
-     that I don't fail out."
-
-    "My hand brushes the pen, and I quickly pull it out and give it to
-     her."
-
-    gg "Thank you."
-
-    "She says, and she goes back to studying."
-
-    return
-
-label gg_smiling:
-
-    "I head to the library, to get some studying done."
-
-    "The glasses girl is there, and smiles at me for a second before
-     turning back to her book."
-
-    "I decide not to disturb her, and instead start reading my own
-     book."
-
-    $ intelligence += 10
-
-    return
-
-label bookslide:
-
-    "I head to the library, to get some studying done."
-
-    "The glasses girl is standing right by the entrance, putting a
-     book back into a bookcase containing science books."
-
-    "It looks quite old, and quite weak, as if it could break at any
-     time."
-
-    "Suddenly, I hear a loud crack come from the bookcase."
-
-    "Without thinking, I throw myself between the girl and the
-     bookcase, pushing her out of the way in the process."
-
-    "As the shelves fail one by one, I'm hit with large textbooks on
-     topics ranging from Astronomy to Zoology."
-
-    "She's safe, but I'm knocked off my feet by the falling books."
-
-    "Before the dust even settled, the girl with glasses realized what
-     happened and asked:"
-
-    gg "Are you alright?"
-
-    "I tell her that I am, all the while rubbing a bruise left by a
-     particularly large Physics book."
-
-    gg "You saved me."
-
-    "She points out. I shrug... I guess I did, but it's not like I'm a
-     hero or anything."
-
-    "She extends out her hand, I take it, and she helps me to get up."
-
-    gg "Wow... Um..."
-
-    "She doesn't know what to say."
-
-    "I suggest that we help clean up the mess, mostly to take her off
-     the spot."
-
-    "She agrees, and together we begin piling the books up into neat
-     piles."
-
-    return
-
-
-label cookies:
-
-    "I head to the library, to get some studying done."
-
-    "The glasses girl is there, apparently waiting for me."
-
-    "She's holding a package in her hands."
-
-    gg "Here."
-
-    "She says, and she hands me the package."
-
-    "I take it from her, and open it."
-
-    "It contains fresh homemade cookies. Ginger snaps, I think."
-
-    gg "It's to thank you."
-
-    "She points out... She's probably not used to this. Especially
-     with guys."
-
-    "I take one of them, and stick it in my mouth."
-
-    "The taste is exquisite."
-
-    "It's perhaps one of the best cookies I've ever tasted."
-
-    "Of course it is. It's the only cookie I'd ever tasted that was
-     made for me by a beutiful girl."
-
-    "I tell her this... that it's delicious, not the girl part."
-
-    "But I do let slip that if I could eat these every day, I'd be the
-     happiest guy in the world."
-
-    "At this, she can only blush."
-
-    return
-
-label gg_confess:
-
-    "I once again barely make it to class on time."
-
-    "I sit down, at my desk, and put some of my books into it."
-
-    "My hand brushes a folded sheet of paper, one I didn't remember
-     putting in there."
-
-    "It's a girl's handwriting... \"Meet me on the roof at lunch.\""
-
-    "That's all it says... no signature or anything."
-
-    "Lunch is a few hours away, but the time passes like a blur."
-
-    "It's all I can do to avoid racing up to the roof... but I give it
-     some time anyway."
-
-    "It wouldn't make sense for me to get there first."
-
-    "I let two minutes elapse before leaving the classroom, and then
-     slowly walk the flights of stairs up to the roof."
-
-    "Standing there, I find the glasses girl."
-
-    "She's holding what looks like a homemade lunch... big enough for
-     two."
-
-    "I look at it, then her, then remember what I had said after she
-     made me the cookies."
-
-    "Finally, I ask her... \"Does this mean?\""
-
-    "She nods. It's all the confirmation I need."
-
-    "I sit down next to my new girlfriend... and together we start
-     eating her lunch."
-
-    "I'm probably the happiest guy in the world."
-
-    "But I still have to find out her name."
-
-    ".:. Ending 1."
-
-    $ renpy.full_restart()
-
-
-init:
-
-    $ event("catchme", "act == 'exercise'",
-            event.depends('introduction'), event.once())
-
-    $ event("cantcatchme", "act == 'exercise'",
-            event.depends('catchme'), event.solo(), priority=190)
-
-    $ event("caughtme", "act == 'exercise' and strength >= 50",
-            event.depends('catchme'), event.once())
-
-    $ event("together", "act == 'exercise' and strength >= 50",
-            event.depends('caughtme'), event.solo(), priority=180)
-
-    $ event("apart", "act == 'exercise' and strength < 50",
-            event.depends('caughtme'), event.solo(), priority=180)
-
-    $ event("pothole", "act == 'exercise' and strength >= 100",
-            event.depends('caughtme'), event.once())
-
-    $ event("dontsee", "act == 'exercise'",
-            event.depends('pothole'), event.solo(), priority=170)
-    
-    $ event("sg_confess", "act == 'class'",
-            event.depends('dontsee'), event.once())
-
-
-label catchme:
-
-    "I decide to go out for a run, to keep myself in shape."
-
-    "As I'm running through the town, I see a girl."
-
-    "She's one of the twins who transferred into my class."
-
-    "She waves, and comes over to me."
-
-    sg "I didn't know you were a runner."
-
-    "I point out that I'm not really a runner... I just run a little
-     bit at a time."
-
-    "I ask her if she wants to run with me for a while."
-
-    sg "As if! You couldn't keep up with me."
-
-    "I point out that I probably can."
-
-    sg "Well, let's see."
-
-    "We set off running, but she quickly pulls past me."
-
-    sg "See? Well, maybe we can try it again when you're a bit
-        faster."
-
-    sg "Until then, later."
-
-    "Even though I'm jogging, she pulls away as if it is nothing."
-
-    return
-
-label cantcatchme:
-
-    "I'm out running again, when the sporty girl catches up to me."
-
-    sg "Still at it?"
-
-    sg "Well, keep up the good work. One day you'll be as fast as me!"
-
-    sg "Well, maybe."
-
-    "She pulls out past me, and disappears into the distance. One day
-     I'll catch up to her."
-
-    $ strength += 10
-
-    return
-
-label caughtme:
-
-    "I'm out running again, when the sporty girl catches up to me."
-
-    sg "Still at it?"
-
-    sg "Well, keep up the good work. One day you'll be as fast as me!"
-
-    sg "Well, maybe."
-
-
-    "Today, however, I'm not about to let this stand unchallenged."
-
-    "I break out into a run, and for the first time ever, I keep up
-     with her."
-
-    "We both run, neck and neck, me keeping up with her."
-
-    "Finally, she starts slowing down, and we come to a stop
-     together."
-
-    sg "Not bad."
-
-    "She pauses to catch her breath."
-
-    sg "You've been practicing, and it really shows."
-    
-    sg "You've finally become fast enough to run with me."
-
-    "I nod, accepting her praise."
-
-    sg "We should do this more often... it's better to run with
-        someone else, to keep the challenge up."
-
-    "I nod again."
-
-    sg "Well, shall we go?"
-
-    "I nod a third time, and we take off, running side by side."
-
-    $ strength += 10
-
-    return
-
-label together:
-
-    "I start running, and meet up with the sporty girl as she passes
-     the street in front of my house."
-
-    "She's still better than me... she's been running for over a mile
-     before reaching this point."
-
-    "Still, I can keep up with her for the rest of the run. And that's
-     not bad."
-
-    $ strength += 10
-
-    return
-
-label apart:
-
-    "I start running, and meet up with the sporty girl as she passes
-     the street in front of my house."
-
-    "I try to keep up with her, but she pulls away from me."
-
-    "When she's a block away, she slows down and lets me catch up."
-
-    sg "It's your own fault... this is what you get for not
-        practicing."
-
-    "She's right, of course, and I redouble my efforts to try to keep
-     up with her."
-
-    $ strength += 10
-    return
-
-label pothole:
-
-    "I start running, and meet up with the sporty girl as she passes
-     the street in front of my house."
-
-    "We run together for several miles."
-
-    "I think about how much I've improved in our time together."
-
-    "And, although she probably won't admit it, I think she's improved
-     as well."
-
-    "I guess a little friendly competition is usually for the best."
-
-    "A small yelp pulls me out of my thought."
-
-    sg "Ow!"
-
-    "The sporty girl sits down, grabbing her ankle."
-
-    "I ask her what happened."
-
-    sg "I... hit a... pothole. Twisted my... ankle."
-
-    "I wince in sympathy."
-
-    "We wait a bit. I'm not sure what to do."
-
-    "Finally, I ask her if she can walk on it."
-
-    "She tries for a bit, but then winces in pain."
-
-    sg "No, I don't think so."
-
-    "I realize that we can't stay here."
-
-    "And so, I crouch down and motion for her to climb up onto my
-     back."
-
-    sg "What are you doing?"
-
-    "I explain that she can't stay out in the middle of the street
-     forever, and she won't get any help until I can get her home."
-
-    "And the only way to do that is for me to carry her."
-
-    "She accepts this, and climbs up onto my back."
-
-    "She wraps her arms around my neck, and I place my hands
-     underneath her to make a seat."
-
-    "I stand up, and start carrying her home."
-
-    return
-
-label dontsee:
-
-    "I go running again."
-
-    "But this time, I don't see the sporty girl."
-
-    "I finish the course that we usually take, but it's not the same
-     without her."
-
-    return
-
-label sg_confess:
-
-    "I once again barely make it to class on time."
-
-    "I sit down, at my desk, and put some of my books into it."
-
-    "My hand brushes a folded sheet of paper, one I didn't remember
-     putting in there."
-
-    "It's a girl's handwriting... \"Meet me on the roof at lunch.\""
-
-    "That's all it says... no signature or anything."
-
-    "Lunch is a few hours away, but the time passes like a blur."
-
-    "It's all I can do to avoid racing up to the roof... but I give it
-     some time anyway."
-
-    "It wouldn't make sense for me to get there first."
-
-    "I let two minutes elapse before leaving the classroom, and then
-     slowly walk the flights of stairs up to the roof."
-
-    "Standing there, I find the sporty girl."
-
-    "She's leaning on a crutch."
-
-    "I look at it for a second, and she notices that."
-
-    sg "I went to the doctor, and he gave me this."
-
-    sg "Looks like we won't be running together for a while."
-
-    "I nod."
-
-    sg "And that's why I asked you here."
-
-    sg "I couldn't stand the though of not seeing you for a few
-        weeks."
-
-    "I search my feelings, and realize I feel the same way."
-
-    sg "So I thought..."
-
-    "She doesn't say it... she doesn't need to."
-
-    "We both know how we feel about each other."
-
-    "And with that, we went from being running partners to partners in
-     a deeper sense."
-
-    "Now if I only knew her name..."
-
-    ".:. Ending 2."
-
-    $ renpy.full_restart()
-
-
-init:
-
-    # This needs to be higher-priority than either girl's ending.    
-    $ event('both_confess', 'act == "class"',
-            event.depends("dontsee"), event.depends("cookies"),
-            event.once(), priority = 50)
-     
-label both_confess:
-
-    "I once again barely make it to class on time."
-
-    "I sit down, at my desk, and put some of my books into it."
-
-    "My hand brushes a folded sheet of paper, then another."
-
-    "I take the first one out, and read it."
-
-    "It's a girl's handwriting... \"Meet me on the roof at lunch.\""
-
-    "That's all it says... no signature or anything."
-
-    "I take a look at the second one, and it says the same thing."
-
-    "Sure, the handwriting is a little different, but..."
-
-    "Lunch is a few hours away, but the time passes like a blur."
-
-    "It's all I can do to avoid racing up to the roof... but I give it
-     some time anyway."
-    
-    "I let two minutes elapse before leaving the classroom, and then
-     slowly walk the flights of stairs up to the roof."
-
-    "Standing there are the twins."
-
-    "Both of them."
-
-    "As in, the two notes came from the two twins."
-
-    "I ask them what they are doing there, feigning ignorance."
-
-    sg "Well, I invited you up here to confess to you..."
-
-    sg "... and then I found out that my sister here was about to do
-        the same thing."
-
-    gg "{size=-4}...I was...{/size}"
-
-    sg "When we found out, we were quite shocked, but after comparing
-        notes, we decide what we're going to do..."
-
-    "I quickly run through the possibilities in my head."
-
-    "The best cases involve them never talking to me again."
-
-    "The worst cases involve me being thrown off the roof."
-
-    bg "We're going to share you!"
-
-    "Eh?"
-
-    "That wasn't something I considered."
-
-    "Each of the girls grabs onto one of my arms."
-
-    "I don't know what the future holds for us..."
-
-    "... and I don't know if this will work out."
-
-    "But I do know that one day I will work up the courage to find out
-     their names."
-
-    ".:. Ending 3."
-
-    $ renpy.full_restart()
-    

dse/game/main.rpy

@@ -1,163 +0,0 @@
-# This is the main program. This can be changed quite a bit to
-# customize it for your program... But remember what you do, so you
-# can integrate with a new version of DSE when it comes out.
-
-# Set up a default theme.
-init python:
-    register_stat("Strength", "strength", 10, 100)
-    register_stat("Intelligence", "intelligence", 10, 100)
-
-    dp_period("Morning", "morning_act")
-    dp_choice("Attend Class", "class")
-    dp_choice("Cut Class", "cut")
-
-    dp_period("Afternoon", "afternoon_act")
-    dp_choice("Study", "study")
-    dp_choice("Hang Out", "hang")
-
-    dp_period("Evening", "evening_act")
-    dp_choice("Exercise", "exercise")
-    dp_choice("Play Games", "play")
-
-    
-# This is the entry point into the game.
-label start:
-
-    # Initialize the default values of some of the variables used in
-    # the game.
-    $ day = 0
-
-    # Show a default background.
-    scene black
-
-    # The script here is run before any event.
-
-    "In case you're just tuning in, here's the story of my life to
-     date."
-
-    "I'm a guy in the second year of high school."
-
-    "I'm not good at sports or school or even something as simple as
-     remembering peoples names."
-
-    "In short, I am your usual random loser guy."
-
-    "And this is my story..."
-
-
-    # We jump to day to start the first day.
-    jump day
-
-
-# This is the label that is jumped to at the start of a day.
-label day:
-
-    # Increment the day it is.
-    $ day += 1
-
-    # We may also want to compute the name for the day here, but
-    # right now we don't bother.
-
-    "It's day [day]."
-
-    # Here, we want to set up some of the default values for the
-    # day planner. In a more complicated game, we would probably
-    # want to add and remove choices from the dp_ variables
-    # (especially dp_period_acts) to reflect the choices the
-    # user has available to him.
-
-    $ morning_act = None
-    $ afternoon_act = None
-    $ evening_act = None
-
-    # Now, we call the day planner, which may set the act variables
-    # to new values. We call it with a list of periods that we want
-    # to compute the values for.
-    call day_planner(["Morning", "Afternoon", "Evening"])
-
-    
-    # We process each of the three periods of the day, in turn.
-label morning:
-
-    # Tell the user what period it is.
-    centered "Morning"
-
-    # Set these variables to appropriate values, so they can be
-    # picked up by the expression in the various events defined below. 
-    $ period = "morning"
-    $ act = morning_act
-
-    # Ensure that the stats are in the proper range.
-    $ normalize_stats()
-    
-    # Execute the events for the morning.
-    call events_run_period
-
-    # That's it for the morning, so we fall through to the
-    # afternoon.
-
-label afternoon:
-
-    # It's possible that we will be skipping the afternoon, if one
-    # of the events in the morning jumped to skip_next_period. If
-    # so, we should skip the afternoon.
-    if check_skip_period():
-        jump evening
-
-    # The rest of this is the same as for the morning.
-
-    centered "Afternoon"
-
-    $ period = "afternoon"
-    $ act = afternoon_act
-
-    $ normalize_stats()
-    
-    call events_run_period
-
-
-label evening:
-    
-    # The evening is the same as the afternoon.
-    if check_skip_period():
-        jump night
-
-    centered "Evening"
-
-    $ period = "evening"
-    $ act = evening_act
-
-    $ normalize_stats()
-    
-    call events_run_period
-
-
-label night:
-
-    # This is now the end of the day, and not a period in which
-    # events can be run. We put some boilerplate end-of-day text
-    # in here.
-
-    centered "Night"
-
-    "It's getting late, so I decide to go to sleep."
-
-    # We call events_end_day to let it know that the day is done.
-    call events_end_day
-
-    # And we jump back to day to start the next day. This goes
-    # on forever, until an event ends the game.
-    jump day
-         
-
-# This is a callback that is called by the day planner. One of the
-# uses of this is to show the statistics to the user.
-label dp_callback:
-
-    # Add in a line of dialogue asking the question that's on
-    # everybody's mind.
-    $ narrator("What should I do today?", interact=False)
-    $ display_stats()
-
-    return
-

dse/game/options.rpy

@@ -1,249 +0,0 @@
-## This file contains some of the options that can be changed to customize
-## your Ren'Py game. It only contains the most common options... there
-## is quite a bit more customization you can do.
-##
-## Lines beginning with two '#' marks are comments, and you shouldn't
-## uncomment them. Lines beginning with a single '#' mark are
-## commented-out code, and you may want to uncomment them when
-## appropriate.
-
-init -1 python hide:
-
-    ## Should we enable the use of developer tools? This should be
-    ## set to False before the game is released, so the user can't
-    ## cheat using developer tools.
-
-    config.developer = True
-
-    ## These control the width and height of the screen.
-
-    config.screen_width = 800
-    config.screen_height = 600
-
-    ## This controls the title of the window, when Ren'Py is
-    ## running in a window.
-
-    config.window_title = u"DSE Demo Game"
-
-    #########################################
-    # Layouts
-    
-    ## This enables the use of an in-game menu that is made out of
-    ## buttons.
-
-    layout.button_menu()
-
-    #########################################
-    # Themes
-    
-    ## We then want to call a theme function. themes.roundrect is
-    ## a theme that features the use of rounded rectangles. It's
-    ## the only theme we currently support.
-    ##
-    ## The theme function takes a number of parameters that can
-    ## customize the color scheme.
-
-    theme.roundrect(
-
-        ## The color of an idle widget face.
-        widget = "#003c78",
-
-        ## The color of a focused widget face.
-        widget_hover = "#0050a0",
-
-        ## The color of the text in a widget.
-        widget_text = "#c8ffff",
-
-        ## The color of the text in a selected widget. (For
-        ## example, the current value of a preference.)
-        widget_selected = "#ffd080",
-
-        ## The color of a disabled widget face. 
-        disabled = "#404040",
-
-        ## The color of disabled widget text.
-        disabled_text = "#c8c8c8",
-
-        ## The color of informational labels.
-        label = "#ffffff",
-
-        ## The color of a frame containing widgets.
-        frame = "#6496c8",
-
-        ## If this is True, the in-game window is rounded. If False,
-        ## the in-game window is square.
-        rounded_window = False,
-
-        ## The background of the main menu. This can be a color
-        ## beginning with '#', or an image filename. The latter
-        ## should take up the full height and width of the screen.
-        mm_root = "#dcebff",
-
-        ## The background of the game menu. This can be a color
-        ## beginning with '#', or an image filename. The latter
-        ## should take up the full height and width of the screen.
-        gm_root = "#dcebff",
-
-        ## And we're done with the theme. The theme will customize
-        ## various styles, so if we want to change them, we should
-        ## do so below.            
-        )
-
-    theme.outline_bars(
-        inside="#fff",
-        idle="#003c78",
-        hover="#0050a0")
-
-    #########################################
-    ## These settings let you customize the window containing the
-    ## dialogue and narration, by replacing it with an image.
-
-    ## The background of the window. In a Frame, the two numbers
-    ## are the size of the left/right and top/bottom borders,
-    ## respectively.
-
-    # style.window.background = Frame("frame.png", 12, 12)
-
-    ## Margin is space surrounding the window, where the background
-    ## is not drawn.
-
-    # style.window.left_margin = 6
-    # style.window.right_margin = 6
-    # style.window.top_margin = 6
-    # style.window.bottom_margin = 6
-
-    ## Padding is space inside the window, where the background is
-    ## drawn.
-
-    # style.window.left_padding = 6
-    # style.window.right_padding = 6
-    # style.window.top_padding = 6
-    # style.window.bottom_padding = 6
-
-    ## This is the minimum height of the window, including the margins
-    ## and padding.
-
-    # style.window.yminimum = 250
-
-
-    #########################################
-    ## This lets you change the placement of the main menu.
-
-    ## The way placement works is that we find an anchor point
-    ## inside a displayable, and a position (pos) point on the
-    ## screen. We then place the displayable so the two points are
-    ## at the same place.
-
-    ## An anchor/pos can be given as an integer or a floating point
-    ## number. If an integer, the number is interpreted as a number
-    ## of pixels from the upper-left corner. If a floating point,
-    ## the number is interpreted as a fraction of the size of the
-    ## displayable or screen.
-
-    # style.mm_menu_frame.xpos = 0.5
-    # style.mm_menu_frame.xanchor = 0.5
-    # style.mm_menu_frame.ypos = 0.75
-    # style.mm_menu_frame.yanchor = 0.5
-
-
-    #########################################
-    ## These let you customize the default font used for text in Ren'Py.
-
-    ## The file containing the default font.
-
-    # style.default.font = "DejaVuSans.ttf"
-
-    ## The default size of text.
-
-    # style.default.size = 22
-
-    ## Note that these only change the size of some of the text. Other
-    ## buttons have their own styles.
-
-
-    #########################################
-    ## These settings let you change some of the sounds that are used by
-    ## Ren'Py.
-
-    ## Set this to False if the game does not have any sound effects.
-
-    config.has_sound = True
-
-    ## Set this to False if the game does not have any music.
-
-    config.has_music = True
-
-    ## Set this to False if the game does not have voicing.
-
-    config.has_voice = True
-
-    ## Sounds that are used when button and imagemaps are clicked.
-
-    # style.button.activate_sound = "click.wav"
-    # style.imagemap.activate_sound = "click.wav"
-
-    ## Sounds that are used when entering and exiting the game menu.
-
-    # config.enter_sound = "click.wav"
-    # config.exit_sound = "click.wav"
-
-    ## A sample sound that can be played to check the sound volume.
-
-    # config.sample_sound = "click.wav"
-
-    ## Music that is played while the user is at the main menu.
-
-    # config.main_menu_music = "main_menu_theme.ogg"
-
-
-    #########################################
-    ## Transitions.
-
-    ## Used when entering the game menu from the game.
-
-    config.enter_transition = None
-
-    ## Used when exiting the game menu to the game.
-
-    config.exit_transition = None
-
-    ## Used between screens of the game menu.
-
-    config.intra_transition = None
-
-    ## Used when entering the game menu from the main menu.
-
-    config.main_game_transition = None
-
-    ## Used when returning to the main menu from the game.
-
-    config.game_main_transition = None
-
-    ## Used when entering the main menu from the splashscreen.
-
-    config.end_splash_transition = None
-
-    ## Used when entering the main menu after the game has ended.
-
-    config.end_game_transition = None
-
-    ## Used when a game is loaded.
-
-    config.after_load_transition = None
-
-    
-    #########################################
-    ## Default values of Preferences.
-
-    ## Note: These options are only evaluated the first time a
-    ## game is run. To have them run a second time, delete
-    ## game/saves/persistent
-
-    ## Should we start in fullscreen mode?
-
-    config.default_fullscreen = False
-
-    ## The default text speed in characters per second. 0 is infinite.
-
-    config.default_text_cps = 0
-

dse/game/stats.rpy

@@ -1,88 +0,0 @@
-init -100 python:
-
-    style.stats_frame = Style(style.frame)
-    style.stats_vbox = Style(style.vbox)
-
-    style.stats_label = Style(style.label)
-    style.stats_label_text = Style(style.label_text)
-
-    style.stat_side = Style(style.default)
-
-    style.stat_label = Style(style.label)
-    style.stat_label_text = Style(style.label_text)
-    style.stat_bar = Style(style.bar)
-    style.stat_value_label = Style(style.label)
-    style.stat_value_label_text = Style(style.label_text)
-        
-    __dse_stats = [ ]
-
-    class __Stat(object):
-
-        def __init__(self, name, var, default, max):
-            self.name = name
-            self.var = var
-            self.default = default
-            self.max = max
-
-    def __init_stats():
-        for s in __dse_stats:
-            setattr(store, s.var, s.default)
-
-    config.start_callbacks.append(__init_stats)
-            
-    def register_stat(name, var, default, max):
-        __dse_stats.append(__Stat(name, var, default, max))
-
-    def normalize_stats():
-        for s in __dse_stats:
-
-            v = getattr(store, s.var)
-
-            if v > s.max:
-                v = s.max
-            if v < 0:
-                v = 0
-
-            setattr(store, s.var, v)
-
-
-    def display_stats(name=True, bar=True, value=True, max=True):
-
-        normalize_stats()
-        
-        ui.window(style=style.stats_frame)
-        ui.vbox(style=style.stats_vbox)
-            
-        layout.label("Statistics", "stats")
-        
-        for s in __dse_stats:
-            v = getattr(store, s.var)
-
-            ui.side(['l', 'r', 'c'], style=style.stat_side)
-
-            if name:
-                layout.label(s.name, "stat")
-            else:
-                ui.null()
-
-            if value and max:
-                layout.label("%d/%d" % (v, s.max), "stat_value")
-            elif value:
-                layout.label("%d" % (v,), "stat_value")
-            elif max:
-                layout.label("%d" % (max,), "stat_value")
-            else:
-                ui.null()
-
-            if bar:
-                ui.bar(s.max, v, style=style.stat_bar)
-            else:
-                ui.null()
-
-            ui.close()
-                
-        ui.close()
-
-        
-    
-    

dse/game/styles.rpy

@@ -1,49 +0,0 @@
-# This file contains styles for the day planner.
-
-init python:
-
-    # Place the day planner.
-    style.dp_frame.ypos = 120
-    style.dp_frame.yanchor = 0.0
-    style.dp_frame.xalign = 0.5
-
-    # Spacing betweeen the choices and the done button.
-    style.dp_vbox.box_spacing = 20
-
-    # Spacing between the choice columns.
-    style.dp_hbox.box_spacing = 20
-
-    # Center the choices.
-    style.dp_choices.xalign = 0.5
-
-    # Center the label of each choice.
-    style.dp_label.xalign = 0.5
-    style.dp_label_text.text_align = 0.5
-
-    # Make each choice button the same size, and centered.
-    style.dp_choice_button.size_group = "dp_choice"
-    style.dp_choice_button.xalign = 0.5
-
-    # Center the done button.
-    style.dp_done_button.xalign = 0.5
-
-    # Put a margin on the stats frame.
-    style.stats_frame.xmargin = 10
-    style.stats_frame.ymargin = 5
-
-    # Space between the label and the stats.
-    style.stats_vbox.box_first_spacing = 10
-
-    # Put blank space around each stat name, and right-justify.
-    style.stat_label.xminimum = 140
-    style.stat_label_text.xalign = 1.0
-    style.stat_label.xmargin = 5
-    
-    # Put blank space around each stat value, and right-justify.
-    style.stat_value_label.xminimum = 100
-    style.stat_value_label_text.xalign = 1.0
-    
-    
-    # Center the stat bar vertically.
-    style.stat_bar.yalign = 0.5
-

help.html

@@ -112,7 +112,7 @@ display: none;
 <dd>Toggles fullscreen mode</dd> 
 <dt>S</dt> 
 <dd>Takes a screenshot, saving it in a file named screenshotxxxx.png, where xxxx is a serial number.</dd> 
-<dt>Alt-H, Command-H</dt> 
+<dt>Alt-M, Command-H</dt> 
 <dd>Hides (iconifies) the window.</dd> 
 <dt>Alt-F4, Command-Q</dt> 
 <dd>Quits the game.</dd> 

launcher/game/ability.rpy

@@ -1,27 +1,27 @@
 # Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
 # See LICENSE.txt for license details.
 
-# Checks for various abilities that might be taken away from us by 
+# Checks for various abilities that might be taken away from us by
 # redistributors.
 
 init 1 python in ability:
-    
+
     from store import config
     import store
     import store.updater as updater
-    
+
     import os
-    
+
     EXECUTABLES = [ "renpy.exe", "renpy.app", "renpy.sh" ]
-    
-    # can_distribute - True if we can distribute 
+
+    # can_distribute - True if we can distribute
     for i in EXECUTABLES:
         if not os.path.exists(os.path.join(config.renpy_base, i)):
             can_distribute = False
     else:
         can_distribute = True
-        
-        
+
+
     # can_update - True if we can update.
     can_update = updater.can_update() or (store.UPDATE_SIMULATE is not None)
-    
+

launcher/game/about.rpy

@@ -2,30 +2,30 @@
 # See LICENSE.txt for license details.
 
 screen about:
-    
+
     $ version = renpy.version()
-    
+
     frame:
         style_group "l"
         style "l_root"
-        
+
         window:
             xfill True
-            
+
             has vbox xfill True
 
             add "logo.png" xalign 0.5 yoffset -5
 
             null height 15
-            
+
             text _("[version!q]") xalign 0.5 bold True
-            
+
             null height 20
 
             textbutton _("View license") action interface.OpenLicense() xalign 0.5
-            
+
     textbutton _("Back") action Jump("front_page") style "l_left_button"
 
 label about:
     call screen about
-    
+

launcher/game/add_file.rpy

@@ -0,0 +1,36 @@
+label add_file:
+
+    python hide:
+        import os
+        import codecs
+
+        filename = interface.input(_("FILENAME"), _("Enter the name of the script file to create."), filename="withslash", cancel=Jump("navigation"))
+
+        if "." in filename and not filename.endswith(".rpy"):
+            interface.error(_("The filename must have the .rpy extension."), label="navigation")
+        elif "." not in filename:
+            filename += ".rpy"
+
+        path = os.path.join(project.current.gamedir, filename)
+        dir = os.path.dirname(path)
+
+        if os.path.exists(path):
+            interface.error(_("The file already exists."), label="navigation")
+
+        contents = u"\uFEFF"
+        contents += _("# Ren'Py automatically loads all script files ending with .rpy. To use this\n# file, define a label and jump to it from another file.\n")
+        contents += "\n"
+
+        try:
+            os.makedirs(dir)
+        except:
+            pass
+
+        contents = u"\uFEFF"
+        contents += _("# Ren'Py automatically loads all script files ending with .rpy. To use this\n# file, define a label and jump to it from another file.\n")
+
+        with open(path, "wb") as f:
+            f.write(contents.encode("utf-8"))
+
+    jump navigation_refresh
+

launcher/game/android.rpy

@@ -0,0 +1,502 @@
+# Copyright 2004-2013 Tom Rothamel <pytom@bishoujo.us>
+# See LICENSE.txt for license details.
+
+init python:
+    ANDROID_NO_JDK = 0
+    ANDROID_NO_RAPT = 1
+    ANDROID_NO_SDK = 2
+    ANDROID_NO_KEY = 3
+    ANDROID_NO_CONFIG = 4
+    ANDROID_OK = 5
+
+
+    NO_JDK_TEXT = _("A 32-bit Java Development Kit is required to build Android packages on Windows. The JDK is different from the JRE, so it's possible you have Java without having the JDK.\n\nPlease {a=http://www.oracle.com/technetwork/java/javase/downloads/index.html}download and install the JDK{/a}, then restart the Ren'Py launcher.")
+    NO_RAPT_TEXT = _("To build Android packages, please download RAPT (from {a=http://www.renpy.org/dl/android}here{/a}), unzip it, and place it into the Ren'Py directory. Then restart the Ren'Py launcher.")
+    NO_SDK_TEXT = _("RAPT has been installed, but you'll need to install the Android SDK before you can build Android packages. Choose Install SDK to do this.")
+    NO_KEY_TEXT = _("RAPT has been installed, but a key hasn't been configured. Please create a new key, or restore android.keystore.")
+    NO_CONFIG_TEXT = _("The current project has not been configured. Use \"Configure\" to configure it before building.")
+    OK_TEXT = _("Choose \"Build\" to build the current project, or attach an Android device and choose \"Build & Install\" to build and install it on the device.")
+
+    PHONE_TEXT = _("Attempts to emulate an Android phone.\n\nTouch input is emulated through the mouse, but only when the button is held down. Escape is mapped to the menu button, and PageUp is mapped to the back button.")
+    TABLET_TEXT = _("Attempts to emulate an Android tablet.\n\nTouch input is emulated through the mouse, but only when the button is held down. Escape is mapped to the menu button, and PageUp is mapped to the back button.")
+    OUYA_TEXT = _("Attempts to emulate an OUYA console.\n\nController input is mapped to the arrow keys, Enter is mapped to the select button, Escape is mapped to the menu button, and PageUp is mapped to the back button.")
+
+    INSTALL_SDK_TEXT = _("Downloads and installs the Android SDK and supporting packages. Optionally, generates the keys required to sign the package.")
+    CONFIGURE_TEXT = _("Configures the package name, version, and other information about this project.")
+    PLAY_KEYS_TEXT = _("Opens the file containing the Google Play keys in the editor.\n\nThis is only needed if the application is using an expansion APK. Read the documentation for more details.")
+    BUILD_TEXT = _("Builds the Android package.")
+    BUILD_AND_INSTALL_TEXT = _("Builds the Android package, and installs it on an Android device connected to your computer.")
+
+
+    import subprocess
+    import re
+    import os
+    import json
+
+    def find_rapt():
+
+        global RAPT_PATH
+
+        candidates = [ ]
+
+        for fn in os.listdir(config.renpy_base):
+            if not fn.startswith("rapt-"):
+                continue
+
+            if not os.path.isdir(os.path.join(config.renpy_base, fn)):
+                continue
+
+            try:
+                version = fn[5:]
+                version = tuple(int(i) for i in version.split('.'))
+            except ValueError:
+                continue
+
+            candidates.append((version, fn))
+
+        if not candidates:
+            RAPT_PATH = None
+        else:
+            RAPT_PATH = os.path.join(config.renpy_base, candidates[-1][1])
+
+            import sys
+            sys.path.insert(0, os.path.join(RAPT_PATH, "buildlib"))
+
+    find_rapt()
+
+    import threading
+
+    if RAPT_PATH:
+        import rapt
+        import rapt.build
+        import rapt.configure
+        import rapt.install_sdk
+        import rapt.plat
+    else:
+        rapt = None
+
+    def AndroidState():
+        """
+        Determines the state of the android install, and returns it.
+        """
+
+        if renpy.windows and not "JAVA_HOME" in os.environ:
+            return ANDROID_NO_JDK
+        if RAPT_PATH is None:
+            return ANDROID_NO_RAPT
+        if not os.path.exists(os.path.join(RAPT_PATH, "android-sdk/extras/google/play_licensing")):
+            return ANDROID_NO_SDK
+        if not os.path.exists(os.path.join(RAPT_PATH, "android.keystore")):
+            return ANDROID_NO_KEY
+        if not os.path.exists(os.path.join(project.current.path, ".android.json")):
+            return ANDROID_NO_CONFIG
+        return ANDROID_OK
+
+
+    def AndroidStateText(state):
+        """
+        Returns text corresponding to the state.
+        """
+
+        if state == ANDROID_NO_JDK:
+            return NO_JDK_TEXT
+        if state == ANDROID_NO_RAPT:
+            return NO_RAPT_TEXT
+        if state == ANDROID_NO_SDK:
+            return NO_SDK_TEXT
+        if state == ANDROID_NO_KEY:
+            return NO_KEY_TEXT
+        if state == ANDROID_NO_CONFIG:
+            return NO_CONFIG_TEXT
+        if state == ANDROID_OK:
+            return OK_TEXT
+
+    def AndroidIfState(state, needed, action):
+        """
+        If `state` is `needed` or better, `action` is returned. Otherwise,
+        returns None, disabling the button.
+        """
+
+        if state >= needed:
+            return action
+        else:
+            return None
+
+    class AndroidInterface(object):
+
+        def __init__(self):
+            self.process = None
+            self.filename = project.current.temp_filename("android.txt")
+
+            self.info_msg = ""
+
+            with open(self.filename, "w"):
+                pass
+
+        def info(self, prompt):
+            self.info_msg = prompt
+            interface.processing(prompt, pause=False)
+
+        def yesno(self, prompt, submessage=None):
+            return interface.yesno(prompt, submessage=submessage)
+
+        def yesno_choice(self, prompt, default=None):
+            choices = [ (True, "Yes"), (False, "No") ]
+            return interface.choice(prompt, choices, default)
+
+        def terms(self, url, prompt):
+            submessage = _("{a=%s}%s{/a}") % (url, url)
+            return interface.yesno(prompt, submessage=submessage)
+
+        def input(self, prompt, empty=None):
+
+            if empty is None:
+                empty = ''
+
+            while True:
+                rv = interface.input(_("QUESTION"), prompt, default=empty, cancel=Jump("android"))
+
+                rv = rv.strip()
+
+                if rv:
+                    return rv
+
+        def choice(self, prompt, choices, default):
+            return interface.choice(prompt, choices, default, cancel=Jump("android"))
+
+        def fail(self, prompt):
+            prompt = re.sub(r'(http://\S+)', r'{a=\1}\1{/a}', prompt)
+
+            # Open android.txt in the editor.
+            editor.EditAbsolute(self.filename)()
+
+            interface.error(prompt, label="android")
+
+        def success(self, prompt):
+            interface.info(prompt, pause=False)
+
+        def final_success(self, prompt):
+            interface.info(prompt, label="android")
+
+        def call(self, cmd, cancel=False, use_path=False):
+
+            if not use_path:
+                cmd = [ rapt.plat.path(cmd[0]) ] + list(cmd[1:])
+
+            self.cmd = cmd
+
+            f = open(self.filename, "a")
+
+            f.write("\n\n\n")
+
+            if cancel:
+                cancel_action = self.cancel
+            else:
+                cancel_action = None
+
+            startupinfo = None
+            if renpy.windows:
+                startupinfo = subprocess.STARTUPINFO()
+                startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+
+            try:
+                interface.processing(self.info_msg, show_screen=True, cancel=cancel_action)
+                self.process = subprocess.Popen(cmd, cwd=RAPT_PATH, stdout=f, stderr=f, startupinfo=startupinfo)
+                renpy.call_screen("android_process", interface=self)
+            finally:
+                f.close()
+                interface.hide_screen()
+                self.process = None
+
+        def check_process(self):
+            rv = self.process.poll()
+
+            if rv is not None:
+                if rv:
+                    raise subprocess.CalledProcessError(rv, self.cmd)
+                else:
+                    return True
+
+        def download(self, url, dest):
+            try:
+                d = Downloader(url, dest)
+                cancel_action = [ d.cancel, Jump("android") ]
+                interface.processing(self.info_msg, show_screen=True, cancel=cancel_action, bar_value=DownloaderValue(d))
+                ui.timer(.1, action=d.check, repeat=True)
+                ui.interact()
+            finally:
+                interface.hide_screen()
+
+        def background(self, f):
+            try:
+                t = threading.Thread(target=f)
+                t.start()
+
+                interface.processing(self.info_msg, show_screen=True)
+
+                while t.is_alive():
+                    renpy.pause(0)
+                    t.join(0.25)
+
+            finally:
+                interface.hide_screen()
+
+
+        def cancel(self):
+            if self.process:
+                self.process.terminate()
+
+            renpy.jump("android")
+
+
+    class AndroidBuild(Action):
+        """
+        Activates an Android build process.
+        """
+
+        def __init__(self, label):
+            self.label = label
+
+        def __call__(self):
+            renpy.jump(self.label)
+
+    class LaunchEmulator(Action):
+
+        def __init__(self, emulator, variants):
+            self.emulator = emulator
+            self.variants = variants
+
+        def __call__(self):
+
+            env = {
+                "RENPY_EMULATOR" : self.emulator,
+                "RENPY_VARIANT" : self.variants,
+                }
+
+            p = project.current
+            p.launch(env=env)
+
+    def update_android_json():
+        """
+        Updates .android.json to include the google play information.
+        """
+
+        project.current.update_dump(True)
+
+        build = project.current.dump["build"]
+
+        filename = os.path.join(project.current.path, ".android.json")
+
+        with open(filename, "r") as f:
+            android_json = json.load(f)
+
+        if "google_play_key" in build:
+            android_json["google_play_key"] = build["google_play_key"]
+        else:
+            android_json.pop("google_play_key", None)
+
+        if "google_play_salt" in build:
+
+            if len(build["google_play_salt"]) != 20:
+                raise Exception("build.google_play_salt must be exactly 20 bytes long.")
+
+            android_json["google_play_salt"] = ", ".join(str(i) for i in build["google_play_salt"])
+        else:
+            android_json.pop("google_play_salt", None)
+
+
+        with open(filename, "w") as f:
+            json.dump(android_json, f)
+
+    def android_build(command):
+        """
+        This actually builds the package.
+        """
+
+        update_android_json()
+
+        dist = project.current.temp_filename("android.dist")
+
+        if os.path.exists(dist):
+            shutil.rmtree(dist)
+
+        distribute.Distributor(project.current,
+            reporter=distribute.GuiReporter(),
+            packages=[ 'android' ],
+            build_update=False,
+            noarchive=True,
+            packagedest=dist,
+            report_success=False,
+            )
+
+        with interface.nolinks():
+            rapt.build.build(AndroidInterface(), dist, command)
+
+# The android support can stick unicode into os.environ. Fix that.
+init 100 python:
+    for k, v in list(os.environ.items()):
+        if isinstance(v, str):
+            os.environ[k] = renpy.fsencode(v)
+
+screen android_process(interface):
+
+    zorder 100
+
+    default ft = FileTail(interface.filename)
+
+    text "[ft.text!q]":
+        size 14
+        color TEXT
+        font "Roboto-Light.ttf"
+        xpos 75
+        ypos 350
+
+    timer .1 action interface.check_process repeat True
+    timer .2 action ft.update repeat True
+
+
+screen android:
+
+    default tt = Tooltip(None)
+    $ state = AndroidState()
+
+    frame:
+        style_group "l"
+        style "l_root"
+
+        window:
+
+            has vbox
+
+            label _("Android: [project.current.name!q]")
+
+            add HALF_SPACER
+
+            hbox:
+
+                # Left side.
+                frame:
+                    style "l_indent"
+                    xmaximum ONEHALF
+                    xfill True
+
+                    has vbox
+
+                    add SEPARATOR2
+
+                    frame:
+                        style "l_indent"
+                        has vbox
+
+                        text _("Emulation:")
+
+                        add HALF_SPACER
+
+                        frame style "l_indent":
+
+                            has vbox
+
+                            textbutton _("Phone"):
+                                action LaunchEmulator("touch", "small phone touch android")
+                                hovered tt.Action(PHONE_TEXT)
+
+                            textbutton _("Tablet"):
+                                action LaunchEmulator("touch", "medium tablet touch android")
+                                hovered tt.Action(TABLET_TEXT)
+
+                            textbutton _("Television / OUYA"):
+                                action LaunchEmulator("tv", "small tv ouya android")
+                                hovered tt.Action(OUYA_TEXT)
+
+
+                    add SPACER
+                    add SEPARATOR2
+
+                    frame:
+                        style "l_indent"
+                        has vbox
+
+                        text _("Build:")
+
+                        add HALF_SPACER
+
+                        frame style "l_indent":
+
+                            has vbox
+
+                            textbutton _("Install SDK & Create Keys"):
+                                action AndroidIfState(state, ANDROID_NO_SDK, Jump("android_installsdk"))
+                                hovered tt.Action(INSTALL_SDK_TEXT)
+
+                            textbutton _("Configure"):
+                                action AndroidIfState(state, ANDROID_NO_CONFIG, Jump("android_configure"))
+                                hovered tt.Action(CONFIGURE_TEXT)
+
+                            textbutton _("Build Package"):
+                                action AndroidIfState(state, ANDROID_OK, AndroidBuild("android_build"))
+                                hovered tt.Action(BUILD_TEXT)
+
+                            textbutton _("Build & Install"):
+                                action AndroidIfState(state, ANDROID_OK, AndroidBuild("android_build_and_install"))
+                                hovered tt.Action(BUILD_AND_INSTALL_TEXT)
+
+
+
+                # Right side.
+                frame:
+                    style "l_indent"
+                    xmaximum ONEHALF
+                    xfill True
+
+                    has vbox
+
+                    add SEPARATOR2
+
+                    frame:
+                        style "l_indent"
+                        has vbox
+
+                        add SPACER
+
+                        if tt.value:
+                            text tt.value
+                        else:
+                            text AndroidStateText(state)
+
+
+    textbutton _("Back") action Jump("front_page") style "l_left_button"
+
+
+label android:
+    call screen android
+
+
+label android_installsdk:
+
+    python:
+        with interface.nolinks():
+            rapt.install_sdk.install_sdk(AndroidInterface())
+
+    jump android
+
+
+label android_configure:
+
+    python:
+        rapt.configure.configure(AndroidInterface(), project.current.path)
+
+    jump android
+
+
+label android_build:
+
+    $ android_build([ 'release' ])
+
+    jump android
+
+
+label android_build_and_install:
+
+    $ android_build([ 'release', 'install' ])
+
+    jump android

launcher/game/archiver.rpy

@@ -2,7 +2,7 @@
 # See LICENSE.txt for license details.
 
 # Ren'Py archiver. This builds a Ren'Py archive file, and the
-# associated index file. These files are really easy to 
+# associated index file. These files are really easy to
 # reverse-engineer, but are probably better than nothing.
 
 init python in archiver:
@@ -23,16 +23,16 @@ init python in archiver:
 
             # The archive file.
             self.f = open(filename, "wb")
-            
+
             # The index to the file.
             self.index = _dict()
-            
+
             # A fixed key minimizes difference between archive versions.
             self.key = 0x42424242
 
             padding = "RPA-3.0 XXXXXXXXXXXXXXXX XXXXXXXX\n"
             self.f.write(padding)
-            
+
         def add(self, name, path):
             """
             Adds a file to the archive.
@@ -55,7 +55,7 @@ init python in archiver:
             self.index[name].append((offset ^ self.key, dlen ^ self.key, ""))
 
         def close(self):
-            
+
             indexoff = self.f.tell()
 
             self.f.write(dumps(self.index, HIGHEST_PROTOCOL).encode("zlib"))
@@ -64,4 +64,4 @@ init python in archiver:
             self.f.write("RPA-3.0 %016x %08x\n" % (indexoff, self.key))
 
             self.f.close()
-            
+

launcher/game/change_icon.py

@@ -5,7 +5,7 @@
 import struct
 import sys
 import array
-import pefile
+import pefile # @UnresolvedImport
 
 # This class performs various operations on memory-loaded binary files,
 # including modifications.
@@ -16,7 +16,7 @@ class BinFile(object):
         self.a[addr+1] = (value >> 8) & 0xff
         self.a[addr+2] = (value >> 16) & 0xff
         self.a[addr+3] = (value >> 24) & 0xff
-    
+
     def u32(self):
         addr = self.addr
         rv = self.a[addr]
@@ -46,7 +46,7 @@ class BinFile(object):
             rv += unichr(self.u16())
 
         return rv
-    
+
     def seek(self, addr):
         self.addr = addr
 
@@ -55,7 +55,7 @@ class BinFile(object):
 
     def substring(self, start, len): #@ReservedAssignment
         return self.a[start:start+len].tostring()
-    
+
     def __init__(self, data):
         self.a = array.array('B')
         self.a.fromstring(data)
@@ -66,7 +66,7 @@ class BinFile(object):
 
 # The virtual address of the resource segment.
 resource_virtual = 0
-        
+
 # This parses a data block out of the resources.
 def parse_data(bf, offset):
     bf.seek(offset)
@@ -95,7 +95,7 @@ def parse_directory(bf, offset):
     n_id = bf.u16()
 
     entries = [ ]
-    
+
     for _i in range(n_named + n_id):
         entries.append((bf.u32(), bf.u32()))
 
@@ -113,8 +113,8 @@ def parse_directory(bf, offset):
             value = parse_data(bf, value)
 
         rv[name] = value
-            
-    return rv 
+
+    return rv
 
 
 ##############################################################################
@@ -124,7 +124,7 @@ def show_resources(d, prefix):
     if not isinstance(d, dict):
         print prefix, "Codepage", d[0], "length", len(d[1])
         return
-        
+
     for k in d:
         print prefix, k
         show_resources(d[k], prefix + "  ")
@@ -141,7 +141,7 @@ class Packer(object):
 
         self.entries = ""
         self.entries_offset = 0
-        
+
         head = self.pack_dict(d, 0)
 
         self.data = ""
@@ -151,44 +151,44 @@ class Packer(object):
         self.entries_offset = len(head)
 
         return self.pack_dict(d, 0) + self.entries + self.data
-        
+
     def pack_name(self, s):
         rv = self.data_offset + len(self.data)
 
         l = len(s)
         s = s.encode("utf-16le")
         self.data += struct.pack("<H", l) + s + "\0\0"
-        
+
         return rv
 
     def pack_tuple(self, t):
         codepage, data = t
 
-        rv = len(self.entries) + self.entries_offset        
+        rv = len(self.entries) + self.entries_offset
 
         if len(self.data) % 2:
             self.data += "P"
 
         daddr = len(self.data) + self.data_offset
-        
+
         self.entries += struct.pack("<IIII", daddr + resource_virtual, len(data), codepage, 0)
         self.data += data
 
         # if len(self.data) % 1 == 1:
         #    self.data += 'P'
-        
+
         return rv
-    
+
     def pack_dict(self, d, offset):
         name_entries = sorted((a, b) for a, b in d.iteritems() if isinstance(a, unicode))
         id_entries = sorted((a, b) for a, b in d.iteritems() if isinstance(a, int))
-        
+
         rv = struct.pack("<IIHHHH", 0, 0, 4, 0, len(name_entries), len(id_entries))
-        
+
         offset += len(rv) + (len(name_entries) + len(id_entries)) * 8
-        
+
         rest = ""
-        
+
         for (name, value) in name_entries + id_entries:
             if isinstance(name, unicode):
                 name = 0x80000000 | self.pack_name(name)
@@ -200,11 +200,11 @@ class Packer(object):
                 rest += packed
             else:
                 addr = self.pack_tuple(value)
-                
+
             rv += struct.pack("<II", name, addr)
 
         return rv + rest
-        
+
 ##############################################################################
 # This loads in an icon file, and returns a dictionary that is suitable for
 # use in the resources of an exe file.
@@ -219,8 +219,8 @@ def load_icon(fn):
     rv = { }
     rv[3] = { }
 
-    group = struct.pack("HHH", 0, 1, count)    
-    
+    group = struct.pack("HHH", 0, 1, count)
+
     for i in range(count):
         width = f.u8()
         height = f.u8()
@@ -235,17 +235,17 @@ def load_icon(fn):
         f.seek(offset + 16)
         if not f.u32():
             f.set_u32(offset + 20, 0)
-            
+
         rv[3][i + 1] = { 0 : (1252, f.substring(offset, size)) }
 
 
         group += struct.pack("BBBBHHIH", width, height, colors, reserved,
                              planes, bpp, size, i + 1)
-        
+
         f.seek(addr)
 
     rv[14] = { 1 : { 0 : (1252, group) } }
-        
+
     return rv
 
 
@@ -269,25 +269,25 @@ def change_icons(oldexe, icofn):
 
     physize = rsrc_section.SizeOfRawData
     virsize = rsrc_section.Misc_VirtualSize
-    
+
     f = file(oldexe, "rb")
     f.seek(base)
     data = f.read(physize)
     f.close()
 
     bf = BinFile(data)
-    
+
     resources = parse_directory(bf, 0)
     # show_resources(resources, "")
     resources.update(load_icon(icofn))
     # show_resources(resources, "")
-    
+
     rsrc = Packer().pack(resources)
 
     alignment = pe.OPTIONAL_HEADER.SectionAlignment
-    
+
     # print "Alignment is", alignment
-    
+
     if len(rsrc) % alignment:
         pad = alignment - (len(rsrc) % alignment)
         padding = "RENPYVNE" * (pad / 8 + 1)
@@ -295,34 +295,34 @@ def change_icons(oldexe, icofn):
         rsrc += padding
 
     newsize = len(rsrc)
-    
+
     rsrc_section.Misc_VirtualSize += newsize - virsize
     rsrc_section.Misc_PhysicalAddress += newsize - virsize
     rsrc_section.Misc += newsize - virsize
     rsrc_section.SizeOfRawData += newsize - physize
-    
-    pe.OPTIONAL_HEADER.SizeOfInitializedData += newsize - physize 
+
+    pe.OPTIONAL_HEADER.SizeOfInitializedData += newsize - physize
 
     # Resource size.
     pe.OPTIONAL_HEADER.DATA_DIRECTORY[2].Size += newsize - virsize
 
     # Compute the total size of the image.
     total_size = 0
-    
+
     for i in pe.sections:
 
         sec_size = i.Misc_VirtualSize
         sec_size = sec_size - (sec_size % alignment) + alignment
-            
+
         total_size += sec_size
 
     pe.OPTIONAL_HEADER.SizeOfImage = total_size
 
-    return pe.write()[:base] + rsrc 
-    
+    return pe.write()[:base] + rsrc
+
 if __name__ == "__main__":
 
     f = file(sys.argv[3], "wb")
     f.write(change_icons(sys.argv[1], sys.argv[2]))
     f.close()
-    
+

launcher/game/choose_theme.rpy

@@ -11,64 +11,64 @@ init python:
         """
         Gets a list of all of the theme names we know about.
         """
-        
+
         names = list(theme_data.THEME.keys())
         names.sort(key=lambda a : a.lower())
-        
+
         return names
-    
+
     def scheme_names(theme):
         """
         Gets a list of the color scheme names corresponding to the given
         theme.
         """
-        
+
         names = list(theme_data.THEME[theme].keys())
         names.sort(key=lambda a : a.lower())
-        
+
         return names
 
     def theme_yinitial():
         names = theme_names()
-        
+
         if len(names) < 2:
             return 0
-            
+
         return 1.0 * names.index(current_theme) / (len(names) - 1)
 
     def scheme_yinitial():
         names = scheme_names(current_theme)
-        
+
         if len(names) < 2:
             return 0
-            
+
         return 1.0 * names.index(current_scheme) / (len(names) - 1)
 
     def pick_theme(theme, scheme):
         """
-        Returns a theme and scheme that are similar to `theme` and `scheme`. 
-        
+        Returns a theme and scheme that are similar to `theme` and `scheme`.
+
         If the theme is known, picks it, otherwise picks a random theme. If
-        the scheme is known for that theme, picks it, otherwise picks a 
+        the scheme is known for that theme, picks it, otherwise picks a
         random scheme that is known for the current theme.
         """
-        
+
         if theme not in theme_data.THEME:
             theme = random.choice(list(theme_data.THEME))
-        
+
         schemes = theme_data.THEME[theme]
-        
+
         if scheme not in schemes:
             if theme in schemes:
                 scheme = theme
             else:
                 scheme = random.choice(list(schemes))
-            
+
         return theme, scheme
-        
+
     def implement_theme(theme, scheme):
         global showing_theme, showing_scheme
-        
+
         if theme == showing_theme and scheme == showing_scheme:
             return
 
@@ -80,52 +80,52 @@ init python:
         showing_scheme = scheme
 
         renpy.restart_interaction()
-    
+
     showing_theme = None
     showing_scheme = None
 
     class SetTheme(Action):
         def __init__(self, theme):
             self.theme = theme
-            
+
         def __call__(self):
             global current_theme
-            global current_scheme 
-            
+            global current_scheme
+
             current_theme, current_scheme = pick_theme(self.theme, current_scheme)
-            
+
             implement_theme(current_theme, current_scheme)
             renpy.restart_interaction()
 
         def get_selected(self):
             return current_theme == self.theme
-            
+
     class SetScheme(Action):
         def __init__(self, scheme):
             self.scheme = scheme
-            
+
         def __call__(self):
             global current_theme
-            global current_scheme 
-            
+            global current_scheme
+
             current_theme, current_scheme = pick_theme(current_theme, self.scheme)
-            
+
             implement_theme(current_theme, current_scheme)
             renpy.restart_interaction()
-            
+
         def get_selected(self):
             return current_scheme == self.scheme
-            
+
     class PreviewTheme(Action):
-        
+
         def __init__(self, theme, scheme):
             self.theme = theme
             self.scheme = scheme
-            
+
         def __call__(self):
             theme, scheme = pick_theme(self.theme, self.scheme)
             implement_theme(theme, scheme)
-            
+
         def unhovered(self):
             if (showing_theme == self.theme and showing_scheme == self.scheme):
                 implement_theme(current_theme, current_scheme)
@@ -135,11 +135,11 @@ init python:
 
     ##########################################################################
     # Code to update options.rpy
-    
+
     def list_logical_lines(filename):
         """
          This reads in filename, and turns it into a list of logical
-         lines. 
+         lines.
         """
 
         f = codecs.open(filename, "rb", "utf-8")
@@ -227,7 +227,7 @@ init python:
                         continue
 
                     continue
-                    
+
                 line += c
                 pos += 1
 
@@ -239,7 +239,7 @@ init python:
 
     def switch_theme():
         """
-        Switches the theme of the current project to the current theme 
+        Switches the theme of the current project to the current theme
         and color scheme. (As set in current_theme and current_scheme.)
         """
 
@@ -258,7 +258,7 @@ init python:
                 if (not changed) and m and (m.group(1) in theme_data.THEME_FUNCTIONS):
                     l = "    " + theme_code
                     changed = True
-                        
+
                 out.write(l + "\n")
 
         if changed:
@@ -272,7 +272,7 @@ init python:
         else:
             os.unlink(filename + ".new")
             interface.error(_("Could not change the theme. Perhaps options.rpy was changed too much."))
-            
+
 
         # Now give the theme's screen-ops function a chance to make any
         # necessary changes to the screens.rpy file
@@ -289,13 +289,13 @@ init python:
                     for l in lines:
                         out.write(l + "\n")
                     changed = True
-            
+
             if changed:
                 try:
                     os.unlink(filename + ".bak")
                 except:
                     pass
-                    
+
                 os.rename(filename, filename + ".bak")
                 os.rename(filename + ".new", filename)
 
@@ -307,13 +307,20 @@ init python:
                 pass
             pass
 
+    def make_style_backup():
+        """
+        Call this to back up the styles. This should be called in a
+        translate python block in each translation.
+        """
 
-init 100 python:
-    style_backup = renpy.style.backup()
+        global style_backup
+        style_backup = renpy.style.backup()
 
+translate None python:
+    make_style_backup()
 
 screen theme_demo:
-    
+
     window:
         style "gm_root"
         xpadding 5
@@ -324,16 +331,16 @@ screen theme_demo:
             style_group "prefs"
 
             vbox:
-                    
+
                 frame:
                     style_group "pref"
                     has vbox
-          
+
                     label _("Display")
                     textbutton _("Window") action SelectedIf(True)
                     textbutton _("Fullscreen") action ui.returns(None)
                     textbutton _("Planetarium") action None
-                    
+
 
                 frame:
                     style_group "pref"
@@ -368,16 +375,16 @@ screen choose_theme:
     frame:
         style_group "l"
         style "l_root"
-        
+
         window:
-    
+
             has vbox
 
             label _("Choose Theme")
 
             hbox:
                 yfill True
-                
+
                 # Theme selector.
                 frame:
                     style "l_indent"
@@ -385,51 +392,51 @@ screen choose_theme:
                     xmaximum 225
 
                     has vbox
-                    
+
                     label _("Theme") style "l_label_small"
 
                     viewport:
                         scrollbars "vertical"
                         yinitial theme_yinitial()
                         mousewheel True
-                        
+
                         has vbox
-            
+
                         for i in theme_names():
                             textbutton "[i]":
                                 action SetTheme(i)
                                 hovered PreviewTheme(i, current_scheme)
-                                style "l_list2" 
+                                style "l_list2"
+
 
-                
                 # Color scheme selector.
                 frame:
                     style "l_indent"
                     bottom_margin HALF_SPACER_HEIGHT
                     xmaximum 225
-                    
+
                     has vbox
-                    
+
                     label _("Color Scheme") style "l_label_small"
-                    
+
                     viewport:
                         scrollbars "vertical"
                         mousewheel True
                         yinitial scheme_yinitial()
-                        
+
                         has vbox
-            
+
                         for i in scheme_names(current_theme):
-                            textbutton "[i]":  
+                            textbutton "[i]":
                                 action SetScheme(i)
                                 hovered PreviewTheme(current_theme, i)
-                                style "l_list2" 
+                                style "l_list2"
+
 
-                
                 # Preview
                 frame:
                     style "l_default"
-                    background Frame("pattern.png", 0, 0, tile=True)
+                    background Frame(PATTERN, 0, 0, tile=True)
                     xpadding 5
                     ypadding 5
 
@@ -437,19 +444,19 @@ screen choose_theme:
                     yfill True
                     xmargin 20
                     bottom_margin 6
-                
+
                     use theme_demo
 
     textbutton _("Back") action Jump("front_page") style "l_left_button"
     textbutton _("Continue") action Return(True) style "l_right_button"
-                        
+
 
 label choose_theme_callable:
 
     python:
         current_theme, current_scheme = pick_theme(None, None)
-        implement_theme(current_theme, current_scheme) 
-    
+        implement_theme(current_theme, current_scheme)
+
     call screen choose_theme
 
     python hide:
@@ -457,9 +464,7 @@ label choose_theme_callable:
             switch_theme()
 
     return
-    
+
 label choose_theme:
     call choose_theme_callable
     jump front_page
-
-    

launcher/game/distribute_gui.rpy

@@ -5,66 +5,66 @@ init python:
     class PackageToggle(Action):
         def __init__(self, name):
             self.name = name
-            
+
         def get_selected(self):
-            return self.name in project.current.data['packages'] 
-    
+            return self.name in project.current.data['packages']
+
         def __call__(self):
             packages = project.current.data['packages']
-    
+
             if self.name in packages:
                 packages.remove(self.name)
             else:
                 packages.append(self.name)
-                
+
             project.current.save_data()
             renpy.restart_interaction()
 
     class DataToggle(Action):
         def __init__(self, field):
             self.field = field
-            
+
         def get_selected(self):
             return project.current.data[self.field]
-            
+
         def __call__(self):
             project.current.data[self.field] = not project.current.data[self.field]
-            
+
             project.current.save_data()
             renpy.restart_interaction()
 
 
     DEFAULT_BUILD_INFO = """
-                         
-## This section contains information about how to build your project into 
+
+## This section contains information about how to build your project into
 ## distribution files.
 init python:
-    
+
     ## The name that's used for directories and archive files. For example, if
     ## this is 'mygame-1.0', the windows distribution will be in the
     ## directory 'mygame-1.0-win', in the 'mygame-1.0-win.zip' file.
     build.directory_name = "PROJECTNAME-1.0"
-    
+
     ## The name that's uses for executables - the program that users will run
     ## to start the game. For example, if this is 'mygame', then on Windows,
     ## users can click 'mygame.exe' to start the game.
     build.executable_name = "PROJECTNAME"
-    
+
     ## If True, Ren'Py will include update information into packages. This
     ## allows the updater to run.
     build.include_update = False
-    
+
     ## File patterns:
-    ## 
+    ##
     ## The following functions take file patterns. File patterns are case-
     ## insensitive, and matched against the path relative to the base
     ## directory, with and without a leading /. If multiple patterns match,
     ## the first is used.
-    ##    
+    ##
     ##
     ## In a pattern:
     ##
-    ## / 
+    ## /
     ##     Is the directory separator.
     ## *
     ##     Matches all characters, except the directory separator.
@@ -87,9 +87,9 @@ init python:
     build.classify('**/.**', None)
     build.classify('**/#**', None)
     build.classify('**/thumbs.db', None)
-    
+
     ## To archive files, classify them as 'archive'.
-    
+
     # build.classify('game/**.png', 'archive')
     # build.classify('game/**.jpg', 'archive')
 
@@ -100,7 +100,7 @@ init python:
     build.documentation('*.txt')
     """
 
-# A screen that displays a file or directory name, and 
+# A screen that displays a file or directory name, and
 # lets the user change it,
 #
 # title
@@ -108,17 +108,17 @@ init python:
 # value
 #     The value of the field.
 screen distribute_name:
-    
+
     add SEPARATOR2
-         
+
     frame:
         style "l_indent"
         has vbox
-        
+
         text title
-        
+
         add HALF_SPACER
-        
+
         frame:
             style "l_indent"
             text "[value!q]"
@@ -127,27 +127,27 @@ screen distribute_name:
 
 
 screen build_distributions:
-    
+
     frame:
         style_group "l"
         style "l_root"
-        
+
         window:
-    
+
             has vbox
 
             label _("Build Distributions: [project.current.name!q]")
-            
+
             add HALF_SPACER
 
             hbox:
-                
+
                 # Left side.
                 frame:
                     style "l_indent"
                     xmaximum ONEHALF
                     xfill True
-                    
+
                     has vbox
 
                     use distribute_name(
@@ -159,23 +159,23 @@ screen build_distributions:
                         value=project.current.dump["build"]["executable_name"])
 
                     add SEPARATOR2
-                         
+
                     frame:
                         style "l_indent"
                         has vbox
-                        
+
                         text _("Actions:")
-                        
+
                         add HALF_SPACER
 
                         frame style "l_indent":
-                            
+
                             has vbox
 
                             textbutton _("Edit options.rpy") action editor.Edit("game/options.rpy", check=True)
                             textbutton _("Refresh") action Jump("build_distributions")
-                        
-                    
+
+
                 # Right side.
                 frame:
                     style "l_indent"
@@ -185,23 +185,22 @@ screen build_distributions:
                     has vbox
 
                     add SEPARATOR2
-                         
+
                     frame:
                         style "l_indent"
                         has vbox
-                        
+
                         text _("Build Packages:")
 
                         add HALF_SPACER
 
                         $ packages = project.current.dump["build"]["packages"]
-                        
+
                         for pkg in packages:
-                            
-                            $ description = pkg["description"]
-                            
-                            textbutton "[description!q]" action PackageToggle(pkg["name"]) style "l_checkbox"
-                                                           
+                            if not pkg["hidden"]:
+                                $ description = pkg["description"]
+                                textbutton "[description!q]" action PackageToggle(pkg["name"]) style "l_checkbox"
+
                         add SPACER
 
                         if project.current.dump["build"]["include_update"]:
@@ -214,34 +213,30 @@ screen build_distributions:
 label build_update_dump:
     python:
         project.current.update_dump(True)
-        
+
         if project.current.dump.get("error", False):
             interface.error(_("Errors were detected when running the project. Please ensure the project runs without errors before building distributions."))
-            
+
     return
 
 label build_distributions:
-    
+
     call build_update_dump
-    
+
     if not project.current.dump["build"]["directory_name"]:
         jump build_missing
 
     call screen build_distributions
 
 label build_missing:
-    
+
     python hide:
-        
+
         interface.yesno(_("Your project does not contain build information. Would you like to add build information to the end of options.rpy?"), yes=Return(True), no=Jump("front_page"))
 
         build_info = DEFAULT_BUILD_INFO.replace("PROJECTNAME", project.current.name)
-        
+
         with open(os.path.join(project.current.path, "game", "options.rpy"), "a") as f:
             f.write(build_info)
 
     jump build_distributions
-    
-    
-
-    

launcher/game/download.rpy

@@ -0,0 +1,129 @@
+init python:
+
+    import urllib2
+    import os
+    import threading
+    import time
+
+    class Downloader(object):
+
+        def __init__(self, url, dest):
+            """
+            Downloads `url` to `dest`, providing progress reports
+            as necessary.
+            """
+
+            self.url = url
+
+            # The destination file, and the destination temp file.
+            self.dest = dest
+            self.tmp = dest + ".tmp"
+
+            # Open the tmpfile.
+            self.safe_unlink(self.tmp)
+            self.tmpfile = open(self.tmp, "wb")
+
+            # Set by the thread to indicate progress (ranges from 0.0 to 1.0).
+            self.progress = 0.0
+
+            # This is set to true by cancel() to indicate the download should be cancelled.
+            self.cancelled = False
+
+            # Set on succes or failure.
+            self.success = False
+            self.failure = None
+
+            try:
+                # Open the URL.
+                self.urlfile = urllib2.urlopen(url)
+
+                t = threading.Thread(target=self.thread)
+                t.daemon = True
+                t.start()
+
+            except Exception as e:
+                self.failure = str(e)
+
+        def thread(self):
+
+            try:
+                count = 0
+
+                if "content-length" in self.urlfile.headers:
+                    length = int(self.urlfile.headers["content-length"])
+                else:
+                    length = 0
+
+                while not self.cancelled:
+
+                    data = self.urlfile.read(65536)
+
+                    if not data:
+                        break
+
+                    count += len(data)
+                    self.tmpfile.write(data)
+
+                    if length > 0:
+                        self.progress = 1.0 * count / length
+
+                self.tmpfile.close()
+
+                if self.cancelled:
+                    return
+
+                if length and count != length:
+                    self.failure = "Download length does not match content length."
+                    return
+
+                self.safe_unlink(self.dest)
+                os.rename(self.tmp, self.dest)
+
+                self.success = True
+
+            except Exception as e:
+                self.failure = str(e)
+
+
+        def safe_unlink(self, fn):
+            if os.path.exists(fn):
+                os.unlink(fn)
+
+        def cancel(self):
+            """
+            Cancels the download.
+            """
+
+            self.cancelled = True
+
+        def check(self):
+            """
+            Returns True if the download is finished, False if it was cancelled,
+            None if it's ongoing, and raises an Exception if the download has failed.
+            """
+
+            if self.success:
+                return True
+            if self.cancelled:
+                return False
+            if self.failure:
+                raise Exception("Downloading {} to {} failed: {}".format(self.url, self.dest, self.failure))
+
+            return None
+
+    class DownloaderValue(BarValue):
+        """
+        A BarValue that reports the progress of a background download.
+        """
+
+        def __init__(self, d):
+            self.downloader = d
+
+        def get_adjustment(self):
+            self.adjustment = ui.adjustment(value=0.0, range=1.0, adjustable=False)
+            return self.adjustment
+
+        def periodic(self, st):
+            self.adjustment.change(self.downloader.progress)
+            return .25
+

launcher/game/editor.rpy

@@ -13,29 +13,29 @@ init python in editor:
     import store.updater as updater
     import store.interface as interface
     import store
-    
+
     import glob
     import re
     import traceback
     import os
     import os.path
-    
+
     # Should we set up the editor?
     set_editor = "RENPY_EDIT_PY" not in os.environ
 
     # A map from editor name to EditorInfo object.
     editors = { }
-  
+
     class EditorInfo(object):
         def __init__(self, filename):
             # The path to the editor info file.
             self.filename = filename
-            
+
             # The name of the editor.
             self.name = os.path.basename(filename)[:-len(".edit.py")]
-            
+
             # The time the editor file was last modified. We use this
-            # to decide if we should update the editors mat when we 
+            # to decide if we should update the editors mat when we
             # have multiple versions of an editor in contention.
             self.mtime = os.path.getmtime(filename)
 
@@ -46,13 +46,13 @@ init python in editor:
         """
 
         ei = EditorInfo(filename)
-         
+
         if ei.name in editors:
            if editors[ei.name].mtime >= ei.mtime:
                return
-                
+
         editors[ei.name] = ei
-        
+
     def scan_all():
         """
         Finds all *.edit.py files, and uses them to populate the list
@@ -60,11 +60,11 @@ init python in editor:
         """
 
         editors.clear()
-        
+
         for d in [ config.renpy_base, persistent.projects_directory ]:
             if d is None:
                 continue
-            
+
             for filename in glob.glob(d + "/*/*.edit.py"):
                 scan_editor(filename)
 
@@ -78,42 +78,42 @@ init python in editor:
 
     class FancyEditorInfo(object):
         """
-        Represents an editor in the selection screen. A FEI knows if the 
+        Represents an editor in the selection screen. A FEI knows if the
         editor is installed or not.
         """
-    
+
         def __init__(self, priority, name, description=None, dlc=None, dldescription=None, error_message=None):
             # The priority of the editor. Lower priorities will come later
             # in the list.
             self.priority = priority
-            
+
             # The name of the editor.
             self.name = name
-            
+
             # Is the editor installed?
             self.installed = name in editors
-            
+
             # The dlc needed to install the editor.
             self.dlc = dlc
-            
+
             # A description of the editor.
             self.description = description
-            
+
             # A description of the download.
             self.dldescription = dldescription
-            
+
             # An error message to display if the editor failed to start.
             self.error_message = error_message
-            
+
     def fancy_scan_editors():
         """
         Creates the list of FancyEditorInfo objects.
         """
-        
+
         global fancy_editors
-        
+
         scan_all()
-        
+
         fei = fancy_editors = [ ]
 
         # Editra.
@@ -134,36 +134,36 @@ init python in editor:
             dlc = "editra-linux"
             installed = os.path.exists(os.path.join(config.basedir, "editra/Editra"))
             description = EDL
-            error_message = _("The may have occured because wxPython is not installed on this system.")
+            error_message = _("This may have occured because wxPython is not installed on this system.")
 
         e = FancyEditorInfo(
             1,
-            "Editra", 
+            "Editra",
             description,
             dlc,
             _("Up to 22 MB download required."),
             error_message)
-            
+
         e.installed = e.installed or installed
-            
+
         fei.append(e)
-        
+
         # jEdit
         fei.append(FancyEditorInfo(
             2,
             "jEdit",
-            "A mature editor that requires Java.",
+            _("A mature editor that requires Java."),
             "jedit",
             _("1.8 MB download required."),
             _("This may have occured because Java is not installed on this system."),
             ))
-        
+
         fei.append(FancyEditorInfo(
             3,
             "System Editor",
-            "Invokes the editor your operating system has associated with .rpy files.",
+            _("Invokes the editor your operating system has associated with .rpy files."),
             None))
-        
+
         for k in editors:
             if k in [ "Editra", "jEdit", "System Editor", "None" ]:
                 continue
@@ -173,13 +173,13 @@ init python in editor:
                 k,
                 None,
                 None))
-                    
+
         fei.append(FancyEditorInfo(
             5,
             "None",
-            "Prevents Ren'Py from opening a text editor.",
+            _("Prevents Ren'Py from opening a text editor."),
             None))
-                    
+
         fei.sort(key=lambda e : (e.priority, e.name.lower()))
 
         # If we're in a linux distro or something, assume all editors work.
@@ -190,40 +190,40 @@ init python in editor:
     def fancy_activate_editor(default=False):
         """
         Activates the editor in persistent.editor, if it's installed.
-        
+
         `default`
-            
+
         """
-    
+
         global error_message
-    
+
         fancy_scan_editors()
-        
+
         if default and not set_editor:
             renpy.editor.init()
             return
-        
+
         for i in fancy_editors:
-            
+
             if i.name == persistent.editor:
                 if i.installed and i.name in editors:
                     ei = editors[i.name]
                     os.environ["RENPY_EDIT_PY"] = renpy.fsencode(os.path.abspath(ei.filename))
                     error_message = i.error_message
                     break
-                    
+
         else:
             persistent.editor = None
             os.environ.pop("RENPY_EDIT_PY", None)
-            
+
         renpy.editor.init()
 
     def fancy_select_editor(name):
         """
         Selects the editor with the given name, installing it if it
-        doesn't already exist. 
+        doesn't already exist.
         """
-        
+
         for fe in fancy_editors:
             if fe.name == name:
                 break
@@ -231,47 +231,47 @@ init python in editor:
             return
 
         if not fe.installed:
-            
+
             # We don't check the status of this because fancy_activate_editor
             # will fail if the editor is not installed.
             store.add_dlc(fe.dlc)
 
         persistent.editor = fe.name
         fancy_activate_editor()
-        
+
         return persistent.editor is not None
 
     # Call fancy_activate_editor on startup.
     fancy_activate_editor(True)
-    
+
     class SelectEditor(Action):
         def __init__(self, name):
             self.name = name
-            
+
         def get_selected(self):
             return persistent.editor == self.name
-            
+
         def __call__(self):
             return fancy_select_editor(self.name)
 
 
     def check_editor():
         """
-        Checks to see if an editor is set. If one isn't asks the user to 
-        select one. 
-        
-        Returns True if the editor is set and editing can proceed, and 
+        Checks to see if an editor is set. If one isn't asks the user to
+        select one.
+
+        Returns True if the editor is set and editing can proceed, and
         False otherwise.
         """
-        
+
         if not set_editor:
             return True
-            
+
         if persistent.editor:
             return True
-            
+
         return renpy.invoke_in_new_context(renpy.call_screen, "editor")
-        
+
     ##########################################################################
     # Editing actions.
 
@@ -280,42 +280,42 @@ init python in editor:
         def __init__(self, filename, line=None, check=False):
             """
             An action that opens the given line of the given file in a
-            text editor. 
-            
+            text editor.
+
             `filename`
                 The filename to open.
-                
+
             `line`
                 The line in the file to jump to.
-                
+
             `check`
                 If true, we will check to see if the file exists, and gray
                 out the box if it does not.
             """
-            
+
             self.filename = filename
             self.line = line
             self.check = check
-    
+
         def get_sensitive(self):
             if not self.check:
                 return True
-                
+
             fn = project.current.unelide_filename(self.filename)
             return os.path.exists(fn)
-    
+
         def __call__(self):
-            
+
             if not self.get_sensitive():
                 return
-            
+
             if not check_editor():
                 return
-            
+
             fn = project.current.unelide_filename(self.filename)
-            
+
             try:
-                
+
                 e = renpy.editor.editor
 
                 e.begin()
@@ -325,35 +325,81 @@ init python in editor:
             except Exception, e:
                 exception = traceback.format_exception_only(type(e), e)[-1][:-1]
                 renpy.invoke_in_new_context(interface.error, _("An exception occured while launching the text editor:\n[exception!q]"), error_message, exception=exception)
-                
-                
+
+    class EditAbsolute(Action):
+        def __init__(self, filename, line=None, check=False):
+            """
+            An action that lets us edit an absolutely-specified filename.
+
+            `filename`
+                The filename to open.
+
+            `line`
+                The line in the file to jump to.
+
+            `check`
+                If true, we will check to see if the file exists, and gray
+                out the box if it does not.
+            """
+
+            self.filename = filename
+            self.line = line
+            self.check = check
+
+        def get_sensitive(self):
+            if not self.check:
+                return True
+
+            return os.path.exists(self.filename)
+
+        def __call__(self):
+
+            if not self.get_sensitive():
+                return
+
+            if not check_editor():
+                return
+
+            try:
+
+                e = renpy.editor.editor
+
+                e.begin()
+                e.open(self.filename, line=self.line)
+                e.end()
+
+            except Exception, e:
+                exception = traceback.format_exception_only(type(e), e)[-1][:-1]
+                renpy.invoke_in_new_context(interface.error, _("An exception occured while launching the text editor:\n[exception!q]"), error_message, exception=exception)
+
 
     class EditAll(Action):
         """
         Opens all scripts that are part of the current project in a web browser.
         """
-        
+
         def __init__(self):
             return
-            
+
         def __call__(self):
 
             if not check_editor():
                 return
 
-            scripts = project.current.script_files()            
+            scripts = project.current.script_files()
+            scripts = [ i for i in scripts if not i.startswith("game/tl/") ]
             scripts.sort(key=lambda fn : fn.lower())
 
             for fn in [ "game/screens.rpy", "game/options.rpy", "game/script.rpy" ]:
                 if fn in scripts:
                     scripts.remove(fn)
                     scripts.insert(0, fn)
-                    
+
             try:
 
                 e = renpy.editor.editor
                 e.begin()
-                
+
                 for fn in scripts:
                     fn = project.current.unelide_filename(fn)
                     e.open(fn)
@@ -365,56 +411,54 @@ init python in editor:
                 renpy.invoke_in_new_context(interface.error, _("An exception occured while launching the text editor:\n[exception!q]"), error_message, exception=exception)
 
 screen editor:
-    
+
     frame:
         style_group "l"
         style "l_root"
-        
+
         window:
-    
+
             has vbox
 
             label _("Select Editor")
-            
+
             add HALF_SPACER
-            
+
             hbox:
                 frame:
                     style "l_indent"
                     xfill True
-                    
+
                     viewport:
                         scrollbars "vertical"
                         mousewheel True
-                        
+
                         has vbox
-                                            
+
                         text _("A text editor is the program you'll use to edit Ren'Py script files. Here, you can select the editor Ren'Py will use. If not already present, the editor will be automatically downloaded and installed.") style "l_small_text"
 
                         for fe in editor.fancy_editors:
-                            
+
                             add SPACER
-                            
+
                             textbutton fe.name action editor.SelectEditor(fe.name)
-                            
+
                             add HALF_SPACER
-                            
+
                             frame:
                                 style "l_indent"
                                 has vbox
-                                
+
                                 if fe.description:
                                     text fe.description style "l_small_text"
-                                    
+
                                 if not fe.installed:
                                     add HALF_SPACER
                                     text fe.dldescription style "l_small_text"
 
-                
+
     textbutton _("Cancel") action Return(False) style "l_left_button"
 
 label editor_preference:
     call screen editor
     jump preferences
-
-    

launcher/game/front_page.rpy

@@ -2,9 +2,9 @@
 # See LICENSE.txt for license details.
 
 define PROJECT_ADJUSTMENT = ui.adjustment()
-    
+
 init python:
-        
+
     import os
     import subprocess
 
@@ -13,127 +13,154 @@ init python:
         Opens `directory` in a file browser. `directory` is relative to
         the project root.
         """
-        
+
         def __init__(self, directory, absolute=False):
             if absolute:
                 self.directory = directory
             else:
                 self.directory = os.path.join(project.current.path, directory)
-            
+
         def get_sensitive(self):
             return os.path.exists(self.directory)
-            
+
         def __call__(self):
 
             directory = renpy.fsencode(self.directory)
-            
+
             if renpy.windows:
                 os.startfile(directory)
             elif renpy.macintosh:
                 subprocess.Popen([ "open", directory ])
             else:
                 subprocess.Popen([ "xdg-open", directory ])
-            
+
     # Used for testing.
     def Relaunch():
         renpy.quit(relaunch=True)
-    
+
 screen front_page:
     frame:
         style_group "l"
         style "l_root"
-        
+
         has hbox
-        
+
         # Projects list section - on left.
-        
+
         frame:
-            style "l_default"
+            style "l_projects"
             xmaximum 300
             right_margin 2
-            
-            top_margin 20
-            bottom_margin 26
-        
+
+            top_padding 20
+            bottom_padding 26
+
             side "t c b":
 
                 window style "l_label":
-                    text "PROJECTS:" style "l_label_text" size 36 yoffset 10 
-            
+
+                    has hbox:
+                        xfill True
+
+                    text "PROJECTS:" style "l_label_text" size 36 yoffset 10
+
+                    textbutton _("refresh"):
+                        xalign 1.0
+                        yalign 1.0
+                        yoffset 5
+                        style "l_small_button"
+                        action project.Rescan()
+                        right_margin HALF_INDENT
+
                 side "c r":
-                    
+
                     viewport:
                         yadjustment PROJECT_ADJUSTMENT
                         mousewheel True
                         use front_page_project_list
-                
+
                     vbar:
                         style "l_vscrollbar"
                         adjustment PROJECT_ADJUSTMENT
-                        
+
                 vbox:
                     add HALF_SPACER
                     add SEPARATOR
                     add HALF_SPACER
-                    
-                    textbutton _("+ Create New Project"):
-                        left_margin (HALF_INDENT)
-                        action Jump("new_project")
-                    
-                
+
+                    hbox:
+                        xfill True
+
+                        textbutton _("+ Create New Project"):
+                            left_margin (HALF_INDENT)
+                            action Jump("new_project")
+
+
+
         # Project section - on right.
 
         if project.current is not None:
             use front_page_project
-    
+
     if project.current is not None:
         textbutton _("Launch Project") action project.Launch() style "l_right_button"
-                                                                    
-        
-                
+
+
+
 # This is used by front_page to display the list of known projects on the screen.
 screen front_page_project_list:
-    
+
     $ projects = project.manager.projects
-    
+    $ templates = project.manager.templates
+
     vbox:
-        
+
+        if templates and persistent.show_templates:
+
+            for p in templates:
+
+                textbutton _("[p.name!q] (template)"):
+                    action project.Select(p)
+                    style "l_list"
+
+            null height 12
+
         if projects:
-        
+
             for p in projects:
 
                 textbutton "[p.name!q]":
                     action project.Select(p)
                     style "l_list"
-            
+
             null height 12
-            
+
         textbutton _("Tutorial") action project.Select("tutorial") style "l_list"
         textbutton _("The Question") action project.Select("the_question") style "l_list"
 
-        
-# This is used for the right side of the screen, which is where the project-specific 
+
+# This is used for the right side of the screen, which is where the project-specific
 # buttons are.
 screen front_page_project:
-    
+
     $ p = project.current
-        
+
     window:
-        
+
         has vbox
 
         frame style "l_label":
             has hbox xfill True
             text "[p.name!q]" style "l_label_text"
-            label "Active Project" style "l_alternate"
+            label _("Active Project") style "l_alternate"
 
         grid 2 1:
             xfill True
             spacing HALF_INDENT
-            
+
             vbox:
-            
-                label _("Open Directory") style "l_label_small" 
+
+                label _("Open Directory") style "l_label_small"
 
                 frame style "l_indent":
                     has vbox
@@ -142,30 +169,30 @@ screen front_page_project:
                     textbutton _("base") action OpenDirectory(".")
                     # textbutton _("images") action OpenDirectory("game/images") style "l_list"
                     # textbutton _("save") action None style "l_list"
-                
+
             vbox:
-            
+
                 label _("Edit File") style "l_label_small"
 
                 frame style "l_indent":
                     has vbox
-                
-                    textbutton _("script.rpy") action editor.Edit("game/script.rpy", check=True)
-                    textbutton _("options.rpy") action editor.Edit("game/options.rpy", check=True)
-                    textbutton _("screens.rpy") action editor.Edit("game/screens.rpy", check=True)
+
+                    textbutton "script.rpy" action editor.Edit("game/script.rpy", check=True)
+                    textbutton "options.rpy" action editor.Edit("game/options.rpy", check=True)
+                    textbutton "screens.rpy" action editor.Edit("game/screens.rpy", check=True)
                     textbutton _("All script files") action editor.EditAll()
-                
+
         add SPACER
         add SEPARATOR
         add SPACER
-        
+
         frame style "l_indent":
             has vbox
-            
+
             textbutton _("Navigate Script") text_size 30 action Jump("navigation")
-        
+
         add SPACER
-        
+
         grid 2 1:
             xfill True
             spacing HALF_INDENT
@@ -176,7 +203,7 @@ screen front_page_project:
                 textbutton _("Check Script (Lint)") action Jump("lint")
                 textbutton _("Change Theme") action Jump("choose_theme")
                 textbutton _("Delete Persistent") action Jump("rmpersistent")
-                
+
                 # textbutton "Relaunch" action Relaunch
 
             frame style "l_indent":
@@ -184,27 +211,30 @@ screen front_page_project:
 
                 if ability.can_distribute:
                     textbutton _("Build Distributions") action Jump("build_distributions")
-                    
-        
+
+                textbutton _("Android") action Jump("android")
+                textbutton _("Generate Translations") action Jump("translate")
+                textbutton _("Extract Dialogue") action Jump("extract_dialogue")
+
 label main_menu:
     return
-    
+
 label start:
     show screen bottom_info
-    
+
 label front_page:
-    call screen front_page 
+    call screen front_page
     jump front_page
-    
-    
+
+
 label lint:
     python hide:
 
         interface.processing(_("Checking script for potential problems..."))
         lint_fn = project.current.temp_filename("lint.txt")
-        
+
         project.current.launch([ 'lint', lint_fn ], wait=True)
-        
+
         e = renpy.editor.editor
         e.begin(True)
         e.open(lint_fn)
@@ -213,10 +243,10 @@ label lint:
     jump front_page
 
 label rmpersistent:
-    
+
     python hide:
         interface.processing(_("Deleting persistent data..."))
         project.current.launch([ 'rmpersistent' ], wait=True)
-        
+
     jump front_page
-    
+

launcher/game/interface.rpy

@@ -5,18 +5,19 @@
 # Interface actions.
 init python in interface:
     from store import OpenURL, config, Return
+    import store
 
     import os.path
     import contextlib
-    
+
     RENPY_URL = "http://www.renpy.org"
-    RENPY_GAMES_URL = "http://games.renpy.org"    
+    RENPY_GAMES_URL = "http://games.renpy.org"
     DOC_PATH = os.path.join(config.renpy_base, "doc/index.html")
     DOC_URL = "http://www.renpy.org/doc/html/"
 
     LICENSE_PATH = os.path.join(config.renpy_base, "doc/license.html")
     LICENSE_URL = "http://www.renpy.org/doc/html/license.html"
-    
+
     if os.path.exists(DOC_PATH):
         DOC_LOCAL_URL = "file:///" + DOC_PATH
     else:
@@ -26,12 +27,12 @@ init python in interface:
         LICENSE_LOCAL_URL = "file:///" + LICENSE_PATH
     else:
         LICENSE_LOCAL_URL = None
-    
+
     def OpenDocumentation():
         """
         An action that opens the documentation.
         """
-                    
+
         if DOC_LOCAL_URL is not None:
             return OpenURL(DOC_LOCAL_URL)
         else:
@@ -41,97 +42,122 @@ init python in interface:
         """
         An action that opens the license.
         """
-                    
+
         if LICENSE_LOCAL_URL is not None:
             return OpenURL(LICENSE_LOCAL_URL)
         else:
             return OpenURL(LICENSE_URL)
-    
-    
+
+
     # Should we display the bottom links?
     links = True
-    
+
     @contextlib.contextmanager
     def nolinks():
         global links
         links = False
-        
+
         try:
             yield
         finally:
             links = True
-    
+
 # This displays the bottom of the screen. If the tooltip is not None, this displays the
-# tooltip. Otherwise, it displays a list of links (to various websites, and to the 
+# tooltip. Otherwise, it displays a list of links (to various websites, and to the
 # preferences and update screen), or is just blank.
 screen bottom_info:
-    
+
     zorder 100
-    
+
     if interface.links:
-        
+
         frame:
             style_group "l"
             style "l_default"
-            
+
             left_margin (10 + INDENT)
             right_margin (10 + INDENT)
             xfill True
             ypos 536
             yanchor 0.0
-            
+
             hbox:
                 xfill True
-                
+
                 hbox:
                     spacing INDENT
                     textbutton _("Documentation") style "l_link" action interface.OpenDocumentation()
                     textbutton _("Ren'Py Website") style "l_link" action OpenURL(interface.RENPY_URL)
                     textbutton _("Ren'Py Games List") style "l_link" action OpenURL(interface.RENPY_GAMES_URL)
                     textbutton _("About") style "l_link" action Jump("about")
-                
+
                 hbox:
                     spacing INDENT
                     xalign 1.0
 
                     if ability.can_update:
                         textbutton _("update") action Jump("update") style "l_link"
-                    
+
                     textbutton _("preferences") style "l_link" action Jump("preferences")
                     textbutton _("quit") style "l_link" action Quit(confirm=False)
 
-                    
+
 screen common:
-    
+
     default complete = None
     default total = None
     default yes = None
     default no = None
-    
+    default choices = None
+    default cancel = None
+    default bar_value = None
+
     frame:
         style "l_root"
 
         frame:
             style_group "l_info"
-        
+
             has vbox
-            
+
             text message:
                 text_align 0.5
                 xalign 0.5
                 layout "subtitle"
-        
+
             if complete is not None:
                 add SPACER
-                
+
                 frame:
                     style "l_progress_frame"
-                    
+
                     bar:
                         range total
                         value complete
                         style "l_progress_bar"
-        
+
+            if bar_value is not None:
+                add SPACER
+
+                frame:
+                    style "l_progress_frame"
+
+                    bar:
+                        value bar_value
+                        style "l_progress_bar"
+
+
+            if choices:
+                add SPACER
+
+                for v, l in choices:
+                    textbutton l action SetScreenVariable("selected", v)
+
+                if selected is not None:
+                    $ continue_ = Return(selected)
+                else:
+                    $ continue_ = None
+
             if submessage:
                 add SPACER
 
@@ -142,21 +168,23 @@ screen common:
 
             if yes:
                 add SPACER
-                
+
                 hbox:
                     xalign 0.5
                     textbutton _("Yes") style "l_button" action yes
                     null width 160
                     textbutton _("No") style "l_button" action no
-                
+
 
         label title text_color title_color style "l_info_label"
 
     if back:
-        textbutton _("Back") action Return(False) style "l_left_button"
-        
+        textbutton _("Back") action back style "l_left_button"
+    elif cancel:
+        textbutton _("Cancel") action cancel style "l_left_button"
+
     if continue_:
-        textbutton _("Continue") action Return(True) style "l_right_button"
+        textbutton _("Continue") action continue_ style "l_right_button"
 
 
 screen launcher_input:
@@ -166,142 +194,168 @@ screen launcher_input:
 
         frame:
             style_group "l_info"
-        
+
             has vbox
-            
-            text message
+
+            text message:
+                text_align 0.5
+                xalign 0.5
+                layout "subtitle"
 
             add SPACER
 
-            input style "l_default" size 24 xalign 0.5 default default color "#d86b45"
+            input style "l_default" size 24 xalign 0.5 default default color INPUT_COLOR
 
             if filename:
                 add SPACER
                 text _("Due to package format limitations, non-ASCII file and directory names are not allowed.")
-            
-        label _("[title]") style "l_info_label" text_color "#d19753"
 
-    
+        label title style "l_info_label" text_color QUESTION_COLOR
+
     if cancel:
         textbutton _("Cancel") action cancel style "l_left_button"
-  
+
 init python in interface:
 
     import traceback
-    
-    def common(title, title_color, message, submessage=None, back=False, continue_=False, pause0=False, **kwargs):
+    from store import Jump
+
+    def common(title, title_color, message, submessage=None, back=None, continue_=None, pause0=False, show_screen=False, **kwargs):
         """
         Displays the info, interaction, and processing screens.
 
         `title`
             The title of the screen.
-        
+
         `message`
             The main message that is displayed when the screen is.
-        
+
         `submessage`
             If not None, a message that is displayed below the main message.
-        
+
         `back`
-            If True, a back button will be present. If it's clicked, False will
-            be returned.
-        
+            If not None, a back button will be present. `back` is the action that
+            is called when the button is clicked.
+
+        `cancel`
+            If not None, a cancel button will be present. `cancel` is the action
+            that is called when the button is clicked.
+
         `continue_`
-            If True, a continue button will be present. If it's clicked, True 
-            will be returned.
-        
+            If True, a continue button will be present. `continue_` gives the action
+            that is called when that button is clicked.
+
         `pause0`
-            If True, a zero-length pause will be inserted before calling the 
-            screen. This will display it to the user and then immediately 
+            If True, a zero-length pause will be inserted before calling the
+            screen. This will display it to the user and then immediately
             return.
-        
-        
+
+        `show_screen`
+            If True, the screen will be show, and will return immediately. if False,
+            the screen will be called, and interaction will pause.
+
         Other keyword arguments are passed to the screen itself.
         """
 
-        if pause0:
-            ui.pausebehavior(0)
-            
-        return renpy.call_screen("common", title=title, title_color=title_color, message=message, submessage=submessage, back=back, continue_=continue_, **kwargs) 
 
-    
+        if show_screen:
+            screen_func = renpy.show_screen
+        else:
+            screen_func = renpy.call_screen
+
+            if pause0:
+                ui.pausebehavior(0)
+
+        return screen_func("common", title=title, title_color=title_color, message=message, submessage=submessage, back=back, continue_=continue_, **kwargs)
+
+    def hide_screen():
+        """
+        Hides a screen that was shown with show_screen=True.
+        """
+
+        renpy.hide_screen("common")
+
+
     def error(message, submessage=None, label="front_page", **kwargs):
         """
         Indicates to the user that an error has occured.
-        
+
         `message`
-            The message to display. 
+            The message to display.
 
         `submessage`
-            Optional secondary message information. For example, this may be 
+            Optional secondary message information. For example, this may be
             used to display an exception string.
-            
+
         `label`
             The label to redirect to when the user finishes displaying the error. None
-            to just return.
-        
+            to just return False.
+
         Keyword arguments are passed into the screen so that they can be substituted into
         the message.
         """
 
-        common(_("ERROR"), "#d15353", message=message, submessage=submessage, back=True, **kwargs)
-        
+        if label is None:
+            action = Return(False)
+        else:
+            action = Jump(label)
+
+        common(_("ERROR"), store.ERROR_COLOR, message=message, submessage=submessage, back=action, **kwargs)
 
-        if label:
-            renpy.jump(label)
 
     @contextlib.contextmanager
     def error_handling(what, label="front_page"):
         """
-        This is a context manager that catches exceptions and displays them using 
+        This is a context manager that catches exceptions and displays them using
         interface.error.
-        
+
         `what`
-            What we're doing when the error occurs. This is usually written using 
+            What we're doing when the error occurs. This is usually written using
             the present participle.
-            
+
         `label`
             The label to jump to when error handling finishes.
-           
+
         As an example of usage::
-        
+
             with interface.error_handling("opening the log file"):
-                f = open("log.txt", "w")            
+                f = open("log.txt", "w")
         """
-            
-                
+
+
         try:
             yield
         except Exception, e:
             import traceback
             traceback.print_exc()
 
-            error(_("While [what!q], an error occured:"), 
-                _("[exception!q]"), 
-                what=what, 
+            error(_("While [what!q], an error occured:"),
+                _("[exception!q]"),
+                what=what,
+                label=label,
                 exception=traceback.format_exception_only(type(e), e)[-1][:-1])
-                
+
     def input(title, message, filename=False, sanitize=True, cancel=None, default=""):
         """
         Requests typewritten input from the user.
         """
-        
+
         rv = default
-        
+
         while True:
-            
+
             rv = renpy.call_screen("launcher_input", title=title, message=message, filename=filename, cancel=cancel, default=rv)
-            
+
             if sanitize:
                 if ("[" in rv) or ("{" in rv):
                     error(_("Text input may not contain the {{ or [[ characters."), label=None)
                     continue
-                    
+
             if filename:
-                if ("\\" in rv) or ("/" in rv):
+                if filename and (filename != "withslash") and (("\\" in rv) or ("/" in rv)):
                     error(_("File and directory names may not contain / or \\."), label=None)
                     continue
-                    
+
                 try:
                     rv.encode("ascii")
                 except:
@@ -310,29 +364,27 @@ init python in interface:
 
             return rv
 
-        
-
     def info(message, submessage=None, pause=True, **kwargs):
         """
-        Displays an informational message to the user. The user will be asked to click to 
+        Displays an informational message to the user. The user will be asked to click to
         confirm that he has read the message.
-        
+
         `message`
-            The message to display. 
-        
+            The message to display.
+
         `pause`
             True if we should pause while showing the info.
-        
+
         Keyword arguments are passed into the screen so that they can be substituted into
         the message.
         """
-        
+
         if pause:
-            common(_("INFORMATION"), "#545454", message, submessage, continue_=True, **kwargs)
+            common(_("INFORMATION"), store.INFO_COLOR, message, submessage, continue_=Return(True), **kwargs)
         else:
-            common(_("INFORMATION"), "#545454", message, submessage, pause=0, **kwargs)
-    
-    
+            common(_("INFORMATION"), store.INFO_COLOR, message, submessage, pause0=True, **kwargs)
+
+
     def interaction(title, message, submessage=None, **kwargs):
         """
         Put up on the screen while an interaction with an external program occurs.
@@ -340,53 +392,68 @@ init python in interface:
 
         `title`
             The title of the interaction.
-        
+
         `message`
             The message itself.
-        
+
         `submessage`
             An optional sub message.
         """
 
-        common(title, "#d19753", message, submessage, pause0=True, **kwargs)
-        
+        common(title, store.INTERACTION_COLOR, message, submessage, pause0=True, **kwargs)
+
     def processing(message, submessage=None, complete=None, total=None, **kwargs):
         """
         Indicates to the user that processing is taking place. This should be used when
         there is an indefinite amount of work to be done.
-        
+
         `message`
-            The message to display. 
-        
+            The message to display.
+
         `submessage`
             An additional message to display.
 
         `complete`
             The fraction complete the step is.
-        
+
         `total`
             The total amount of work to do in this step.
-        
+
         Keyword arguments are passed into the screen so that they can be substituted into
         the message.
         """
 
-        common(_("PROCESSING"), "#545454", message, submessage, pause0=True, complete=complete, total=total, **kwargs) 
+        common(_("PROCESSING"), store.INTERACTION_COLOR, message, submessage, pause0=True, complete=complete, total=total, **kwargs)
+
 
-        
     def yesno(message, yes=Return(True), no=Return(False), **kwargs):
         """
         Asks the user a yes or no question.
-        
+
         `message`
             The question to ask.
-        
+
         `yes`
             The action to perform if the user answers yes.
-        
+
         `no`
             The action to perform if the user answer no.
         """
 
-        return common(_("QUESTION"), "#d19753", message, yes=yes, no=no, **kwargs)
-        
+        return common(_("QUESTION"), store.QUESTION_COLOR, message, yes=yes, no=no, **kwargs)
+
+    def choice(message, choices, selected, **kwargs):
+        """
+        Asks the user to pick a choice from a menu.
+
+        `choices`
+            A list of (value, label) tuples, giving the choices.
+
+        `selected`
+            The default choice that we mark as selected.
+        """
+
+        return common(_("CHOICE"), store.QUESTION_COLOR, message, choices=choices, selected=selected, **kwargs)
+
+
+

launcher/game/navigation.rpy

@@ -6,25 +6,25 @@ init python in navigation:
     import store.project as project
     import store.editor as editor
     from store import persistent, Action
-    
+
 
     # The last navigation screen we've seen. This is the scree we try to go
     # to the next time we enter navigation. (We may not be able to go there,
     # if the screen is empty.)
     if persistent.navigation is None:
         persistent.navigation = "label"
-    
-    # A map from a kind of information, to how we should sort it. Possible 
+
+    # A map from a kind of information, to how we should sort it. Possible
     # sorts are alphabetical, by-file, natural.
     if persistent.navigation_sort is None:
         persistent.navigation_sort = { }
-    
+
     if persistent.navigate_private is None:
         persistent.navigate_private = False
-        
+
     if persistent.navigate_library is None:
         persistent.navigate_library = False
-    
+
     # A list of kinds of navigation we support.
     KINDS = [ "file", "label", "define", "transform", "screen", "callable", "todo" ]
 
@@ -37,22 +37,22 @@ init python in navigation:
 
     def group_and_sort(kind):
         """
-        This is responsible for pulling navigation information of the 
-        appropriate kind out of project.current.dump, grouping it, 
+        This is responsible for pulling navigation information of the
+        appropriate kind out of project.current.dump, grouping it,
         and sorting it.
-        
-        This returns a list of (group, list of (name, filename, line)). The 
+
+        This returns a list of (group, list of (name, filename, line)). The
         group may be a string or None.
         """
 
         project.current.update_dump()
 
         sort = persistent.navigation_sort[kind]
-        
+
         name_map = project.current.dump.get("location", {}).get(kind, { })
-        
+
         groups = { }
-        
+
         for name, loc in name_map.items():
             filename, line = loc
             filename = filename.replace("\\", "/")
@@ -63,56 +63,56 @@ init python in navigation:
                 group = filename
                 if group.startswith("game/"):
                     group = group[5:]
-            
+
             g = groups.get(group, None)
             if g is None:
                 groups[group] = g = [ ]
-                
+
             g.append((name, filename, line))
-            
+
         for g in groups.values():
             if sort == "natural":
                 g.sort(key=lambda a : a[2])
             else:
                 g.sort(key=lambda a : a[0].lower())
-                
+
         rv = list(groups.items())
         rv.sort()
 
         return rv
 
     def group_and_sort_files():
-        
+
         rv = [ ]
-        
+
         for fn in project.current.script_files():
             shortfn = fn
             shortfn = shortfn.replace("\\", "/")
 
             if shortfn.startswith("game/"):
                 shortfn = fn[5:]
-                
+
             rv.append((shortfn, fn, None))
-            
+
         rv.sort()
-        
+
         return [ (None, rv) ]
 
     class ChangeKind(Action):
         """
         Changes the kind of thing we're navigating over.
         """
-        
+
         def __init__(self, kind):
             self.kind = kind
-            
+
         def get_selected(self):
             return persistent.navigation == self.kind
 
         def __call__(self):
             if persistent.navigation == self.kind:
                 return
-                
+
             persistent.navigation = self.kind
             renpy.jump("navigation_loop")
 
@@ -123,38 +123,38 @@ init python in navigation:
 
         def __init__(self, sort):
             self.sort = sort
-            
+
         def get_selected(self):
             return persistent.navigation_sort[persistent.navigation] == self.sort
-            
+
         def __call__(self):
             if self.get_selected():
                 return
-            
+
             persistent.navigation_sort[persistent.navigation] = self.sort
             renpy.jump("navigation_loop")
 
-    
+
 screen navigation:
-    
+
     frame:
         style_group "l"
         style "l_root"
-        
+
         window:
-    
+
             has vbox
-    
+
             frame style "l_label":
                 has hbox xfill True
                 text _("Navigate: [project.current.name]") style "l_label_text"
-                
+
                 frame:
                     style "l_alternate"
                     style_group "l_small"
-                    
+
                     has hbox
-                        
+
                     if persistent.navigation != "file":
                         text _("Order: ")
                         textbutton _("alphabetical") action navigation.ChangeSort("alphabetical")
@@ -164,17 +164,17 @@ screen navigation:
                         textbutton _("natural") action navigation.ChangeSort("natural")
 
                         null width HALF_INDENT
-                        
+
                     textbutton _("refresh") action Jump("navigation_refresh")
 
-            
+
             add HALF_SPACER
-            
+
             frame style "l_indent":
                 hbox:
                     spacing HALF_INDENT
                     text _("Category:")
-                    
+
                     textbutton _("files") action navigation.ChangeKind("file")
                     textbutton _("labels") action navigation.ChangeKind("label")
                     textbutton _("defines") action navigation.ChangeKind("define")
@@ -199,31 +199,35 @@ screen navigation:
                             style_group "l_navigation"
 
                             for group_name, group in groups:
-                            
+
                                 if group_name is not None:
                                     text "[group_name!q]"
-                                 
-                                if persistent.navigation == "todo":    
+
+                                if persistent.navigation == "todo":
                                     vbox:
                                         for name, filename, line in group:
                                             textbutton "[name!q]" action editor.Edit(filename, line)
-                                        
+
                                 else:
                                     hbox:
                                         box_wrap True
-                                        
+
                                         for name, filename, line in group:
                                             textbutton "[name!q]" action editor.Edit(filename, line)
 
                                 if group_name is not None:
                                     add SPACER
 
+                            if persistent.navigation == "file":
+                                add SPACER
+                                textbutton _("+ Add script file") action Jump("add_file") style "l_button"
+
                 else:
-                    
+
                     fixed:
-                        
+
                         if persistent.navigation == "todo":
-                            
+
                             text _("No TODO comments found.\n\nTo create one, include \"# TODO\" in your script."):
                                 text_align 0.5
                                 xalign 0.5
@@ -240,18 +244,18 @@ screen navigation:
 
 label navigation:
 label navigation_loop:
-    
+
     python in navigation:
-        
-        kind = persistent.navigation        
+
+        kind = persistent.navigation
 
         if kind == "file":
             groups = group_and_sort_files()
         else:
             groups = group_and_sort(kind)
-            
+
         renpy.call_screen("navigation", groups=groups)
-        
+
 label navigation_refresh:
     $ project.current.update_dump(True)
     jump navigation_loop

launcher/game/new_project.rpy

@@ -14,9 +14,9 @@ screen select_template:
     frame:
         style_group "l"
         style "l_root"
-        
+
         window:
-    
+
             has vbox
 
             label _("Choose Project Template")
@@ -26,18 +26,18 @@ screen select_template:
                 frame:
                     style "l_indent"
                     xmaximum ONETHIRD
-                    
+
                     viewport:
                         scrollbars "vertical"
                         vbox:
                             for p in project.manager.templates:
                                 textbutton "[p.name!q]" action SetScreenVariable("result", p) style "l_list"
-                    
+
                 frame:
                     style "l_indent"
                     xmaximum TWOTHIRDS
-                    
-                    text _("Please select a template to use for your new project. Ren'Py ships with a default template that creates an English-language game with standard screens.")
+
+                    text _("Please select a template to use for your new project. The template sets the default font and the user interface language. If your language is not supported, choose 'english'.")
 
 
     textbutton _("Back") action Jump("front_page") style "l_left_button"
@@ -45,27 +45,27 @@ screen select_template:
 
 
 label new_project:
-    
+
     if persistent.projects_directory is None:
         call choose_projects_directory
-    
+
     python hide:
-        
+
         project_name = interface.input(
-            _("PROJECT NAME"), 
+            _("PROJECT NAME"),
             _("Please enter the name of your project:"),
             filename=True,
             cancel=Jump("front_page"))
-        
+
         project_name = project_name.strip()
         if not project_name:
             interface.error(_("The project name may not be empty."))
 
         project_dir = os.path.join(persistent.projects_directory, project_name)
-        
+
         if project.manager.get(project_name) is not None:
             interface.error(_("[project_name!q] already exists. Please choose a different project name."), project_name=project_name)
-        
+
         if os.path.exists(project_dir):
             interface.error(_("[project_dir!q] already exists. Please choose a different project name."), project_dir=project_dir)
 
@@ -75,25 +75,25 @@ label new_project:
             template = renpy.call_screen("select_template")
 
         template_path = template.path
-        
+
         with interface.error_handling("creating a new project"):
             shutil.copytree(template_path, project_dir)
-        
+
             # Delete the tmp directory, if it exists.
             if os.path.isdir(os.path.join(project_dir, "tmp")):
                 os.path.rmtree(os.path.join(project_dir, "tmp"))
-            
+
             # Delete project.json, which must exist.
             os.unlink(os.path.join(project_dir, "project.json"))
-                
+
             # Change the save directory in options.rpy
             fn = os.path.join(project_dir, "game/options.rpy")
             with open(fn, "rb") as f:
                 options = f.read().decode("utf-8")
 
-            save_dir = project_name + "-" + str(int(time.time()))
-            options = re.sub(r'template-\d+', save_dir, options)
-            
+            options = options.replace("PROJECT_NAME", project_name)
+            options = options.replace("UNIQUE", str(int(time.time())))
+
             with open(fn, "wb") as f:
                 f.write(options.encode("utf-8"))
 
@@ -101,9 +101,7 @@ label new_project:
         with interface.error_handling("activating the new project"):
             project.manager.scan()
             project.Select(project.manager.get(project_name))()
-        
+
     call choose_theme_callable
 
     jump front_page
-    
-    

launcher/game/options.rpy

@@ -35,7 +35,7 @@ init -1 python hide:
 
     #########################################
     # Themes
-    
+
     ## We then want to call a theme function. themes.roundrect is
     ## a theme that features the use of rounded rectangles. It's
     ## the only theme we currently support.
@@ -46,7 +46,7 @@ init -1 python hide:
     theme.roundrect(
         ## Theme: Roundrect
         ## Color scheme: Basic Blue
-                                    
+
         ## The color of an idle widget face.
         widget = "#003c78",
 
@@ -60,7 +60,7 @@ init -1 python hide:
         ## example, the current value of a preference.)
         widget_selected = "#ffffc8",
 
-        ## The color of a disabled widget face. 
+        ## The color of a disabled widget face.
         disabled = "#404040",
 
         ## The color of disabled widget text.
@@ -88,7 +88,7 @@ init -1 python hide:
 
         ## And we're done with the theme. The theme will customize
         ## various styles, so if we want to change them, we should
-        ## do so below.            
+        ## do so below.
         )
 
     #########################################
@@ -100,7 +100,7 @@ init -1 python hide:
     ##   show help to the user.
     ## - A file name relative to the base directory, which is opened in a
     ##   web browser.
-    ## - None, to disable help.   
+    ## - None, to disable help.
     config.help = "README.html"
 
     #########################################
@@ -171,47 +171,58 @@ init -1 python hide:
     config.has_autosave = False
     config.log_enable = False
     config.mouse_hide_time = 86400 * 366
-    
+
     _game_menu_screen = None
-    
-    config.underlay = [ ]
+
+    config.underlay = [
+        renpy.Keymap(
+            quit = renpy.quit_event,
+            iconify = renpy.iconify,
+            choose_renderer = renpy.curried_call_in_new_context("_choose_renderer"),
+            ),
+    ]
+
     config.rollback_enabled = False
 
 
 ## This section controls how to build Ren'Py. (Building the launcher is how
 ## we build Ren'Py distributions.)
 init python:
-        
+
     ## We're building Ren'Py tonight.
     build.renpy = True
-    
+
     ## The version number that's supplied to the updater.
     build.version = "Ren'Py {}".format(config.version)
-    
+
     ## The name that's used for directories and archive files. For example, if
     ## this is 'mygame-1.0', the windows distribution will be in the
     ## directory 'mygame-1.0-win', in the 'mygame-1.0-win.zip' file.
-    build.directory_name = "renpy-" + config.version.rsplit('.', 1)[0]
-    
+
+    if 'RENPY_NIGHTLY' in os.environ:
+        build.directory_name = os.environ['RENPY_NIGHTLY']
+    else:
+        build.directory_name = "renpy-" + config.version.rsplit('.', 1)[0]
+
     ## The name that's uses for executables - the program that users will run
     ## to start the game. For example, if this is 'mygame', then on Windows,
     ## users can click 'mygame.exe' to start the game.
     build.executable_name = "renpy"
-    
+
     ## If True, Ren'Py will include update information into packages. This
     ## allows the updater to run.
     build.include_update = True
-    
+
     ## Clear out various file patterns.
     build.renpy_patterns = [ ]
     build.early_base_patterns = [ ]
     build.base_patterns = [ ]
     build.late_base_patterns = [ ]
-    
-    # We don't need to clear out the executable patterns, since they're 
+
+    # We don't need to clear out the executable patterns, since they're
     # correct for Ren'Py.
-    
-    ## Now, add the Ren'Py distribution in using classify_renpy.    
+
+    ## Now, add the Ren'Py distribution in using classify_renpy.
     build.classify_renpy("**~", None)
     build.classify_renpy("**/#*", None)
     build.classify_renpy("**/thumbs.db", None)
@@ -230,22 +241,22 @@ init python:
     # main source.
     build.classify_renpy("renpy.py", "source")
     build.classify_renpy("renpy/**", "source")
-    build.classify_renpy("common/**", "source")
 
     # games.
+    build.classify_renpy("launcher/game/theme/", None)
     build.classify_renpy("launcher/**", "source")
-    build.classify_renpy("template/**", "source")
+    build.classify_renpy("templates/**", "source")
     build.classify_renpy("the_question/**", "source")
     build.classify_renpy("tutorial/**", "source")
 
-    # docs.    
+    # docs.
     build.classify_renpy("doc/", "source")
     build.classify_renpy("doc/.doctrees/", None)
     build.classify_renpy("doc/_sources/", None)
     build.classify_renpy("doc/**", "source")
     build.classify_renpy("LICENSE.txt", "source")
-    
-    # module.    
+
+    # module.
     build.classify_renpy("module/", "source")
     build.classify_renpy("module/*.c", "source")
     build.classify_renpy("module/gen/", "source")
@@ -259,14 +270,12 @@ init python:
     build.classify_renpy("module/pysdlsound/*.pyx", "source")
 
     # all-platforms binary.
+    build.classify_renpy("lib/*/renpy", None)
+    build.classify_renpy("lib/*/renpy.exe", None)
     build.classify_renpy("lib/**", "binary")
-    build.classify_renpy("python27.dll", "binary")
-    build.classify_renpy("msvcr90.dll", "binary")
-    build.classify_renpy("Microsoft.VC90.CRT.manifest", "binary")
     build.classify_renpy("renpy.sh", "binary")
-    build.classify_renpy("renpy.app/**", "binary")
     build.classify_renpy("renpy.exe", "binary")
-    build.classify_renpy("console.exe", "binary")
+    # renpy.app is now built from scratch from distribute.rpy.
 
     # jedit rules.
     build.classify_renpy("jedit/**", "jedit")
@@ -274,9 +283,11 @@ init python:
     # editra rules.
     build.classify_renpy("editra/", "editra-all")
     build.classify_renpy("editra/Editra.edit.py", "editra-all")
-    build.classify_renpy("editra/Editra/**", "editra-linux")
+    build.classify_renpy("editra/Editra/**", "editra-linux editra-windows")
     build.classify_renpy("editra/Editra-mac.app/**", "editra-mac")
-    build.classify_renpy("editra/Editra-win32/**", "editra-windows")
+    build.classify_renpy("editra/lib/**", "editra-windows")
+    build.classify_renpy("editra/editra.exe", "editra-windows")
+
 
     # Executable rules.
     build.executable("editra/Editra/Editra")

launcher/game/package_formats.rpy

@@ -2,61 +2,146 @@
 # See LICENSE.txt for license details.
 
 init python in distribute:
-    
+
     import time
     import zipfile
     import tarfile
     import zlib
+    import struct
+    import stat
+    import shutil
+
+    from zipfile import crc32
 
     zlib.Z_DEFAULT_COMPRESSION = 9
-    
+
+    class ZipFile(zipfile.ZipFile):
+
+        def write_with_info(self, zinfo, filename):
+            """Put the bytes from filename into the archive under the name
+            arcname."""
+            if not self.fp:
+                raise RuntimeError(
+                      "Attempt to write to ZIP archive that was already closed")
+
+            st = os.stat(filename)
+            isdir = stat.S_ISDIR(st.st_mode)
+
+            zinfo.file_size = st.st_size
+            zinfo.flag_bits = 0x00
+            zinfo.header_offset = self.fp.tell()    # Start of header bytes
+
+            self._writecheck(zinfo)
+            self._didModify = True
+
+            if isdir:
+                zinfo.file_size = 0
+                zinfo.compress_size = 0
+                zinfo.CRC = 0
+                self.filelist.append(zinfo)
+                self.NameToInfo[zinfo.filename] = zinfo
+                self.fp.write(zinfo.FileHeader())
+                return
+
+            with open(filename, "rb") as fp:
+                # Must overwrite CRC and sizes with correct data later
+                zinfo.CRC = CRC = 0
+                zinfo.compress_size = compress_size = 0
+                zinfo.file_size = file_size = 0
+                self.fp.write(zinfo.FileHeader())
+                if zinfo.compress_type == zipfile.ZIP_DEFLATED:
+                    cmpr = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION,
+                         zlib.DEFLATED, -15)
+                else:
+                    cmpr = None
+                while 1:
+                    buf = fp.read(1024 * 1024)
+                    if not buf:
+                        break
+                    file_size = file_size + len(buf)
+                    CRC = crc32(buf, CRC) & 0xffffffff
+                    if cmpr:
+                        buf = cmpr.compress(buf)
+                        compress_size = compress_size + len(buf)
+                    self.fp.write(buf)
+            if cmpr:
+                buf = cmpr.flush()
+                compress_size = compress_size + len(buf)
+                self.fp.write(buf)
+                zinfo.compress_size = compress_size
+            else:
+                zinfo.compress_size = file_size
+            zinfo.CRC = CRC
+            zinfo.file_size = file_size
+            # Seek backwards and write CRC and file sizes
+            position = self.fp.tell()       # Preserve current position in file
+            self.fp.seek(zinfo.header_offset + 14, 0)
+            self.fp.write(struct.pack("<LLL", zinfo.CRC, zinfo.compress_size,
+                  zinfo.file_size))
+            self.fp.seek(position, 0)
+            self.filelist.append(zinfo)
+            self.NameToInfo[zinfo.filename] = zinfo
+
+
     class ZipPackage(object):
         """
         A class that creates a zip file.
         """
-        
+
         def __init__(self, filename):
-            self.zipfile = zipfile.ZipFile(filename, "w", zipfile.ZIP_DEFLATED)
-            
+            self.zipfile = ZipFile(filename, "w", zipfile.ZIP_DEFLATED)
+
         def add_file(self, name, path, xbit):
-            
+
             if path is None:
                 raise Exception("path for " + name + " must not be None.")
 
             zi = zipfile.ZipInfo(name)
 
-            s = os.stat(path)
-            zi.date_time = time.gmtime(s.st_mtime)[:6]                            
+            try:
+                s = os.stat(path)
+                zi.date_time = time.gmtime(s.st_mtime)[:6]
+            except:
+                zi.date_time = time.gmtime()[:6]
+
             zi.compress_type = zipfile.ZIP_DEFLATED
             zi.create_system = 3
 
             if xbit:
-                zi.external_attr = long(0100777) << 16
+                zi.external_attr = long(0100755) << 16
             else:
-                zi.external_attr = long(0100666) << 16 
+                zi.external_attr = long(0100644) << 16
 
-            with open(path, "rb") as f:
-                data = f.read()
-                
-            self.zipfile.writestr(zi, data)
+            self.zipfile.write_with_info(zi, path)
 
         def add_directory(self, name, path):
-            return
-            
+            if path is None:
+                return
+
+            zi = zipfile.ZipInfo(name + "/")
+
+            s = os.stat(path)
+            zi.date_time = time.gmtime(s.st_mtime)[:6]
+            zi.compress_type = zipfile.ZIP_STORED
+            zi.create_system = 3
+            zi.external_attr = (long(0040755) << 16) | 0x10
+
+            self.zipfile.write_with_info(zi, path)
+
         def close(self):
             self.zipfile.close()
 
 
     class TarPackage(object):
-        
+
         def __init__(self, filename, mode, notime=False):
             """
             notime
                 If true, times will be forced to the epoch.
             """
-            
+
             self.tarfile = tarfile.open(filename, mode)
-            self.tarfile.dereference = True            
+            self.tarfile.dereference = True
             self.notime = notime
 
         def add_file(self, name, path, xbit):
@@ -66,13 +151,13 @@ init python in distribute:
             else:
                 info = tarfile.TarInfo(name)
                 info.size = 0
-                info.mtime = time.time()
+                info.mtime = int(time.time())
                 info.type = tarfile.DIRTYPE
 
             if xbit:
-                info.mode = 0777
+                info.mode = 0755
             else:
-                info.mode = 0666
+                info.mode = 0644
 
             info.uid = 1000
             info.gid = 1000
@@ -93,3 +178,31 @@ init python in distribute:
 
         def close(self):
             self.tarfile.close()
+
+    class DirectoryPackage(object):
+
+        def mkdir(self, path):
+            if not os.path.isdir(path):
+                os.mkdir(path, 0755)
+
+        def __init__(self, path):
+            self.path = path
+            self.mkdir(path)
+
+        def add_file(self, name, path, xbit):
+            fn = os.path.join(self.path, name)
+            shutil.copy2(path, fn)
+
+            if xbit:
+                os.chmod(fn, 0755)
+            else:
+                os.chmod(fn, 0644)
+
+        def add_directory(self, name, path):
+            fn = os.path.join(self.path, name)
+            self.mkdir(fn)
+
+        def close(self):
+            return
+
+

launcher/game/preferences.rpy

@@ -4,77 +4,93 @@
 init python:
     if persistent.gl_enable is None:
         persistent.gl_enable = True
-        
+
     config.gl_enable = persistent.gl_enable
-    
+
     if persistent.windows_console is None:
         persistent.windows_console = False
 
+    def scan_translations():
+
+        languages = renpy.known_languages()
+
+        if not languages:
+            return None
+
+        rv = [ ( "English", None) ]
+
+        for i in languages:
+            rv.append((i.title(), i))
+
+        return rv
+
 
 screen preferences:
-    
+
+    $ translations = scan_translations()
+
     frame:
         style_group "l"
         style "l_root"
-        
+
         window:
-    
+
             has vbox
 
             label _("Launcher Preferences")
-            
+
             add HALF_SPACER
 
-            
             hbox:
 
                 frame:
                     style "l_indent"
-                    xmaximum ONEHALF
+                    xmaximum ONETHIRD
                     xfill True
- 
+
                     has vbox
 
                     # Projects directory selection.
                     add SEPARATOR2
-                    
+
                     frame:
                         style "l_indent"
                         yminimum 75
                         has vbox
-                        
+
                         text _("Projects Directory:")
-            
+
                         add HALF_SPACER
-            
-                        
-                        frame style "l_indent": 
+
+
+                        frame style "l_indent":
                             if persistent.projects_directory:
                                 textbutton _("[persistent.projects_directory!q]") action Jump("projects_directory_preference")
                             else:
                                 textbutton _("Not Set") action Jump("projects_directory_preference")
-                                
-                        
+
+
+
                     add SPACER
 
                     # Text editor selection.
                     add SEPARATOR2
-                    
+
                     frame:
                         style "l_indent"
                         yminimum 75
                         has vbox
-                        
+
                         text _("Text Editor:")
-            
+
                         add HALF_SPACER
-                        
-                        frame style "l_indent": 
+
+                        frame style "l_indent":
                             if persistent.editor:
                                 textbutton persistent.editor action Jump("editor_preference")
                             else:
                                 textbutton _("Not Set") action Jump("editor_preference")
-                        
+
                     add SPACER
 
                     if ability.can_update:
@@ -86,64 +102,93 @@ screen preferences:
                             style "l_indent"
                             yminimum 75
                             has vbox
-                            
+
                             text _("Update Channel:")
-                
+
                             add HALF_SPACER
-                            
-                            frame style "l_indent": 
+
+                            frame style "l_indent":
                                 textbutton persistent.update_channel action Jump("update_preference")
-                    
+
                 frame:
                     style "l_indent"
-                    xmaximum ONEHALF
+                    xmaximum ONETHIRD
                     xfill True
-                    
+
                     has vbox
                     add SEPARATOR2
-                    
+
                     frame:
                         style "l_indent"
                         yminimum 75
                         has vbox
-                        
+
                         text _("Navigation Options:")
-                    
+
                         add HALF_SPACER
-                    
+
                         textbutton _("Include private names") style "l_checkbox" action ToggleField(persistent, "navigate_private")
                         textbutton _("Include library names") style "l_checkbox" action ToggleField(persistent, "navigate_library")
 
                     add SPACER
                     add SEPARATOR2
-                    
+
                     frame:
                         style "l_indent"
                         yminimum 75
                         has vbox
-                        
+
                         text _("Launcher Options:")
-                    
+
                         add HALF_SPACER
-                    
+
                         textbutton _("Hardware rendering") style "l_checkbox" action ToggleField(persistent, "gl_enable")
-                        
+                        textbutton _("Show templates") style "l_checkbox" action ToggleField(persistent, "show_templates")
+
                         if renpy.windows:
                             textbutton _("Console output") style "l_checkbox" action ToggleField(persistent, "windows_console")
 
-                    add SPACER
+
+                frame:
+                    style "l_indent"
+                    xmaximum ONETHIRD
+                    xfill True
+
+                    has vbox
+
                     add SEPARATOR2
-                    
+
                     frame:
                         style "l_indent"
                         yminimum 75
                         has vbox
-                        
+
                         text _("Actions:")
-                    
+
                         add HALF_SPACER
 
-                        textbutton _("Open launcher as project") style "l_nonbox" action [ project.Select("launcher"), Jump("front_page") ]
+                        textbutton _("Open launcher project") style "l_nonbox" action [ project.Select("launcher"), Jump("front_page") ]
+
+                    if translations:
+
+                        add SPACER
+
+                        # Text editor selection.
+                        add SEPARATOR2
+
+                        frame:
+                            style "l_indent"
+                            yminimum 75
+                            has vbox
+
+                            text _("Language:")
+
+                            add HALF_SPACER
+
+                            # frame style "l_indent":
+
+                            for tlname, tlvalue in translations:
+                                textbutton tlname action Language(tlvalue) style "l_list"
 
 
     textbutton _("Back") action Jump("front_page") style "l_left_button"

launcher/game/project.rpy

@@ -5,13 +5,10 @@
 
 init python:
     try:
-        import EasyDialogs
-    except ImportError:
-        try:
-            import EasyDialogsWin as EasyDialogs
-        except:
-            EasyDialogs = None
-    
+        import EasyDialogsWin as EasyDialogs
+    except:
+        EasyDialogs = None
+
     import os
 
 init python in project:
@@ -24,9 +21,10 @@ init python in project:
     import json
     import subprocess
     import re
-    
+    import tempfile
+
     class Project(object):
-    
+
         def __init__(self, path):
 
             while path.endswith("/"):
@@ -34,36 +32,37 @@ init python in project:
 
             if not os.path.exists(path):
                 raise Exception("{} does not exist.".format(path))
-            
+
             # The name of the project.
             self.name = os.path.basename(path)
-            
+
             # The path to the project.
             self.path = path
-    
+
             # The path to the game directory.
             gamedir = os.path.join(path, "game")
             if os.path.isdir(gamedir):
                 self.gamedir = gamedir
             else:
                 self.gamedir = path
-            
+
             # Load the data.
             self.load_data()
 
             # The project's temporary directory.
-            self.tmp = os.path.join(self.path, "tmp")
-                
-            # The path to the json dumpfile.
-            self.dump_filename = os.path.join(self.tmp, "navigation.json")
-                
+            self.tmp = None
+
             # This contains the result of dumping information about the game
             # to disk.
             self.dump = { }
-                
+
             # The mtime of the last dump file loaded.
             self.dump_mtime = 0
 
+        def get_dump_filename(self):
+            self.make_tmp()
+            return os.path.join(self.tmp, "navigation.json")
+
         def load_data(self):
             try:
                 f = open(os.path.join(self.path, "project.json"), "rb")
@@ -88,92 +87,140 @@ init python in project:
 
         def update_data(self):
             data = self.data
-            
+
             data.setdefault("build_update", False)
             data.setdefault("packages", [ "all" ])
 
         def make_tmp(self):
             """
-            Makes the project's temporary directory, if it doesn't exist 
+            Makes the project's temporary directory, if it doesn't exist
             yet.
             """
-            
+
+            if self.tmp and os.path.isdir(self.tmp):
+                return
+
+            tmp = os.path.join(self.path, "tmp")
+
             try:
-                os.mkdir(self.tmp)
+                os.mkdir(tmp)
             except:
                 pass
-            
+
+            if os.path.isdir(tmp):
+                self.tmp = tmp
+                return
+
+            self.tmp = tempfile.mkdtemp()
+
         def temp_filename(self, filename):
             """
             Returns a filename in the temporary directory.
             """
-            
+
             self.make_tmp()
             return os.path.join(self.tmp, filename)
-            
-        def launch(self, args=[], wait=False):
+
+        def launch(self, args=[], wait=False, env={}):
+            """
+            Launches the project.
+
+            `args`
+                Additional arguments to give to the project.
+
+            `wait`
+                If true, waits for the launched project to terminate before
+                continuing.
+
+            `env`
+                Additional variables to include in the environment.
+            """
 
             self.make_tmp()
 
-            if renpy.renpy.windows and sys.argv[0].endswith(".exe"):
-                if persistent.windows_console:
-                    cmd = [ os.path.join(config.renpy_base, "console.exe") ]
-                else:
-                    cmd = [ os.path.join(config.renpy_base, "renpy.exe") ]
+            # Find the python executable to run.
+            executable_path = os.path.dirname(sys.executable)
+
+            if renpy.renpy.windows:
+                extension = ".exe"
             else:
-                cmd = [ sys.executable, "-OO", sys.argv[0] ]
- 
+                extension = ""
+
+            if persistent.windows_console:
+                executables = [ "python" + extension ]
+            else:
+                executables = [ "pythonw" + extension ]
+
+            executables.append(sys.executable)
+
+            for i in executables:
+                executable = os.path.join(executable_path, i)
+                if os.path.exists(executable):
+                    break
+            else:
+                raise Exception("Python interpreter not found: %r", executables)
+
+            # Put together the basic command line.
+            cmd = [ executable, "-EO", sys.argv[0] ]
+
             cmd.append(self.path)
             cmd.extend(args)
-            
+
+            # Add flags to dump game info.
             cmd.append("--json-dump")
-            cmd.append(self.dump_filename)
+            cmd.append(self.get_dump_filename())
 
             if persistent.navigate_private:
                 cmd.append("--json-dump-private")
-                
+
             if persistent.navigate_library:
                 cmd.append("--json-dump-common")
-                
 
-            with interface.error_handling("launching the project"):
-                cmd = [ renpy.fsencode(i) for i in cmd ]
-                
-                p = subprocess.Popen(cmd)
-                
-                if wait:
-                    p.wait()
-                
+            environ = dict(os.environ)
+            environ.update(env)
+
+            for k in environ:
+                environ[k] = renpy.fsencode(environ[k])
+
+            # Launch the project.
+            cmd = [ renpy.fsencode(i) for i in cmd ]
+
+            p = subprocess.Popen(cmd, env=environ)
+
+            if wait:
+                p.wait()
+
         def update_dump(self, force=False, gui=True):
             """
-            If the dumpfile does not exist, runs Ren'Py to create it. Otherwise, 
+            If the dumpfile does not exist, runs Ren'Py to create it. Otherwise,
             loads it in iff it's newer than the one that's already loaded.
             """
 
-            if force or not os.path.exists(self.dump_filename):
-                self.make_tmp()
-                
+            dump_filename = self.get_dump_filename()
+
+            if force or not os.path.exists(dump_filename):
+
                 if gui:
                     interface.processing(_("Ren'Py is scanning the project..."))
-                
+
                 self.launch(["quit"], wait=True)
-            
-            if not os.path.exists(self.dump_filename):
+
+            if not os.path.exists(dump_filename):
                 self.dump["error"] = True
                 return
-            
-            file_mtime = os.path.getmtime(self.dump_filename)
+
+            file_mtime = os.path.getmtime(dump_filename)
             if file_mtime == self.dump_mtime:
                 return
 
             self.dump_mtime = file_mtime
 
             try:
-                with open(self.dump_filename, "r") as f:
+                with open(dump_filename, "r") as f:
                     self.dump = json.load(f)
                 # add todo list to dump data
                 self.update_todos()
-                
+
             except:
                 self.dump["error"] = True
 
@@ -184,7 +231,7 @@ init python in project:
             """
 
             todos = self.dump.setdefault("location", {})["todo"] = {}
-            
+
             files = self.script_files()
 
             for f in files:
@@ -193,12 +240,17 @@ init python in project:
 
                 for l, line in enumerate(data):
                     l += 1
-    
+
+                    try:
+                        line = line.decode("utf-8")
+                    except:
+                        continue
+
                     m = re.search(r".*#\s*TODO(\s*:\s*|\s+)(.*)", line, re.I)
-    
+
                     if m is None:
                         continue
-                        
+
                     raw_todo_text = m.group(2).strip()
                     todo_text = raw_todo_text
 
@@ -207,7 +259,7 @@ init python in project:
                     while not todo_text or todo_text in todos:
                         index += 1
                         todo_text = "{0} ({1})".format(raw_todo_text, index)
-                        
+
                     todos[todo_text] = [f, l]
 
 
@@ -215,7 +267,7 @@ init python in project:
             """
             Unelides the filename relative to the project base.
             """
-            
+
             fn1 = os.path.join(self.path, fn)
             if os.path.exists(fn1):
                 return fn1
@@ -223,90 +275,90 @@ init python in project:
             fn2 = os.path.join(config.renpy_base, fn)
             if os.path.exists(fn2):
                 return fn2
-                
+
             return fn
-                
+
         def script_files(self):
             """
             Return a list of the script files that make up the project. These
             are elided, and so need to be passed to unelide_filename before they
             can be included in the project.
             """
-            
+
             rv = [ ]
             rv.extend(i for i, isdir in util.walk(self.path) if (not isdir) and (i.endswith(".rpy") or i.endswith(".rpym")) )
 
             return rv
 
-    
+
     class ProjectManager(object):
         """
         This maintains a list of the various types of projects that
         we know about.
         """
-        
+
         def __init__(self):
 
            # The projects directory.
            self.projects_directory = ""
-           
+
            # Normal projects, in alphabetical order by lowercase name.
            self.projects = [ ]
-           
+
            # Template projects.
            self.templates = [ ]
 
            # All projects - normal, template, and hidden.
            self.all_projects = [ ]
-           
+
            # Directories that have been scanned.
            self.scanned = set()
-           
+
            self.scan()
-           
+
         def scan(self):
             """
             Scans for projects.
             """
-           
+
             if (persistent.projects_directory is not None) and not os.path.isdir(persistent.projects_directory):
                 persistent.projects_directory = None
-           
+
             self.projects_directory = persistent.projects_directory
 
             self.projects = [ ]
             self.templates = [ ]
             self.all_projects = [ ]
             self.scanned = set()
-           
+
             if self.projects_directory is not None:
                 self.scan_directory(self.projects_directory)
-               
+
             self.scan_directory(config.renpy_base)
             self.scan_directory(os.path.join(config.renpy_base, "templates"))
-            
-            self.projects.sort(key=lambda p : p.name.lower())           
-            self.templates.sort(key=lambda p : p.name.lower())           
-        
+
+            self.projects.sort(key=lambda p : p.name.lower())
+            self.templates.sort(key=lambda p : p.name.lower())
+
         def scan_directory(self, d):
             """
             Scans for projects in directories directly underneath `d`.
             """
-            
+
             global current
-            
+
             d = os.path.abspath(d)
-            
+
             if not os.path.isdir(d):
                 return
-            
+
             for pdir in os.listdir(d):
                 ppath = os.path.join(d, pdir)
-                
+
                 # A project must be a directory.
                 if not os.path.isdir(ppath):
                     continue
-                    
+
                 # A project has either a game/ directory, or a project.json
                 # file.
                 if (not os.path.isdir(os.path.join(ppath, "game"))) and (not os.path.exists(os.path.join(ppath, "project.json"))):
@@ -315,52 +367,52 @@ init python in project:
                 if ppath in self.scanned:
                     continue
                 self.scanned.add(ppath)
-                    
+
                 # We have a project directory, so create a Project.
                 p = Project(ppath)
-                
+
                 project_type = p.data.get("type", "normal")
-                
+
                 if project_type == "hidden":
                     pass
                 elif project_type == "template":
                     self.templates.append(p)
                 else:
-                    self.projects.append(p)  
-                
+                    self.projects.append(p)
+
                 self.all_projects.append(p)
-                
+
             # Select the default project.
             if persistent.active_project is not None:
                 p = self.get(persistent.active_project)
-                
+
                 if p is not None:
                     current = p
                     return
-                    
+
             p = self.get("tutorial")
             if p is not None:
                 current = p
                 return
-                
+
             current = None
-                
-            
+
+
         def get(self, name):
             """
             Gets the project with the given name.
-            
+
             Returns None if the project doesn't exist.
             """
-            
+
             for p in self.all_projects:
                 if p.name == name:
                     return p
-                    
+
             return None
-                
-    manager = ProjectManager()            
-    
+
+    manager = ProjectManager()
+
     # The current project.
     current = None
 
@@ -370,38 +422,38 @@ init python in project:
         An action that causes p to become the selected project when it was
         clicked. If label is not None, jumps to the given label.
         """
-    
+
         def __init__(self, p, label=None):
             """
             `p`
-                Either a project object, or a string giving the name of a 
+                Either a project object, or a string giving the name of a
                 project.
-            
+
             `label`
                 The label to jump to when clicked.
             """
-            
+
             if isinstance(p, basestring):
                 p = manager.get(p)
-            
+
             self.project = p
             self.label = label
-            
+
         def get_selected(self):
             if self.project is None:
                 return False
 
             if current is None:
                 return False
-                        
+
             return current.path == self.project.path
-            
+
         def get_sensitive(self):
             return self.project is not None
-            
+
         def __call__(self):
             global current
-            
+
             current = self.project
             persistent.active_project = self.project.name
 
@@ -409,14 +461,14 @@ init python in project:
 
             if self.label is not None:
                 renpy.jump(self.label)
-            
-            
+
+
     class Launch(Action):
         """
         An action that launches the supplied project, or the current
         project if no project is supplied.
         """
-        
+
         def __init__(self, p=None):
             if p is None:
                 self.project = current
@@ -424,13 +476,23 @@ init python in project:
                 self.project = manager.get(p)
             else:
                 self.project = p
-            
+
         def get_sensitive(self):
             return self.project is not None
-            
+
         def __call__(self):
             self.project.launch()
 
+    class Rescan(Action):
+        def __call__(self):
+            """
+            Rescans the projects directory.
+            """
+
+            manager.scan()
+            renpy.restart_interaction()
+
+
     manager.scan()
 
     if isinstance(persistent.projects_directory, str):
@@ -438,60 +500,52 @@ init python in project:
 
 ###############################################################################
 # Code to choose the projects directory.
-            
+
 label choose_projects_directory:
-    
+
     python hide:
 
-        interface.interaction(_("PROJECTS DIRECTORY"), _("Please choose the projects directory."), _("This launcher will scan for projects in this directory, will create new projects in this directory, and will place built projects into this directory."))
-            
+        interface.interaction(_("PROJECTS DIRECTORY"), _("Please choose the projects directory using the directory chooser.\n{b}The directory chooser may have opened behind this window.{/b}"), _("This launcher will scan for projects in this directory, will create new projects in this directory, and will place built projects into this directory."),)
+
         path = persistent.projects_directory
 
         if path:
-            
             default_path = path
-            
         else:
-
             try:
                 default_path = os.path.dirname(os.path.abspath(config.renpy_base))
             except:
                 default_path = os.path.abspath(config.renpy_base)
-        
+
 
         if EasyDialogs:
 
             choice = EasyDialogs.AskFolder(defaultLocation=default_path, wanted=unicode)
 
             if choice is not None:
-                path = choice                
+                path = choice
             else:
                 path = None
 
         else:
 
             try:
-                env = os.environ.copy()
-    
-                if 'RENPY_ORIGINAL_LD_LIBRARY_PATH' in env:
-                    env['LD_LIBRARY_PATH'] = env['RENPY_ORIGINAL_LD_LIBRARY_PATH']
 
-                cmd = [ "zenity", "--title=Select Projects Directory", "--file-selection", "--directory", "--filename=" + renpy.fsencode(default_path) ]
+                cmd = [ "/usr/bin/python", os.path.join(config.gamedir, "tkaskdir.py"), renpy.fsencode(default_path) ]
 
-                zen = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE)
-
-                choice = zen.stdout.read()        
-                zen.wait()
+                p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+                choice = p.stdout.read()
+                p.wait()
 
                 if choice:
-                    path = renpy.fsdecode(choice[:-1])
-            
+                    path = renpy.fsdecode(choice)
+
             except:
                 import traceback
                 traceback.print_exc()
-                
+
                 path = None
-                interface.error(_("Ren'Py was unable to run zenity to choose the projects directory."), label=None)
+                interface.error(_("Ren'Py was unable to run python with tkinter to choose the projects directory."), label=None)
 
         if path is None:
             path = default_path
@@ -499,7 +553,7 @@ label choose_projects_directory:
 
         path = renpy.fsdecode(path)
 
-        persistent.projects_directory = path                    
+        persistent.projects_directory = path
         project.manager.scan()
-    
+
     return

launcher/game/script_version.rpy

@@ -1,4 +0,0 @@
-init -999:
-    $ config.script_version = (6, 15, 0)
-
-    

launcher/game/style.rpy

@@ -1,14 +1,59 @@
 # Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
 # See LICENSE.txt for license details.
 
-init python:
+init -1 python:
+
+    # The color of non-interactive text.
+    TEXT = "#545454"
+
+    # Colors for buttons in various states.
+    IDLE = "#42637b"
+    HOVER = "#d86b45"
+    DISABLED = "#808080"
+
+    # Colors for reversed text buttons (selected list entries).
+    REVERSE_IDLE = "#78a5c5"
+    REVERSE_HOVER = "#d86b45"
+    REVERSE_TEXT = "#ffffff"
+
+    # Colors for the scrollbar thumb.
+    SCROLLBAR_IDLE = "#dfdfdf"
+    SCROLLBAR_HOVER = "#d86b45"
+
+    # An image used as a separator pattern.
+    PATTERN = "pattern.png"
+
+    # A displayable used for the background of everything.
+    BACKGROUND = "background.png"
+
+    # A displayable used for the background of windows
+    # containing commands, preferences, and navigation info.
+    WINDOW = Frame("window.png", 0, 0, tile=True)
+
+    # A displayable used for the background of the projects list.
+    PROJECTS_WINDOW = Null()
+
+    # A displayable used the background of information boxes.
+    INFO_WINDOW = "#f9f9f9"
+
+    # Colors for the titles of information boxes.
+    ERROR_COLOR = "#d15353"
+    INFO_COLOR = "#545454"
+    INTERACTION_COLOR = "#d19753"
+    QUESTION_COLOR = "#d19753"
+
+    # The color of input text.
+    INPUT_COLOR = "#d86b45"
+
+
+init 1 python:
     INDENT = 20
     HALF_INDENT = 10
 
     SCROLLBAR_SIZE = 16
 
-    SEPARATOR = Frame("pattern.png", 0, 0, tile=True, ymaximum=5, yalign=1.0)
-    SEPARATOR2 = Frame("pattern.png", 0, 0, tile=True, ymaximum=10, yalign=1.0)
+    SEPARATOR = Frame(PATTERN, 0, 0, tile=True, ymaximum=5, yalign=1.0)
+    SEPARATOR2 = Frame(PATTERN, 0, 0, tile=True, ymaximum=10, yalign=1.0)
 
     SPACER_HEIGHT = 12
     SPACER = Null(height=SPACER_HEIGHT)
@@ -16,27 +61,16 @@ init python:
     HALF_SPACER_HEIGHT = 6
     HALF_SPACER = Null(height=HALF_SPACER_HEIGHT)
 
-    # Colors.
-    TEXT = "#545454"
-    IDLE = "#42637b"
-    LIGHT_IDLE = "#78a5c5"
-    SCROLLBAR_IDLE = "#dfdfdf"
-    HOVER = "#d86b45"
-    WHITE = "#ffffff"
-    DISABLED = "#808080"
-    DANGER = "#d15353"
-    
     # FONTS/WEIGHTS
     LIGHT = "Roboto-Light.ttf"
     REGULAR = "Roboto-Regular.ttf"
     DARK = "Roboto-Medium.ttf"
-    
+
     # DIVIDING THE SCREEN
     ONETHIRD = 258
     TWOTHIRDS = 496
     ONEHALF = 377
 
-    
     # Default style.
     style.l_default = Style(style.default)
     style.l_default.font = LIGHT
@@ -44,7 +78,7 @@ init python:
     style.l_default.idle_color = IDLE
     style.l_default.hover_color = HOVER
     style.l_default.size = 18
-    
+
     style.l_text = Style(style.l_default)
 
     style.l_button = Style(style.l_default)
@@ -70,30 +104,33 @@ init python:
     style.l_left_button = Style(style.l_right_button)
     style.l_left_button.xalign = 0.0
     style.l_left_button_text = Style(style.l_right_button_text)
-    
-    
+
+
     # The root frame. This contains everything but the bottom navigation, back
     # button, and tooltip button.
     style.l_root = Style(style.l_default)
-    style.l_root.background = "background.png"
+    style.l_root.background = BACKGROUND
     style.l_root.xpadding = 10
     style.l_root.top_padding = 64
     style.l_root.bottom_padding = 128
-    
+
     # An inner window.
     style.l_window = Style(style.l_default)
-    style.l_window.background = Frame("window.png", 0, 0, tile=True)
+
+    style.l_window.background = WINDOW
+
     style.l_window.left_padding = 6
     style.l_window.xfill = True
     style.l_window.yfill = True
-    
+
+
     # Normal-sized labels.
     style.l_label = Style(style.l_default)
     style.l_label.xfill = True
     style.l_label.top_padding = 10
     style.l_label.bottom_padding = 8
     style.l_label.bottom_margin = 12
-    style.l_label.background = SEPARATOR    
+    style.l_label.background = SEPARATOR
     style.l_label_text = Style(style.l_default)
     style.l_label_text.size = 24
     style.l_label_text.xpos = INDENT
@@ -104,12 +141,12 @@ init python:
     style.l_label_small.xfill = True
     style.l_label_small.bottom_padding = 8
     style.l_label_small.bottom_margin = HALF_SPACER_HEIGHT
-    style.l_label_small.background = SEPARATOR    
+    style.l_label_small.background = SEPARATOR
     style.l_label_small_text = Style(style.l_default)
     style.l_label_small_text.xpos = INDENT
     style.l_label_small_text.yoffset = 6
     style.l_label_small_text.size = 20
-    
+
     # Alternate labels. This nests inside an l_label, and gives a button
     # or label that's nested inside another label.
     style.l_alternate = Style(style.l_default)
@@ -121,33 +158,32 @@ init python:
     style.l_alternate_text.size = 14
     style.l_alternate_text.font = LIGHT
     style.l_alternate_text.text_align = 1.0
-    
+
     style.l_small_button = Style(style.l_button)
     style.l_small_button_text = Style(style.l_button_text)
     style.l_small_button_text.size = 14
     style.l_small_text = Style(style.l_text)
     style.l_small_text.size = 14
-    
-    
+
     # Indents its contents.
     style.l_indent = Style(style.l_default)
     style.l_indent.left_margin = INDENT
-    
+
     # Indents its contents and pads them vertically.
     style.l_indent_margin = Style(style.l_indent)
-    style.l_indent_margin.ymargin = 6 
-    
+    style.l_indent_margin.ymargin = 6
+
     # List button.
     style.l_list = Style(style.l_default)
     style.l_list.left_padding = HALF_INDENT
     style.l_list.xfill = True
-    style.l_list.selected_background = LIGHT_IDLE
-    style.l_list.selected_hover_background = HOVER
+    style.l_list.selected_background = REVERSE_IDLE
+    style.l_list.selected_hover_background = REVERSE_HOVER
     style.l_list_text = Style(style.l_default)
     style.l_list_text.idle_color = IDLE
     style.l_list_text.hover_color = HOVER
-    style.l_list_text.selected_idle_color = WHITE
-    style.l_list_text.selected_hover_color = WHITE
+    style.l_list_text.selected_idle_color = REVERSE_TEXT
+    style.l_list_text.selected_hover_color = REVERSE_TEXT
     style.l_list_text.insensitive_color = DISABLED
 
     style.l_list2 = Style(style.l_list)
@@ -162,46 +198,51 @@ init python:
         Image("vscrollbar_center.png", xalign=0.5, yalign=0.5),
         xmaximum = SCROLLBAR_SIZE)
     style.l_vscrollbar.hover_thumb = Fixed(
-        Solid(HOVER, xmaximum=8, xalign=0.5),
+        Solid(SCROLLBAR_HOVER, xmaximum=8, xalign=0.5),
         Image("vscrollbar_center.png", xalign=0.5, yalign=0.5),
         xmaximum = SCROLLBAR_SIZE)
     style.l_vscrollbar.xmaximum = SCROLLBAR_SIZE
     style.l_vscrollbar.bar_vertical = True
     style.l_vscrollbar.bar_invert = True
     style.l_vscrollbar.unscrollable = "hide"
-    
-    
+
+
     # Information window.
     style.l_info_vbox = Style(style.vbox)
     style.l_info_vbox.yalign = 0.5
     style.l_info_vbox.xalign = 0.5
     style.l_info_vbox.xfill = True
-    
+
     style.l_info_frame = Style(style.l_default)
     style.l_info_frame.ypadding = 21
     style.l_info_frame.xfill = True
+
     style.l_info_frame.background = Fixed(
-        "#f9f9f9",
-        Frame("pattern.png", 0, 0, tile=True, ymaximum=5, yalign=0.0, yoffset=8),
-        Frame("pattern.png", 0, 0, tile=True, ymaximum=5, yalign=1.0, yoffset=-8),
-        )    
+        INFO_WINDOW,
+        Frame(PATTERN, 0, 0, tile=True, ymaximum=5, yalign=0.0, yoffset=8),
+        Frame(PATTERN, 0, 0, tile=True, ymaximum=5, yalign=1.0, yoffset=-8),
+        )
+
     style.l_info_frame.yminimum = 180
-    style.l_info_frame.ypos = 100
-    
+    style.l_info_frame.ypos = 75
+
     style.l_info_label = Style(style.l_default)
     style.l_info_label.xalign = 0.5
-    style.l_info_label.ypos = 100
+    style.l_info_label.ypos = 75
     style.l_info_label.yanchor = 1.0
     style.l_info_label.yoffset = 12
     style.l_info_label_text = Style(style.l_default)
     style.l_info_label_text.size = 36
-    
+
     style.l_info_text = Style(style.l_default)
     style.l_info_text.xalign = 0.5
-        
+
     style.l_info_button = Style(style.l_button)
     style.l_info_button.xalign = 0.5
+    style.l_info_button.xmargin = 50
     style.l_info_button_text = Style(style.l_button_text)
+    style.l_info_button_text.text_align = 0.5
+    style.l_info_button_text.layout = "subtitle"
 
     # Code navigation
     style.l_navigation_button = Style(style.l_button)
@@ -220,29 +261,43 @@ init python:
     # Check boxes
     style.l_checkbox = Style(style.l_button)
     style.l_checkbox.left_padding = INDENT
-    style.l_checkbox.background = Image("checkbox_idle.png", yalign=0.5)
-    style.l_checkbox.hover_background = Image("checkbox_hover.png", yalign=0.5)
-    style.l_checkbox.selected_idle_background = Image("checkbox_selected_idle.png", yalign=0.5)
-    style.l_checkbox.selected_hover_background = Image("checkbox_selected_hover.png", yalign=0.5)
-    style.l_checkbox.insensitive_background = Image("checkbox_insensitive.png", yalign=0.5)
+
+    def checkbox(full, color):
+        if full:
+            return im.Twocolor("checkbox_full.png", color, color, yalign=0.5)
+        else:
+            return im.Twocolor("checkbox_empty.png", color, color, yalign=0.5)
+
+    style.l_checkbox.background = checkbox(False, IDLE)
+    style.l_checkbox.hover_background = checkbox(False, HOVER)
+    style.l_checkbox.selected_idle_background = checkbox(True, IDLE)
+    style.l_checkbox.selected_hover_background = checkbox(True, HOVER)
+    style.l_checkbox.insensitive_background = checkbox(False, DISABLED)
 
     style.l_checkbox_text = Style(style.l_button_text)
     style.l_checkbox_text.selected_font = LIGHT
-    
+
     # A normal button that lines up with checkboxes.
     style.l_nonbox = Style(style.l_button)
     style.l_nonbox.xpadding = INDENT
     style.l_nonbox_text = Style(style.l_button_text)
     style.l_nonbox_text.selected_font = LIGHT
-        
+
     # A progress bar and its frame.
     style.l_progress_frame = Style(style.l_default)
-    style.l_progress_frame.background = Frame("pattern.png", 0, 0, tile=True)
+    style.l_progress_frame.background = Frame(PATTERN, 0, 0, tile=True)
     style.l_progress_frame.ypadding = 5
-    
+
     style.l_progress_bar = Style(style.l_default)
-    style.l_progress_bar.left_bar = LIGHT_IDLE
+    style.l_progress_bar.left_bar = REVERSE_IDLE
     style.l_progress_bar.right_bar = Null()
     style.l_progress_bar.ymaximum = 24
 
+    # The projects window.
+    style.l_projects = Style(style.l_default)
+    style.l_projects.background = PROJECTS_WINDOW
 
+    style.hyperlink_text.size = 18
+    style.hyperlink_text.font = LIGHT
+    style.hyperlink_text.color = IDLE
+    style.hyperlink_text.hover_color = HOVER

launcher/game/tail.rpy

@@ -0,0 +1,44 @@
+# Copyright 2004-2013 Tom Rothamel <pytom@bishoujo.us>
+# See LICENSE.txt for license details.
+
+
+init python:
+
+    class FileTail(object):
+
+        def __init__(self, filename, lines=8):
+            self.filename = filename
+            self.text = ""
+            self.lines = lines
+
+        def update(self):
+
+            try:
+                with open(self.filename) as f:
+                    text = f.read()
+                    text = text.strip()
+                    text = text.split("\n")
+
+                    newtext = [ ]
+                    for l in text:
+
+                        if "\r" in l:
+                            _head, _sep, l = l.rpartition("\r")
+
+                        while l:
+                            newtext.append(l[:100])
+                            l = l[100:]
+
+                    text = newtext
+                    text = text[-self.lines:]
+                    text = "\n".join(text)
+
+                    if text != self.text:
+                        self.text = text
+                        renpy.restart_interaction()
+
+            except:
+                pass
+
+
+

launcher/game/theme_data.rpy

@@ -9,18 +9,18 @@ init python in theme_data:
 
         x = 0
         correct_section = False
-        
+
         while x < len(lines):
             l = lines[x]
 
             m = re.match(r'^screen\s+\w+\s*:\s*$', l)
             if m:
                 correct_section = False
-            
+
             m = re.match(r'^screen\s+file_picker\s*:\s*$', l)
             if m:
                 correct_section = True
-                    
+
             if correct_section:
                 m = re.match(r'^\s+\$\s*columns\s*=\s*(\d+)\s*$', l)
                 if m:
@@ -28,7 +28,7 @@ init python in theme_data:
                 m = re.match(r'^\s+\$\s*rows\s*=\s*(\d+)\s*$', l)
                 if m:
                     l = l.replace(str(m.group(1)), str(file_picker_rows))
-                
+
             lines[x] = l
 
             x = x + 1
@@ -37,7 +37,7 @@ init python in theme_data:
 
     def roundrect_screen_ops(lines):
         return __PerformScreenOperations(lines)
-                       
+
     def awt_screen_ops(lines):
         return __PerformScreenOperations(lines, file_picker_rows=3)
 
@@ -49,12 +49,12 @@ init python in theme_data:
 
     # The set of theme functions.
     THEME_FUNCTIONS = set()
-    
+
     # theme name -> function name to call to munge screens.rpy as appropriate
     # for that theme.
     THEME_SCREEN_OPERATIONS = { }
-    
-    # Color schemes that work (technically - some are eye-melting) with the 
+
+    # Color schemes that work (technically - some are eye-melting) with the
     # roundrect-style themes.
     ROUNDRECT_SCHEMES = {
         'Basic Blue': {'disabled': '#404040',
@@ -337,7 +337,7 @@ init python in theme_data:
                        'widget_hover': '#b38698',
                        'widget_selected': '#fffeed',
                        'widget_text': '#ffffff'},
-    
+
        'Watermelon': {'disabled': '#f9cdad',
                        'disabled_text': '#fc9d9a',
                        'frame': '#f9cdad',
@@ -462,11 +462,11 @@ init python in theme_data:
         ("Marker", "marker"),
         ("Crayon", "crayon"),
        ]
-    
+
     ROUNDRECT_CODE = """theme.%(function)s(
         ## Theme: %(theme)s
         ## Color scheme: %(scheme)s
-                                    
+
         ## The color of an idle widget face.
         widget = "%(widget)s",
 
@@ -480,7 +480,7 @@ init python in theme_data:
         ## example, the current value of a preference.)
         widget_selected = "%(widget_selected)s",
 
-        ## The color of a disabled widget face. 
+        ## The color of a disabled widget face.
         disabled = "%(disabled)s",
 
         ## The color of disabled widget text.
@@ -508,9 +508,9 @@ init python in theme_data:
 
         ## And we're done with the theme. The theme will customize
         ## various styles, so if we want to change them, we should
-        ## do so below.            
+        ## do so below.
         )"""
-                       
+
     for theme, function in ROUNDRECT_VARIANTS:
         THEME[theme] = { }
         THEME_FUNCTIONS.add(function)
@@ -521,13 +521,13 @@ init python in theme_data:
             subs["function"] = function
             subs["theme"] = theme
             subs["scheme"] = scheme
-                       
+
             THEME[theme][scheme] = ROUNDRECT_CODE % (subs)
 
     AWT_CODE = """theme.a_white_tulip(
         ## Theme: A White Tulip
         ## Scheme %(scheme)s
-               
+
         ## The color of an idle widget face.
         widget = "%(widget)s",
 
@@ -538,7 +538,7 @@ init python in theme_data:
         ## example, the current value of a preference.)
         widget_selected = "%(widget_selected)s",
 
-        ## The color of a disabled widget face. 
+        ## The color of a disabled widget face.
         disabled = "%(disabled)s",
 
         ## The color of a frame containing widgets.
@@ -556,9 +556,9 @@ init python in theme_data:
 
         ## And we're done with the theme. The theme will customize
         ## various styles, so if we want to change them, we should
-        ## do so below.            
+        ## do so below.
         )"""
-    
+
     THEME["A White Tulip"] = { }
     THEME_FUNCTIONS.add("a_white_tulip")
     THEME_SCREEN_OPERATIONS["A White Tulip"] = awt_screen_ops
@@ -567,7 +567,7 @@ init python in theme_data:
     for scheme, colors in ROUNDRECT_SCHEMES.iteritems():
         subs = dict(colors)
         subs["scheme"] = scheme
-                   
+
         THEME["A White Tulip"][scheme] = AWT_CODE % (subs)
 
     THEME["A White Tulip"]["A White Tulip"] = AWT_CODE % dict(

launcher/game/tkaskdir.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+
+# Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
+# See LICENSE.txt for license details.
+
+# This is used on Linux and Mac to prompt the user for the projects
+# directory.
+
+import sys
+
+# Python3 and Python2-style imports.
+try:
+    from tkinter import Tk
+    from tkinter.filedialog import askdirectory
+except ImportError:
+    from Tkinter import Tk
+    from tkFileDialog import askdirectory
+
+# Create the TK canvas.
+
+if __name__ == "__main__":
+    root = Tk()
+    root.withdraw()
+
+    result = askdirectory(initialdir=sys.argv[1], parent=root, title="Select Ren'Py Projects Directory")
+    sys.stdout.write(result)

launcher/game/tl/japanese/MTLc3m-LICENSE

@@ -0,0 +1,17 @@
+MTLc3m.ttf is destributed under Apache License 2.0.
+--------------------------------
+
+Copyright (C) 2008 The Android Open Source Project
+Copyright (C) 2010 MOTOYA CO.,LTD.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+  
+     http://www.apache.org/licenses/LICENSE-2.0
+  
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

launcher/game/tl/japanese/about.rpy

@@ -0,0 +1,15 @@
+
+translate japanese strings:
+
+    # game/about.rpy:21
+    old "[version!q]"
+    new "[version!q]"
+
+    # game/about.rpy:25
+    old "View license"
+    new "ライセンス"
+
+    # game/about.rpy:27
+    old "Back"
+    new "戻る"
+

launcher/game/tl/japanese/add_file.rpy

@@ -0,0 +1,23 @@
+
+translate japanese strings:
+
+    # game/add_file.rpy:7
+    old "FILENAME"
+    new "ファイル名"
+
+    # game/add_file.rpy:7
+    old "Enter the name of the script file to create."
+    new "作成するスクリプトファイル名を入力してください。"
+
+    # game/add_file.rpy:10
+    old "The filename must have the .rpy extension."
+    new "ファイル名は拡張子 .rpy を持つ必要があります。"
+
+    # game/add_file.rpy:18
+    old "The file already exists."
+    new "ファイルは既に存在します。"
+
+    # game/add_file.rpy:21
+    old "# Ren'Py automatically loads all script files ending with .rpy. To use this\n# file, define a label and jump to it from another file.\n"
+    new "# Ren'Pyは .rpy で終わるすべてのスクリプトファイルを自動的にロードします。このファイルを使用するためにはラベルを定義し、他のファイルからそこにジャンプしてください。\n"
+

launcher/game/tl/japanese/android.rpy

@@ -0,0 +1,107 @@
+
+translate japanese strings:
+
+    # game/android.rpy:12
+    old "To build Android packages, please download RAPT (from {a=http://www.renpy.org/dl/android}here{/a}), unzip it, and place it into the Ren'Py directory. Then restart the Ren'Py launcher."
+    new "Androidパッケージをビルドするためには{a=http://www.renpy.org/dl/android}RAPT{/a}をダウンロードして解凍し、Ren'Py ディレクトリーに配置してからランチャーを再起動してください。"
+
+    # game/android.rpy:13
+    old "RAPT has been installed, but you'll need to install the Android SDK before you can build Android packages. Choose Install SDK to do this."
+    new "RAPT はインストールされましたが、Androidパッケージをビルドする前に Android SDK もインストールする必要があります。このためにSDKをインストールしてください。"
+
+    # game/android.rpy:14
+    old "RAPT has been installed, but a key hasn't been configured. Please create a new key, or restore android.keystore."
+    new "RAPT はインストールされましたが、キーが設定されていません。新しいキーを作成するか、android.keystore を復帰させてください。"
+
+    # game/android.rpy:15
+    old "The current project has not been configured. Use \"Configure\" to configure it before building."
+    new "現在のプロジェクトは設定されていません。「設定」を利用してビルド前に設定してください。"
+
+    # game/android.rpy:16
+    old "Choose \"Build\" to build the current project, or attach an Android device and choose \"Build & Install\" to build and install it on the device."
+    new "「ビルド」を選択して現在のプロジェクトをビルドするか、Android デバイスを接続して「ビルド & インストール」を選択し、ビルド後そのデバイスにインストールしてください。"
+
+    # game/android.rpy:18
+    old "Attempts to emulate an Android phone.\n\nTouch input is emulated through the mouse, but only when the button is held down. Escape is mapped to the menu button, and PageUp is mapped to the back button."
+    new "Android Phoneをエミュレートします。\n\nタッチ入力はマウスを利用してエミュレートされますが、ボタン押下時のみです。Escapeはメニューボタン、PageUpはバックボタンにマップされています。"
+
+    # game/android.rpy:19
+    old "Attempts to emulate an Android tablet.\n\nTouch input is emulated through the mouse, but only when the button is held down. Escape is mapped to the menu button, and PageUp is mapped to the back button."
+    new "Android tabletをエミュレートします。\n\nタッチ入力はマウスを利用してエミュレートされますが、ボタン押下時のみです。Escapeはメニューボタン、PageUpはバックボタンにマップされています。"
+
+    # game/android.rpy:20
+    old "Attempts to emulate an OUYA console.\n\nController input is mapped to the arrow keys, Enter is mapped to the select button, Escape is mapped to the menu button, and PageUp is mapped to the back button."
+    new "Android OUYAをエミュレートします。\n\nコントローラーの入力は矢印キー、Enterはセレクトボタン、Escapeはメニューボタン、PageUpはバックボタンにマップされています。"
+
+    # game/android.rpy:22
+    old "Downloads and installs the Android SDK and supporting packages. Optionally, generates the keys required to sign the package."
+    new "Android SDKをダウンロード後インストールします。任意でサインに必要なキーを生成します。"
+
+    # game/android.rpy:23
+    old "Configures the package name, version, and other information about this project."
+    new "このプロジェクトについてパッケージ名、バージョン、その他の情報を設定してください。"
+
+    # game/android.rpy:24
+    old "Opens the file containing the Google Play keys in the editor.\n\nThis is only needed if the application is using an expansion APK. Read the documentation for more details."
+    new "Google Play key を含むファイルをエディターで開いてください。\n\nこれはアプリが拡張APKを使用する場合のみ必要となります。詳細はドキュメントを参照してください。"
+
+    # game/android.rpy:25
+    old "Builds the Android package."
+    new "Androidパッケージをビルドします。"
+
+    # game/android.rpy:26
+    old "Builds the Android package, and installs it on an Android device connected to your computer."
+    new "Androidパッケージをビルドし、コンピューターに接続されたAndroidデバイスにインストールします。"
+
+    # game/android.rpy:142
+    old "{a=%s}%s{/a}"
+    new "{a=%s}%s{/a}"
+
+    # game/android.rpy:151
+    old "QUESTION"
+    new "質問"
+
+    # game/android.rpy:351
+    old "Android: [project.current.name!q]"
+    new "Android: [project.current.name!q]"
+
+    # game/android.rpy:371
+    old "Emulation:"
+    new "エミュレーター:"
+
+    # game/android.rpy:379
+    old "Phone"
+    new "Phone"
+
+    # game/android.rpy:383
+    old "Tablet"
+    new "Tablet"
+
+    # game/android.rpy:387
+    old "Television / OUYA"
+    new "Television / OUYA"
+
+    # game/android.rpy:399
+    old "Build:"
+    new "ビルド:"
+
+    # game/android.rpy:407
+    old "Install SDK & Create Keys"
+    new "SDKのインストール & キーの作成"
+
+    # game/android.rpy:411
+    old "Configure"
+    new "設定"
+
+    # game/android.rpy:415
+    old "Build Package"
+    new "パッケージのビルド"
+
+    # game/android.rpy:419
+    old "Build & Install"
+    new "ビルド & インストール"
+
+    # game/android.rpy:13
+    old "A 32-bit Java Development Kit is required to build Android packages on Windows. The JDK is different from the JRE, so it's possible you have Java without having the JDK.\n\nPlease {a=http://www.oracle.com/technetwork/java/javase/downloads/index.html}download and install the JDK{/a}, then restart the Ren'Py launcher."
+    new "Windowsでは、Androidパッケージのビルドに32-bitのJava開発キットが必要です。JDKはJREとは異なるため、JDKが無くてもJavaが利用できます。\n\n{a=http://www.oracle.com/technetwork/java/javase/downloads/index.html}JDKのダウンロードとインストール{/a}を行い、Ren'Pyランチャーを再起動して下さい。"
+

launcher/game/tl/japanese/choose_theme.rpy

@@ -0,0 +1,43 @@
+
+translate japanese strings:
+
+    # game/choose_theme.rpy:274
+    old "Could not change the theme. Perhaps options.rpy was changed too much."
+    new "テーマを変更出来ません。 options.rpy が変更されすぎているかもしれません。"
+
+    # game/choose_theme.rpy:332
+    old "Display"
+    new "Display"
+
+    # game/choose_theme.rpy:333
+    old "Window"
+    new "Window"
+
+    # game/choose_theme.rpy:334
+    old "Fullscreen"
+    new "Fullscreen"
+
+    # game/choose_theme.rpy:335
+    old "Planetarium"
+    new "Planetarium"
+
+    # game/choose_theme.rpy:342
+    old "Sound Volume"
+    new "Sound Volume"
+
+    # game/choose_theme.rpy:376
+    old "Choose Theme"
+    new "Choose Theme"
+
+    # game/choose_theme.rpy:389
+    old "Theme"
+    new "テーマ"
+
+    # game/choose_theme.rpy:413
+    old "Color Scheme"
+    new "カラースキーム"
+
+    # game/choose_theme.rpy:444
+    old "Continue"
+    new "続行"
+

launcher/game/tl/japanese/common.rpy

@@ -0,0 +1,312 @@
+
+translate japanese strings:
+
+    # renpy/common/00action_file.rpy:124
+    old "%b %d, %H:%M"
+    new "%m月%d日, %H:%M"
+
+    # renpy/common/00action_file.rpy:587
+    old "Quick save complete."
+    new "クイックセーブ完了。"
+
+
+translate japanese strings:
+
+    # renpy/common/00gallery.rpy:521
+    old "Image [index] of [count] locked."
+    new "画像 [index] / [count] はロックされています。"
+
+    # renpy/common/00gallery.rpy:539
+    old "prev"
+    new "前へ"
+
+    # renpy/common/00gallery.rpy:540
+    old "next"
+    new "次へ"
+
+    # renpy/common/00gallery.rpy:541
+    old "slideshow"
+    new "スライドショー"
+
+    # renpy/common/00gallery.rpy:542
+    old "return"
+    new "戻る"
+
+
+translate japanese strings:
+
+    # renpy/common/00gltest.rpy:50
+    old "Graphics Acceleration"
+    new "グラフィック・アクセラレーション"
+
+    # renpy/common/00gltest.rpy:54
+    old "Automatically Choose"
+    new "自動選択"
+
+    # renpy/common/00gltest.rpy:59
+    old "Force Angle/DirectX Renderer"
+    new "Angle/DirectX による描画を強制"
+
+    # renpy/common/00gltest.rpy:63
+    old "Force OpenGL Renderer"
+    new "OpenGL による描画を強制"
+
+    # renpy/common/00gltest.rpy:67
+    old "Force Software Renderer"
+    new "ソフトウェアによる描画を強制"
+
+    # renpy/common/00gltest.rpy:73
+    old "Changes will take effect the next time this program is run."
+    new "変更は、次にプログラムを起動した時に反映されます。"
+
+    # renpy/common/00gltest.rpy:77
+    old "Quit"
+    new "終了"
+
+    # renpy/common/00gltest.rpy:82
+    old "Return"
+    new "戻る"
+
+    # renpy/common/00gltest.rpy:112
+    old "Performance Warning"
+    new "パフォーマンスに関する注意"
+
+    # renpy/common/00gltest.rpy:117
+    old "This computer is using software rendering."
+    new "このコンピュータはソフトウェアレンダリングを使用しています。"
+
+    # renpy/common/00gltest.rpy:119
+    old "This computer is not using shaders."
+    new "このコンピューターはシェーダーを使用していません。"
+
+    # renpy/common/00gltest.rpy:121
+    old "This computer is displaying graphics slowly."
+    new "このコンピューターは描画速度が遅いです。"
+
+    # renpy/common/00gltest.rpy:123
+    old "This computer has a problem displaying graphics: [problem]."
+    new "このコンピューターはグラフィックスの表示に問題があります: [problem]。"
+
+    # renpy/common/00gltest.rpy:128
+    old "Its graphics drivers may be out of date or not operating correctly. This can lead to slow or incorrect graphics display. Updating DirectX could fix this problem."
+    new "グラフィックドライバーは古いか、あるいは正常に動作していません。これはグラフィックスの表示が遅くなったり、正常に表示されない原因となります。DirectXをアップデートするとこの問題を解決できます。"
+
+    # renpy/common/00gltest.rpy:130
+    old "Its graphics drivers may be out of date or not operating correctly. This can lead to slow or incorrect graphics display."
+    new "グラフィックドライバーは古いか、あるいは正常に動作していません。これはグラフィックスの表示が遅くなったり、正常に表示されない原因となります。"
+
+    # renpy/common/00gltest.rpy:135
+    old "Update DirectX"
+    new "DirectXのアップデート"
+
+    # renpy/common/00gltest.rpy:141
+    old "Continue, Show this warning again"
+    new "今後も、この注意を表示する"
+
+    # renpy/common/00gltest.rpy:145
+    old "Continue, Don't show warning again"
+    new "今後は、この注意を表示しない"
+
+    # renpy/common/00gltest.rpy:171
+    old "Updating DirectX."
+    new "DirectXのアップデート中"
+
+    # renpy/common/00gltest.rpy:175
+    old "DirectX web setup has been started. It may start minimized in the taskbar. Please follow the prompts to install DirectX."
+    new "DirectXウェブセットアップが開始されました。タスクバーに最小化された状態で開始したので、画面に従ってDirectXをインストールして下さい。"
+
+    # renpy/common/00gltest.rpy:179
+    old "{b}Note:{/b} Microsoft's DirectX web setup program will, by default, install the Bing toolbar. If you do not want this toolbar, uncheck the appropriate box."
+    new "{b}メモ:{/b} MicrosoftのDirectXウェブセットアッププログラムは、デフォルトでBingツールバーをインストールします。このツールバーが不要な場合は、対応したチェックボックスを解除して下さい。"
+
+    # renpy/common/00gltest.rpy:183
+    old "When setup finishes, please click below to restart this program."
+    new "セットアップが完了したら、以下をクリックしてプログラムを再起動して下さい。"
+
+    # renpy/common/00gltest.rpy:185
+    old "Restart"
+    new "再起動"
+
+
+translate japanese strings:
+
+    # renpy/common/00keymap.rpy:168
+    old "Saved screenshot as %s."
+    new "スクリーンショットを %s に保存しました。"
+
+
+translate japanese strings:
+
+    # renpy/common/00layout.rpy:421
+    old "Are you sure?"
+    new "本当にいいですか？"
+
+    # renpy/common/00layout.rpy:422
+    old "Are you sure you want to delete this save?"
+    new "この保存データを本当に削除しますか？"
+
+    # renpy/common/00layout.rpy:423
+    old "Are you sure you want to overwrite your save?"
+    new "本当に保存データを上書きしますか？"
+
+    # renpy/common/00layout.rpy:424
+    old "Loading will lose unsaved progress.\nAre you sure you want to do this?"
+    new "読み込みによって未保存のゲームが失われます。\n本当に読み込みますか？"
+
+    # renpy/common/00layout.rpy:425
+    old "Are you sure you want to quit?"
+    new "本当にゲームを終了しますか？"
+
+    # renpy/common/00layout.rpy:426
+    old "Are you sure you want to return to the main menu?\nThis will lose unsaved progress."
+    new "本当にメインメニューに戻りますか？\nこれによって未保存のゲームが失われます。"
+
+    # renpy/common/00layout.rpy:427
+    old "Are you sure you want to begin skipping?"
+    new "本当にスキップモードを開始しますか？"
+
+    # renpy/common/00layout.rpy:428
+    old "Are you sure you want to skip to the next choice?"
+    new "本当に次の選択肢までスキップしますか？"
+
+    # renpy/common/00layout.rpy:429
+    old "Are you sure you want to skip to unseen dialogue or the next choice?"
+    new "本当に未読の会話、もしくは次の選択肢までスキップしますか？"
+
+
+translate japanese strings:
+
+    # renpy/common/00library.rpy:77
+    old "Skip Mode"
+    new "スキップモード"
+
+    # renpy/common/00library.rpy:80
+    old "Fast Skip Mode"
+    new "高速スキップモード"
+
+
+translate japanese strings:
+
+    # renpy/common/00updater.rpy:1258
+    old "Updater"
+    new "アップデーター"
+
+    # renpy/common/00updater.rpy:1267
+    old "This program is up to date."
+    new "このプログラムは最新版です。"
+
+    # renpy/common/00updater.rpy:1269
+    old "[u.version] is available. Do you want to install it?"
+    new "[u.version] が利用可能です。インストールしますか？"
+
+    # renpy/common/00updater.rpy:1271
+    old "Preparing to download the updates."
+    new "アップデートをダウンロードする準備をしています。"
+
+    # renpy/common/00updater.rpy:1273
+    old "Downloading the updates."
+    new "アップデートをダウンロードしています。"
+
+    # renpy/common/00updater.rpy:1275
+    old "Unpacking the updates."
+    new "アップデートを展開しています。"
+
+    # renpy/common/00updater.rpy:1279
+    old "The updates have been installed. The program will restart."
+    new "アップデートがインストールされました。プログラムを再起動します。"
+
+    # renpy/common/00updater.rpy:1281
+    old "The updates have been installed."
+    new "アップデートがインストールされました。"
+
+    # renpy/common/00updater.rpy:1283
+    old "The updates were cancelled."
+    new "アップデートがキャンセルされました。"
+
+
+translate japanese strings:
+
+    # renpy/common/_compat/gamemenu.rpym:180
+    old "Empty Slot."
+    new "空のスロット"
+
+    # renpy/common/_compat/gamemenu.rpym:337
+    old "Previous"
+    new "前へ"
+
+    # renpy/common/_compat/gamemenu.rpym:344
+    old "Next"
+    new "次へ"
+
+
+translate japanese strings:
+
+    # renpy/common/_compat/preferences.rpym:411
+    old "Joystick Mapping"
+    new "ジョイスティックのマッピング"
+
+
+translate japanese strings:
+
+    # renpy/common/_errorhandling.rpym:408
+    old "An exception has occurred."
+    new "例外が発生しました。"
+
+    # renpy/common/_errorhandling.rpym:434
+    old "Rollback"
+    new "ロールバック"
+
+    # renpy/common/_errorhandling.rpym:436
+    old "Attempts a roll back to a prior time, allowing you to save or choose a different choice."
+    new "一つ前へのロールバックを試み、セーブまたは他の選択肢を選ぶことを許可します。"
+
+    # renpy/common/_errorhandling.rpym:439
+    old "Ignore"
+    new "無視"
+
+    # renpy/common/_errorhandling.rpym:441
+    old "Ignores the exception, allowing you to continue. This often leads to additional errors."
+    new "例外を無視し、ゲームの継続を許可します。この場合、付加的なエラーが発生する原因となることがあります。"
+
+    # renpy/common/_errorhandling.rpym:444
+    old "Reload"
+    new "再読み込み"
+
+    # renpy/common/_errorhandling.rpym:446
+    old "Reloads the game from disk, saving and restoring game state if possible."
+    new "ディスクからゲームを再読み込みし、可能であればゲームの保存と復元をします。"
+
+    # renpy/common/_errorhandling.rpym:448
+    old "Open Traceback"
+    new "トレースバックを開く"
+
+    # renpy/common/_errorhandling.rpym:450
+    old "Opens the traceback.txt file in a text editor."
+    new "テキストエディターで traceback.txt を開きます。"
+
+    # renpy/common/_errorhandling.rpym:456
+    old "Quits the game."
+    new "ゲームを終了します。"
+
+    # renpy/common/_errorhandling.rpym:483
+    old "Parsing the script failed."
+    new "スクリプトの変換に失敗しました。"
+
+    # renpy/common/_errorhandling.rpym:510
+    old "Open Parse Errors"
+    new "変換エラーを開く"
+
+    # renpy/common/_errorhandling.rpym:512
+    old "Opens the errors.txt file in a text editor."
+    new "テキストエディターで errors.txt を開きます。"
+
+
+translate japanese strings:
+
+    # renpy/common/_layout/classic_load_save.rpym:152
+    old "a"
+    new "a"
+
+    # renpy/common/_layout/classic_load_save.rpym:161
+    old "q"
+    new "q"

launcher/game/tl/japanese/distribute.rpy

@@ -0,0 +1,39 @@
+
+translate japanese strings:
+
+    # game/distribute.rpy:335
+    old "Nothing to do."
+    new "何もしません。"
+
+    # game/distribute.rpy:339
+    old "Scanning project files..."
+    new "プロジェクトをスキャンしています…"
+
+    # game/distribute.rpy:346
+    old "Scanning Ren'Py files..."
+    new "Ren'Pyファイルをスキャンしています…"
+
+    # game/distribute.rpy:496
+    old "Archiving files..."
+    new "ファイルをアーカイブしています…"
+
+    # game/distribute.rpy:747
+    old "Writing the [variant] [format] package."
+    new "[variant] [format] パッケージを書き出しています。."
+
+    # game/distribute.rpy:760
+    old "Making the [variant] update zsync file."
+    new "[variant] のアップデート用 zsync ファイルを書き出しています。"
+
+    # game/distribute.rpy:856
+    old "Processed {b}[complete]{/b} of {b}[total]{/b} files."
+    new "{b}[total]{/b} 中 {b}[complete]{/b} ファイルが処理されました。"
+
+    # game/distribute.rpy:917
+    old "All packages have been built.\n\nDue to the presence of permission information, unpacking and repacking the Linux and Macintosh distributions on Windows is not supported."
+    new "すべてのパッケージがビルドされました。\n\nパーミッション情報のために、Windows上でのLinuxやMacintosh用の配布物の解凍、再圧縮はサポートされません。"
+
+    # game/distribute.rpy:358
+    old "No packages are selected, so there's nothing to do."
+    new "パッケージが選択されていないため、何もすることがありません。"
+

launcher/game/tl/japanese/distribute_gui.rpy

@@ -0,0 +1,47 @@
+
+translate japanese strings:
+
+    # game/distribute_gui.rpy:139
+    old "Build Distributions: [project.current.name!q]"
+    new "配布物のビルド: [project.current.name!q]"
+
+    # game/distribute_gui.rpy:154
+    old "Directory Name:"
+    new "ディレクトリー名:"
+
+    # game/distribute_gui.rpy:158
+    old "Executable Name:"
+    new "実行ファイル名:"
+
+    # game/distribute_gui.rpy:167
+    old "Actions:"
+    new "アクション:"
+
+    # game/distribute_gui.rpy:175
+    old "Edit options.rpy"
+    new "options.rpy を編集"
+
+    # game/distribute_gui.rpy:176
+    old "Refresh"
+    new "更新"
+
+    # game/distribute_gui.rpy:193
+    old "Build Packages:"
+    new "パッケージをビルド"
+
+    # game/distribute_gui.rpy:208
+    old "Build Updates"
+    new "アップデートをビルド"
+
+    # game/distribute_gui.rpy:212
+    old "Build"
+    new "ビルド"
+
+    # game/distribute_gui.rpy:219
+    old "Errors were detected when running the project. Please ensure the project runs without errors before building distributions."
+    new "プロジェクトの実行時にエラーが検出されました。配布物をビルドする前にエラーなしでプロジェクトが実行するようにしてください。"
+
+    # game/distribute_gui.rpy:236
+    old "Your project does not contain build information. Would you like to add build information to the end of options.rpy?"
+    new "プロジェクトにビルド情報がありません。options.rpy の末尾にビルド情報を追加しますか？"
+

launcher/game/tl/japanese/editor.rpy

@@ -0,0 +1,58 @@
+
+translate japanese strings:
+
+    # game/editor.rpy:120
+    old "{b}Recommended.{/b} A beta editor with an easy to use interface and features that aid in development, such as spell-checking. Editra currently lacks the IME support required for Chinese, Japanese, and Korean text input."
+    new "{b}推奨{/b} スペルチュックのような開発目的のインターフェースや機能を簡単に使用可能なベータエディターです。Editraは現在中国、韓国、日本語の入力に必要な IME のサポートに欠陥があります。"
+
+    # game/editor.rpy:121
+    old "{b}Recommended.{/b} A beta editor with an easy to use interface and features that aid in development, such as spell-checking. Editra currently lacks the IME support required for Chinese, Japanese, and Korean text input. On Linux, Editra requires wxPython."
+    new "{b}推奨{/b} スペルチェックのような開発目的のインターフェースや機能を簡単に使用可能なベータエディターです。Editraは現在中国、韓国、日本語の入力に必要な IME のサポートに欠陥があります。LinuxではEditraはwxpythonを必要とします。"
+
+    # game/editor.rpy:137
+    old "This may have occured because wxPython is not installed on this system."
+    new "これはおそらくwxPythonがこのシステムにインストールされていないため発生しました。"
+
+    # game/editor.rpy:144
+    old "Up to 22 MB download required."
+    new "22MB までのダウンロードが必要です。"
+
+    # game/editor.rpy:157
+    old "1.8 MB download required."
+    new "1.8 MB のダウンロードが必要です。"
+
+    # game/editor.rpy:158
+    old "This may have occured because Java is not installed on this system."
+    new "これはおそらくJavaがこのシステムにインストールされていないため発生しました。"
+
+    # game/editor.rpy:327
+    old "An exception occured while launching the text editor:\n[exception!q]"
+    new "テキストエディターの選択中にエラーが発生しました:\n[exception!q]"
+
+    # game/editor.rpy:423
+    old "Select Editor"
+    new "エディターを選択"
+
+    # game/editor.rpy:438
+    old "A text editor is the program you'll use to edit Ren'Py script files. Here, you can select the editor Ren'Py will use. If not already present, the editor will be automatically downloaded and installed."
+    new "テキストエディタはRen'Pyスクリプトファイルを編集するためのプログラムです。ここではRen'Pyが使用するエディターを選択可能です。存在しなければエディターは自動的にダウンロードされインストールされます。"
+
+    # game/editor.rpy:460
+    old "Cancel"
+    new "キャンセル"
+
+
+translate japanese strings:
+
+    # game/editor.rpy:155
+    old "A mature editor that requires Java."
+    new "Javaを必要とする成熟したエディターです。"
+
+    # game/editor.rpy:164
+    old "Invokes the editor your operating system has associated with .rpy files."
+    new "オペレーティングシステムで .rpy ファイルに関連づけたエディターを実行します。"
+
+    # game/editor.rpy:180
+    old "Prevents Ren'Py from opening a text editor."
+    new "Ren'Pyのテキストエディターの実行を停止します。"
+

launcher/game/tl/japanese/front_page.rpy

@@ -0,0 +1,91 @@
+
+translate japanese strings:
+
+    # game/front_page.rpy:67
+    old "refresh"
+    new "更新"
+
+    # game/front_page.rpy:94
+    old "+ Create New Project"
+    new "+ 新規プロジェクトの作成"
+
+    # game/front_page.rpy:106
+    old "Launch Project"
+    new "プロジェクトの起動"
+
+    # game/front_page.rpy:127
+    old "Tutorial"
+    new "Tutorial"
+
+    # game/front_page.rpy:128
+    old "The Question"
+    new "The Question"
+
+    # game/front_page.rpy:144
+    old "Active Project"
+    new "アクティブなプロジェクト"
+
+    # game/front_page.rpy:152
+    old "Open Directory"
+    new "ディレクトリーを開く"
+
+    # game/front_page.rpy:157
+    old "game"
+    new "game"
+
+    # game/front_page.rpy:158
+    old "base"
+    new "base"
+
+    # game/front_page.rpy:164
+    old "Edit File"
+    new "ファイル編集"
+
+    # game/front_page.rpy:172
+    old "All script files"
+    new "すべてのスクリプト"
+
+    # game/front_page.rpy:181
+    old "Navigate Script"
+    new "スクリプトのナビゲート"
+
+    # game/front_page.rpy:192
+    old "Check Script (Lint)"
+    new "スクリプトチェック(Lint)"
+
+    # game/front_page.rpy:193
+    old "Change Theme"
+    new "テーマ変更"
+
+    # game/front_page.rpy:194
+    old "Delete Persistent"
+    new "永続データ削除"
+
+    # game/front_page.rpy:202
+    old "Build Distributions"
+    new "配布物のビルド"
+
+    # game/front_page.rpy:204
+    old "Android"
+    new "Android"
+
+    # game/front_page.rpy:205
+    old "Generate Translations"
+    new "翻訳の生成"
+
+    # game/front_page.rpy:206
+    old "Extract Dialogue"
+    new "台詞の抽出"
+
+    # game/front_page.rpy:222
+    old "Checking script for potential problems..."
+    new "潜在的な問題のためにスクリプトをチェックしています…"
+
+    # game/front_page.rpy:237
+    old "Deleting persistent data..."
+    new "永続データを削除しています…"
+
+    # game/front_page.rpy:122
+    old "[p.name!q] (template)"
+    new "[p.name!q] (テンプレート)"
+

launcher/game/tl/japanese/interface.rpy

@@ -0,0 +1,83 @@
+
+translate japanese strings:
+
+    # game/interface.rpy:89
+    old "Documentation"
+    new "ドキュメント"
+
+    # game/interface.rpy:90
+    old "Ren'Py Website"
+    new "Ren'Pyサイト"
+
+    # game/interface.rpy:91
+    old "Ren'Py Games List"
+    new "Ren'Pyゲームリスト"
+
+    # game/interface.rpy:92
+    old "About"
+    new "About"
+
+    # game/interface.rpy:99
+    old "update"
+    new "アップデート"
+
+    # game/interface.rpy:101
+    old "preferences"
+    new "設定"
+
+    # game/interface.rpy:102
+    old "quit"
+    new "終了"
+
+    # game/interface.rpy:174
+    old "Yes"
+    new "Yes"
+
+    # game/interface.rpy:176
+    old "No"
+    new "No"
+
+    # game/interface.rpy:211
+    old "Due to package format limitations, non-ASCII file and directory names are not allowed."
+    new "パッケージフォーマットの制限により、アスキーコード以外のファイル、ディレクトリー名は許可されません。"
+
+    # game/interface.rpy:213
+    old "[title]"
+    new "[title]"
+
+    # game/interface.rpy:299
+    old "ERROR"
+    new "エラー"
+
+    # game/interface.rpy:328
+    old "While [what!q], an error occured:"
+    new "[what!q] 中にエラーが発生しました。:"
+
+    # game/interface.rpy:329
+    old "[exception!q]"
+    new "[exception!q]"
+
+    # game/interface.rpy:347
+    old "Text input may not contain the {{ or [[ characters."
+    new "{{ または [[ はテキスト入力出来ません。"
+
+    # game/interface.rpy:352
+    old "File and directory names may not contain / or \\."
+    new "ファイル、ディレクトリーが / または \\. を含んでいるかもしれません。"
+
+    # game/interface.rpy:358
+    old "File and directory names must consist of ASCII characters."
+    new "ファイル、ディレクトリー名はアスキーコードの文字列で構成される必要があります。"
+
+    # game/interface.rpy:379
+    old "INFORMATION"
+    new "情報"
+
+    # game/interface.rpy:422
+    old "PROCESSING"
+    new "処理中"
+
+    # game/interface.rpy:452
+    old "CHOICE"
+    new "選択"
+

launcher/game/tl/japanese/navigation.rpy

@@ -0,0 +1,67 @@
+
+translate japanese strings:
+
+    # game/navigation.rpy:150
+    old "Navigate: [project.current.name]"
+    new "ナビゲーション: [project.current.name]"
+
+    # game/navigation.rpy:159
+    old "Order: "
+    new "並び順:"
+
+    # game/navigation.rpy:160
+    old "alphabetical"
+    new "アルファベット順"
+
+    # game/navigation.rpy:162
+    old "by-file"
+    new "ファイル順"
+
+    # game/navigation.rpy:164
+    old "natural"
+    new "natural"
+
+    # game/navigation.rpy:176
+    old "Category:"
+    new "カテゴリー:"
+
+    # game/navigation.rpy:178
+    old "files"
+    new "ファイル"
+
+    # game/navigation.rpy:179
+    old "labels"
+    new "ラベル"
+
+    # game/navigation.rpy:180
+    old "defines"
+    new "定義"
+
+    # game/navigation.rpy:181
+    old "transforms"
+    new "変換"
+
+    # game/navigation.rpy:182
+    old "screens"
+    new "スクリーン"
+
+    # game/navigation.rpy:183
+    old "callables"
+    new "関数"
+
+    # game/navigation.rpy:184
+    old "TODOs"
+    new "TODO"
+
+    # game/navigation.rpy:223
+    old "+ Add script file"
+    new "+ スクリプトファイルを追加する。"
+
+    # game/navigation.rpy:231
+    old "No TODO comments found.\n\nTo create one, include \"# TODO\" in your script."
+    new "TODOコメントは見つかりません。\n\n作成には \"# TODO\" をスクリプトに加えてください。"
+
+    # game/navigation.rpy:238
+    old "The list of names is empty."
+    new "名前のリストは空です。"
+

launcher/game/tl/japanese/new_project.rpy

@@ -0,0 +1,31 @@
+
+translate japanese strings:
+
+    # game/new_project.rpy:22
+    old "Choose Project Template"
+    new "テンプレートを選んでください"
+
+    # game/new_project.rpy:40
+    old "Please select a template to use for your new project. The template sets the default font and the user interface language. If your language is not supported, choose 'english'."
+    new "新しいプロジェクトで使用するテンプレートを選択してください。Ren'Pyはデフォルトのフォントとユーザーインターフェイスの言語を設定します。あなたの言語がサポートされていないなら 'english' を選択してください。"
+
+    # game/new_project.rpy:55
+    old "PROJECT NAME"
+    new "プロジェクト名"
+
+    # game/new_project.rpy:56
+    old "Please enter the name of your project:"
+    new "プロジェクト名を入力してください:"
+
+    # game/new_project.rpy:62
+    old "The project name may not be empty."
+    new "プロジェクト名が空です。"
+
+    # game/new_project.rpy:67
+    old "[project_name!q] already exists. Please choose a different project name."
+    new "[project_name!q] は既に存在します。違う名前を選択してください。"
+
+    # game/new_project.rpy:70
+    old "[project_dir!q] already exists. Please choose a different project name."
+    new "[project_dir!q] は既に存在します。違う名前を選択してください。"
+

launcher/game/tl/japanese/preferences.rpy

@@ -0,0 +1,63 @@
+
+translate japanese strings:
+
+    # game/preferences.rpy:40
+    old "Launcher Preferences"
+    new "ランチャー設定"
+
+    # game/preferences.rpy:61
+    old "Projects Directory:"
+    new "プロジェクトディレクトリー:"
+
+    # game/preferences.rpy:68
+    old "[persistent.projects_directory!q]"
+    new "[persistent.projects_directory!q]"
+
+    # game/preferences.rpy:70
+    old "Not Set"
+    new "未設定"
+
+    # game/preferences.rpy:84
+    old "Text Editor:"
+    new "テキストエディター:"
+
+    # game/preferences.rpy:106
+    old "Update Channel:"
+    new "アップデートチャンネル:"
+
+    # game/preferences.rpy:126
+    old "Navigation Options:"
+    new "ナビゲートオプション:"
+
+    # game/preferences.rpy:130
+    old "Include private names"
+    new "内部使用の名前を含める"
+
+    # game/preferences.rpy:131
+    old "Include library names"
+    new "本体の名前を含める"
+
+    # game/preferences.rpy:141
+    old "Launcher Options:"
+    new "ランチャー設定:"
+
+    # game/preferences.rpy:145
+    old "Hardware rendering"
+    new "ハードウェアレンダリング"
+
+    # game/preferences.rpy:148
+    old "Console output"
+    new "コンソール出力"
+
+    # game/preferences.rpy:169
+    old "Open launcher project"
+    new "ランチャーのプロジェクトを開く"
+
+    # game/preferences.rpy:183
+    old "Language:"
+    new "言語:"
+
+    # game/preferences.rpy:146
+    old "Show templates"
+    new "テンプレートの表示"
+

launcher/game/tl/japanese/project.rpy

@@ -0,0 +1,27 @@
+
+translate japanese strings:
+
+    # game/project.rpy:204
+    old "Ren'Py is scanning the project..."
+    new "Ren'Py プロジェクトをスキャンしています…"
+
+    # game/project.rpy:503
+    old "PROJECTS DIRECTORY"
+    new "プロジェクトディレクトリー"
+
+    # game/project.rpy:503
+    old "Please choose the projects directory using the directory chooser.\n{b}The directory chooser may have opened behind this window.{/b}"
+    new "プロジェクトディレクトリーを選択してください。\n{b}ディレクトリー選択画面がこのウィンドウの下に隠れている場合があります。{/b}"
+
+    # game/project.rpy:503
+    old "This launcher will scan for projects in this directory, will create new projects in this directory, and will place built projects into this directory."
+    new "ランチャーはこのディレクトリーでプロジェクトをスキャンし、新しいプロジェクトを作成し、ビルドしたプロジェクトを出力します。"
+
+    # game/project.rpy:543
+    old "Ren'Py was unable to run python with tkinter to choose the projects directory."
+    new "Ren'Py はプロジェクトディレクトリーを選択するために tkinter でpythonを実行することは出来ません。"
+
+    # game/project.rpy:547
+    old "Ren'Py has set the projects directory to:"
+    new "Ren'Py は以下にプロジェクトディレクトリーを設定します:"
+

launcher/game/tl/japanese/style.rpy

@@ -0,0 +1,15 @@
+translate japanese python:
+    MTLC = "tl/japanese/MTLc3m.ttf"
+    style.l_default.font = MTLC
+    style.l_default.size = 16
+    style.l_button_text.selected_font = MTLC
+    style.l_button_text.selected_bold = True
+    style.l_link_text.font = MTLC
+    style.l_alternate_text.font = MTLC
+    style.l_navigation_button_text.font = MTLC
+    style.l_navigation_text.font = MTLC
+    style.l_navigation_text.bold = True
+    style.l_checkbox_text.selected_font = MTLC
+    style.l_nonbox_text.selected_font = MTLC
+    style.hyperlink_text.font = MTLC
+    make_style_backup()

launcher/game/tl/japanese/translations.rpy

@@ -0,0 +1,35 @@
+
+translate japanese strings:
+
+    # game/translations.rpy:10
+    old "Create or Update Translations"
+    new "翻訳の作成または更新"
+
+    # game/translations.rpy:10
+    old "Please enter the name of the language for which you want to create or update translations."
+    new "翻訳を作成または更新したい言語名を入力してください。"
+
+    # game/translations.rpy:15
+    old "The language name can not be the empty string."
+    new "言語名は空の文字列であってはなりません。"
+
+    # game/translations.rpy:26
+    old "Ren'Py is generating translations...."
+    new "Ren'Pyは翻訳を生成しています…"
+
+    # game/translations.rpy:30
+    old "Ren'Py has finished generating [language] translations."
+    new "Ren'Pyは [language] の翻訳ファイルを生成しました。"
+
+    # game/translations.rpy:44
+    old "What format would you like for the extracted dialogue?"
+    new "どのフォーマットで台詞を抽出しますか？"
+
+    # game/translations.rpy:56
+    old "Ren'Py is extracting dialogue...."
+    new "Ren'Pyは台詞を抽出しています…"
+
+    # game/translations.rpy:60
+    old "Ren'Py has finished extracting dialogue. The extracted dialogue can be found in dialogue.[format] in the base directory."
+    new "Ren'Pyは台詞を抽出し終えました。抽出した台詞はベースディレクトリーの dialogue.[format] にあります。"
+

launcher/game/tl/japanese/updater.rpy

@@ -0,0 +1,87 @@
+
+translate japanese strings:
+
+    # game/updater.rpy:54
+    old "Select Update Channel"
+    new "アップデートチャンネルを選択してください"
+
+    # game/updater.rpy:65
+    old "The update channel controls the version of Ren'Py the updater will download. Please select an update channel:"
+    new "アップデートチャンネルはアップデーターがダウンロードするRen'Pyのバージョンを制御します。アップデートチャンネルを選択してください。"
+
+    # game/updater.rpy:70
+    old "Release"
+    new "Release"
+
+    # game/updater.rpy:76
+    old "{b}Recommended.{/b} The version of Ren'Py that should be used in all newly-released games."
+    new "{b}推奨{/b} 全ての新しく配布されるゲームで使用されるべきRen'Pyのバージョンです。"
+
+    # game/updater.rpy:81
+    old "Prerelease"
+    new "Prerelease"
+
+    # game/updater.rpy:87
+    old "A preview of the next version of Ren'Py that can be used for testing and taking advantage of new features, but not for final releases of games."
+    new "テストや新機能利用のために使用されるRen'Pyの次期バージョンのプレビューですが、\nゲームの最終リリースには向きません。"
+
+    # game/updater.rpy:93
+    old "Experimental"
+    new "Experimental"
+
+    # game/updater.rpy:99
+    old "Experimental versions of Ren'Py. You shouldn't select this channel unless asked by a Ren'Py developer."
+    new "Ren'Pyの試験的なバージョンです。開発者に頼まれない限りこのバージョンを使用するべきではありません。"
+
+    # game/updater.rpy:119
+    old "An error has occured:"
+    new "エラーが発生しました:"
+
+    # game/updater.rpy:121
+    old "Checking for updates."
+    new "アップデートをチェックしています。"
+
+    # game/updater.rpy:123
+    old "Ren'Py is up to date."
+    new "Ren'Pyは最新です。"
+
+    # game/updater.rpy:125
+    old "[u.version] is now available. Do you want to install it?"
+    new "[u.version] が利用可能です。インストールしますか？"
+
+    # game/updater.rpy:127
+    old "Preparing to download the update."
+    new "アップデートのダウンロード準備をしています。"
+
+    # game/updater.rpy:129
+    old "Downloading the update."
+    new "アップデートをダウンロードしています。"
+
+    # game/updater.rpy:131
+    old "Unpacking the update."
+    new "アップデートを解凍しています。"
+
+    # game/updater.rpy:133
+    old "Finishing up."
+    new "完了しました。"
+
+    # game/updater.rpy:135
+    old "The update has been installed. Ren'Py will restart."
+    new "アップデートはインストールされました。Ren'Pyは再起動します。"
+
+    # game/updater.rpy:137
+    old "The update has been installed."
+    new "アップデートはインストールされました。"
+
+    # game/updater.rpy:139
+    old "The update was cancelled."
+    new "アップデートはキャンセルされました。"
+
+    # game/updater.rpy:156
+    old "Ren'Py Update"
+    new "Ren'Py アップデート"
+
+    # game/updater.rpy:162
+    old "Proceed"
+    new "続行"
+

launcher/game/tl/spanish/about.rpy

@@ -0,0 +1,9 @@
+translate spanish strings:
+
+    # game/about.rpy:21
+    old "[version!q]"
+    new "[version!q]"
+
+    # game/about.rpy:25
+    old "View license"
+    new "Ver licencia"

launcher/game/tl/spanish/add_file.rpy

@@ -0,0 +1,21 @@
+translate spanish strings:
+
+    # game/add_file.rpy:7
+    old "FILENAME"
+    new "Nombre del archivo"
+
+    # game/add_file.rpy:7
+    old "Enter the name of the script file to create."
+    new "Introduce el nombre del archivo de script para crearlo."
+
+    # game/add_file.rpy:10
+    old "The filename must have the .rpy extension."
+    new "El nombre del archivo debe tener la extensión .rpy."
+
+    # game/add_file.rpy:18
+    old "The file already exists."
+    new "El archivo ya existe."
+
+    # game/add_file.rpy:21
+    old "# Ren'Py automatically loads all script files ending with .rpy. To use this\n# file, define a label and jump to it from another file.\n"
+    new "# Ren'Py carga automaticamente todos los archivos que terminan en .rpy. Para usar este\n# archivo, defina una etiqueta y salte a el desde otro archivo\n"

launcher/game/tl/spanish/android.rpy

@@ -0,0 +1,105 @@
+translate spanish strings:
+
+    # game/android.rpy:13
+    old "A 32-bit Java Development Kit is required to build Android packages on Windows. The JDK is different from the JRE, so it's possible you have Java without having the JDK.\n\nPlease {a=http://www.oracle.com/technetwork/java/javase/downloads/index.html}download and install the JDK{/a}, then restart the Ren'Py launcher."
+    new "Se necesita Java Development Kit de 32-bit para construir paquetes de Android en Windows. El JDK es diferente al JRE, es posible que tenga Java sin tener el JDK.\n\nPor favor {a=http://www.oracle.com/technetwork/java/javase/downloads/index.html}descarga e instala el JDK{/a}, después, reinicia Ren'Py."
+
+    # game/android.rpy:14
+    old "To build Android packages, please download RAPT (from {a=http://www.renpy.org/dl/android}here{/a}), unzip it, and place it into the Ren'Py directory. Then restart the Ren'Py launcher."
+    new "Para construir paquetes de Android, por favor descarga RAPT (desde {a=http://www.renpy.org/dl/android}aquí{/a}), descomprímelo y cópialo dentro de la carpeta de Ren'Py. Después reinicia el launcher de Ren'Py."
+
+    # game/android.rpy:15
+    old "RAPT has been installed, but you'll need to install the Android SDK before you can build Android packages. Choose Install SDK to do this."
+    new "RAPT está instalado, pero tendrás que instalar el SDK de Android para poder construir paquetes de Android. Selecciona instalar SDK para instalarlo."
+
+    # game/android.rpy:16
+    old "RAPT has been installed, but a key hasn't been configured. Please create a new key, or restore android.keystore."
+    new "RAPT está instalado, pero la clave aun no se ha configurado. Por favor crea una nueva clave, o restaura android.keystore."
+
+    # game/android.rpy:17
+    old "The current project has not been configured. Use \"Configure\" to configure it before building."
+    new "El proyecto actual no se ha configurado. Usa \"Configurar\" para configurarlo antes de construirlo."
+
+    # game/android.rpy:18
+    old "Choose \"Build\" to build the current project, or attach an Android device and choose \"Build & Install\" to build and install it on the device."
+    new "Selecciona \"Construir\" para construir el proyecto actual, o conecta un dispositivo Android y selecciona \"Construir & instalar\" para construirlo e instalarlo en el dispositivo."
+
+    # game/android.rpy:20
+    old "Attempts to emulate an Android phone.\n\nTouch input is emulated through the mouse, but only when the button is held down. Escape is mapped to the menu button, and PageUp is mapped to the back button."
+    new "Al intentar emular un teléfono Android. \n\nLa entrada táctil se emula mediante el ratón, pero sólo cuando el botón se mantiene pulsado. Escape está asignado al botón de menú, y PageUp está asignado al botón Atrás."
+
+    # game/android.rpy:21
+    old "Attempts to emulate an Android tablet.\n\nTouch input is emulated through the mouse, but only when the button is held down. Escape is mapped to the menu button, and PageUp is mapped to the back button."
+    new "Al intentar emular una tablet Android. \n\nLa entrada táctil se emula mediante el ratón, pero sólo cuando el botón se mantiene pulsado. Escape está asignado al botón de menú, y PageUp está asignado al botón Atrás."
+
+    # game/android.rpy:22
+    old "Attempts to emulate an OUYA console.\n\nController input is mapped to the arrow keys, Enter is mapped to the select button, Escape is mapped to the menu button, and PageUp is mapped to the back button."
+    new "Al intentar emular una consola OUYA. \n\nPara el control se usan las flechas, Intro está asignado al botón select. Escape está asignado al botón de menú, y PageUp está asignado al botón Atrás."
+
+    # game/android.rpy:23
+    old "Downloads and installs the Android SDK and supporting packages. Optionally, generates the keys required to sign the package."
+    new "Descarga e instala el SDK de android y los paquetes de soporte. Opcionalmente, genera la clave necesaria para firmar el paquete."
+
+    # game/android.rpy:24
+    old "Configures the package name, version, and other information about this project."
+    new "Configura el nombre del paquete, la versión, y otra información de este proyecto."
+
+    # game/android.rpy:25
+    old "Opens the file containing the Google Play keys in the editor.\n\nThis is only needed if the application is using an expansion APK. Read the documentation for more details."
+    new "Abre el archivo que contiene las claves de Google Play en el editor. \n\nEsto sólo es necesario si la aplicación usa una expansión APK. Para más información lee la documentación."
+
+    # game/android.rpy:26
+    old "Builds the Android package."
+    new "Construir el paquete de Android."
+
+    # game/android.rpy:27
+    old "Builds the Android package, and installs it on an Android device connected to your computer."
+    new "Construye el paquete de Android, e instálalo en un dispositivo Android connectado a tu ordenador."
+
+    # game/android.rpy:148
+    old "{a=%s}%s{/a}"
+    new "{a=%s}%s{/a}"
+
+    # game/android.rpy:157
+    old "QUESTION"
+    new "PREGUNTA"
+
+    # game/android.rpy:367
+    old "Android: [project.current.name!q]"
+    new "Android: [project.current.name!q]"
+
+    # game/android.rpy:387
+    old "Emulation:"
+    new "Emulación:"
+
+    # game/android.rpy:395
+    old "Phone"
+    new "Teléfono"
+
+    # game/android.rpy:399
+    old "Tablet"
+    new "Tablet"
+
+    # game/android.rpy:403
+    old "Television / OUYA"
+    new "Televisión / OUYA"
+
+    # game/android.rpy:415
+    old "Build:"
+    new "Construir:"
+
+    # game/android.rpy:423
+    old "Install SDK & Create Keys"
+    new "Instalar SDK y Crear claves"
+
+    # game/android.rpy:427
+    old "Configure"
+    new "Configurar"
+
+    # game/android.rpy:431
+    old "Build Package"
+    new "Construir Paquete"
+
+    # game/android.rpy:435
+    old "Build & Install"
+    new "Construir & Instalar"

launcher/game/tl/spanish/choose_theme.rpy

@@ -0,0 +1,37 @@
+translate spanish strings:
+
+    # game/choose_theme.rpy:274
+    old "Could not change the theme. Perhaps options.rpy was changed too much."
+    new "No se puede cambiar el tema. Quizás options.rpy ha sufrido muchos cambios."
+
+    # game/choose_theme.rpy:332
+    old "Display"
+    new "Display"
+
+    # game/choose_theme.rpy:333
+    old "Window"
+    new "Window"
+
+    # game/choose_theme.rpy:334
+    old "Fullscreen"
+    new "Fullscreen"
+
+    # game/choose_theme.rpy:335
+    old "Planetarium"
+    new "Planetarium"
+
+    # game/choose_theme.rpy:342
+    old "Sound Volume"
+    new "Sound Volume"
+
+    # game/choose_theme.rpy:376
+    old "Choose Theme"
+    new "Elegir Tema"
+
+    # game/choose_theme.rpy:389
+    old "Theme"
+    new "Tema"
+
+    # game/choose_theme.rpy:413
+    old "Color Scheme"
+    new "Combinación de colores"

launcher/game/tl/spanish/common.rpy

@@ -0,0 +1,322 @@
+#translation: renpy/common/00action_file.rpy
+translate spanish strings:
+
+    # renpy/common/00action_file.rpy:124
+    old "%b %d, %H:%M"
+    new "%d %b, %H:%M"
+
+    # renpy/common/00action_file.rpy:587
+    old "Quick save complete."
+    new "Guardado rapido completado"
+
+
+#translation: renpy/common/00gallery.rpy
+translate spanish strings:
+
+    # renpy/common/00gallery.rpy:521
+    old "Image [index] of [count] locked."
+    new "Imagen [index] de [count] bloqueada."
+
+    # renpy/common/00gallery.rpy:539
+    old "prev"
+    new "prev"
+
+    # renpy/common/00gallery.rpy:540
+    old "next"
+    new "siguiente"
+
+    # renpy/common/00gallery.rpy:541
+    old "slideshow"
+    new "presentación"
+
+    # renpy/common/00gallery.rpy:542
+    old "return"
+    new "volver"
+
+
+#translation: renpy/common/00gltest.rpy
+translate spanish strings:
+
+    # renpy/common/00gltest.rpy:50
+    old "Graphics Acceleration"
+    new "Aceleración Gráfica"
+
+    # renpy/common/00gltest.rpy:54
+    old "Automatically Choose"
+    new "Seleccionar automaticamente"
+
+    # renpy/common/00gltest.rpy:59
+    old "Force Angle/DirectX Renderer"
+    new "Forzar Angle/DirectX Renderer"
+
+    # renpy/common/00gltest.rpy:63
+    old "Force OpenGL Renderer"
+    new "Forzar OpenGL Renderer"
+
+    # renpy/common/00gltest.rpy:67
+    old "Force Software Renderer"
+    new "Forzar renderización por software"
+
+    # renpy/common/00gltest.rpy:73
+    old "Changes will take effect the next time this program is run."
+    new "Los cambios tendrán efecto la próxima vez que este programa se ejecute."
+
+    # renpy/common/00gltest.rpy:77
+    old "Quit"
+    new "Salir"
+
+    # renpy/common/00gltest.rpy:82
+    old "Return"
+    new "Volver"
+
+    # renpy/common/00gltest.rpy:112
+    old "Performance Warning"
+    new "Advertencia de rendimiento"
+
+    # renpy/common/00gltest.rpy:117
+    old "This computer is using software rendering."
+    new "Este equipo usa renderización por software."
+
+    # renpy/common/00gltest.rpy:119
+    old "This computer is not using shaders."
+    new "Este equipo no utiliza shaders."
+
+    # renpy/common/00gltest.rpy:121
+    old "This computer is displaying graphics slowly."
+    new "Este equipo está mostrando gráficos lentamente."
+
+    # renpy/common/00gltest.rpy:123
+    old "This computer has a problem displaying graphics: [problem]."
+    new "Este equipo tiene un problema monstrando gráficos: [problem]."
+
+    # renpy/common/00gltest.rpy:128
+    old "Its graphics drivers may be out of date or not operating correctly. This can lead to slow or incorrect graphics display. Updating DirectX could fix this problem."
+    new "Sus drivers gráficos pueden estar desactualizados o no funcionar correctamente. Esto puede ocasionar visualización de gráficos lenta o incorrecta. Actualizar DirectX podría solucionar este problema."
+
+    # renpy/common/00gltest.rpy:130
+    old "Its graphics drivers may be out of date or not operating correctly. This can lead to slow or incorrect graphics display."
+    new "Sus drivers gráficos pueden estar desactualizados o no funcionar correctamente. Esto puede ocasionar visualización de gráficos lenta o incorrecta."
+
+    # renpy/common/00gltest.rpy:135
+    old "Update DirectX"
+    new "Actualizar DirectX"
+
+    # renpy/common/00gltest.rpy:141
+    old "Continue, Show this warning again"
+    new "Continuar, Mostrar este aviso otra vez"
+
+    # renpy/common/00gltest.rpy:145
+    old "Continue, Don't show warning again"
+    new "Continuar, No mostrar este aviso otra vezn"
+
+    # renpy/common/00gltest.rpy:171
+    old "Updating DirectX."
+    new "Actualizando DirectX."
+
+    # renpy/common/00gltest.rpy:175
+    old "DirectX web setup has been started. It may start minimized in the taskbar. Please follow the prompts to install DirectX."
+    new "Se ha iniciado DirectX web setup. Puede inciiar minimizado en la barra de tareas. Por favor siga las instrucciones para instalar DirectX."
+
+    # renpy/common/00gltest.rpy:179
+    old "{b}Note:{/b} Microsoft's DirectX web setup program will, by default, install the Bing toolbar. If you do not want this toolbar, uncheck the appropriate box."
+    new "{b}Nota:{/b} Programa de instalación web de Microsoft DirectX, por defecto, instala la barra de herramientas de Bing. Si no quieres que se instale, desactiva la casilla correspondiente."
+
+    # renpy/common/00gltest.rpy:183
+    old "When setup finishes, please click below to restart this program."
+    new "Cuando finalize la configuración, por favor haga click abajo para reiniciar el programa."
+
+    # renpy/common/00gltest.rpy:185
+    old "Restart"
+    new "Reiniciar"
+
+
+#translation: renpy/common/00keymap.rpy
+translate spanish strings:
+
+    # renpy/common/00keymap.rpy:168
+    old "Saved screenshot as %s."
+    new "Screenshot guardada como %s."
+
+
+#translation: renpy/common/00layout.rpy
+translate spanish strings:
+
+    # renpy/common/00layout.rpy:421
+    old "Are you sure?"
+    new "¿Estás seguro?"
+
+    # renpy/common/00layout.rpy:422
+    old "Are you sure you want to delete this save?"
+    new "¿Seguro que quieres eliminar esta partida guardada?"
+
+    # renpy/common/00layout.rpy:423
+    old "Are you sure you want to overwrite your save?"
+    new "¿Seguro que quieres sobreescribir esta partida guardada?"
+
+    # renpy/common/00layout.rpy:424
+    old "Loading will lose unsaved progress.\nAre you sure you want to do this?"
+    new "Cargando, perderas el progreso no guardado. \n¿Seguro que quieres hacer esto?"
+
+    # renpy/common/00layout.rpy:425
+    old "Are you sure you want to quit?"
+    new "¿Seguro que quieres salir?"
+
+    # renpy/common/00layout.rpy:426
+    old "Are you sure you want to return to the main menu?\nThis will lose unsaved progress."
+    new "Seguro que quieres volver al menu principal?\nPerderas el progreso no guardado."
+
+    # renpy/common/00layout.rpy:427
+    old "Are you sure you want to begin skipping?"
+    new "Seguro que quieres comenzar a omitir?"
+
+    # renpy/common/00layout.rpy:428
+    old "Are you sure you want to skip to the next choice?"
+    new "¿Seguro que quieres saltarte la siguiente eleccion?"
+
+    # renpy/common/00layout.rpy:429
+    old "Are you sure you want to skip to unseen dialogue or the next choice?"
+    new "¿Seugro que quieres saltarte los diálogos no vistos o la sigueinte elección?"
+
+
+#translation: renpy/common/00library.rpy
+translate spanish strings:
+
+    # renpy/common/00library.rpy:77
+    old "Skip Mode"
+    new "Modo Salto"
+
+    # renpy/common/00library.rpy:80
+    old "Fast Skip Mode"
+    new "Modo de salto rápido"
+
+
+#translation: renpy/common/00updater.rpy
+translate spanish strings:
+
+    # renpy/common/00updater.rpy:1258
+    old "Updater"
+    new "Actualizador"
+
+    # renpy/common/00updater.rpy:1267
+    old "This program is up to date."
+    new "Este programa está actualizado."
+
+    # renpy/common/00updater.rpy:1269
+    old "[u.version] is available. Do you want to install it?"
+    new "[u.version] está disponible. ¿Quieres instalarla?"
+
+    # renpy/common/00updater.rpy:1271
+    old "Preparing to download the updates."
+    new "Preparando para descargar las actualizaciones."
+
+    # renpy/common/00updater.rpy:1273
+    old "Downloading the updates."
+    new "Descargando actualizaciones."
+
+    # renpy/common/00updater.rpy:1275
+    old "Unpacking the updates."
+    new "Desempaquetando las actualizaciones."
+
+    # renpy/common/00updater.rpy:1279
+    old "The updates have been installed. The program will restart."
+    new "Se han instalado las actualizaciones. El programa se reiniciará."
+
+    # renpy/common/00updater.rpy:1281
+    old "The updates have been installed."
+    new "se han instalado las actualizaciones."
+
+    # renpy/common/00updater.rpy:1283
+    old "The updates were cancelled."
+    new "Se han cancelado las actualizaciones."
+
+
+#translation: renpy/common/_compat/gamemenu.rpym
+translate spanish strings:
+
+    # renpy/common/_compat/gamemenu.rpym:180
+    old "Empty Slot."
+    new "Ranura vacía."
+
+    # renpy/common/_compat/gamemenu.rpym:337
+    old "Previous"
+    new "Anterior"
+
+    # renpy/common/_compat/gamemenu.rpym:344
+    old "Next"
+    new "Siguiente"
+
+
+#translation: renpy/common/_compat/preferences.rpym
+translate spanish strings:
+
+    # renpy/common/_compat/preferences.rpym:411
+    old "Joystick Mapping"
+    new "Asignar Joystick"
+
+
+#translation: renpy/common/_errorhandling.rpym
+translate spanish strings:
+
+    # renpy/common/_errorhandling.rpym:408
+    old "An exception has occurred."
+    new "Se ha producido una excepción."
+
+    # renpy/common/_errorhandling.rpym:434
+    old "Rollback"
+    new "Regresar"
+
+    # renpy/common/_errorhandling.rpym:436
+    old "Attempts a roll back to a prior time, allowing you to save or choose a different choice."
+    new "Intente volver atŕas, le permitirá guardar o elegir una opción diferente."
+
+    # renpy/common/_errorhandling.rpym:439
+    old "Ignore"
+    new "Ignorar"
+
+    # renpy/common/_errorhandling.rpym:441
+    old "Ignores the exception, allowing you to continue. This often leads to additional errors."
+    new "Ignora la excepción, le permite continuar. Esto suele conducir a errores adicionales."
+
+    # renpy/common/_errorhandling.rpym:444
+    old "Reload"
+    new "recargar"
+
+    # renpy/common/_errorhandling.rpym:446
+    old "Reloads the game from disk, saving and restoring game state if possible."
+    new "Vuelve a cargar el juego desde el disco. guarda y restaura el estado del juego si es posible."
+
+    # renpy/common/_errorhandling.rpym:448
+    old "Open Traceback"
+    new "Abrir Traceback"
+
+    # renpy/common/_errorhandling.rpym:450
+    old "Opens the traceback.txt file in a text editor."
+    new "Abrir el archivo traceback.txt en un editor de texto."
+
+    # renpy/common/_errorhandling.rpym:456
+    old "Quits the game."
+    new "Salir del juego."
+
+    # renpy/common/_errorhandling.rpym:483
+    old "Parsing the script failed."
+    new "Analizando el script fallido."
+
+    # renpy/common/_errorhandling.rpym:510
+    old "Open Parse Errors"
+    new "Abrir Analisis de Errores"
+
+    # renpy/common/_errorhandling.rpym:512
+    old "Opens the errors.txt file in a text editor."
+    new "Abre el archivo errors.txt en un editor de texto."
+
+
+#translation: renpy/common/_layout/classic_load_save.rpym
+translate spanish strings:
+
+    # renpy/common/_layout/classic_load_save.rpym:152
+    old "a"
+    new "a"
+
+    # renpy/common/_layout/classic_load_save.rpym:161
+    old "q"
+    new "q"

launcher/game/tl/spanish/distribute.rpy

@@ -0,0 +1,33 @@
+translate spanish strings:
+
+    # game/distribute.rpy:358
+    old "No packages are selected, so there's nothing to do."
+    new "Ningún paquete seleccionado. No hay nada que hacer."
+
+    # game/distribute.rpy:363
+    old "Scanning project files..."
+    new "Escaneando archivos del proyecto..."
+
+    # game/distribute.rpy:373
+    old "Scanning Ren'Py files..."
+    new "Escaneando los archivos de Ren'Py..."
+
+    # game/distribute.rpy:421
+    old "All packages have been built.\n\nDue to the presence of permission information, unpacking and repacking the Linux and Macintosh distributions on Windows is not supported."
+    new "Se han construido todos los paquetes.\n\nDebido a la presencia de información de permisos, desempaquetar y reempaquetar las distribuciones para Linux y Macintosh no es compatible en Windows."
+
+    # game/distribute.rpy:545
+    old "Archiving files..."
+    new "Archivando archivos..."
+
+    # game/distribute.rpy:801
+    old "Writing the [variant] [format] package."
+    new "Escribiendo el paquete [format] para [variant]."
+
+    # game/distribute.rpy:814
+    old "Making the [variant] update zsync file."
+    new "Creando el archivo de actualización zsync para [variant]."
+
+    # game/distribute.rpy:910
+    old "Processed {b}[complete]{/b} of {b}[total]{/b} files."
+    new "Procesados {b}[complete]{/b} de {b}[total]{/b} archivos."

launcher/game/tl/spanish/distribute_gui.rpy

@@ -0,0 +1,45 @@
+translate spanish strings:
+
+    # game/distribute_gui.rpy:139
+    old "Build Distributions: [project.current.name!q]"
+    new "Construir Distibuciones: [project.current.name!q]"
+
+    # game/distribute_gui.rpy:154
+    old "Directory Name:"
+    new "Nombre de la carpeta:"
+
+    # game/distribute_gui.rpy:158
+    old "Executable Name:"
+    new "Nombre del ejecutable:"
+
+    # game/distribute_gui.rpy:167
+    old "Actions:"
+    new "Acciones:"
+
+    # game/distribute_gui.rpy:175
+    old "Edit options.rpy"
+    new "Editar options.rpy"
+
+    # game/distribute_gui.rpy:176
+    old "Refresh"
+    new "Recargar"
+
+    # game/distribute_gui.rpy:193
+    old "Build Packages:"
+    new "Construir Paquetes:"
+
+    # game/distribute_gui.rpy:208
+    old "Build Updates"
+    new "Construir Actualizaciones"
+
+    # game/distribute_gui.rpy:212
+    old "Build"
+    new "Construir"
+
+    # game/distribute_gui.rpy:219
+    old "Errors were detected when running the project. Please ensure the project runs without errors before building distributions."
+    new "Se detectaron errores al ejecutar el proyecto. Por favor asegúrese de que el proyecto se ejecuta sin errores antes de construir distibuciones."
+
+    # game/distribute_gui.rpy:236
+    old "Your project does not contain build information. Would you like to add build information to the end of options.rpy?"
+    new "Tu proyecto no tiene información de construcción. ¿Te gustaría añadir la información de construcción al final del archivo options.rpy?"

launcher/game/tl/spanish/editor.rpy

@@ -0,0 +1,64 @@
+translate spanish strings:
+
+    # description for the option: "Editra"
+    # game/editor.rpy:120
+    old "{b}Recommended.{/b} A beta editor with an easy to use interface and features that aid in development, such as spell-checking. Editra currently lacks the IME support required for Chinese, Japanese, and Korean text input."
+    new "{b}Recomendado.{/b} Un editor beta con una interfaz fácil de usar y funciones que ayudan en el desarrollo, como la corrección ortográfica. Editra actualmente carece de soporte IME necesario para la introducción de texto Chino, Japonés y Coreano."
+
+    # description for "Editra" on Linux
+    # game/editor.rpy:121
+    old "{b}Recommended.{/b} A beta editor with an easy to use interface and features that aid in development, such as spell-checking. Editra currently lacks the IME support required for Chinese, Japanese, and Korean text input. On Linux, Editra requires wxPython."
+    new "{b}Recomendado.{/b} Un editor beta con una interfaz fácil de usar y funciones que ayudan en el desarrollo, como la corrección ortográfica. Editra actualmente carece de soporte IME necesario para la introducción de texto Chino, Japonés y Coreano. En Linux, Editra requiere wxPython."
+
+    # game/editor.rpy:137
+    old "This may have occured because wxPython is not installed on this system."
+    new "Esto puede haber ocurrido porque wxPython no está instalado en este sistema."
+
+    # game/editor.rpy:144
+    old "Up to 22 MB download required."
+    new "Requiere descargar hasta 22 MB."
+
+    # description for the option: "JEdit"
+    # game/editor.rpy:155
+    old "A mature editor that requires Java."
+    new "Un editor muy maduro que requiere Java."
+
+    # game/editor.rpy:157
+    old "1.8 MB download required."
+    new "Requiere descargar 1.8 MB."
+
+    # game/editor.rpy:158
+    old "This may have occured because Java is not installed on this system."
+    new "Esto puede haber ocurrido porque Java no está instalado en este sistema"
+
+    # option: "System Editor"
+    # game/editor.rpy:163
+    old "System Editor"
+    new "Editor del sistema"
+
+    # description for the option: "System Editor"
+    # game/editor.rpy:164
+    old "Invokes the editor your operating system has associated with .rpy files."
+    new "Usar el editor de su sistema operativo para que se asocie con los archivos .rpy."
+
+    # option: "None"
+    # game/editor.rpy:179
+    old "None"
+    new "Ninguno"
+
+    # description for the option: "None"
+    # game/editor.rpy:180
+    old "Prevents Ren'Py from opening a text editor."
+    new "Evita que Ren'Py abra un editor de texto."
+
+    # game/editor.rpy:327
+    old "An exception occured while launching the text editor:\n[exception!q]"
+    new "Ha ocurrido una excepción mientras se ejecutaba el editor de texto:\[exception!q]"
+
+    # game/editor.rpy:423
+    old "Select Editor"
+    new "Seleccionar Editor"
+
+    # game/editor.rpy:438
+    old "A text editor is the program you'll use to edit Ren'Py script files. Here, you can select the editor Ren'Py will use. If not already present, the editor will be automatically downloaded and installed."
+    new "Un editor de texto es el programa que vas a utilizar para editar los scripts de Ren'Py. Aquí, puedes seleccionar el editor que Ren'Py usará. Si no está disponible, el editor se descargará e instalará automáticamente."

launcher/game/tl/spanish/front_page.rpy

@@ -0,0 +1,93 @@
+translate spanish strings:
+
+    # game/font_page.rpy 65
+    old "PROJECTS:"
+    new "PROYECTOS:"
+
+    # game/front_page.rpy:67
+    old "refresh"
+    new "recargar"
+
+    # game/front_page.rpy:94
+    old "+ Create New Project"
+    new "+ Crear Un Proyecto Nuevo"
+
+    # game/front_page.rpy:106
+    old "Launch Project"
+    new "Ejecutar Proyecto"
+
+    # game/front_page.rpy:122
+    old "[p.name!q] (template)"
+    new "[p.name!q] (plantilla)"
+
+    # game/front_page.rpy:127
+    old "Tutorial"
+    new "Tutorial"
+
+    # game/front_page.rpy:128
+    old "The Question"
+    new "The Question"
+
+    # game/front_page.rpy:144
+    old "Active Project"
+    new "Proyecto Activo"
+
+    # game/front_page.rpy:152
+    old "Open Directory"
+    new "Abrir Carpeta"
+
+    # game/front_page.rpy:157
+    old "game"
+    new "game"
+
+    # game/front_page.rpy:158
+    old "base"
+    new "base"
+
+    # game/front_page.rpy:164
+    old "Edit File"
+    new "Editar Archivo"
+
+    # game/front_page.rpy:172
+    old "All script files"
+    new "Todos los scripts"
+
+    # game/front_page.rpy:181
+    old "Navigate Script"
+    new "Navegar por los Scripts"
+
+    # game/front_page.rpy:192
+    old "Check Script (Lint)"
+    new "Comprobar Script (Lint)"
+
+    # game/front_page.rpy:193
+    old "Change Theme"
+    new "Cambiar Tema"
+
+    # game/front_page.rpy:194
+    old "Delete Persistent"
+    new "Eliminar Datos Persistentes"
+
+    # game/front_page.rpy:202
+    old "Build Distributions"
+    new "Construir Distibuciones"
+
+    # game/front_page.rpy:204
+    old "Android"
+    new "Android"
+
+    # game/front_page.rpy:205
+    old "Generate Translations"
+    new "Generar Traducciones"
+
+    # game/front_page.rpy:206
+    old "Extract Dialogue"
+    new "Extraer Diálogos"
+
+    # game/front_page.rpy:222
+    old "Checking script for potential problems..."
+    new "Comprobando script por problemas potenciales..."
+
+    # game/front_page.rpy:237
+    old "Deleting persistent data..."
+    new "Eliminando datos persistentes..."

launcher/game/tl/spanish/interface.rpy

@@ -0,0 +1,93 @@
+translate spanish strings:
+
+    # game/interface.rpy:89
+    old "Documentation"
+    new "Documentación"
+
+    # game/interface.rpy:90
+    old "Ren'Py Website"
+    new "Web de Ren'Py"
+
+    # game/interface.rpy:91
+    old "Ren'Py Games List"
+    new "Lista de juegos Ren'Py"
+
+    # game/interface.rpy:92
+    old "About"
+    new "Acerca de"
+
+    # game/interface.rpy:99
+    old "update"
+    new "actualizar"
+
+    # game/interface.rpy:101
+    old "preferences"
+    new "preferencias"
+
+    # game/interface.rpy:102
+    old "quit"
+    new "salir"
+
+    # game/interface.rpy:174
+    old "Yes"
+    new "Sí"
+
+    # game/interface.rpy:176
+    old "No"
+    new "No"
+
+    # game/interface.rpy:182
+    old "Back"
+    new "Atrás"
+
+    # game/interface.rpy:184
+    old "Cancel"
+    new "Cancelar"
+
+    # game/interface.rpy:187
+    old "Continue"
+    new "Continuar"
+
+    # game/interface.rpy:211
+    old "Due to package format limitations, non-ASCII file and directory names are not allowed."
+    new "Debido a las limitaciones del formato de paquete, no se permite el uso de nombres de archivos y carpetas que no sean ASCII"
+
+    # game/interface.rpy:213
+    old "[title]"
+    new "[title]"
+
+    # game/interface.rpy:299
+    old "ERROR"
+    new "ERROR"
+
+    # game/interface.rpy:328
+    old "While [what!q], an error occured:"
+    new "Mientras [what!q], se produjo un error:"
+
+    # game/interface.rpy:329
+    old "[exception!q]"
+    new "[exception!q]"
+
+    # game/interface.rpy:347
+    old "Text input may not contain the {{ or [[ characters."
+    new "La entrada de texto no puede contener los caracteres {{ o [[."
+
+    # game/interface.rpy:352
+    old "File and directory names may not contain / or \\."
+    new "Los nombres de archivos y carpetas no pueden contener / o \\."
+
+    # game/interface.rpy:358
+    old "File and directory names must consist of ASCII characters."
+    new "Los nombres de archivos y carpetas deben ser caracteres ASCII."
+
+    # game/interface.rpy:379
+    old "INFORMATION"
+    new "INFORMACIÓN"
+
+    # game/interface.rpy:422
+    old "PROCESSING"
+    new "PROCESANDO"
+
+    # game/interface.rpy:452
+    old "CHOICE"
+    new "SELECCIONA"

launcher/game/tl/spanish/navigation.rpy

@@ -0,0 +1,65 @@
+translate spanish strings:
+
+    # game/navigation.rpy:150
+    old "Navigate: [project.current.name]"
+    new "Navegando por: [project.current.name]"
+
+    # game/navigation.rpy:159
+    old "Order: "
+    new "Orden: "
+
+    # game/navigation.rpy:160
+    old "alphabetical"
+    new "alfabético"
+
+    # game/navigation.rpy:162
+    old "by-file"
+    new "por archivo"
+
+    # game/navigation.rpy:164
+    old "natural"
+    new "natural"
+
+    # game/navigation.rpy:176
+    old "Category:"
+    new "Categoría:"
+
+    # game/navigation.rpy:178
+    old "files"
+    new "archivos"
+
+    # game/navigation.rpy:179
+    old "labels"
+    new "Etiquetas"
+
+    # game/navigation.rpy:180
+    old "defines"
+    new "defines"
+
+    # game/navigation.rpy:181
+    old "transforms"
+    new "transforms"
+
+    # game/navigation.rpy:182
+    old "screens"
+    new "pantallas"
+
+    # game/navigation.rpy:183
+    old "callables"
+    new "callables"
+
+    # game/navigation.rpy:184
+    old "TODOs"
+    new "TODO"
+
+    # game/navigation.rpy:223
+    old "+ Add script file"
+    new "+ Añadir archivo de script"
+
+    # game/navigation.rpy:231
+    old "No TODO comments found.\n\nTo create one, include \"# TODO\" in your script."
+    new "No se han encontrado comentarios \"TODO\". Para crear uno, incluye \"# TODO\" en tu script."
+
+    # game/navigation.rpy:238
+    old "The list of names is empty."
+    new "La lista de nombres está vacía."

launcher/game/tl/spanish/new_project.rpy

@@ -0,0 +1,29 @@
+translate spanish strings:
+
+    # game/new_project.rpy:22
+    old "Choose Project Template"
+    new "Elige una plantilla para el proyecto"
+
+    # game/new_project.rpy:40
+    old "Please select a template to use for your new project. The template sets the default font and the user interface language. If your language is not supported, choose 'english'."
+    new "Por favor selecciona una plantilla para usar en tu nuevo proyecto. La plantilla establece la fuente predeterminada y el idioma de la interfaz de usuario, Si tu idioma no está soportado, elige \"English\"."
+
+    # game/new_project.rpy:55
+    old "PROJECT NAME"
+    new "NOMBRE DEL PROYECTO"
+
+    # game/new_project.rpy:56
+    old "Please enter the name of your project:"
+    new "Por favor introduce el nombre de tu proyecto:"
+
+    # game/new_project.rpy:62
+    old "The project name may not be empty."
+    new "El nombre del proyecto no puede estar vacío."
+
+    # game/new_project.rpy:67
+    old "[project_name!q] already exists. Please choose a different project name."
+    new "[project_name!q] ya existe. Por favor elige un nombre diferente para el proyecto."
+
+    # game/new_project.rpy:70
+    old "[project_dir!q] already exists. Please choose a different project name."
+    new "[project_dir!q] ya existe. Por favor elige un nombre diferente para el proyecto."

launcher/game/tl/spanish/preferences.rpy

@@ -0,0 +1,61 @@
+translate spanish strings:
+
+    # game/preferences.rpy:40
+    old "Launcher Preferences"
+    new "Preferencias del Launcher"
+
+    # game/preferences.rpy:61
+    old "Projects Directory:"
+    new "Carpeta de Proyectos:"
+
+    # game/preferences.rpy:68
+    old "[persistent.projects_directory!q]"
+    new "[persistent.projects_directory!q]"
+
+    # game/preferences.rpy:70
+    old "Not Set"
+    new "No establecido"
+
+    # game/preferences.rpy:84
+    old "Text Editor:"
+    new "Editor de texto:"
+
+    # game/preferences.rpy:106
+    old "Update Channel:"
+    new "Canal de actualización"
+
+    # game/preferences.rpy:126
+    old "Navigation Options:"
+    new "Opciones de navegación:"
+
+    # game/preferences.rpy:130
+    old "Include private names"
+    new "Incluir nombres privados"
+
+    # game/preferences.rpy:131
+    old "Include library names"
+    new "Incluir nombres de bibliotecas"
+
+    # game/preferences.rpy:141
+    old "Launcher Options:"
+    new "Opciones del Launcher:"
+
+    # game/preferences.rpy:145
+    old "Hardware rendering"
+    new "Renderización por hardware"
+
+    # game/preferences.rpy:146
+    old "Show templates"
+    new "Mostrar plantillas"
+
+    # game/preferences.rpy:148
+    old "Console output"
+    new "Salida de la consola"
+
+    # game/preferences.rpy:169
+    old "Open launcher project"
+    new "Abrir el launcher"
+
+    # game/preferences.rpy:183
+    old "Language:"
+    new "Idioma:"

launcher/game/tl/spanish/project.rpy

@@ -0,0 +1,25 @@
+translate spanish strings:
+
+    # game/project.rpy:204
+    old "Ren'Py is scanning the project..."
+    new "Ren'Py está escaneando el proyecto..."
+
+    # game/project.rpy:503
+    old "PROJECTS DIRECTORY"
+    new "CARPETA DEL PROYECTO"
+
+    # game/project.rpy:503
+    old "Please choose the projects directory using the directory chooser.\n{b}The directory chooser may have opened behind this window.{/b}"
+    new "Por favor elige la carpeta del proyecto usando el selector de proyecto. \n{b}El selector de carpetas puede haberse abierto detrás de esta ventana."
+
+    # game/project.rpy:503
+    old "This launcher will scan for projects in this directory, will create new projects in this directory, and will place built projects into this directory."
+    new "El launcher buscará proyectos en esta carpeta, creará nuevos proyectos en esta carpeta, y colocará los proyectos en este directorio."
+
+    # game/project.rpy:543
+    old "Ren'Py was unable to run python with tkinter to choose the projects directory."
+    new "Ren'Py ha podido ejecutar python con tkinter para elegir el directorio de proyectos."
+
+    # game/project.rpy:547
+    old "Ren'Py has set the projects directory to:"
+    new "Ren'Py ha establecido el directorio de proyectos:"

launcher/game/tl/spanish/style.rpy

@@ -0,0 +1,3 @@
+translate spanish python:
+
+        make_style_backup()

launcher/game/tl/spanish/translations.rpy

@@ -0,0 +1,33 @@
+translate spanish strings:
+
+    # game/translations.rpy:10
+    old "Create or Update Translations"
+    new "Crear o Actualizar Traducciones"
+
+    # game/translations.rpy:10
+    old "Please enter the name of the language for which you want to create or update translations."
+    new "Por favor introduce el nombre del idioma para el que desea crear o actualizar una traducción."
+
+    # game/translations.rpy:15
+    old "The language name can not be the empty string."
+    new "El nombre del idioma no puede estar vacío."
+
+    # game/translations.rpy:26
+    old "Ren'Py is generating translations...."
+    new "Ren'Py está generando las traducciones..."
+
+    # game/translations.rpy:30
+    old "Ren'Py has finished generating [language] translations."
+    new "Ren'Py ha terminado de generar las traducciones [language]"
+
+    # game/translations.rpy:44
+    old "What format would you like for the extracted dialogue?"
+    new "¿Qué formato te gustaría para los diálogos extraidos?"
+
+    # game/translations.rpy:56
+    old "Ren'Py is extracting dialogue...."
+    new "Ren'Py está extrayendo los diálogos..."
+
+    # game/translations.rpy:60
+    old "Ren'Py has finished extracting dialogue. The extracted dialogue can be found in dialogue.[format] in the base directory."
+    new "Ren'Py ha terminado de extraer los diálogos. Los diálogo extraídos se pueden encontrar en el dialogue.[format] en el directorio base."

launcher/game/tl/spanish/updater.rpy

@@ -0,0 +1,85 @@
+translate spanish strings:
+
+    # game/updater.rpy:54
+    old "Select Update Channel"
+    new "Selecciona el Canal de Actualización"
+
+    # game/updater.rpy:65
+    old "The update channel controls the version of Ren'Py the updater will download. Please select an update channel:"
+    new "El canal de actualización controla la versión de Ren'Py que el actualizador descargará. Por favor selecciona un canal de actualización:"
+
+    # game/updater.rpy:70
+    old "Release"
+    new "Release"
+
+    # game/updater.rpy:76
+    old "{b}Recommended.{/b} The version of Ren'Py that should be used in all newly-released games."
+    new "{b}Recomendado.{/b} La versión the Ren'Py que se recomienda usar en todos los juegos recién liberados."
+
+    # game/updater.rpy:81
+    old "Prerelease"
+    new "Prerelease"
+
+    # game/updater.rpy:87
+    old "A preview of the next version of Ren'Py that can be used for testing and taking advantage of new features, but not for final releases of games."
+    new "Una vista previa de la próxima versión de Ren'Py que puede ser utilizada para probar y aprovechar las nuevas características, pero no para las versiones finales de los juegos."
+
+    # game/updater.rpy:93
+    old "Experimental"
+    new "Experimental"
+
+    # game/updater.rpy:99
+    old "Experimental versions of Ren'Py. You shouldn't select this channel unless asked by a Ren'Py developer."
+    new "Versiones experimentales de Ren'Py. No debes seleccionar el canal a menos que te lo pida un desarrollador de Ren'Py."
+
+    # game/updater.rpy:119
+    old "An error has occured:"
+    new "Ha ocurrido un error:"
+
+    # game/updater.rpy:121
+    old "Checking for updates."
+    new "Comprobando actualizaciones."
+
+    # game/updater.rpy:123
+    old "Ren'Py is up to date."
+    new "Ren'Py está actualizado."
+
+    # game/updater.rpy:125
+    old "[u.version] is now available. Do you want to install it?"
+    new "[u.version] ahora está disponible. ¿Quieres instalarla?"
+
+    # game/updater.rpy:127
+    old "Preparing to download the update."
+    new "Preparando para descargar la actualización."
+
+    # game/updater.rpy:129
+    old "Downloading the update."
+    new "Descargando la actualización."
+
+    # game/updater.rpy:131
+    old "Unpacking the update."
+    new "Descomprimiendo la actualización."
+
+    # game/updater.rpy:133
+    old "Finishing up."
+    new "Finalizar."
+
+    # game/updater.rpy:135
+    old "The update has been installed. Ren'Py will restart."
+    new "La actualización se ha instalado. Ren'Py se reiniciará."
+
+    # game/updater.rpy:137
+    old "The update has been installed."
+    new "La actualización se ha instalado."
+
+    # game/updater.rpy:139
+    old "The update was cancelled."
+    new "Se ha cancelado la actualización."
+
+    # game/updater.rpy:156
+    old "Ren'Py Update"
+    new "Actualizar Ren'Py"
+
+    # game/updater.rpy:162
+    old "Proceed"
+    new "Seguir"

launcher/game/translations.rpy

@@ -0,0 +1,63 @@
+init python:
+
+    if persistent.translate_language is None:
+        persistent.translate_language = "english"
+
+label translate:
+
+    python:
+
+        language = interface.input(_("Create or Update Translations"), _("Please enter the name of the language for which you want to create or update translations."), filename=True, default=persistent.translate_language, cancel=Jump("front_page"))
+
+        language = language.strip()
+
+        if not language:
+            interface.error(_("The language name can not be the empty string."))
+
+        persistent.translate_language = language
+
+        args = [ "translate", language ]
+
+        if language == "rot13":
+            args.append("--rot13")
+        else:
+            args.append("--empty")
+
+        interface.processing(_("Ren'Py is generating translations...."))
+        project.current.launch(args, wait=True)
+        project.current.update_dump(force=True)
+
+        interface.info(_("Ren'Py has finished generating [language] translations."))
+
+    jump front_page
+
+label extract_dialogue:
+
+    python:
+
+        CHOICES = [
+            ("tab", "Tab-delimited Spreadsheet (dialogue.tab)"),
+            ("txt", "Dialogue Text Only (dialogue.txt)"),
+            ]
+
+        format = interface.choice(
+            _("What format would you like for the extracted dialogue?"),
+            CHOICES,
+            persistent.dialogue_format,
+            cancel=Jump("front_page"))
+
+        persistent.dialogue_format = format
+
+        args = [ "dialogue" ]
+
+        if format == "txt":
+            args.append("--text")
+
+        interface.processing(_("Ren'Py is extracting dialogue...."))
+        project.current.launch(args, wait=True)
+        project.current.update_dump(force=True)
+
+        interface.info(_("Ren'Py has finished extracting dialogue. The extracted dialogue can be found in dialogue.[format] in the base directory."))
+
+
+    jump front_page

launcher/game/updater.rpy

@@ -6,81 +6,80 @@ init python:
     #
     # It must be None for a release.
     UPDATE_SIMULATE = None
-    
+
     PUBLIC_KEY = "renpy_public.pem"
-    
+
     UPDATE_URLS = {
         "Release" : "http://update.renpy.org/release/updates.json",
         "Prerelease" : "http://update.renpy.org/prerelease/updates.json",
-        "Experimental" : "http://update.renpy.org/experimental/updates.json" 
+        "Experimental" : "http://update.renpy.org/experimental/updates.json"
         }
-    
+
     version_tuple = renpy.version(tuple=True)
-    
+
     DLC_URL = "http://update.renpy.org/{0}.{1}.{2}/updates.json".format(version_tuple[0], version_tuple[1], version_tuple[2])
-    
+
     if persistent.update_channel not in UPDATE_URLS:
         persistent.update_channel = "Release"
-    
-    def check_dlc(name):        
+
+    def check_dlc(name):
         """
         Returns true if the named dlc package is present.
         """
-        
+
         return name in updater.get_installed_packages()
-        
+
     def add_dlc(name):
         """
         Adds the DLC package, if it doesn't already exist.
-        
+
         Returns True if the DLC is installed, False otherwise.
         """
-        
+
         if check_dlc(name):
             return True
-            
+
         return renpy.invoke_in_new_context(updater.update, DLC_URL, add=[name], public_key=PUBLIC_KEY, simulate=UPDATE_SIMULATE, restart=False)
 
 screen update_channel:
-    
+
     frame:
         style_group "l"
         style "l_root"
-        
+
         window:
-    
+
             has vbox
 
             label _("Select Update Channel")
-            
+
             add HALF_SPACER
-            
-            
+
             hbox:
                 frame:
                     style "l_indent"
                     xfill True
-                    
+
                     has vbox
 
                     text _("The update channel controls the version of Ren'Py the updater will download. Please select an update channel:") style "l_small_text"
 
                     # Release
                     add SPACER
-                    
+
                     textbutton _("Release") action [ SetField(persistent, "update_channel", "Release"), Jump("preferences") ]
 
                     add HALF_SPACER
-                    
+
                     frame:
                         style "l_indent"
                         text _("{b}Recommended.{/b} The version of Ren'Py that should be used in all newly-released games.") style "l_small_text"
 
                     # Prerelease
                     add SPACER
-                    
+
                     textbutton _("Prerelease") action [ SetField(persistent, "update_channel", "Prerelease"), Jump("preferences") ]
-                    
+
                     add HALF_SPACER
 
                     frame:
@@ -92,14 +91,14 @@ screen update_channel:
                     add SPACER
 
                     textbutton _("Experimental") action [ SetField(persistent, "update_channel", "Experimental"), Jump("preferences") ]
-                    
+
                     add HALF_SPACER
 
                     frame:
                         style "l_indent"
                         text _("Experimental versions of Ren'Py. You shouldn't select this channel unless asked by a Ren'Py developer.") style "l_small_text"
 
-                
+
     textbutton _("Cancel") action Jump("preferences") style "l_left_button"
 
 label update_preference:
@@ -107,13 +106,13 @@ label update_preference:
     return
 
 screen updater:
-        
+
     frame:
         style "l_root"
 
         frame:
             style_group "l_info"
-        
+
             has vbox
 
             if u.state == u.ERROR:
@@ -145,10 +144,10 @@ screen updater:
 
             if u.progress is not None:
                 add SPACER
-                
+
                 frame:
                     style "l_progress_frame"
-                    
+
                     bar:
                         range 1.0
                         value u.progress
@@ -158,15 +157,15 @@ screen updater:
 
     if u.can_cancel:
         textbutton _("Cancel") action u.cancel style "l_left_button"
-        
+
     if u.can_proceed:
         textbutton _("Proceed") action u.proceed style "l_right_button"
 
 label update:
-    
+
     python:
         updater.update(UPDATE_URLS[persistent.update_channel], simulate=UPDATE_SIMULATE, public_key=PUBLIC_KEY)
-    
+
     # This should never happen.
     jump front_page
 

launcher/game/util.rpy

@@ -3,28 +3,28 @@
 
 init python in util:
     import os
-    
+
     def walk(directory, base=None):
         """
-        Walks through the directories and files underneath `directory`, 
-        yielding (name, isdir) tuples. The names are given relative to 
+        Walks through the directories and files underneath `directory`,
+        yielding (name, isdir) tuples. The names are given relative to
         `base`, which defaults to `directory` if None.
         """
 
         directory = renpy.fsdecode(directory)
-        
+
         if base is None:
             base = directory
         else:
             base = renpy.fsdecode(base)
- 
+
         for subdir, directories, files in os.walk(directory):
             for fn in directories:
                 fullfn = os.path.join(subdir, fn)
                 relfn = os.path.relpath(fullfn, base)
-                
+
                 relfn = relfn.replace("\\", "/")
-                
+
                 yield relfn, True
 
             for fn in files:
@@ -32,6 +32,6 @@ init python in util:
                 relfn = os.path.relpath(fullfn, base)
 
                 relfn = relfn.replace("\\", "/")
-                
+
                 yield relfn, False
-    
+

launcher2/EasyDialogsResources.py

@@ -1,144 +0,0 @@
-import binascii
-
-
-def a2b(a):
-    return binascii.a2b_hex(''.join(a.split()))
-
-
-resources = {
-             260 : a2b('''
-                          01 00 ff ff 00 00 00 00  00 00 00 00 c8 00 c0 80
-                          02 00 00 00 00 00 b8 00  29 00 00 00 00 00 00 00
-                          08 00 90 01 00 01 4d 00  53 00 20 00 53 00 68 00
-                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
-                          00 00 00 00 00 00 00 00  01 00 01 50 7f 00 14 00
-                          32 00 0e 00 01 00 00 00  ff ff 80 00 4f 00 4b 00
-                          00 00 00 00 00 00 00 00  00 00 00 00 04 08 00 50
-                          07 00 07 00 aa 00 0c 00  ea 03 00 00 ff ff 81 00
-                          00 00 00 00             
-                       '''),
-             261 : a2b('''
-                          01 00 ff ff 00 00 00 00  00 00 00 00 c8 00 c0 80
-                          04 00 00 00 00 00 b8 00  3a 00 00 00 00 00 00 00
-                          08 00 90 01 00 01 4d 00  53 00 20 00 53 00 68 00
-                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
-                          00 00 00 00 00 00 00 00  80 00 81 50 07 00 14 00
-                          aa 00 0c 00 ec 03 00 00  ff ff 81 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  01 00 01 50 7f 00 25 00
-                          32 00 0e 00 01 00 00 00  ff ff 80 00 4f 00 4b 00
-                          00 00 00 00 00 00 00 00  00 00 00 00 00 00 01 50
-                          4a 00 25 00 32 00 0e 00  02 00 00 00 ff ff 80 00
-                          43 00 61 00 6e 00 63 00  65 00 6c 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  04 08 00 50 07 00 07 00
-                          aa 00 0c 00 eb 03 00 00  ff ff 81 00 00 00 00 00
-                       '''),
-             262 : a2b('''
-                          01 00 ff ff 00 00 00 00  00 00 00 00 c8 00 c0 80
-                          04 00 00 00 00 00 b8 00  29 00 00 00 00 00 00 00
-                          08 00 90 01 00 01 4d 00  53 00 20 00 53 00 68 00
-                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
-                          00 00 00 00 00 00 00 00  00 00 01 50 7f 00 14 00
-                          32 00 0e 00 06 00 00 00  ff ff 80 00 59 00 65 00
-                          73 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-                          04 08 00 50 07 00 07 00  aa 00 0c 00 ed 03 00 00
-                          ff ff 81 00 00 00 00 00  00 00 00 00 00 00 00 00
-                          00 00 01 50 07 00 14 00  32 00 0e 00 07 00 00 00
-                          ff ff 80 00 4e 00 6f 00  00 00 00 00 00 00 00 00
-                          00 00 00 00 00 00 01 50  4b 00 14 00 32 00 0e 00
-                          02 00 00 00 ff ff 80 00  43 00 61 00 6e 00 63 00
-                          65 00 6c 00 00 00 00 00         
-                       '''),
-             263 : a2b('''
-                          01 00 ff ff 00 00 00 00  00 00 00 00 80 00 ca 80
-                          03 00 00 00 00 00 e2 00  29 00 00 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  00 00 81 50 07 00 14 00
-                          97 00 0e 00 eb 03 00 00  6d 00 73 00 63 00 74 00
-                          6c 00 73 00 5f 00 70 00  72 00 6f 00 67 00 72 00
-                          65 00 73 00 73 00 33 00  32 00 00 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  04 08 00 50 07 00 07 00
-                          d4 00 0c 00 ea 03 00 00  ff ff 81 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  00 00 00 50 a9 00 14 00
-                          32 00 0e 00 02 00 00 00  ff ff 80 00 43 00 61 00
-                          6e 00 63 00 65 00 6c 00  00 00 00 00    
-                       '''),
-             264 : a2b('''
-                          01 00 ff ff 00 00 00 00  00 00 00 00 c8 00 c0 80
-                          04 00 00 00 00 00 b8 00  3a 00 00 00 00 00 00 00
-                          08 00 90 01 00 01 4d 00  53 00 20 00 53 00 68 00
-                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
-                          00 00 00 00 00 00 00 00  a0 00 81 50 07 00 14 00
-                          aa 00 0c 00 ec 03 00 00  ff ff 81 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  01 00 01 50 7f 00 25 00
-                          32 00 0e 00 01 00 00 00  ff ff 80 00 4f 00 4b 00
-                          00 00 00 00 00 00 00 00  00 00 00 00 00 00 01 50
-                          4a 00 25 00 32 00 0e 00  02 00 00 00 ff ff 80 00
-                          43 00 61 00 6e 00 63 00  65 00 6c 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  04 08 00 50 07 00 07 00
-                          aa 00 0c 00 eb 03 00 00  ff ff 81 00 00 00 00 00
-                       '''),
-             265 : a2b('''
-                          01 00 ff ff 00 00 00 00  00 00 00 00 c8 00 c8 80
-                          12 00 00 00 00 00 d9 00  fc 00 00 00 00 00 00 00
-                          08 00 90 01 00 01 4d 00  53 00 20 00 53 00 68 00
-                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
-                          00 00 00 00 00 00 00 00  01 00 01 50 6c 00 ea 00
-                          30 00 0e 00 01 00 00 00  ff ff 80 00 4f 00 4b 00
-                          00 00 00 00 00 00 00 00  00 00 00 00 00 00 01 50
-                          a2 00 ea 00 30 00 0e 00  02 00 00 00 ff ff 80 00
-                          43 00 61 00 6e 00 63 00  65 00 6c 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  07 00 00 50 06 00 06 00
-                          cc 00 4e 00 ff ff ff ff  ff ff 80 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  03 00 21 50 48 00 12 00
-                          84 00 64 00 03 00 00 00  ff ff 85 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  00 00 02 50 0c 00 24 00
-                          c0 00 08 00 04 00 00 00  ff ff 82 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  80 00 81 50 0c 00 30 00
-                          c0 00 0e 00 05 00 00 00  ff ff 81 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  00 00 01 50 9c 00 42 00
-                          30 00 0e 00 06 00 00 00  ff ff 80 00 41 00 64 00
-                          64 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-                          07 00 00 50 06 00 54 00  cb 00 3c 00 ff ff ff ff
-                          ff ff 80 00 00 00 00 00  00 00 00 00 00 00 00 00
-                          03 00 21 50 48 00 61 00  84 00 64 00 07 00 00 00
-                          ff ff 85 00 00 00 00 00  00 00 00 00 00 00 00 00
-                          00 00 02 50 0c 00 72 00  c0 00 08 00 08 00 00 00
-                          ff ff 82 00 00 00 00 00  00 00 00 00 00 00 00 00
-                          00 00 01 50 9c 00 7e 00  30 00 0e 00 09 00 00 00
-                          ff ff 80 00 41 00 64 00  64 00 00 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  00 00 01 50 06 00 96 00
-                          42 00 0e 00 0a 00 00 00  ff ff 80 00 41 00 64 00
-                          64 00 20 00 66 00 69 00  6c 00 65 00 2e 00 2e 00
-                          2e 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-                          00 00 01 50 4e 00 96 00  42 00 0e 00 0b 00 00 00
-                          ff ff 80 00 41 00 64 00  64 00 20 00 6e 00 65 00
-                          77 00 20 00 66 00 69 00  6c 00 65 00 2e 00 2e 00
-                          2e 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
-                          00 00 01 50 06 00 a8 00  42 00 0e 00 0c 00 00 00
-                          ff ff 80 00 41 00 64 00  64 00 20 00 66 00 6f 00
-                          6c 00 64 00 65 00 72 00  2e 00 2e 00 2e 00 00 00
-                          00 00 00 00 00 00 00 00  00 00 00 00 07 00 00 50
-                          06 00 c6 00 cc 00 1e 00  ff ff ff ff ff ff 80 00
-                          43 00 6f 00 6d 00 6d 00  61 00 6e 00 64 00 20 00
-                          6c 00 69 00 6e 00 65 00  3a 00 00 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  80 00 81 50 0c 00 d2 00
-                          c0 00 0e 00 0e 00 00 00  ff ff 81 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  00 00 02 50 0c 00 14 00
-                          3c 00 08 00 1e 00 00 00  ff ff 82 00 4f 00 70 00
-                          74 00 69 00 6f 00 6e 00  3a 00 00 00 00 00 00 00
-                          00 00 00 00 00 00 00 00  00 00 02 50 0c 00 63 00
-                          3c 00 08 00 46 00 00 00  ff ff 82 00 43 00 6f 00
-                          6d 00 6d 00 61 00 6e 00  64 00 3a 00 00 00 00 00
-                       '''),
-             270 : a2b('''
-                          01 00 ff ff 00 00 00 00  00 00 00 00 48 04 00 44
-                          02 00 00 00 00 00 23 01  1a 00 00 00 00 00 00 00
-                          08 00 00 00 00 00 4d 00  53 00 20 00 53 00 68 00
-                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
-                          00 00 00 00 00 00 00 00  01 00 02 50 00 00 07 00
-                          23 01 08 00 ff ff ff ff  ff ff 82 00 53 00 74 00
-                          61 00 74 00 69 00 63 00  00 00 00 00 00 00 00 00
-                          00 00 00 00 00 00 02 40  00 00 12 00 23 01 08 00
-                          5f 04 00 00 ff ff 82 00  73 00 74 00 63 00 33 00
-                          32 00 00 00 00 00           
-                       '''),
-            }

launcher2/archiver.rpy

@@ -1,177 +0,0 @@
-init python:
-    import renpy.tools.archiver as archiver
-    import os
-    import os.path
-    import fnmatch
-    
-label archiver:
-
-    python hide:
-
-        # Get the options
-        name = project.info.get('archive_name', "data")
-        include = project.info.get('archive_include', "*.png *.gif *.jpg")
-        exclude = project.info.get('archive_exclude', "presplash.png")
-
-        # Allow the user to set the options.
-        while True:
-
-            set_tooltip("")
-
-            screen()
-            ui.vbox()
-            
-            title(_(u"Archiver"))
-
-            text(_(u"The archiver allows you to obfuscate your game by including files in an archive file."))
-
-            ui.null(height=15)
-            
-            text_variable(_(u"Archive Name:"), name, "name",
-                          _(u"The name of the archive to create."))
-
-            text_variable(_(u"Include Patterns:"), include, "include",
-                          _(u"Files matching these patterns are included in the archive."))
-
-            text_variable(_(u"Exclude Patterns:"), exclude, "exclude",
-                          _(u"Files matching these patterns are excluded from the archive."))
-
-            ui.null(height=15)
-
-            button(_(u"Archive"), ui.returns("archive"), _(u"Build the archive."))
-            button(_(u"Cancel"), ui.jumps("top"), "")
-
-            ui.close()
-
-            act = interact()
-
-            if act == "name":
-                name = input(
-                    _(u"Archive Name"),
-                    _(u"The name of the archive file to create, without the .rpa extension.\n\nThe \"data\" archive is loaded automatically. Other archives must be added to config.archives."),
-                    name)
-                       
-            elif act == "include":
-                include = input(
-                    _(u"Include Patterns"),
-                    _(u"This is a space-separated list of file patterns. Files matching these patterns are added to the archive.\n\nAsterisks (*) can be used as a wildcard."),
-                    include)
-
-            elif act == "exclude":
-                exclude = input(
-                    _(u"Include Patterns"),
-                    _(u"This is a space-separated list of file patterns. Files matching these patterns are excluded from the archive. If a file is matched by both an exclude and include pattern, the exclude takes precedence.\n\nAsterisks (*) can be used as a wildcard."),
-                    exclude)
-
-            elif act == "archive":
-                break
-
-        # Store the options.
-            
-        project.info["archive_name"] = name
-        project.info["archive_include"] = include
-        project.info["archive_exclude"] = exclude
-
-        project.save()
-
-
-        # Break up the extension lists.
-
-        include = [ i.strip() for i in include.split() ]
-        exclude = [ i.strip() for i in exclude.split() ]
-
-        # Get the gamedir and the archived dir.
-        gamedir = os.path.join(project.path, "game")
-        archived = os.path.join(project.path, "archived")
-
-        # The prefix of the archive file.
-        prefix = os.path.join(gamedir, name)
-
-        archived_files = set()
-        files = [ ]
-        
-        # Choose files to archive.
-
-        set_tooltip("")
-        
-        info(
-            _(u"Scanning Files..."),
-            "")
-        
-        for bdir in (gamedir, archived):
-            
-            for dirname, dirs, filenames in os.walk(bdir):
-                
-                dirs[:] = [ i for i in dirs if not i[0] == '.' ]
-
-                for fn in filenames:
-
-                    fullfn = dirname + "/" + fn
-                    shortfn = fullfn[len(bdir)+1:]
-
-                    if fn[0] == ".":
-                        continue
-                    
-                    if shortfn in archived_files:
-                        continue
-
-                    should_archive = False
-
-                    for i in include:
-                        if fnmatch.fnmatch(fn, i):
-                            should_archive = True
-
-                    for i in exclude:
-                        if fnmatch.fnmatch(fn, i):
-                            should_archive = False
-
-                    if not should_archive:
-                        continue
-
-                    files.append((fullfn, shortfn))
-                    archived_files.add(shortfn)
-
-        if not files:
-            error(_(u"The patterns did not match any files, so no archive was created."))
-                    
-        # Actually archiving files.
-        info(_(u"Archiving Files..."), "")
-                    
-        archiver.archive(prefix, files)
-
-        # Move files out of the way.
-        for fullfn, shortfn in files:
-            afn = archived + "/" + shortfn
-
-            if fullfn == afn:
-                continue
-
-            try:
-                os.makedirs(os.path.dirname(afn))
-            except:
-                pass
-
-            try:
-                os.rename(fullfn, afn)
-            except:
-                os.rename(afn, afn + ".old")
-                os.rename(fullfn, afn)
-                os.unlink(afn + ".old")
-
-        # Report success.
-        screen()
-        ui.vbox()
-        
-        title(_(u"Success"))
-        text(_(u"The files have been added to the archive, and moved into the \"archived\" directory. Future runs of the archiver will archive files in both the \"game\" and \"archived\" directories."))
-
-        ui.null(height=20)
-
-        button(_(u"Return"), ui.jumps("top"), None)
-        
-        ui.close()
-        interact()
-
-            
-        
-        

launcher2/change_icon.py

@@ -1,329 +0,0 @@
-
-# http://www.csn.ul.ie/~caolan/publink/winresdump/winresdump/doc/pefile.html
-# Contains a reasonable description of the format.
-
-import struct
-import sys
-import array
-import pefile
-
-# This class performs various operations on memory-loaded binary files,
-# including modifications.
-class BinFile(object):
-
-    def set_u32(self, addr, value):
-        self.a[addr+0] = (value >> 0) & 0xff
-        self.a[addr+1] = (value >> 8) & 0xff
-        self.a[addr+2] = (value >> 16) & 0xff
-        self.a[addr+3] = (value >> 24) & 0xff
-    
-    def u32(self):
-        addr = self.addr
-        rv = self.a[addr]
-        rv |= self.a[addr+1] << 8
-        rv |= self.a[addr+2] << 16
-        rv |= self.a[addr+3] << 24
-        self.addr += 4
-        return rv
-
-    def u16(self):
-        addr = self.addr
-        rv = self.a[addr]
-        rv |= self.a[addr+1] << 8
-        self.addr += 2
-        return rv
-
-    def u8(self):
-        rv = self.a[self.addr]
-        self.addr += 1
-        return rv
-
-    def name(self):
-        c = self.u16()
-
-        rv = u""
-        for _i in range(c):
-            rv += unichr(self.u16())
-
-        return rv
-    
-    def seek(self, addr):
-        self.addr = addr
-
-    def tostring(self):
-        return self.a.tostring()
-
-    def substring(self, start, len): #@ReservedAssignment
-        return self.a[start:start+len].tostring()
-    
-    def __init__(self, data):
-        self.a = array.array('B')
-        self.a.fromstring(data)
-
-##############################################################################
-# These functions parse data out of the file. In these functions, offset is
-# relative to the start of the file.
-
-# The virtual address of the resource segment.
-resource_virtual = 0
-        
-# This parses a data block out of the resources.
-def parse_data(bf, offset):
-    bf.seek(offset)
-    data_offset = bf.u32()
-    data_len = bf.u32()
-    code_page = bf.u32()
-    bf.u32()
-
-    l = [ ]
-
-    bf.seek(data_offset - resource_virtual)
-    for _i in range(data_len):
-        l.append(chr(bf.u8()))
-
-    return (code_page, "".join(l))
-
-# This parses a resource directory.
-def parse_directory(bf, offset):
-
-    bf.seek(offset)
-    char = bf.u32() #@UnusedVariable
-    timedate = bf.u32() #@UnusedVariable
-    major = bf.u16() #@UnusedVariable
-    minor = bf.u16() #@UnusedVariable
-    n_named = bf.u16()
-    n_id = bf.u16()
-
-    entries = [ ]
-    
-    for _i in range(n_named + n_id):
-        entries.append((bf.u32(), bf.u32()))
-
-    rv = { }
-
-    for name, value in entries:
-
-        if name & 0x80000000:
-            bf.seek((name & 0x7fffffff))
-            name = bf.name()
-
-        if value & 0x80000000:
-            value = parse_directory(bf, value & 0x7fffffff)
-        else:
-            value = parse_data(bf, value)
-
-        rv[name] = value
-            
-    return rv 
-
-
-##############################################################################
-# This utility function displays the tree of resources that have been loaded.
-def show_resources(d, prefix):
-
-    if not isinstance(d, dict):
-        print prefix, "Codepage", d[0], "length", len(d[1])
-        return
-        
-    for k in d:
-        print prefix, k
-        show_resources(d[k], prefix + "  ")
-
-##############################################################################
-# These functions repack the resources into a new resource segment. Here,
-# the offset is relative to the start of the resource segment.
-
-class Packer(object):
-
-    def pack(self, d):
-        self.data = ""
-        self.data_offset = 0
-
-        self.entries = ""
-        self.entries_offset = 0
-        
-        head = self.pack_dict(d, 0)
-
-        self.data = ""
-        self.data_offset = len(head) + len(self.entries)
-
-        self.entries = ""
-        self.entries_offset = len(head)
-
-        return self.pack_dict(d, 0) + self.entries + self.data
-        
-    def pack_name(self, s):
-        rv = self.data_offset + len(self.data)
-
-        l = len(s)
-        s = s.encode("utf-16le")
-        self.data += struct.pack("<H", l) + s + "\0\0"
-        
-        return rv
-
-    def pack_tuple(self, t):
-        codepage, data = t
-
-        rv = len(self.entries) + self.entries_offset        
-
-        if len(self.data) % 2:
-            self.data += "P"
-
-        daddr = len(self.data) + self.data_offset
-        
-        self.entries += struct.pack("<IIII", daddr + resource_virtual, len(data), codepage, 0)
-        self.data += data
-
-        # if len(self.data) % 1 == 1:
-        #    self.data += 'P'
-        
-        return rv
-    
-    def pack_dict(self, d, offset):
-        name_entries = sorted((a, b) for a, b in d.iteritems() if isinstance(a, unicode))
-        id_entries = sorted((a, b) for a, b in d.iteritems() if isinstance(a, int))
-        
-        rv = struct.pack("<IIHHHH", 0, 0, 4, 0, len(name_entries), len(id_entries))
-        
-        offset += len(rv) + (len(name_entries) + len(id_entries)) * 8
-        
-        rest = ""
-        
-        for (name, value) in name_entries + id_entries:
-            if isinstance(name, unicode):
-                name = 0x80000000 | self.pack_name(name)
-
-            if isinstance(value, dict):
-                addr = offset | 0x80000000
-                packed = self.pack_dict(value, offset)
-                offset += len(packed)
-                rest += packed
-            else:
-                addr = self.pack_tuple(value)
-                
-            rv += struct.pack("<II", name, addr)
-
-        return rv + rest
-        
-##############################################################################
-# This loads in an icon file, and returns a dictionary that is suitable for
-# use in the resources of an exe file.
-def load_icon(fn):
-    f = BinFile(file(fn, "rb").read())
-
-    f.seek(0)
-    f.u16()
-    f.u16()
-    count = f.u16()
-
-    rv = { }
-    rv[3] = { }
-
-    group = struct.pack("HHH", 0, 1, count)    
-    
-    for i in range(count):
-        width = f.u8()
-        height = f.u8()
-        colors = f.u8()
-        reserved = f.u8()
-        planes = f.u16()
-        bpp = f.u16()
-        size = f.u32()
-        offset = f.u32()
-
-        addr = f.addr
-        f.seek(offset + 16)
-        if not f.u32():
-            f.set_u32(offset + 20, 0)
-            
-        rv[3][i + 1] = { 0 : (1252, f.substring(offset, size)) }
-
-
-        group += struct.pack("BBBBHHIH", width, height, colors, reserved,
-                             planes, bpp, size, i + 1)
-        
-        f.seek(addr)
-
-    rv[14] = { 1 : { 0 : (1252, group) } }
-        
-    return rv
-
-
-##############################################################################
-# This is the main function that should be called externally, that copies over
-# the icons.
-def change_icons(oldexe, icofn):
-    global resource_virtual
-
-    pe = pefile.PE(oldexe)
-
-    for s in pe.sections:
-        if s.Name == ".rsrc\0\0\0":
-            rsrc_section = s
-            break
-    else:
-        raise Exception("Couldn't find resource section.")
-
-    base = rsrc_section.PointerToRawData
-    resource_virtual = rsrc_section.VirtualAddress
-
-    physize = rsrc_section.SizeOfRawData
-    virsize = rsrc_section.Misc_VirtualSize
-    
-    f = file(oldexe, "rb")
-    f.seek(base)
-    data = f.read(physize)
-    f.close()
-
-    bf = BinFile(data)
-    
-    resources = parse_directory(bf, 0)
-    # show_resources(resources, "")
-    resources.update(load_icon(icofn))
-    # show_resources(resources, "")
-    
-    rsrc = Packer().pack(resources)
-
-    alignment = pe.OPTIONAL_HEADER.SectionAlignment
-    
-    # print "Alignment is", alignment
-    
-    if len(rsrc) % alignment:
-        pad = alignment - (len(rsrc) % alignment)
-        padding = "RENPYVNE" * (pad / 8 + 1)
-        padding = padding[:pad]
-        rsrc += padding
-
-    newsize = len(rsrc)
-    
-    rsrc_section.Misc_VirtualSize += newsize - virsize
-    rsrc_section.Misc_PhysicalAddress += newsize - virsize
-    rsrc_section.Misc += newsize - virsize
-    rsrc_section.SizeOfRawData += newsize - physize
-    
-    pe.OPTIONAL_HEADER.SizeOfInitializedData += newsize - physize 
-
-    # Resource size.
-    pe.OPTIONAL_HEADER.DATA_DIRECTORY[2].Size += newsize - virsize
-
-    # Compute the total size of the image.
-    total_size = 0
-    
-    for i in pe.sections:
-
-        sec_size = i.Misc_VirtualSize
-        sec_size = sec_size - (sec_size % alignment) + alignment
-        print sec_size
-            
-        total_size += sec_size
-
-    pe.OPTIONAL_HEADER.SizeOfImage = total_size
-
-    return pe.write()[:base] + rsrc 
-    
-if __name__ == "__main__":
-
-    f = file(sys.argv[3], "wb")
-    f.write(change_icons(sys.argv[1], sys.argv[2]))
-    f.close()
-