Step towards making trunk work...?

About to downgrade ubuntu, wanted to get this stuff off my disk just in case. Can't make it any worse right? git-svn-id: https://exe.svn.sourceforge.net/svnroot/exe/trunk@2352 38b22f21-9aea-0310-abfc-843a9883df58
author: matiu <matiu@38b22f21-9aea-0310-abfc-843a9883df58> 2006-11-12 22:55:10 (GMT)
committer: matiu <matiu@38b22f21-9aea-0310-abfc-843a9883df58> 2006-11-12 22:55:10 (GMT)
commit: 5b24cd19511e73a055cae1349a6cacbc61c9dd12 (patch)
tree: 19254e5d385d6cc7e8227b181be6f185f7f643a5
parent: b3e15644440213be14eb90e99010f6b8ad6f27bd (diff)
170 files changed, 1584 insertions, 1113 deletions
diff --git a/app.fil b/app.fil
index cb6d52f..fddc560 100644
--- a/app.fil
+++ b/app.fil
@@ -67,7 +67,6 @@ exe/webui/multichoiceblock.py
 exe/webui/mathblock.py
 exe/webui/clozeblock.py
 exe/webui/errorpage.py
-exe/webui/quiztestblock.py
 exe/webui/freetextblock.py
 exe/webui/galleryblock.py
 exe/webui/webserver.py
diff --git a/exe/engine/beautifulsoup.py b/exe/engine/beautifulsoup.py
index fbc5f2b..f04a488 100644
--- a/exe/engine/beautifulsoup.py
+++ b/exe/engine/beautifulsoup.py
@@ -232,7 +232,6 @@ class PageElement:
             yield i
 
     def _matches(self, chunk, howToMatch):
-        #print 'looking for %s in %s' % (howToMatch, chunk)
         #
         # If given a list of items, return true if the list contains a
         # text element that matches.
@@ -714,13 +713,11 @@ class BeautifulStoneSoup(Tag, SGMLParser):
            isinstance(self.currentTag.contents[0], NavigableText):
             self.currentTag.string = self.currentTag.contents[0]
 
-        #print "Pop", tag.name
         if self.tagStack:
             self.currentTag = self.tagStack[-1]
         return self.currentTag
 
     def pushTag(self, tag):
-        #print "Push", tag.name
         if self.currentTag:
             self.currentTag.append(tag)
         self.tagStack.append(tag)
@@ -753,7 +750,6 @@ class BeautifulStoneSoup(Tag, SGMLParser):
         if name == self.ROOT_TAG_NAME:
             return            
 
-        #print "Pop to tag", name
         numPops = 0
         mostRecentTag = None
         for i in range(len(self.tagStack)-1, 0, -1):
@@ -818,7 +814,6 @@ class BeautifulStoneSoup(Tag, SGMLParser):
     def unknown_starttag(self, name, attrs, selfClosing=0):
         if self.quoteStack:
             #This is not a real tag.
-            #print "<%s> is not real!" % name
             attrs = ''.join(map(lambda(x, y): ' %s="%s"' % (x, y), attrs))
             self.handle_data('<%s%s>' % (name, attrs))
             return
@@ -833,13 +828,11 @@ class BeautifulStoneSoup(Tag, SGMLParser):
         if selfClosing or name in self.SELF_CLOSING_TAGS:
             self.popTag()                
         if name in self.QUOTE_TAGS:
-            #print "Beginning quote (%s)" % name
             self.quoteStack.append(name)
 
     def unknown_endtag(self, name):
         if self.quoteStack and self.quoteStack[-1] != name:
             #This is not a real end tag.
-            #print "</%s> is not real!" % name
             self.handle_data('</%s>' % name)
             return
         self.endData()
diff --git a/exe/engine/rssidevice.py b/exe/engine/rssidevice.py
index a081a5d..ff3cdb9 100644
--- a/exe/engine/rssidevice.py
+++ b/exe/engine/rssidevice.py
@@ -51,7 +51,7 @@ iDevice you can provide links from a feed you select for learners to view."""),
         self.icon             = u"inter"
         self._urlInstruc      = x_(u"""Enter an RSS URL for the RSS feed you 
 want to attach to your content. Feeds are often identified by a small graphic
- icon (often like this <img src="/images/feed-icon.png" />) or the text "RSS". Clicking on the 
+ icon (often like this <img src="feed-icon.png" />) or the text "RSS". Clicking on the 
  icon or text label will display an RSS feed right in your browser. You can copy and paste the
 URL into this field. Alternately, right clicking on the link or graphic will open a menu box;
 click on COPY LINK LOCATION or Copy Shortcut. Back in eXe open the RSS bookmark iDevice and Paste the URL 
@@ -73,7 +73,6 @@ display them as links in your content. From here you can edit the bookmarks and
         content = ""
         rssDic = feedparser.parse(url)
         length = len(rssDic['entries'])
-        print str(length)
         if length > 0 :
             for i in range(0, length):
                 content += '<p><A href="%s">%s</A></P>' %(
diff --git a/exe/export/imsexport.py b/exe/export/imsexport.py
index a9dbc0c..f28007c 100644
--- a/exe/export/imsexport.py
+++ b/exe/export/imsexport.py
@@ -190,7 +190,7 @@ class IMSPage(Page):
         html += u"@import url(base.css);\n"
         html += u"@import url(content.css);\n"
         html += u"</style>\n"
-        html += u'<script type="text/javascript" src="common.js"></script>\n'
+        html += u'<script type="text/javascript" src="common_exportable.js"></script>\n'
         html += u"</head>\n"
         html += u"<body>\n"
         html += u"<div id=\"outer\">\n"
@@ -280,7 +280,7 @@ class IMSExport(object):
                                   'imscp_v1p1.xsd',
                                   'imsmd_v1p2p2.xsd',
                                   'ims_xml.xsd',
-                                  'common.js'), outputDir)
+                                  'common_exportable.js'), outputDir)
 
         # copy video container file for flash movies.
         #videofile = (self.templatesDir/'videoContainer.swf')
diff --git a/exe/export/scormexport.py b/exe/export/scormexport.py
index 7af6e1e..efc9896 100644
--- a/exe/export/scormexport.py
+++ b/exe/export/scormexport.py
@@ -305,7 +305,7 @@ class ScormPage(Page):
         html += u"src=\"APIWrapper.js\"></script>\n" 
         html += u"<script type=\"text/javascript\" "
         html += u"src=\"SCOFunctions.js\"></script>\n"             
-        html += u'<script type="text/javascript" src="common.js"></script>\n'
+        html += u'<script type="text/javascript" src="common_exportable.js"></script>\n'
         html += u"</head>\n"
         html += u'<body onload="loadPage()" ' # onbeforeunload="unloadPage()" '
         html += u'onunload="unloadPage()">'
@@ -411,7 +411,7 @@ class ScormExport(object):
                                   'adlcp_rootv1p2.xsd',
                                   'SCOFunctions.js', 
                                   'libot_drag.js',
-                                  'common.js'), outputDir)
+                                  'common_exportable.js'), outputDir)
 
         # copy video container file for flash movies.
         #videofile = (self.templatesDir/'videoContainer.swf')
diff --git a/exe/export/singlepageexport.py b/exe/export/singlepageexport.py
index 0e96131..d5939eb 100644
--- a/exe/export/singlepageexport.py
+++ b/exe/export/singlepageexport.py
@@ -98,8 +98,7 @@ class SinglePageExport(object):
         package.resourceDir.copyfiles(self.outputDir)
 
         # copy script files.
-        self.scriptsDir.copylist(('libot_drag.js', 'common.js'), 
-                                     self.outputDir)
+        self.scriptsDir.copylist(('libot_drag.js', 'common_exportable.js'), self.outputDir)
 
         # copy video container file for flash movies.
         #videofile = (self.templatesDir/'videoContainer.swf')
@@ -130,7 +129,7 @@ class SinglePageExport(object):
         html += "</title>\n"
         html += u"<meta http-equiv=\"Content-Type\" content=\"text/html; "
         html += u" charset=utf-8\" />\n";
-        html += u'<script type="text/javascript" src="common.js"></script>\n'
+        html += u'<script type="text/javascript" src="common_exportable.js"></script>\n'
         html += u"</head>\n"
         return html
 
diff --git a/exe/export/websiteexport.py b/exe/export/websiteexport.py
index 4c6ce74..b557579 100644
--- a/exe/export/websiteexport.py
+++ b/exe/export/websiteexport.py
@@ -150,7 +150,7 @@ class WebsiteExport(object):
         package.resourceDir.copyfiles(outputDir)
             
         # copy script files.
-        self.scriptsDir.copylist(('libot_drag.js', 'common.js'), 
+        self.scriptsDir.copylist(('libot_drag.js', 'common_exportable.js'), 
                                   outputDir)
 
         # copy video container file for flash movies.
diff --git a/exe/export/websitepage.py b/exe/export/websitepage.py
index ec5bed3..7ceff77 100644
--- a/exe/export/websitepage.py
+++ b/exe/export/websitepage.py
@@ -77,7 +77,7 @@ class WebsitePage(object):
         html += u" </title>\n" 
         html += u"<meta http-equiv=\"Content-Type\" content=\"text/html; "
         html += u" charset=utf-8\" />\n";
-        html += u'<script type="text/javascript" src="common.js"></script>\n'
+        html += u'<script type="text/javascript" src="common_exportable.js"></script>\n'
         html += u"</head>\n"
         html += u"<body>\n"
         html += u"<div id=\"content\">\n"
diff --git a/exe/locale/cs/LC_MESSAGES/exe.mo b/exe/locale/cs/LC_MESSAGES/exe.mo
index e8d67d6..932293a 100644
--- a/exe/locale/cs/LC_MESSAGES/exe.mo
+++ b/exe/locale/cs/LC_MESSAGES/exe.mo
diff --git a/exe/locale/es/LC_MESSAGES/exe.mo b/exe/locale/es/LC_MESSAGES/exe.mo
index 0d47cb2..652c366 100644
--- a/exe/locale/es/LC_MESSAGES/exe.mo
+++ b/exe/locale/es/LC_MESSAGES/exe.mo
diff --git a/exe/locale/messages.pot b/exe/locale/messages.pot
index a11c2e9..2a51737 100644
--- a/exe/locale/messages.pot
+++ b/exe/locale/messages.pot
@@ -488,6 +488,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="delNode" key="delNodeKey" label="Delete">
 #: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="delNode" key="delNodeKey" label="Delete">
 #: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="delNode" key="delNodeKey" label="Delete">
+#: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="delNode" key="delNodeKey" label="Delete">
 msgid "Delete"
 msgstr ""
 
@@ -554,6 +555,8 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Description:" id="dcDescription" style="width:8em" tooltiptext="An account of the content of the resource.">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Description:" id="ppDescription" style="width:8em" tooltiptext="An account of the content of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Description:" id="dcDescription" style="width:8em" tooltiptext="An account of the content of the resource.">
+#: exe/resources/internal/templates/packageproperties.xul:<label value="Description:" id="ppDescription" style="width:8em" tooltiptext="An account of the content of the resource.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Description:" id="dcDescription" style="width:8em" tooltiptext="An account of the content of the resource.">
 msgid "Description:"
 msgstr ""
 
@@ -590,6 +593,9 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<button oncommand="submitForm(this.parentNode.parentNode);" id="ppBtnDone" label="Done">
 #: exe/resources/internal/templates/dublincore.xul:<button oncommand="submitForm(this.parentNode.parentNode)" id="dcBtnDone" label="Done">
 #: exe/resources/internal/templates/exportproperties.xul:<button oncommand="submitForm(this.parentNode.parentNode)" id="exportPropsDone" label="Done">
+#: exe/resources/internal/templates/packageproperties.xul:<button oncommand="submitForm(this.parentNode.parentNode);" id="ppBtnDone" label="Done">
+#: exe/resources/internal/templates/dublincore.xul:<button oncommand="submitForm(this.parentNode.parentNode)" id="dcBtnDone" label="Done">
+#: exe/resources/internal/templates/exportproperties.xul:<button oncommand="submitForm(this.parentNode.parentNode)" id="exportPropsDone" label="Done">
 msgid "Done"
 msgstr ""
 
@@ -1430,6 +1436,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menulist onchange="this.style.color = 'blue'" id="dc_language" label="Select Language">
 #: exe/resources/internal/templates/dublincore.xul:<menulist onchange="this.style.color = 'blue'" id="dc_language" label="Select Language">
 #: exe/resources/internal/templates/dublincore.xul:<menulist onchange="this.style.color = 'blue'" id="dc_language" label="Select Language">
+#: exe/resources/internal/templates/dublincore.xul:<menulist onchange="this.style.color = 'blue'" id="dc_language" label="Select Language">
 msgid "Select Language"
 msgstr ""
 
@@ -1964,6 +1971,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="toolsEditor()" label="iDevice Editor">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="toolsEditor()" label="iDevice Editor">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="toolsEditor()" label="iDevice Editor">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="toolsEditor()" label="iDevice Editor">
 msgid "iDevice Editor"
 msgstr ""
 
@@ -1999,6 +2007,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<caption id="dcCaptionMetadata" label="Dublin Core Metadata">
 #: exe/resources/internal/templates/dublincore.xul:<caption id="dcCaptionMetadata" label="Dublin Core Metadata">
 #: exe/resources/internal/templates/dublincore.xul:<caption id="dcCaptionMetadata" label="Dublin Core Metadata">
+#: exe/resources/internal/templates/dublincore.xul:<caption id="dcCaptionMetadata" label="Dublin Core Metadata">
 msgid "Dublin Core Metadata"
 msgstr ""
 
@@ -2006,6 +2015,7 @@ msgstr ""
 #: exe/resources/internal/templates/exportproperties.xul:<caption id="ppScolinks" label="SCORM 1.2 Options">
 #: exe/resources/internal/templates/exportproperties.xul:<caption id="ppScolinks" label="SCORM 1.2 Options">
 #: exe/resources/internal/templates/exportproperties.xul:<caption id="ppScolinks" label="SCORM 1.2 Options">
+#: exe/resources/internal/templates/exportproperties.xul:<caption id="ppScolinks" label="SCORM 1.2 Options">
 msgid "SCORM 1.2 Options"
 msgstr ""
 
@@ -2013,6 +2023,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="insertPackage()" label="Insert Package">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="insertPackage()" label="Insert Package">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="insertPackage()" label="Insert Package">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="insertPackage()" label="Insert Package">
 msgid "Insert Package"
 msgstr ""
 
@@ -2020,6 +2031,7 @@ msgstr ""
 #: exe/resources/internal/templates/metadata.xul:<tab label="Dublin Core">
 #: exe/resources/internal/templates/metadata.xul:<tab label="Dublin Core">
 #: exe/resources/internal/templates/metadata.xul:<tab label="Dublin Core">
+#: exe/resources/internal/templates/metadata.xul:<tab label="Dublin Core">
 msgid "Dublin Core"
 msgstr ""
 
@@ -2027,6 +2039,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<caption id="pptitle" label="Project Properties">
 #: exe/resources/internal/templates/packageproperties.xul:<caption id="pptitle" label="Project Properties">
 #: exe/resources/internal/templates/packageproperties.xul:<caption id="pptitle" label="Project Properties">
+#: exe/resources/internal/templates/packageproperties.xul:<caption id="pptitle" label="Project Properties">
 msgid "Project Properties"
 msgstr ""
 
@@ -2034,6 +2047,7 @@ msgstr ""
 #: exe/resources/internal/templates/properties.xul:<tab id="tabPackage" label="Package">
 #: exe/resources/internal/templates/properties.xul:<tab id="tabPackage" label="Package">
 #: exe/resources/internal/templates/properties.xul:<tab id="tabPackage" label="Package">
+#: exe/resources/internal/templates/properties.xul:<tab id="tabPackage" label="Package">
 msgid "Package"
 msgstr ""
 
@@ -2041,6 +2055,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Title:" id="dcTitle" style="width:8em" tooltiptext="The name given to the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Title:" id="dcTitle" style="width:8em" tooltiptext="The name given to the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Title:" id="dcTitle" style="width:8em" tooltiptext="The name given to the resource.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Title:" id="dcTitle" style="width:8em" tooltiptext="The name given to the resource.">
 msgid "Title:"
 msgstr ""
 
@@ -2048,6 +2063,7 @@ msgstr ""
 #: exe/resources/internal/templates/exportproperties.xul:<checkbox oncommand="this.style.color = 'blue';" id="pp_scolinks" label="Add Previous/Next links within SCOs?" tooltiptext="Checking this box will cause eXe to add Previous and Next links to individual pages within your SCO. The LMS will also still add this kind of functionality." checked="false">
 #: exe/resources/internal/templates/exportproperties.xul:<checkbox oncommand="this.style.color = 'blue';" id="pp_scolinks" label="Add Previous/Next links within SCOs?" tooltiptext="Checking this box will cause eXe to add Previous and Next links to individual pages within your SCO. The LMS will also still add this kind of functionality." checked="false">
 #: exe/resources/internal/templates/exportproperties.xul:<checkbox oncommand="this.style.color = 'blue';" id="pp_scolinks" label="Add Previous/Next links within SCOs?" tooltiptext="Checking this box will cause eXe to add Previous and Next links to individual pages within your SCO. The LMS will also still add this kind of functionality." checked="false">
+#: exe/resources/internal/templates/exportproperties.xul:<checkbox oncommand="this.style.color = 'blue';" id="pp_scolinks" label="Add Previous/Next links within SCOs?" tooltiptext="Checking this box will cause eXe to add Previous and Next links to individual pages within your SCO. The LMS will also still add this kind of functionality." checked="false">
 msgid "Add Previous/Next links within SCOs?"
 msgstr ""
 
@@ -2055,6 +2071,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="extractPackage()" label="Extract Package">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="extractPackage()" label="Extract Package">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="extractPackage()" label="Extract Package">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="extractPackage()" label="Extract Package">
 msgid "Extract Package"
 msgstr ""
 
@@ -2062,6 +2079,7 @@ msgstr ""
 #: exe/resources/internal/templates/metadata.xul:<tab label="IEEE LOM">
 #: exe/resources/internal/templates/metadata.xul:<tab label="IEEE LOM">
 #: exe/resources/internal/templates/metadata.xul:<tab label="IEEE LOM">
+#: exe/resources/internal/templates/metadata.xul:<tab label="IEEE LOM">
 msgid "IEEE LOM"
 msgstr ""
 
@@ -2069,6 +2087,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Project Title:" id="ppProjectTitle" style="width:8em" tooltiptext="The project's title.">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Project Title:" id="ppProjectTitle" style="width:8em" tooltiptext="The project's title.">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Project Title:" id="ppProjectTitle" style="width:8em" tooltiptext="The project's title.">
+#: exe/resources/internal/templates/packageproperties.xul:<label value="Project Title:" id="ppProjectTitle" style="width:8em" tooltiptext="The project's title.">
 msgid "Project Title:"
 msgstr ""
 
@@ -2076,6 +2095,7 @@ msgstr ""
 #: exe/resources/internal/templates/properties.xul:<tab id="tabMetadata" label="Metadata">
 #: exe/resources/internal/templates/properties.xul:<tab id="tabMetadata" label="Metadata">
 #: exe/resources/internal/templates/properties.xul:<tab id="tabMetadata" label="Metadata">
+#: exe/resources/internal/templates/properties.xul:<tab id="tabMetadata" label="Metadata">
 msgid "Metadata"
 msgstr ""
 
@@ -2083,6 +2103,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Creator:" id="dcCreator" style="width:8em" tooltiptext="An entity primarily responsible for making the content of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Creator:" id="dcCreator" style="width:8em" tooltiptext="An entity primarily responsible for making the content of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Creator:" id="dcCreator" style="width:8em" tooltiptext="An entity primarily responsible for making the content of the resource.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Creator:" id="dcCreator" style="width:8em" tooltiptext="An entity primarily responsible for making the content of the resource.">
 msgid "Creator:"
 msgstr ""
 
@@ -2090,6 +2111,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="addChild" keycode="VK_INSERT" id="addChildKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="addChild" keycode="VK_INSERT" id="addChildKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="addChild" keycode="VK_INSERT" id="addChildKey">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="addChild" keycode="VK_INSERT" id="addChildKey">
 msgid "VK_INSERT"
 msgstr ""
 
@@ -2097,6 +2119,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Header Background:" id="ppBackgroundImg" style="width:8em" tooltiptext="Background image for a header (an image 100px high is recommended).">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Header Background:" id="ppBackgroundImg" style="width:8em" tooltiptext="Background image for a header (an image 100px high is recommended).">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Header Background:" id="ppBackgroundImg" style="width:8em" tooltiptext="Background image for a header (an image 100px high is recommended).">
+#: exe/resources/internal/templates/packageproperties.xul:<label value="Header Background:" id="ppBackgroundImg" style="width:8em" tooltiptext="Background image for a header (an image 100px high is recommended).">
 msgid "Header Background:"
 msgstr ""
 
@@ -2104,6 +2127,7 @@ msgstr ""
 #: exe/resources/internal/templates/properties.xul:<tab id="tabExport" label="Export">
 #: exe/resources/internal/templates/properties.xul:<tab id="tabExport" label="Export">
 #: exe/resources/internal/templates/properties.xul:<tab id="tabExport" label="Export">
+#: exe/resources/internal/templates/properties.xul:<tab id="tabExport" label="Export">
 msgid "Export"
 msgstr ""
 
@@ -2111,6 +2135,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Subject:" id="dcSubject" style="width:8em" tooltiptext="The topic of the content of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Subject:" id="dcSubject" style="width:8em" tooltiptext="The topic of the content of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Subject:" id="dcSubject" style="width:8em" tooltiptext="The topic of the content of the resource.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Subject:" id="dcSubject" style="width:8em" tooltiptext="The topic of the content of the resource.">
 msgid "Subject:"
 msgstr ""
 
@@ -2118,6 +2143,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="delNode" keycode="VK_DELETE" id="delNodeKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="delNode" keycode="VK_DELETE" id="delNodeKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="delNode" keycode="VK_DELETE" id="delNodeKey">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="delNode" keycode="VK_DELETE" id="delNodeKey">
 msgid "VK_DELETE"
 msgstr ""
 
@@ -2125,6 +2151,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<button oncommand="addImage('pp_backgroundImg');" id="loadImage" label="Load Image">
 #: exe/resources/internal/templates/packageproperties.xul:<button oncommand="addImage('pp_backgroundImg');" id="loadImage" label="Load Image">
 #: exe/resources/internal/templates/packageproperties.xul:<button oncommand="addImage('pp_backgroundImg');" id="loadImage" label="Load Image">
+#: exe/resources/internal/templates/packageproperties.xul:<button oncommand="addImage('pp_backgroundImg');" id="loadImage" label="Load Image">
 msgid "Load Image"
 msgstr ""
 
@@ -2132,6 +2159,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<description id="dcDescSubject">
 #: exe/resources/internal/templates/dublincore.xul:<description id="dcDescSubject">
 #: exe/resources/internal/templates/dublincore.xul:<description id="dcDescSubject">
+#: exe/resources/internal/templates/dublincore.xul:<description id="dcDescSubject">
 msgid ""
 "\n"
 "                Typically, Subject will be expressed as keywords, key phrases or\n"
@@ -2145,6 +2173,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="renNode" key="R" modifiers="control" id="renNodeKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="renNode" key="R" modifiers="control" id="renNodeKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="renNode" key="R" modifiers="control" id="renNodeKey">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="renNode" key="R" modifiers="control" id="renNodeKey">
 msgid "R"
 msgstr ""
 
@@ -2152,6 +2181,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<button oncommand="clearImage('pp_backgroundImg');" id="clearImage" label="Clear Image">
 #: exe/resources/internal/templates/packageproperties.xul:<button oncommand="clearImage('pp_backgroundImg');" id="clearImage" label="Clear Image">
 #: exe/resources/internal/templates/packageproperties.xul:<button oncommand="clearImage('pp_backgroundImg');" id="clearImage" label="Clear Image">
+#: exe/resources/internal/templates/packageproperties.xul:<button oncommand="clearImage('pp_backgroundImg');" id="clearImage" label="Clear Image">
 msgid "Clear Image"
 msgstr ""
 
@@ -2159,6 +2189,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Publisher:" id="dcPublisher" style="width:8em" tooltiptext="An entity responsible for making the resource available.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Publisher:" id="dcPublisher" style="width:8em" tooltiptext="An entity responsible for making the resource available.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Publisher:" id="dcPublisher" style="width:8em" tooltiptext="An entity responsible for making the resource available.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Publisher:" id="dcPublisher" style="width:8em" tooltiptext="An entity responsible for making the resource available.">
 msgid "Publisher:"
 msgstr ""
 
@@ -2166,6 +2197,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="promote" keycode="VK_LEFT" modifiers="control" id="promoteKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="promote" keycode="VK_LEFT" modifiers="control" id="promoteKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="promote" keycode="VK_LEFT" modifiers="control" id="promoteKey">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="promote" keycode="VK_LEFT" modifiers="control" id="promoteKey">
 msgid "VK_LEFT"
 msgstr ""
 
@@ -2173,6 +2205,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<checkbox oncommand="this.style.color = 'blue';" id="pp_backgroundImgTile" label="Tile background image?" checked="false">
 #: exe/resources/internal/templates/packageproperties.xul:<checkbox oncommand="this.style.color = 'blue';" id="pp_backgroundImgTile" label="Tile background image?" checked="false">
 #: exe/resources/internal/templates/packageproperties.xul:<checkbox oncommand="this.style.color = 'blue';" id="pp_backgroundImgTile" label="Tile background image?" checked="false">
+#: exe/resources/internal/templates/packageproperties.xul:<checkbox oncommand="this.style.color = 'blue';" id="pp_backgroundImgTile" label="Tile background image?" checked="false">
 msgid "Tile background image?"
 msgstr ""
 
@@ -2180,6 +2213,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Contributors:" id="dcContributors" style="width:8em" tooltiptext="An entity responsible for making contributions to the content of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Contributors:" id="dcContributors" style="width:8em" tooltiptext="An entity responsible for making contributions to the content of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Contributors:" id="dcContributors" style="width:8em" tooltiptext="An entity responsible for making contributions to the content of the resource.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Contributors:" id="dcContributors" style="width:8em" tooltiptext="An entity responsible for making contributions to the content of the resource.">
 msgid "Contributors:"
 msgstr ""
 
@@ -2187,6 +2221,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="demote" keycode="VK_RIGHT" modifiers="control" id="demoteKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="demote" keycode="VK_RIGHT" modifiers="control" id="demoteKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="demote" keycode="VK_RIGHT" modifiers="control" id="demoteKey">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="demote" keycode="VK_RIGHT" modifiers="control" id="demoteKey">
 msgid "VK_RIGHT"
 msgstr ""
 
@@ -2194,6 +2229,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Author:" id="ppAuthor" style="width:8em" tooltiptext="Primary author of the resource.">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Author:" id="ppAuthor" style="width:8em" tooltiptext="Primary author of the resource.">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Author:" id="ppAuthor" style="width:8em" tooltiptext="Primary author of the resource.">
+#: exe/resources/internal/templates/packageproperties.xul:<label value="Author:" id="ppAuthor" style="width:8em" tooltiptext="Primary author of the resource.">
 msgid "Author:"
 msgstr ""
 
@@ -2201,6 +2237,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Date:" id="dcDate" style="width:8em" tooltiptext="A date of an event in the lifecycle of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Date:" id="dcDate" style="width:8em" tooltiptext="A date of an event in the lifecycle of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Date:" id="dcDate" style="width:8em" tooltiptext="A date of an event in the lifecycle of the resource.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Date:" id="dcDate" style="width:8em" tooltiptext="A date of an event in the lifecycle of the resource.">
 msgid "Date:"
 msgstr ""
 
@@ -2208,6 +2245,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="up" key="U" modifiers="control" id="upKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="up" key="U" modifiers="control" id="upKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="up" key="U" modifiers="control" id="upKey">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="up" key="U" modifiers="control" id="upKey">
 msgid "U"
 msgstr ""
 
@@ -2215,6 +2253,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<caption id="ppCaptionTaxonomy" label="Taxonomy">
 #: exe/resources/internal/templates/packageproperties.xul:<caption id="ppCaptionTaxonomy" label="Taxonomy">
 #: exe/resources/internal/templates/packageproperties.xul:<caption id="ppCaptionTaxonomy" label="Taxonomy">
+#: exe/resources/internal/templates/packageproperties.xul:<caption id="ppCaptionTaxonomy" label="Taxonomy">
 msgid "Taxonomy"
 msgstr ""
 
@@ -2222,6 +2261,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<description id="dcDescDate">
 #: exe/resources/internal/templates/dublincore.xul:<description id="dcDescDate">
 #: exe/resources/internal/templates/dublincore.xul:<description id="dcDescDate">
+#: exe/resources/internal/templates/dublincore.xul:<description id="dcDescDate">
 msgid ""
 "\n"
 "                 Typically, Date will be associated with the creation or\n"
@@ -2234,6 +2274,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="down" key="D" modifiers="control" id="downKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="down" key="D" modifiers="control" id="downKey">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="down" key="D" modifiers="control" id="downKey">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="down" key="D" modifiers="control" id="downKey">
 msgid "D"
 msgstr ""
 
@@ -2241,6 +2282,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Level 1:" id="ppLevel1" style="width:8em" tooltiptext="Default name for level 1 nodes">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Level 1:" id="ppLevel1" style="width:8em" tooltiptext="Default name for level 1 nodes">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Level 1:" id="ppLevel1" style="width:8em" tooltiptext="Default name for level 1 nodes">
+#: exe/resources/internal/templates/packageproperties.xul:<label value="Level 1:" id="ppLevel1" style="width:8em" tooltiptext="Default name for level 1 nodes">
 msgid "Level 1:"
 msgstr ""
 
@@ -2248,6 +2290,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Type:" id="dcType" style="width:8em" tooltiptext="The nature or genre of the content of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Type:" id="dcType" style="width:8em" tooltiptext="The nature or genre of the content of the resource.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Type:" id="dcType" style="width:8em" tooltiptext="The nature or genre of the content of the resource.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Type:" id="dcType" style="width:8em" tooltiptext="The nature or genre of the content of the resource.">
 msgid "Type:"
 msgstr ""
 
@@ -2255,6 +2298,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="N" modifiers="control" id="file-new-key" oncommand="fileNew()">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="N" modifiers="control" id="file-new-key" oncommand="fileNew()">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="N" modifiers="control" id="file-new-key" oncommand="fileNew()">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="N" modifiers="control" id="file-new-key" oncommand="fileNew()">
 msgid "N"
 msgstr ""
 
@@ -2262,6 +2306,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Level 2:" id="ppLevel2" style="width:8em" tooltiptext="Default name for level 2 nodes">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Level 2:" id="ppLevel2" style="width:8em" tooltiptext="Default name for level 2 nodes">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Level 2:" id="ppLevel2" style="width:8em" tooltiptext="Default name for level 2 nodes">
+#: exe/resources/internal/templates/packageproperties.xul:<label value="Level 2:" id="ppLevel2" style="width:8em" tooltiptext="Default name for level 2 nodes">
 msgid "Level 2:"
 msgstr ""
 
@@ -2269,6 +2314,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<description id="dcDescType">
 #: exe/resources/internal/templates/dublincore.xul:<description id="dcDescType">
 #: exe/resources/internal/templates/dublincore.xul:<description id="dcDescType">
+#: exe/resources/internal/templates/dublincore.xul:<description id="dcDescType">
 msgid ""
 "\n"
 "              Type includes terms describing general categories, functions, or\n"
@@ -2280,6 +2326,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="S" modifiers="control" id="file-save-key" oncommand="fileSave()">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="S" modifiers="control" id="file-save-key" oncommand="fileSave()">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="S" modifiers="control" id="file-save-key" oncommand="fileSave()">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="S" modifiers="control" id="file-save-key" oncommand="fileSave()">
 msgid "S"
 msgstr ""
 
@@ -2287,6 +2334,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Level 3:" id="ppLevel3" style="width:8em" tooltiptext="Default name for level 3 nodes">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Level 3:" id="ppLevel3" style="width:8em" tooltiptext="Default name for level 3 nodes">
 #: exe/resources/internal/templates/packageproperties.xul:<label value="Level 3:" id="ppLevel3" style="width:8em" tooltiptext="Default name for level 3 nodes">
+#: exe/resources/internal/templates/packageproperties.xul:<label value="Level 3:" id="ppLevel3" style="width:8em" tooltiptext="Default name for level 3 nodes">
 msgid "Level 3:"
 msgstr ""
 
@@ -2294,6 +2342,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Format:" id="dcFormat" style="width:8em" tooltiptext="Select a Format.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Format:" id="dcFormat" style="width:8em" tooltiptext="Select a Format.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Format:" id="dcFormat" style="width:8em" tooltiptext="Select a Format.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Format:" id="dcFormat" style="width:8em" tooltiptext="Select a Format.">
 msgid "Format:"
 msgstr ""
 
@@ -2301,6 +2350,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="O" modifiers="control" id="file-open-key" oncommand="fileOpen()">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="O" modifiers="control" id="file-open-key" oncommand="fileOpen()">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="O" modifiers="control" id="file-open-key" oncommand="fileOpen()">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="O" modifiers="control" id="file-open-key" oncommand="fileOpen()">
 msgid "O"
 msgstr ""
 
@@ -2308,6 +2358,7 @@ msgstr ""
 #: exe/resources/internal/templates/packageproperties.xul:<button flex="0" oncommand="submitForm(this.parentNode.parentNode, 'window.parent.location.reload(true);');" id="ppBtnUpdateTree" label="Update Tree" tooltiptext="Submit changes and update the tree display">
 #: exe/resources/internal/templates/packageproperties.xul:<button flex="0" oncommand="submitForm(this.parentNode.parentNode, 'window.parent.location.reload(true);');" id="ppBtnUpdateTree" label="Update Tree" tooltiptext="Submit changes and update the tree display">
 #: exe/resources/internal/templates/packageproperties.xul:<button flex="0" oncommand="submitForm(this.parentNode.parentNode, 'window.parent.location.reload(true);');" id="ppBtnUpdateTree" label="Update Tree" tooltiptext="Submit changes and update the tree display">
+#: exe/resources/internal/templates/packageproperties.xul:<button flex="0" oncommand="submitForm(this.parentNode.parentNode, 'window.parent.location.reload(true);');" id="ppBtnUpdateTree" label="Update Tree" tooltiptext="Submit changes and update the tree display">
 msgid "Update Tree"
 msgstr ""
 
@@ -2315,6 +2366,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menulist onchange="this.style.color = 'blue'" id="dc_format" label="Select Format">
 #: exe/resources/internal/templates/dublincore.xul:<menulist onchange="this.style.color = 'blue'" id="dc_format" label="Select Format">
 #: exe/resources/internal/templates/dublincore.xul:<menulist onchange="this.style.color = 'blue'" id="dc_format" label="Select Format">
+#: exe/resources/internal/templates/dublincore.xul:<menulist onchange="this.style.color = 'blue'" id="dc_format" label="Select Format">
 msgid "Select Format"
 msgstr ""
 
@@ -2322,6 +2374,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="Q" modifiers="control" id="file-quit-key" oncommand="fileQuit()">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="Q" modifiers="control" id="file-quit-key" oncommand="fileQuit()">
 #: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="Q" modifiers="control" id="file-quit-key" oncommand="fileQuit()">
+#: exe/resources/internal/templates/mainpage.xul:<key n:render="translate" key="Q" modifiers="control" id="file-quit-key" oncommand="fileQuit()">
 msgid "Q"
 msgstr ""
 
@@ -2329,6 +2382,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="XHTML" id="dcmiXHTML" label="XHTML">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="XHTML" id="dcmiXHTML" label="XHTML">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="XHTML" id="dcmiXHTML" label="XHTML">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="XHTML" id="dcmiXHTML" label="XHTML">
 msgid "XHTML"
 msgstr ""
 
@@ -2336,6 +2390,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="file-menu" accesskey="f" label="File">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="file-menu" accesskey="f" label="File">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="file-menu" accesskey="f" label="File">
+#: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="file-menu" accesskey="f" label="File">
 msgid "label=\"File\" accesskey=\"f\""
 msgstr ""
 
@@ -2343,6 +2398,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="SCORM 1.2" id="dcmiSCORM" label="SCORM 1.2">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="SCORM 1.2" id="dcmiSCORM" label="SCORM 1.2">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="SCORM 1.2" id="dcmiSCORM" label="SCORM 1.2">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="SCORM 1.2" id="dcmiSCORM" label="SCORM 1.2">
 msgid "SCORM 1.2"
 msgstr ""
 
@@ -2350,6 +2406,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-new-key" oncommand="fileNew()" accesskey="n" label="New">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-new-key" oncommand="fileNew()" accesskey="n" label="New">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-new-key" oncommand="fileNew()" accesskey="n" label="New">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-new-key" oncommand="fileNew()" accesskey="n" label="New">
 msgid "label=\"New\" accesskey=\"n\""
 msgstr ""
 
@@ -2357,6 +2414,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="IMS-CP" id="dcmiIMS" label="IMS Content Package 1.1.3">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="IMS-CP" id="dcmiIMS" label="IMS Content Package 1.1.3">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="IMS-CP" id="dcmiIMS" label="IMS Content Package 1.1.3">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="IMS-CP" id="dcmiIMS" label="IMS Content Package 1.1.3">
 msgid "IMS Content Package 1.1.3"
 msgstr ""
 
@@ -2364,6 +2422,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-open-key" oncommand="fileOpen()" accesskey="o" label="Open">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-open-key" oncommand="fileOpen()" accesskey="o" label="Open">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-open-key" oncommand="fileOpen()" accesskey="o" label="Open">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-open-key" oncommand="fileOpen()" accesskey="o" label="Open">
 msgid "label=\"Open\" accesskey=\"o\""
 msgstr ""
 
@@ -2375,6 +2434,8 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="website" label="Web Site">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="Web Site" id="dcmiWebSite" label="Web Site">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="website" label="Web Site">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="Web Site" id="dcmiWebSite" label="Web Site">
+#: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="website" label="Web Site">
 msgid "Web Site"
 msgstr ""
 
@@ -2382,6 +2443,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-save-key" oncommand="fileSave()" accesskey="s" label="Save">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-save-key" oncommand="fileSave()" accesskey="s" label="Save">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-save-key" oncommand="fileSave()" accesskey="s" label="Save">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" key="file-save-key" oncommand="fileSave()" accesskey="s" label="Save">
 msgid "label=\"Save\" accesskey=\"s\""
 msgstr ""
 
@@ -2389,6 +2451,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Identifier:" id="dcIdentifier" style="width:8em" tooltiptext="An unambiguous reference to the resource within a given context.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Identifier:" id="dcIdentifier" style="width:8em" tooltiptext="An unambiguous reference to the resource within a given context.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Identifier:" id="dcIdentifier" style="width:8em" tooltiptext="An unambiguous reference to the resource within a given context.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Identifier:" id="dcIdentifier" style="width:8em" tooltiptext="An unambiguous reference to the resource within a given context.">
 msgid "Identifier:"
 msgstr ""
 
@@ -2396,6 +2459,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="fileSaveAs()" accesskey="a" label="Save As...">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="fileSaveAs()" accesskey="a" label="Save As...">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="fileSaveAs()" accesskey="a" label="Save As...">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="fileSaveAs()" accesskey="a" label="Save As...">
 msgid "label=\"Save As...\" accesskey=\"a\""
 msgstr ""
 
@@ -2403,6 +2467,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Source:" id="dcSource" style="width:8em" tooltiptext="A Reference to a resource from which the present resource is derived.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Source:" id="dcSource" style="width:8em" tooltiptext="A Reference to a resource from which the present resource is derived.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Source:" id="dcSource" style="width:8em" tooltiptext="A Reference to a resource from which the present resource is derived.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Source:" id="dcSource" style="width:8em" tooltiptext="A Reference to a resource from which the present resource is derived.">
 msgid "Source:"
 msgstr ""
 
@@ -2410,6 +2475,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="export-menu" accesskey="e" label="Export">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="export-menu" accesskey="e" label="Export">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="export-menu" accesskey="e" label="Export">
+#: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="export-menu" accesskey="e" label="Export">
 msgid "label=\"Export\" accesskey=\"e\""
 msgstr ""
 
@@ -2417,6 +2483,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<label value="Language:" id="dcLanguage" style="width:8em" tooltiptext="Select a language.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Language:" id="dcLanguage" style="width:8em" tooltiptext="Select a language.">
 #: exe/resources/internal/templates/dublincore.xul:<label value="Language:" id="dcLanguage" style="width:8em" tooltiptext="Select a language.">
+#: exe/resources/internal/templates/dublincore.xul:<label value="Language:" id="dcLanguage" style="width:8em" tooltiptext="Select a language.">
 msgid "Language:"
 msgstr ""
 
@@ -2424,6 +2491,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('scorm')" accesskey="s" label="SCORM 1.2">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('scorm')" accesskey="s" label="SCORM 1.2">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('scorm')" accesskey="s" label="SCORM 1.2">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('scorm')" accesskey="s" label="SCORM 1.2">
 msgid "label=\"SCORM 1.2\" accesskey=\"s\""
 msgstr ""
 
@@ -2431,6 +2499,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="aa" id="dcmiaa" label="Afar ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="aa" id="dcmiaa" label="Afar ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="aa" id="dcmiaa" label="Afar ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="aa" id="dcmiaa" label="Afar ">
 msgid "Afar "
 msgstr ""
 
@@ -2438,6 +2507,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('ims')" accesskey="i" label="IMS Content Package">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('ims')" accesskey="i" label="IMS Content Package">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('ims')" accesskey="i" label="IMS Content Package">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('ims')" accesskey="i" label="IMS Content Package">
 msgid "label=\"IMS Content Package\" accesskey=\"i\""
 msgstr ""
 
@@ -2445,6 +2515,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ab" id="dcmiab" label="Abkhazian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ab" id="dcmiab" label="Abkhazian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ab" id="dcmiab" label="Abkhazian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ab" id="dcmiab" label="Abkhazian ">
 msgid "Abkhazian "
 msgstr ""
 
@@ -2452,6 +2523,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('webSite')" label="Self-contained Folder">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('webSite')" label="Self-contained Folder">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('webSite')" label="Self-contained Folder">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('webSite')" label="Self-contained Folder">
 msgid "Self-contained Folder"
 msgstr ""
 
@@ -2459,6 +2531,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ae" id="dcmiae" label="Avestan ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ae" id="dcmiae" label="Avestan ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ae" id="dcmiae" label="Avestan ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ae" id="dcmiae" label="Avestan ">
 msgid "Avestan "
 msgstr ""
 
@@ -2466,6 +2539,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('zipFile')" label="Zip File">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('zipFile')" label="Zip File">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('zipFile')" label="Zip File">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('zipFile')" label="Zip File">
 msgid "Zip File"
 msgstr ""
 
@@ -2473,6 +2547,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="af" id="dcmiaf" label="Afrikaans ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="af" id="dcmiaf" label="Afrikaans ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="af" id="dcmiaf" label="Afrikaans ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="af" id="dcmiaf" label="Afrikaans ">
 msgid "Afrikaans "
 msgstr ""
 
@@ -2480,6 +2555,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('singlePage')" accesskey="p" label="Single Page">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('singlePage')" accesskey="p" label="Single Page">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('singlePage')" accesskey="p" label="Single Page">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('singlePage')" accesskey="p" label="Single Page">
 msgid "label=\"Single Page\" accesskey=\"p\""
 msgstr ""
 
@@ -2487,6 +2563,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="am" id="dcmiam" label="Amharic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="am" id="dcmiam" label="Amharic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="am" id="dcmiam" label="Amharic ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="am" id="dcmiam" label="Amharic ">
 msgid "Amharic "
 msgstr ""
 
@@ -2494,6 +2571,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('textFile')" accesskey="t" label="Text File">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('textFile')" accesskey="t" label="Text File">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('textFile')" accesskey="t" label="Text File">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="exportPackage('textFile')" accesskey="t" label="Text File">
 msgid "label=\"Text File\" accesskey=\"t\""
 msgstr ""
 
@@ -2501,6 +2579,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ar" id="dcmiar" label="Arabic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ar" id="dcmiar" label="Arabic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ar" id="dcmiar" label="Arabic ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ar" id="dcmiar" label="Arabic ">
 msgid "Arabic "
 msgstr ""
 
@@ -2512,6 +2591,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="as" id="dcmias" label="Assamese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="as" id="dcmias" label="Assamese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="as" id="dcmias" label="Assamese ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="as" id="dcmias" label="Assamese ">
 msgid "Assamese "
 msgstr ""
 
@@ -2519,6 +2599,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="insertPackage()" accesskey="i" label="Insert Package">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="insertPackage()" accesskey="i" label="Insert Package">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="insertPackage()" accesskey="i" label="Insert Package">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="insertPackage()" accesskey="i" label="Insert Package">
 msgid "label=\"Insert Package\" accesskey=\"i\""
 msgstr ""
 
@@ -2526,6 +2607,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ay" id="dcmiay" label="Aymara ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ay" id="dcmiay" label="Aymara ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ay" id="dcmiay" label="Aymara ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ay" id="dcmiay" label="Aymara ">
 msgid "Aymara "
 msgstr ""
 
@@ -2533,6 +2615,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="extractPackage()" accesskey="E" label="Extract Package">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="extractPackage()" accesskey="E" label="Extract Package">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="extractPackage()" accesskey="E" label="Extract Package">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="extractPackage()" accesskey="E" label="Extract Package">
 msgid "label=\"Extract Package\" accesskey=\"E\""
 msgstr ""
 
@@ -2540,6 +2623,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="az" id="dcmiaz" label="Azerbaijani ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="az" id="dcmiaz" label="Azerbaijani ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="az" id="dcmiaz" label="Azerbaijani ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="az" id="dcmiaz" label="Azerbaijani ">
 msgid "Azerbaijani "
 msgstr ""
 
@@ -2547,6 +2631,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="fileQuit()" accesskey="q" label="Quit">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="fileQuit()" accesskey="q" label="Quit">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="fileQuit()" accesskey="q" label="Quit">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="fileQuit()" accesskey="q" label="Quit">
 msgid "label=\"Quit\" accesskey=\"q\""
 msgstr ""
 
@@ -2554,6 +2639,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ba" id="dcmiba" label="Bashkir ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ba" id="dcmiba" label="Bashkir ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ba" id="dcmiba" label="Bashkir ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ba" id="dcmiba" label="Bashkir ">
 msgid "Bashkir "
 msgstr ""
 
@@ -2561,6 +2647,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="tools-menu" accesskey="t" label="Tools">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="tools-menu" accesskey="t" label="Tools">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="tools-menu" accesskey="t" label="Tools">
+#: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="tools-menu" accesskey="t" label="Tools">
 msgid "label=\"Tools\" accesskey=\"t\""
 msgstr ""
 
@@ -2568,6 +2655,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="be" id="dcmibe" label="Byelorussian; Belarusian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="be" id="dcmibe" label="Byelorussian; Belarusian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="be" id="dcmibe" label="Byelorussian; Belarusian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="be" id="dcmibe" label="Byelorussian; Belarusian ">
 msgid "Byelorussian; Belarusian "
 msgstr ""
 
@@ -2575,6 +2663,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="toolsPreferences()" label="Preferences">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="toolsPreferences()" label="Preferences">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="toolsPreferences()" label="Preferences">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="toolsPreferences()" label="Preferences">
 msgid "Preferences"
 msgstr ""
 
@@ -2582,6 +2671,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bg" id="dcmibg" label="Bulgarian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bg" id="dcmibg" label="Bulgarian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bg" id="dcmibg" label="Bulgarian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="bg" id="dcmibg" label="Bulgarian ">
 msgid "Bulgarian "
 msgstr ""
 
@@ -2589,6 +2679,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="styles-menu" accesskey="s" label="Styles">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="styles-menu" accesskey="s" label="Styles">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="styles-menu" accesskey="s" label="Styles">
+#: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="styles-menu" accesskey="s" label="Styles">
 msgid "label=\"Styles\" accesskey=\"s\""
 msgstr ""
 
@@ -2596,6 +2687,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bh" id="dcmibh" label="Bihari ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bh" id="dcmibh" label="Bihari ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bh" id="dcmibh" label="Bihari ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="bh" id="dcmibh" label="Bihari ">
 msgid "Bihari "
 msgstr ""
 
@@ -2603,6 +2695,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="window.location = window.location" id="refresh-menu" accesskey="r" label="Refresh">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="window.location = window.location" id="refresh-menu" accesskey="r" label="Refresh">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="window.location = window.location" id="refresh-menu" accesskey="r" label="Refresh">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="window.location = window.location" id="refresh-menu" accesskey="r" label="Refresh">
 msgid "label=\"Refresh\" accesskey=\"r\""
 msgstr ""
 
@@ -2610,6 +2703,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bi" id="dcmibi" label="Bislama ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bi" id="dcmibi" label="Bislama ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bi" id="dcmibi" label="Bislama ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="bi" id="dcmibi" label="Bislama ">
 msgid "Bislama "
 msgstr ""
 
@@ -2617,6 +2711,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="help-menu" accesskey="h" label="Help">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="help-menu" accesskey="h" label="Help">
 #: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="help-menu" accesskey="h" label="Help">
+#: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="help-menu" accesskey="h" label="Help">
 msgid "label=\"Help\" accesskey=\"h\""
 msgstr ""
 
@@ -2624,6 +2719,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bn" id="dcmibn" label="Bengali; Bangla ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bn" id="dcmibn" label="Bengali; Bangla ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bn" id="dcmibn" label="Bengali; Bangla ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="bn" id="dcmibn" label="Bengali; Bangla ">
 msgid "Bengali; Bangla "
 msgstr ""
 
@@ -2631,6 +2727,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="aboutPage()" accesskey="a" label="About">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="aboutPage()" accesskey="a" label="About">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="aboutPage()" accesskey="a" label="About">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="aboutPage()" accesskey="a" label="About">
 msgid "label=\"About\" accesskey=\"a\""
 msgstr ""
 
@@ -2638,6 +2735,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bo" id="dcmibo" label="Tibetan ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bo" id="dcmibo" label="Tibetan ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bo" id="dcmibo" label="Tibetan ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="bo" id="dcmibo" label="Tibetan ">
 msgid "Tibetan "
 msgstr ""
 
@@ -2645,6 +2743,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="registerOnline()" accesskey="R" label="Register Online">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="registerOnline()" accesskey="R" label="Register Online">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="registerOnline()" accesskey="R" label="Register Online">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="registerOnline()" accesskey="R" label="Register Online">
 msgid "label=\"Register Online\" accesskey=\"R\""
 msgstr ""
 
@@ -2652,6 +2751,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="br" id="dcmibr" label="Breton ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="br" id="dcmibr" label="Breton ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="br" id="dcmibr" label="Breton ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="br" id="dcmibr" label="Breton ">
 msgid "Breton "
 msgstr ""
 
@@ -2659,6 +2759,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="reportIssue()" accesskey="R" label="Report an Issue">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="reportIssue()" accesskey="R" label="Report an Issue">
 #: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="reportIssue()" accesskey="R" label="Report an Issue">
+#: exe/resources/internal/templates/mainpage.xul:<menuitem n:render="translate" oncommand="reportIssue()" accesskey="R" label="Report an Issue">
 msgid "label=\"Report an Issue\" accesskey=\"R\""
 msgstr ""
 
@@ -2666,6 +2767,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bs" id="dcmibs" label="Bosnian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bs" id="dcmibs" label="Bosnian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="bs" id="dcmibs" label="Bosnian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="bs" id="dcmibs" label="Bosnian ">
 msgid "Bosnian "
 msgstr ""
 
@@ -2673,6 +2775,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<label n:render="debugInfo" value="debugInfo">
 #: exe/resources/internal/templates/mainpage.xul:<label n:render="debugInfo" value="debugInfo">
 #: exe/resources/internal/templates/mainpage.xul:<label n:render="debugInfo" value="debugInfo">
+#: exe/resources/internal/templates/mainpage.xul:<label n:render="debugInfo" value="debugInfo">
 msgid "debugInfo"
 msgstr ""
 
@@ -2680,6 +2783,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ca" id="dcmica" label="Catalan ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ca" id="dcmica" label="Catalan ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ca" id="dcmica" label="Catalan ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ca" id="dcmica" label="Catalan ">
 msgid "Catalan "
 msgstr ""
 
@@ -2687,6 +2791,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="addChild" key="addChildKey" label="Add Page">
 #: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="addChild" key="addChildKey" label="Add Page">
 #: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="addChild" key="addChildKey" label="Add Page">
+#: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="addChild" key="addChildKey" label="Add Page">
 msgid "Add Page"
 msgstr ""
 
@@ -2694,6 +2799,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ce" id="dcmice" label="Chechen ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ce" id="dcmice" label="Chechen ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ce" id="dcmice" label="Chechen ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ce" id="dcmice" label="Chechen ">
 msgid "Chechen "
 msgstr ""
 
@@ -2701,6 +2807,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="renNode" key="renNodeKey" id="btnRename" label="Rename">
 #: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="renNode" key="renNodeKey" id="btnRename" label="Rename">
 #: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="renNode" key="renNodeKey" id="btnRename" label="Rename">
+#: exe/resources/internal/templates/mainpage.xul:<toolbarbutton n:render="renNode" key="renNodeKey" id="btnRename" label="Rename">
 msgid "Rename"
 msgstr ""
 
@@ -2708,6 +2815,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ch" id="dcmich" label="Chamorro ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ch" id="dcmich" label="Chamorro ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ch" id="dcmich" label="Chamorro ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ch" id="dcmich" label="Chamorro ">
 msgid "Chamorro "
 msgstr ""
 
@@ -2715,6 +2823,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<label n:render="outlinePane" flex="1" value="outlinePane">
 #: exe/resources/internal/templates/mainpage.xul:<label n:render="outlinePane" flex="1" value="outlinePane">
 #: exe/resources/internal/templates/mainpage.xul:<label n:render="outlinePane" flex="1" value="outlinePane">
+#: exe/resources/internal/templates/mainpage.xul:<label n:render="outlinePane" flex="1" value="outlinePane">
 msgid "outlinePane"
 msgstr ""
 
@@ -2722,6 +2831,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="co" id="dcmico" label="Corsican ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="co" id="dcmico" label="Corsican ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="co" id="dcmico" label="Corsican ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="co" id="dcmico" label="Corsican ">
 msgid "Corsican "
 msgstr ""
 
@@ -2729,6 +2839,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<label value="iDevices" style="margin-top:5px;">
 #: exe/resources/internal/templates/mainpage.xul:<label value="iDevices" style="margin-top:5px;">
 #: exe/resources/internal/templates/mainpage.xul:<label value="iDevices" style="margin-top:5px;">
+#: exe/resources/internal/templates/mainpage.xul:<label value="iDevices" style="margin-top:5px;">
 msgid "iDevices"
 msgstr ""
 
@@ -2736,6 +2847,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cs" id="dcmics" label="Czech ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cs" id="dcmics" label="Czech ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cs" id="dcmics" label="Czech ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="cs" id="dcmics" label="Czech ">
 msgid "Czech "
 msgstr ""
 
@@ -2743,6 +2855,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<label n:render="idevicePane" flex="1" value="iDevicePane">
 #: exe/resources/internal/templates/mainpage.xul:<label n:render="idevicePane" flex="1" value="iDevicePane">
 #: exe/resources/internal/templates/mainpage.xul:<label n:render="idevicePane" flex="1" value="iDevicePane">
+#: exe/resources/internal/templates/mainpage.xul:<label n:render="idevicePane" flex="1" value="iDevicePane">
 msgid "iDevicePane"
 msgstr ""
 
@@ -2750,6 +2863,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cu" id="dcmicu" label="Church Slavic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cu" id="dcmicu" label="Church Slavic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cu" id="dcmicu" label="Church Slavic ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="cu" id="dcmicu" label="Church Slavic ">
 msgid "Church Slavic "
 msgstr ""
 
@@ -2757,6 +2871,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<tab n:render="translate" label="Authoring">
 #: exe/resources/internal/templates/mainpage.xul:<tab n:render="translate" label="Authoring">
 #: exe/resources/internal/templates/mainpage.xul:<tab n:render="translate" label="Authoring">
+#: exe/resources/internal/templates/mainpage.xul:<tab n:render="translate" label="Authoring">
 msgid "Authoring"
 msgstr ""
 
@@ -2764,6 +2879,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cv" id="dcmicv" label="Chuvash ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cv" id="dcmicv" label="Chuvash ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cv" id="dcmicv" label="Chuvash ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="cv" id="dcmicv" label="Chuvash ">
 msgid "Chuvash "
 msgstr ""
 
@@ -2771,6 +2887,7 @@ msgstr ""
 #: exe/resources/internal/templates/mainpage.xul:<tab n:render="translate" label="Properties">
 #: exe/resources/internal/templates/mainpage.xul:<tab n:render="translate" label="Properties">
 #: exe/resources/internal/templates/mainpage.xul:<tab n:render="translate" label="Properties">
+#: exe/resources/internal/templates/mainpage.xul:<tab n:render="translate" label="Properties">
 msgid "Properties"
 msgstr ""
 
@@ -2778,6 +2895,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cy" id="dcmicy" label="Welsh ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cy" id="dcmicy" label="Welsh ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="cy" id="dcmicy" label="Welsh ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="cy" id="dcmicy" label="Welsh ">
 msgid "Welsh "
 msgstr ""
 
@@ -2785,6 +2903,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="da" id="dcmida" label="Danish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="da" id="dcmida" label="Danish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="da" id="dcmida" label="Danish ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="da" id="dcmida" label="Danish ">
 msgid "Danish "
 msgstr ""
 
@@ -2792,6 +2911,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="de" id="dcmide" label="German ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="de" id="dcmide" label="German ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="de" id="dcmide" label="German ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="de" id="dcmide" label="German ">
 msgid "German "
 msgstr ""
 
@@ -2799,6 +2919,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="dz" id="dcmidz" label="Dzongkha; Bhutani ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="dz" id="dcmidz" label="Dzongkha; Bhutani ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="dz" id="dcmidz" label="Dzongkha; Bhutani ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="dz" id="dcmidz" label="Dzongkha; Bhutani ">
 msgid "Dzongkha; Bhutani "
 msgstr ""
 
@@ -2806,6 +2927,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="el" id="dcmiel" label="Greek ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="el" id="dcmiel" label="Greek ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="el" id="dcmiel" label="Greek ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="el" id="dcmiel" label="Greek ">
 msgid "Greek "
 msgstr ""
 
@@ -2813,6 +2935,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="en" id="dcmien" label="English ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="en" id="dcmien" label="English ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="en" id="dcmien" label="English ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="en" id="dcmien" label="English ">
 msgid "English "
 msgstr ""
 
@@ -2820,6 +2943,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="eo" id="dcmieo" label="Esperanto ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="eo" id="dcmieo" label="Esperanto ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="eo" id="dcmieo" label="Esperanto ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="eo" id="dcmieo" label="Esperanto ">
 msgid "Esperanto "
 msgstr ""
 
@@ -2827,6 +2951,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="es" id="dcmies" label="Spanish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="es" id="dcmies" label="Spanish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="es" id="dcmies" label="Spanish ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="es" id="dcmies" label="Spanish ">
 msgid "Spanish "
 msgstr ""
 
@@ -2834,6 +2959,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="et" id="dcmiet" label="Estonian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="et" id="dcmiet" label="Estonian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="et" id="dcmiet" label="Estonian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="et" id="dcmiet" label="Estonian ">
 msgid "Estonian "
 msgstr ""
 
@@ -2841,6 +2967,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="eu" id="dcmieu" label="Basque ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="eu" id="dcmieu" label="Basque ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="eu" id="dcmieu" label="Basque ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="eu" id="dcmieu" label="Basque ">
 msgid "Basque "
 msgstr ""
 
@@ -2848,6 +2975,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fa" id="dcmifa" label="Persian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fa" id="dcmifa" label="Persian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fa" id="dcmifa" label="Persian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="fa" id="dcmifa" label="Persian ">
 msgid "Persian "
 msgstr ""
 
@@ -2855,6 +2983,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fi" id="dcmifi" label="Finnish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fi" id="dcmifi" label="Finnish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fi" id="dcmifi" label="Finnish ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="fi" id="dcmifi" label="Finnish ">
 msgid "Finnish "
 msgstr ""
 
@@ -2862,6 +2991,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fj" id="dcmifj" label="Fijian; Fiji ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fj" id="dcmifj" label="Fijian; Fiji ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fj" id="dcmifj" label="Fijian; Fiji ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="fj" id="dcmifj" label="Fijian; Fiji ">
 msgid "Fijian; Fiji "
 msgstr ""
 
@@ -2869,6 +2999,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fo" id="dcmifo" label="Faroese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fo" id="dcmifo" label="Faroese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fo" id="dcmifo" label="Faroese ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="fo" id="dcmifo" label="Faroese ">
 msgid "Faroese "
 msgstr ""
 
@@ -2876,6 +3007,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fr" id="dcmifr" label="French ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fr" id="dcmifr" label="French ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fr" id="dcmifr" label="French ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="fr" id="dcmifr" label="French ">
 msgid "French "
 msgstr ""
 
@@ -2883,6 +3015,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fy" id="dcmify" label="Frisian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fy" id="dcmify" label="Frisian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="fy" id="dcmify" label="Frisian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="fy" id="dcmify" label="Frisian ">
 msgid "Frisian "
 msgstr ""
 
@@ -2890,6 +3023,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ga" id="dcmiga" label="Irish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ga" id="dcmiga" label="Irish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ga" id="dcmiga" label="Irish ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ga" id="dcmiga" label="Irish ">
 msgid "Irish "
 msgstr ""
 
@@ -2897,6 +3031,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gd" id="dcmigd" label="Scots; Gaelic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gd" id="dcmigd" label="Scots; Gaelic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gd" id="dcmigd" label="Scots; Gaelic ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="gd" id="dcmigd" label="Scots; Gaelic ">
 msgid "Scots; Gaelic "
 msgstr ""
 
@@ -2904,6 +3039,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gl" id="dcmigl" label="Gallegan; Galician ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gl" id="dcmigl" label="Gallegan; Galician ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gl" id="dcmigl" label="Gallegan; Galician ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="gl" id="dcmigl" label="Gallegan; Galician ">
 msgid "Gallegan; Galician "
 msgstr ""
 
@@ -2911,6 +3047,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gn" id="dcmign" label="Guarani ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gn" id="dcmign" label="Guarani ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gn" id="dcmign" label="Guarani ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="gn" id="dcmign" label="Guarani ">
 msgid "Guarani "
 msgstr ""
 
@@ -2918,6 +3055,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gu" id="dcmigu" label="Gujarati ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gu" id="dcmigu" label="Gujarati ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gu" id="dcmigu" label="Gujarati ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="gu" id="dcmigu" label="Gujarati ">
 msgid "Gujarati "
 msgstr ""
 
@@ -2925,6 +3063,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gv" id="dcmigv" label="Manx ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gv" id="dcmigv" label="Manx ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="gv" id="dcmigv" label="Manx ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="gv" id="dcmigv" label="Manx ">
 msgid "Manx "
 msgstr ""
 
@@ -2932,6 +3071,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ha" id="dcmiha" label="Hausa (?) ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ha" id="dcmiha" label="Hausa (?) ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ha" id="dcmiha" label="Hausa (?) ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ha" id="dcmiha" label="Hausa (?) ">
 msgid "Hausa (?) "
 msgstr ""
 
@@ -2939,6 +3079,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="he" id="dcmihe" label="Hebrew (formerly iw) ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="he" id="dcmihe" label="Hebrew (formerly iw) ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="he" id="dcmihe" label="Hebrew (formerly iw) ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="he" id="dcmihe" label="Hebrew (formerly iw) ">
 msgid "Hebrew (formerly iw) "
 msgstr ""
 
@@ -2946,6 +3087,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hi" id="dcmihi" label="Hindi ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hi" id="dcmihi" label="Hindi ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hi" id="dcmihi" label="Hindi ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="hi" id="dcmihi" label="Hindi ">
 msgid "Hindi "
 msgstr ""
 
@@ -2953,6 +3095,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ho" id="dcmiho" label="Hiri Motu ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ho" id="dcmiho" label="Hiri Motu ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ho" id="dcmiho" label="Hiri Motu ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ho" id="dcmiho" label="Hiri Motu ">
 msgid "Hiri Motu "
 msgstr ""
 
@@ -2960,6 +3103,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hr" id="dcmihr" label="Croatian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hr" id="dcmihr" label="Croatian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hr" id="dcmihr" label="Croatian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="hr" id="dcmihr" label="Croatian ">
 msgid "Croatian "
 msgstr ""
 
@@ -2967,6 +3111,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hu" id="dcmihu" label="Hungarian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hu" id="dcmihu" label="Hungarian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hu" id="dcmihu" label="Hungarian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="hu" id="dcmihu" label="Hungarian ">
 msgid "Hungarian "
 msgstr ""
 
@@ -2974,6 +3119,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hy" id="dcmihy" label="Armenian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hy" id="dcmihy" label="Armenian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hy" id="dcmihy" label="Armenian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="hy" id="dcmihy" label="Armenian ">
 msgid "Armenian "
 msgstr ""
 
@@ -2981,6 +3127,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hz" id="dcmihz" label="Herero ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hz" id="dcmihz" label="Herero ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="hz" id="dcmihz" label="Herero ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="hz" id="dcmihz" label="Herero ">
 msgid "Herero "
 msgstr ""
 
@@ -2988,6 +3135,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ia" id="dcmiia" label="Interlingua ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ia" id="dcmiia" label="Interlingua ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ia" id="dcmiia" label="Interlingua ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ia" id="dcmiia" label="Interlingua ">
 msgid "Interlingua "
 msgstr ""
 
@@ -2995,6 +3143,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="id" id="dcmiid" label="Indonesian (formerly in) ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="id" id="dcmiid" label="Indonesian (formerly in) ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="id" id="dcmiid" label="Indonesian (formerly in) ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="id" id="dcmiid" label="Indonesian (formerly in) ">
 msgid "Indonesian (formerly in) "
 msgstr ""
 
@@ -3002,6 +3151,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ie" id="dcmiie" label="Interlingue ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ie" id="dcmiie" label="Interlingue ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ie" id="dcmiie" label="Interlingue ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ie" id="dcmiie" label="Interlingue ">
 msgid "Interlingue "
 msgstr ""
 
@@ -3009,6 +3159,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ik" id="dcmiik" label="Inupiak ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ik" id="dcmiik" label="Inupiak ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ik" id="dcmiik" label="Inupiak ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ik" id="dcmiik" label="Inupiak ">
 msgid "Inupiak "
 msgstr ""
 
@@ -3016,6 +3167,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="io" id="dcmiio" label="Ido ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="io" id="dcmiio" label="Ido ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="io" id="dcmiio" label="Ido ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="io" id="dcmiio" label="Ido ">
 msgid "Ido "
 msgstr ""
 
@@ -3023,6 +3175,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="is" id="dcmiis" label="Icelandic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="is" id="dcmiis" label="Icelandic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="is" id="dcmiis" label="Icelandic ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="is" id="dcmiis" label="Icelandic ">
 msgid "Icelandic "
 msgstr ""
 
@@ -3030,6 +3183,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="it" id="dcmiit" label="Italian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="it" id="dcmiit" label="Italian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="it" id="dcmiit" label="Italian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="it" id="dcmiit" label="Italian ">
 msgid "Italian "
 msgstr ""
 
@@ -3037,6 +3191,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="iu" id="dcmiiu" label="Inuktitut ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="iu" id="dcmiiu" label="Inuktitut ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="iu" id="dcmiiu" label="Inuktitut ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="iu" id="dcmiiu" label="Inuktitut ">
 msgid "Inuktitut "
 msgstr ""
 
@@ -3044,6 +3199,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ja" id="dcmija" label="Japanese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ja" id="dcmija" label="Japanese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ja" id="dcmija" label="Japanese ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ja" id="dcmija" label="Japanese ">
 msgid "Japanese "
 msgstr ""
 
@@ -3051,6 +3207,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="jv" id="dcmijv" label="Javanese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="jv" id="dcmijv" label="Javanese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="jv" id="dcmijv" label="Javanese ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="jv" id="dcmijv" label="Javanese ">
 msgid "Javanese "
 msgstr ""
 
@@ -3058,6 +3215,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ka" id="dcmika" label="Georgian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ka" id="dcmika" label="Georgian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ka" id="dcmika" label="Georgian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ka" id="dcmika" label="Georgian ">
 msgid "Georgian "
 msgstr ""
 
@@ -3065,6 +3223,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ki" id="dcmiki" label="Kikuyu ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ki" id="dcmiki" label="Kikuyu ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ki" id="dcmiki" label="Kikuyu ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ki" id="dcmiki" label="Kikuyu ">
 msgid "Kikuyu "
 msgstr ""
 
@@ -3072,6 +3231,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kj" id="dcmikj" label="Kuanyama ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kj" id="dcmikj" label="Kuanyama ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kj" id="dcmikj" label="Kuanyama ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="kj" id="dcmikj" label="Kuanyama ">
 msgid "Kuanyama "
 msgstr ""
 
@@ -3079,6 +3239,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kk" id="dcmikk" label="Kazakh ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kk" id="dcmikk" label="Kazakh ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kk" id="dcmikk" label="Kazakh ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="kk" id="dcmikk" label="Kazakh ">
 msgid "Kazakh "
 msgstr ""
 
@@ -3086,6 +3247,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kl" id="dcmikl" label="Kalaallisut; Greenlandic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kl" id="dcmikl" label="Kalaallisut; Greenlandic ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kl" id="dcmikl" label="Kalaallisut; Greenlandic ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="kl" id="dcmikl" label="Kalaallisut; Greenlandic ">
 msgid "Kalaallisut; Greenlandic "
 msgstr ""
 
@@ -3093,6 +3255,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="km" id="dcmikm" label="Khmer; Cambodian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="km" id="dcmikm" label="Khmer; Cambodian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="km" id="dcmikm" label="Khmer; Cambodian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="km" id="dcmikm" label="Khmer; Cambodian ">
 msgid "Khmer; Cambodian "
 msgstr ""
 
@@ -3100,6 +3263,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kn" id="dcmikn" label="Kannada ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kn" id="dcmikn" label="Kannada ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kn" id="dcmikn" label="Kannada ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="kn" id="dcmikn" label="Kannada ">
 msgid "Kannada "
 msgstr ""
 
@@ -3107,6 +3271,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ko" id="dcmiko" label="Korean ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ko" id="dcmiko" label="Korean ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ko" id="dcmiko" label="Korean ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ko" id="dcmiko" label="Korean ">
 msgid "Korean "
 msgstr ""
 
@@ -3114,6 +3279,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ks" id="dcmiks" label="Kashmiri ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ks" id="dcmiks" label="Kashmiri ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ks" id="dcmiks" label="Kashmiri ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ks" id="dcmiks" label="Kashmiri ">
 msgid "Kashmiri "
 msgstr ""
 
@@ -3121,6 +3287,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ku" id="dcmiku" label="Kurdish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ku" id="dcmiku" label="Kurdish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ku" id="dcmiku" label="Kurdish ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ku" id="dcmiku" label="Kurdish ">
 msgid "Kurdish "
 msgstr ""
 
@@ -3128,6 +3295,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kv" id="dcmikv" label="Komi ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kv" id="dcmikv" label="Komi ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kv" id="dcmikv" label="Komi ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="kv" id="dcmikv" label="Komi ">
 msgid "Komi "
 msgstr ""
 
@@ -3135,6 +3303,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kw" id="dcmikw" label="Cornish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kw" id="dcmikw" label="Cornish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="kw" id="dcmikw" label="Cornish ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="kw" id="dcmikw" label="Cornish ">
 msgid "Cornish "
 msgstr ""
 
@@ -3142,6 +3311,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ky" id="dcmiky" label="Kirghiz ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ky" id="dcmiky" label="Kirghiz ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ky" id="dcmiky" label="Kirghiz ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ky" id="dcmiky" label="Kirghiz ">
 msgid "Kirghiz "
 msgstr ""
 
@@ -3149,6 +3319,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="la" id="dcmila" label="Latin ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="la" id="dcmila" label="Latin ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="la" id="dcmila" label="Latin ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="la" id="dcmila" label="Latin ">
 msgid "Latin "
 msgstr ""
 
@@ -3156,6 +3327,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lb" id="dcmilb" label="Letzeburgesch ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lb" id="dcmilb" label="Letzeburgesch ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lb" id="dcmilb" label="Letzeburgesch ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="lb" id="dcmilb" label="Letzeburgesch ">
 msgid "Letzeburgesch "
 msgstr ""
 
@@ -3163,6 +3335,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ln" id="dcmiln" label="Lingala ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ln" id="dcmiln" label="Lingala ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ln" id="dcmiln" label="Lingala ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ln" id="dcmiln" label="Lingala ">
 msgid "Lingala "
 msgstr ""
 
@@ -3170,6 +3343,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lo" id="dcmilo" label="Lao; Laotian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lo" id="dcmilo" label="Lao; Laotian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lo" id="dcmilo" label="Lao; Laotian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="lo" id="dcmilo" label="Lao; Laotian ">
 msgid "Lao; Laotian "
 msgstr ""
 
@@ -3177,6 +3351,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lt" id="dcmilt" label="Lithuanian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lt" id="dcmilt" label="Lithuanian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lt" id="dcmilt" label="Lithuanian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="lt" id="dcmilt" label="Lithuanian ">
 msgid "Lithuanian "
 msgstr ""
 
@@ -3184,6 +3359,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lv" id="dcmilv" label="Latvian; Lettish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lv" id="dcmilv" label="Latvian; Lettish ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="lv" id="dcmilv" label="Latvian; Lettish ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="lv" id="dcmilv" label="Latvian; Lettish ">
 msgid "Latvian; Lettish "
 msgstr ""
 
@@ -3191,6 +3367,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mg" id="dcmimg" label="Malagasy ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mg" id="dcmimg" label="Malagasy ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mg" id="dcmimg" label="Malagasy ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="mg" id="dcmimg" label="Malagasy ">
 msgid "Malagasy "
 msgstr ""
 
@@ -3198,6 +3375,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mh" id="dcmimh" label="Marshall ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mh" id="dcmimh" label="Marshall ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mh" id="dcmimh" label="Marshall ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="mh" id="dcmimh" label="Marshall ">
 msgid "Marshall "
 msgstr ""
 
@@ -3205,6 +3383,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mi" id="dcmimi" label="Maori ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mi" id="dcmimi" label="Maori ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mi" id="dcmimi" label="Maori ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="mi" id="dcmimi" label="Maori ">
 msgid "Maori "
 msgstr ""
 
@@ -3212,6 +3391,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mk" id="dcmimk" label="Macedonian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mk" id="dcmimk" label="Macedonian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mk" id="dcmimk" label="Macedonian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="mk" id="dcmimk" label="Macedonian ">
 msgid "Macedonian "
 msgstr ""
 
@@ -3219,6 +3399,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ml" id="dcmiml" label="Malayalam ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ml" id="dcmiml" label="Malayalam ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ml" id="dcmiml" label="Malayalam ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ml" id="dcmiml" label="Malayalam ">
 msgid "Malayalam "
 msgstr ""
 
@@ -3226,6 +3407,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mn" id="dcmimn" label="Mongolian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mn" id="dcmimn" label="Mongolian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mn" id="dcmimn" label="Mongolian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="mn" id="dcmimn" label="Mongolian ">
 msgid "Mongolian "
 msgstr ""
 
@@ -3233,6 +3415,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mo" id="dcmimo" label="Moldavian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mo" id="dcmimo" label="Moldavian ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mo" id="dcmimo" label="Moldavian ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="mo" id="dcmimo" label="Moldavian ">
 msgid "Moldavian "
 msgstr ""
 
@@ -3240,6 +3423,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mr" id="dcmimr" label="Marathi ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mr" id="dcmimr" label="Marathi ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mr" id="dcmimr" label="Marathi ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="mr" id="dcmimr" label="Marathi ">
 msgid "Marathi "
 msgstr ""
 
@@ -3247,6 +3431,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ms" id="dcmims" label="Malay ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ms" id="dcmims" label="Malay ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="ms" id="dcmims" label="Malay ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ms" id="dcmims" label="Malay ">
 msgid "Malay "
 msgstr ""
 
@@ -3254,6 +3439,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mt" id="dcmimt" label="Maltese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mt" id="dcmimt" label="Maltese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="mt" id="dcmimt" label="Maltese ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="mt" id="dcmimt" label="Maltese ">
 msgid "Maltese "
 msgstr ""
 
@@ -3261,6 +3447,7 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="my" id="dcmimy" label="Burmese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="my" id="dcmimy" label="Burmese ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="my" id="dcmimy" label="Burmese ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="my" id="dcmimy" label="Burmese ">
 msgid "Burmese "
 msgstr ""
 
@@ -3268,6 +3455,311 @@ msgstr ""
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="na" id="dcmina" label="Nauru ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="na" id="dcmina" label="Nauru ">
 #: exe/resources/internal/templates/dublincore.xul:<menuitem value="na" id="dcmina" label="Nauru ">
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="na" id="dcmina" label="Nauru ">
 msgid "Nauru "
 msgstr ""
 
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="nb" id="dcminb" label="Norwegian Bokmål ">
+msgid "Norwegian Bokmål "
+msgstr ""
+
+#: exe/resources/internal/templates/mainpage.xul:<menu n:render="translate" id="merging-menu" accesskey="m" label="Merging">
+msgid "label=\"Merging\" accesskey=\"m\""
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="nd" id="dcmind" label="Ndebele, North ">
+msgid "Ndebele, North "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ne" id="dcmine" label="Nepali ">
+msgid "Nepali "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ng" id="dcming" label="Ndonga ">
+msgid "Ndonga "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="nl" id="dcminl" label="Dutch ">
+msgid "Dutch "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="nn" id="dcminn" label="Norwegian Nynorsk ">
+msgid "Norwegian Nynorsk "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="no" id="dcmino" label="Norwegian ">
+msgid "Norwegian "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="nr" id="dcminr" label="Ndebele, South ">
+msgid "Ndebele, South "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="nv" id="dcminv" label="Navajo ">
+msgid "Navajo "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ny" id="dcminy" label="Chichewa; Nyanja ">
+msgid "Chichewa; Nyanja "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="oc" id="dcmioc" label="Occitan; Provençal ">
+msgid "Occitan; Provençal "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="om" id="dcmiom" label="(Afan) Oromo ">
+msgid "(Afan) Oromo "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="or" id="dcmior" label="Oriya ">
+msgid "Oriya "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="os" id="dcmios" label="Ossetian; Ossetic ">
+msgid "Ossetian; Ossetic "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="pa" id="dcmipa" label="Panjabi; Punjabi ">
+msgid "Panjabi; Punjabi "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="pi" id="dcmipi" label="Pali ">
+msgid "Pali "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="pl" id="dcmipl" label="Polish ">
+msgid "Polish "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ps" id="dcmips" label="Pashto, Pushto ">
+msgid "Pashto, Pushto "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="pt" id="dcmipt" label="Portuguese ">
+msgid "Portuguese "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="qu" id="dcmiqu" label="Quechua ">
+msgid "Quechua "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="rm" id="dcmirm" label="Rhaeto-Romance ">
+msgid "Rhaeto-Romance "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="rn" id="dcmirn" label="Rundi; Kirundi ">
+msgid "Rundi; Kirundi "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ro" id="dcmiro" label="Romanian ">
+msgid "Romanian "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ru" id="dcmiru" label="Russian ">
+msgid "Russian "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="rw" id="dcmirw" label="Kinyarwanda ">
+msgid "Kinyarwanda "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sa" id="dcmisa" label="Sanskrit ">
+msgid "Sanskrit "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sc" id="dcmisc" label="Sardinian ">
+msgid "Sardinian "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sd" id="dcmisd" label="Sindhi ">
+msgid "Sindhi "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="se" id="dcmise" label="Northern Sami ">
+msgid "Northern Sami "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sg" id="dcmisg" label="Sango; Sangro ">
+msgid "Sango; Sangro "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="si" id="dcmisi" label="Sinhalese ">
+msgid "Sinhalese "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sk" id="dcmisk" label="Slovak ">
+msgid "Slovak "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sl" id="dcmisl" label="Slovenian ">
+msgid "Slovenian "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sm" id="dcmism" label="Samoan ">
+msgid "Samoan "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sn" id="dcmisn" label="Shona ">
+msgid "Shona "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="so" id="dcmiso" label="Somali ">
+msgid "Somali "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sq" id="dcmisq" label="Albanian ">
+msgid "Albanian "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sr" id="dcmisr" label="Serbian ">
+msgid "Serbian "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ss" id="dcmiss" label="Swati; Siswati ">
+msgid "Swati; Siswati "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="st" id="dcmist" label="Sesotho; Sotho, Southern ">
+msgid "Sesotho; Sotho, Southern "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="su" id="dcmisu" label="Sundanese ">
+msgid "Sundanese "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sv" id="dcmisv" label="Swedish ">
+msgid "Swedish "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="sw" id="dcmisw" label="Swahili ">
+msgid "Swahili "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ta" id="dcmita" label="Tamil ">
+msgid "Tamil "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="te" id="dcmite" label="Telugu ">
+msgid "Telugu "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="tg" id="dcmitg" label="Tajik ">
+msgid "Tajik "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="th" id="dcmith" label="Thai ">
+msgid "Thai "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ti" id="dcmiti" label="Tigrinya ">
+msgid "Tigrinya "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="tk" id="dcmitk" label="Turkmen ">
+msgid "Turkmen "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="tl" id="dcmitl" label="Tagalog ">
+msgid "Tagalog "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="tn" id="dcmitn" label="Tswana; Setswana ">
+msgid "Tswana; Setswana "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="to" id="dcmito" label="Tonga (?) ">
+msgid "Tonga (?) "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="tr" id="dcmitr" label="Turkish ">
+msgid "Turkish "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ts" id="dcmits" label="Tsonga ">
+msgid "Tsonga "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="tt" id="dcmitt" label="Tatar ">
+msgid "Tatar "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="tw" id="dcmitw" label="Twi ">
+msgid "Twi "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ty" id="dcmity" label="Tahitian ">
+msgid "Tahitian "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ug" id="dcmiug" label="Uighur ">
+msgid "Uighur "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="uk" id="dcmiuk" label="Ukrainian ">
+msgid "Ukrainian "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="ur" id="dcmiur" label="Urdu ">
+msgid "Urdu "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="uz" id="dcmiuz" label="Uzbek ">
+msgid "Uzbek "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="vi" id="dcmivi" label="Vietnamese ">
+msgid "Vietnamese "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="vo" id="dcmivo" label="Volapük; Volapuk ">
+msgid "Volapük; Volapuk "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="wa" id="dcmiwa" label="Walloon ">
+msgid "Walloon "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="wo" id="dcmiwo" label="Wolof ">
+msgid "Wolof "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="xh" id="dcmixh" label="Xhosa ">
+msgid "Xhosa "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="yi" id="dcmiyi" label="Yiddish (formerly ji) ">
+msgid "Yiddish (formerly ji) "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="yo" id="dcmiyo" label="Yoruba ">
+msgid "Yoruba "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="za" id="dcmiza" label="Zhuang ">
+msgid "Zhuang "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="zh" id="dcmizh" label="Chinese ">
+msgid "Chinese "
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<menuitem value="zu" id="dcmizu" label="Zulu.">
+msgid "Zulu."
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<label value="Relation:" id="dcRelation" style="width:8em" tooltiptext="A reference to a related resource.">
+msgid "Relation:"
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<label value="Coverage:" id="dcCoverage" style="width:8em" tooltiptext="The extent or scope of the content of the resource.">
+msgid "Coverage:"
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<label value="Rights:" id="dcRights" style="width:8em" tooltiptext="Information about rights held in and over the resource.">
+msgid "Rights:"
+msgstr ""
+
+#: exe/resources/internal/templates/dublincore.xul:<description id="dcDescRights">
+msgid ""
+"Typically, a Rights element will contain a rights management statement for the resource, or reference a service providing such information. Rights information often encompasses Intellectual Property Rights (IPR), Copyright, and various Property Rights. If the Rights element is absent, no assumptions can be made about the status of these and other rights with respect to the resource."
+msgstr ""
diff --git a/exe/webui/images/panel-amusements.png b/exe/resources/exportable/images/panel-amusements.png
index 721dfcb..721dfcb 100644
--- a/exe/webui/images/panel-amusements.png
+++ b/exe/resources/exportable/images/panel-amusements.png
diff --git a/exe/webui/images/stock-about.png b/exe/resources/exportable/images/stock-about.png
index 7c757a6..7c757a6 100644
--- a/exe/webui/images/stock-about.png
+++ b/exe/resources/exportable/images/stock-about.png
diff --git a/exe/webui/images/stock-add.png b/exe/resources/exportable/images/stock-add.png
index 8749270..8749270 100644
--- a/exe/webui/images/stock-add.png
+++ b/exe/resources/exportable/images/stock-add.png
diff --git a/exe/webui/images/stock-apply.png b/exe/resources/exportable/images/stock-apply.png
index 4d73884..4d73884 100644
--- a/exe/webui/images/stock-apply.png
+++ b/exe/resources/exportable/images/stock-apply.png
diff --git a/exe/webui/images/stock-attach.png b/exe/resources/exportable/images/stock-attach.png
index 3768c0d..3768c0d 100644
--- a/exe/webui/images/stock-attach.png
+++ b/exe/resources/exportable/images/stock-attach.png
diff --git a/exe/webui/images/stock-bold.png b/exe/resources/exportable/images/stock-bold.png
index 9e45ce3..9e45ce3 100644
--- a/exe/webui/images/stock-bold.png
+++ b/exe/resources/exportable/images/stock-bold.png
diff --git a/exe/webui/images/stock-book.png b/exe/resources/exportable/images/stock-book.png
index e6816fc..e6816fc 100644
--- a/exe/webui/images/stock-book.png
+++ b/exe/resources/exportable/images/stock-book.png
diff --git a/exe/webui/images/stock-bookmark-page.png b/exe/resources/exportable/images/stock-bookmark-page.png
index 4eba8a4..4eba8a4 100644
--- a/exe/webui/images/stock-bookmark-page.png
+++ b/exe/resources/exportable/images/stock-bookmark-page.png
diff --git a/exe/webui/images/stock-bookmarks.png b/exe/resources/exportable/images/stock-bookmarks.png
index 61b35fd..61b35fd 100644
--- a/exe/webui/images/stock-bookmarks.png
+++ b/exe/resources/exportable/images/stock-bookmarks.png
diff --git a/exe/webui/images/stock-cancel.png b/exe/resources/exportable/images/stock-cancel.png
index 9bbd324..9bbd324 100644
--- a/exe/webui/images/stock-cancel.png
+++ b/exe/resources/exportable/images/stock-cancel.png
diff --git a/exe/webui/images/stock-cdrom.png b/exe/resources/exportable/images/stock-cdrom.png
index 37cd0a6..37cd0a6 100644
--- a/exe/webui/images/stock-cdrom.png
+++ b/exe/resources/exportable/images/stock-cdrom.png
diff --git a/exe/webui/images/stock-clear.png b/exe/resources/exportable/images/stock-clear.png
index 1f0a4b9..1f0a4b9 100644
--- a/exe/webui/images/stock-clear.png
+++ b/exe/resources/exportable/images/stock-clear.png
diff --git a/exe/webui/images/stock-close.png b/exe/resources/exportable/images/stock-close.png
index 892c1bd..892c1bd 100644
--- a/exe/webui/images/stock-close.png
+++ b/exe/resources/exportable/images/stock-close.png
diff --git a/exe/webui/images/stock-connect.png b/exe/resources/exportable/images/stock-connect.png
index 9db7fec..9db7fec 100644
--- a/exe/webui/images/stock-connect.png
+++ b/exe/resources/exportable/images/stock-connect.png
diff --git a/exe/webui/images/stock-convert.png b/exe/resources/exportable/images/stock-convert.png
index 055bc80..055bc80 100644
--- a/exe/webui/images/stock-convert.png
+++ b/exe/resources/exportable/images/stock-convert.png
diff --git a/exe/webui/images/stock-copy.png b/exe/resources/exportable/images/stock-copy.png
index 9e5d083..9e5d083 100644
--- a/exe/webui/images/stock-copy.png
+++ b/exe/resources/exportable/images/stock-copy.png
diff --git a/exe/webui/images/stock-cut.png b/exe/resources/exportable/images/stock-cut.png
index ed4817f..ed4817f 100644
--- a/exe/webui/images/stock-cut.png
+++ b/exe/resources/exportable/images/stock-cut.png
diff --git a/exe/webui/images/stock-delete.png b/exe/resources/exportable/images/stock-delete.png
index 5d4dca9..5d4dca9 100644
--- a/exe/webui/images/stock-delete.png
+++ b/exe/resources/exportable/images/stock-delete.png
diff --git a/exe/webui/images/stock-disconnect.png b/exe/resources/exportable/images/stock-disconnect.png
index 520e6f5..520e6f5 100644
--- a/exe/webui/images/stock-disconnect.png
+++ b/exe/resources/exportable/images/stock-disconnect.png
diff --git a/exe/webui/images/stock-dnd-multiple.png b/exe/resources/exportable/images/stock-dnd-multiple.png
index 9fca8f5..9fca8f5 100644
--- a/exe/webui/images/stock-dnd-multiple.png
+++ b/exe/resources/exportable/images/stock-dnd-multiple.png
diff --git a/exe/webui/images/stock-dnd.png b/exe/resources/exportable/images/stock-dnd.png
index d78c28a..d78c28a 100644
--- a/exe/webui/images/stock-dnd.png
+++ b/exe/resources/exportable/images/stock-dnd.png
diff --git a/exe/webui/images/stock-download.png b/exe/resources/exportable/images/stock-download.png
index 1fe5db3..1fe5db3 100644
--- a/exe/webui/images/stock-download.png
+++ b/exe/resources/exportable/images/stock-download.png
diff --git a/exe/webui/images/stock-edit.png b/exe/resources/exportable/images/stock-edit.png
index ac35eaa..ac35eaa 100644
--- a/exe/webui/images/stock-edit.png
+++ b/exe/resources/exportable/images/stock-edit.png
diff --git a/exe/webui/images/stock-execute.png b/exe/resources/exportable/images/stock-execute.png
index 7f81bc2..7f81bc2 100644
--- a/exe/webui/images/stock-execute.png
+++ b/exe/resources/exportable/images/stock-execute.png
diff --git a/exe/webui/images/stock-export.png b/exe/resources/exportable/images/stock-export.png
index db961ba..db961ba 100644
--- a/exe/webui/images/stock-export.png
+++ b/exe/resources/exportable/images/stock-export.png
diff --git a/exe/webui/images/stock-find-and-replace.png b/exe/resources/exportable/images/stock-find-and-replace.png
index 9dcbd38..9dcbd38 100644
--- a/exe/webui/images/stock-find-and-replace.png
+++ b/exe/resources/exportable/images/stock-find-and-replace.png
diff --git a/exe/webui/images/stock-find.png b/exe/resources/exportable/images/stock-find.png
index 2825d36..2825d36 100644
--- a/exe/webui/images/stock-find.png
+++ b/exe/resources/exportable/images/stock-find.png
diff --git a/exe/webui/images/stock-font.png b/exe/resources/exportable/images/stock-font.png
index dbcb319..dbcb319 100644
--- a/exe/webui/images/stock-font.png
+++ b/exe/resources/exportable/images/stock-font.png
diff --git a/exe/webui/images/stock-foo.png b/exe/resources/exportable/images/stock-foo.png
index 0a89ed7..0a89ed7 100644
--- a/exe/webui/images/stock-foo.png
+++ b/exe/resources/exportable/images/stock-foo.png
diff --git a/exe/webui/images/stock-fullscreen.png b/exe/resources/exportable/images/stock-fullscreen.png
index bece49b..bece49b 100644
--- a/exe/webui/images/stock-fullscreen.png
+++ b/exe/resources/exportable/images/stock-fullscreen.png
diff --git a/exe/webui/images/stock-go-back-off.png b/exe/resources/exportable/images/stock-go-back-off.png
index db93701..db93701 100644
--- a/exe/webui/images/stock-go-back-off.png
+++ b/exe/resources/exportable/images/stock-go-back-off.png
diff --git a/exe/webui/images/stock-go-back.png b/exe/resources/exportable/images/stock-go-back.png
index 08108c1..08108c1 100644
--- a/exe/webui/images/stock-go-back.png
+++ b/exe/resources/exportable/images/stock-go-back.png
diff --git a/exe/webui/images/stock-go-down-off.png b/exe/resources/exportable/images/stock-go-down-off.png
index d91b56f..d91b56f 100644
--- a/exe/webui/images/stock-go-down-off.png
+++ b/exe/resources/exportable/images/stock-go-down-off.png
diff --git a/exe/webui/images/stock-go-down.png b/exe/resources/exportable/images/stock-go-down.png
index e079b90..e079b90 100644
--- a/exe/webui/images/stock-go-down.png
+++ b/exe/resources/exportable/images/stock-go-down.png
diff --git a/exe/webui/images/stock-go-forward-off.png b/exe/resources/exportable/images/stock-go-forward-off.png
index 3d394d8..3d394d8 100644
--- a/exe/webui/images/stock-go-forward-off.png
+++ b/exe/resources/exportable/images/stock-go-forward-off.png
diff --git a/exe/webui/images/stock-go-forward.png b/exe/resources/exportable/images/stock-go-forward.png
index 3096624..3096624 100644
--- a/exe/webui/images/stock-go-forward.png
+++ b/exe/resources/exportable/images/stock-go-forward.png
diff --git a/exe/webui/images/stock-go-up-off.png b/exe/resources/exportable/images/stock-go-up-off.png
index 3438ff4..3438ff4 100644
--- a/exe/webui/images/stock-go-up-off.png
+++ b/exe/resources/exportable/images/stock-go-up-off.png
diff --git a/exe/webui/images/stock-go-up.png b/exe/resources/exportable/images/stock-go-up.png
index 95c7c38..95c7c38 100644
--- a/exe/webui/images/stock-go-up.png
+++ b/exe/resources/exportable/images/stock-go-up.png
diff --git a/exe/webui/images/stock-goto-bottom-off.png b/exe/resources/exportable/images/stock-goto-bottom-off.png
index a961297..a961297 100644
--- a/exe/webui/images/stock-goto-bottom-off.png
+++ b/exe/resources/exportable/images/stock-goto-bottom-off.png
diff --git a/exe/webui/images/stock-goto-bottom.png b/exe/resources/exportable/images/stock-goto-bottom.png
index c209549..c209549 100644
--- a/exe/webui/images/stock-goto-bottom.png
+++ b/exe/resources/exportable/images/stock-goto-bottom.png
diff --git a/exe/webui/images/stock-goto-first.png b/exe/resources/exportable/images/stock-goto-first.png
index aed85e4..aed85e4 100644
--- a/exe/webui/images/stock-goto-first.png
+++ b/exe/resources/exportable/images/stock-goto-first.png
diff --git a/exe/webui/images/stock-goto-last.png b/exe/resources/exportable/images/stock-goto-last.png
index 85482ec..85482ec 100644
--- a/exe/webui/images/stock-goto-last.png
+++ b/exe/resources/exportable/images/stock-goto-last.png
diff --git a/exe/webui/images/stock-goto-top-off.png b/exe/resources/exportable/images/stock-goto-top-off.png
index 9d54a80..9d54a80 100644
--- a/exe/webui/images/stock-goto-top-off.png
+++ b/exe/resources/exportable/images/stock-goto-top-off.png
diff --git a/exe/webui/images/stock-goto-top.png b/exe/resources/exportable/images/stock-goto-top.png
index 800252e..800252e 100644
--- a/exe/webui/images/stock-goto-top.png
+++ b/exe/resources/exportable/images/stock-goto-top.png
diff --git a/exe/webui/images/stock-help.png b/exe/resources/exportable/images/stock-help.png
index 13f3a1c..13f3a1c 100644
--- a/exe/webui/images/stock-help.png
+++ b/exe/resources/exportable/images/stock-help.png
diff --git a/exe/webui/images/stock-history.png b/exe/resources/exportable/images/stock-history.png
index 0d474df..0d474df 100644
--- a/exe/webui/images/stock-history.png
+++ b/exe/resources/exportable/images/stock-history.png
diff --git a/exe/webui/images/stock-home.png b/exe/resources/exportable/images/stock-home.png
index 8645dde..8645dde 100644
--- a/exe/webui/images/stock-home.png
+++ b/exe/resources/exportable/images/stock-home.png
diff --git a/exe/webui/images/stock-import.png b/exe/resources/exportable/images/stock-import.png
index 0ae7970..0ae7970 100644
--- a/exe/webui/images/stock-import.png
+++ b/exe/resources/exportable/images/stock-import.png
diff --git a/exe/webui/images/stock-insert-image.png b/exe/resources/exportable/images/stock-insert-image.png
index 0e958eb..0e958eb 100644
--- a/exe/webui/images/stock-insert-image.png
+++ b/exe/resources/exportable/images/stock-insert-image.png
diff --git a/exe/webui/images/stock-insert-object.png b/exe/resources/exportable/images/stock-insert-object.png
index f9020d3..f9020d3 100644
--- a/exe/webui/images/stock-insert-object.png
+++ b/exe/resources/exportable/images/stock-insert-object.png
diff --git a/exe/webui/images/stock-insert-table.png b/exe/resources/exportable/images/stock-insert-table.png
index 3c5363d..3c5363d 100644
--- a/exe/webui/images/stock-insert-table.png
+++ b/exe/resources/exportable/images/stock-insert-table.png
diff --git a/exe/webui/images/stock-italic.png b/exe/resources/exportable/images/stock-italic.png
index e8a40a3..e8a40a3 100644
--- a/exe/webui/images/stock-italic.png
+++ b/exe/resources/exportable/images/stock-italic.png
diff --git a/exe/webui/images/stock-jump-to.png b/exe/resources/exportable/images/stock-jump-to.png
index e1d46ec..e1d46ec 100644
--- a/exe/webui/images/stock-jump-to.png
+++ b/exe/resources/exportable/images/stock-jump-to.png
diff --git a/exe/webui/images/stock-justify-center.png b/exe/resources/exportable/images/stock-justify-center.png
index f0ac1bb..f0ac1bb 100644
--- a/exe/webui/images/stock-justify-center.png
+++ b/exe/resources/exportable/images/stock-justify-center.png
diff --git a/exe/webui/images/stock-justify-fill.png b/exe/resources/exportable/images/stock-justify-fill.png
index c64b2c7..c64b2c7 100644
--- a/exe/webui/images/stock-justify-fill.png
+++ b/exe/resources/exportable/images/stock-justify-fill.png
diff --git a/exe/webui/images/stock-justify-left.png b/exe/resources/exportable/images/stock-justify-left.png
index 7b3d89e..7b3d89e 100644
--- a/exe/webui/images/stock-justify-left.png
+++ b/exe/resources/exportable/images/stock-justify-left.png
diff --git a/exe/webui/images/stock-justify-right.png b/exe/resources/exportable/images/stock-justify-right.png
index 0ea37a5..0ea37a5 100644
--- a/exe/webui/images/stock-justify-right.png
+++ b/exe/resources/exportable/images/stock-justify-right.png
diff --git a/exe/webui/images/stock-line-in.png b/exe/resources/exportable/images/stock-line-in.png
index 32c3cd3..32c3cd3 100644
--- a/exe/webui/images/stock-line-in.png
+++ b/exe/resources/exportable/images/stock-line-in.png
diff --git a/exe/webui/images/stock-lockscreen.png b/exe/resources/exportable/images/stock-lockscreen.png
index cb6a3bd..cb6a3bd 100644
--- a/exe/webui/images/stock-lockscreen.png
+++ b/exe/resources/exportable/images/stock-lockscreen.png
diff --git a/exe/webui/images/stock-media-eject.png b/exe/resources/exportable/images/stock-media-eject.png
index be8e67f..be8e67f 100644
--- a/exe/webui/images/stock-media-eject.png
+++ b/exe/resources/exportable/images/stock-media-eject.png
diff --git a/exe/webui/images/stock-media-ffwd.png b/exe/resources/exportable/images/stock-media-ffwd.png
index 0042728..0042728 100644
--- a/exe/webui/images/stock-media-ffwd.png
+++ b/exe/resources/exportable/images/stock-media-ffwd.png
diff --git a/exe/webui/images/stock-media-next.png b/exe/resources/exportable/images/stock-media-next.png
index ee10ea0..ee10ea0 100644
--- a/exe/webui/images/stock-media-next.png
+++ b/exe/resources/exportable/images/stock-media-next.png
diff --git a/exe/webui/images/stock-media-pause.png b/exe/resources/exportable/images/stock-media-pause.png
index c17dfee..c17dfee 100644
--- a/exe/webui/images/stock-media-pause.png
+++ b/exe/resources/exportable/images/stock-media-pause.png
diff --git a/exe/webui/images/stock-media-play.png b/exe/resources/exportable/images/stock-media-play.png
index 032d1ed..032d1ed 100644
--- a/exe/webui/images/stock-media-play.png
+++ b/exe/resources/exportable/images/stock-media-play.png
diff --git a/exe/webui/images/stock-media-prev.png b/exe/resources/exportable/images/stock-media-prev.png
index 3de4279..3de4279 100644
--- a/exe/webui/images/stock-media-prev.png
+++ b/exe/resources/exportable/images/stock-media-prev.png
diff --git a/exe/webui/images/stock-media-rec.png b/exe/resources/exportable/images/stock-media-rec.png
index 9bac46e..9bac46e 100644
--- a/exe/webui/images/stock-media-rec.png
+++ b/exe/resources/exportable/images/stock-media-rec.png
diff --git a/exe/webui/images/stock-media-rewind.png b/exe/resources/exportable/images/stock-media-rewind.png
index c9d1494..c9d1494 100644
--- a/exe/webui/images/stock-media-rewind.png
+++ b/exe/resources/exportable/images/stock-media-rewind.png
diff --git a/exe/webui/images/stock-media-stop.png b/exe/resources/exportable/images/stock-media-stop.png
index e41c327..e41c327 100644
--- a/exe/webui/images/stock-media-stop.png
+++ b/exe/resources/exportable/images/stock-media-stop.png
diff --git a/exe/webui/images/stock-mic.png b/exe/resources/exportable/images/stock-mic.png
index da547a3..da547a3 100644
--- a/exe/webui/images/stock-mic.png
+++ b/exe/resources/exportable/images/stock-mic.png
diff --git a/exe/webui/images/stock-missing-image.png b/exe/resources/exportable/images/stock-missing-image.png
index f8480ad..f8480ad 100644
--- a/exe/webui/images/stock-missing-image.png
+++ b/exe/resources/exportable/images/stock-missing-image.png
diff --git a/exe/webui/images/stock-new-tab.png b/exe/resources/exportable/images/stock-new-tab.png
index 2c9fede..2c9fede 100644
--- a/exe/webui/images/stock-new-tab.png
+++ b/exe/resources/exportable/images/stock-new-tab.png
diff --git a/exe/webui/images/stock-new.png b/exe/resources/exportable/images/stock-new.png
index 24fd8e2..24fd8e2 100644
--- a/exe/webui/images/stock-new.png
+++ b/exe/resources/exportable/images/stock-new.png
diff --git a/exe/webui/images/stock-open.png b/exe/resources/exportable/images/stock-open.png
index 4102e90..4102e90 100644
--- a/exe/webui/images/stock-open.png
+++ b/exe/resources/exportable/images/stock-open.png
diff --git a/exe/webui/images/stock-panel-accessories.png b/exe/resources/exportable/images/stock-panel-accessories.png
index ba5efc0..ba5efc0 100644
--- a/exe/webui/images/stock-panel-accessories.png
+++ b/exe/resources/exportable/images/stock-panel-accessories.png
diff --git a/exe/webui/images/stock-panel-amusements.png b/exe/resources/exportable/images/stock-panel-amusements.png
index 721dfcb..721dfcb 100644
--- a/exe/webui/images/stock-panel-amusements.png
+++ b/exe/resources/exportable/images/stock-panel-amusements.png
diff --git a/exe/webui/images/stock-panel-drawer.png b/exe/resources/exportable/images/stock-panel-drawer.png
index 99166cb..99166cb 100644
--- a/exe/webui/images/stock-panel-drawer.png
+++ b/exe/resources/exportable/images/stock-panel-drawer.png
diff --git a/exe/webui/images/stock-panel-internet.png b/exe/resources/exportable/images/stock-panel-internet.png
index 264ebf9..264ebf9 100644
--- a/exe/webui/images/stock-panel-internet.png
+++ b/exe/resources/exportable/images/stock-panel-internet.png
diff --git a/exe/webui/images/stock-panel-launcher.png b/exe/resources/exportable/images/stock-panel-launcher.png
index 6f5dc2d..6f5dc2d 100644
--- a/exe/webui/images/stock-panel-launcher.png
+++ b/exe/resources/exportable/images/stock-panel-launcher.png
diff --git a/exe/webui/images/stock-panel-multimedia.png b/exe/resources/exportable/images/stock-panel-multimedia.png
index f5e87e6..f5e87e6 100644
--- a/exe/webui/images/stock-panel-multimedia.png
+++ b/exe/resources/exportable/images/stock-panel-multimedia.png
diff --git a/exe/webui/images/stock-panel-screenshot.png b/exe/resources/exportable/images/stock-panel-screenshot.png
index 7054c99..7054c99 100644
--- a/exe/webui/images/stock-panel-screenshot.png
+++ b/exe/resources/exportable/images/stock-panel-screenshot.png
diff --git a/exe/webui/images/stock-paste.png b/exe/resources/exportable/images/stock-paste.png
index 162ce6b..162ce6b 100644
--- a/exe/webui/images/stock-paste.png
+++ b/exe/resources/exportable/images/stock-paste.png
diff --git a/exe/webui/images/stock-preferences.png b/exe/resources/exportable/images/stock-preferences.png
index d64d4e9..d64d4e9 100644
--- a/exe/webui/images/stock-preferences.png
+++ b/exe/resources/exportable/images/stock-preferences.png
diff --git a/exe/webui/images/stock-print-preview.png b/exe/resources/exportable/images/stock-print-preview.png
index 7c50924..7c50924 100644
--- a/exe/webui/images/stock-print-preview.png
+++ b/exe/resources/exportable/images/stock-print-preview.png
diff --git a/exe/webui/images/stock-print.png b/exe/resources/exportable/images/stock-print.png
index 2343dcb..2343dcb 100644
--- a/exe/webui/images/stock-print.png
+++ b/exe/resources/exportable/images/stock-print.png
diff --git a/exe/webui/images/stock-printer-broken.png b/exe/resources/exportable/images/stock-printer-broken.png
index 6af4615..6af4615 100644
--- a/exe/webui/images/stock-printer-broken.png
+++ b/exe/resources/exportable/images/stock-printer-broken.png
diff --git a/exe/webui/images/stock-printer-default.png b/exe/resources/exportable/images/stock-printer-default.png
index a6bf4ae..a6bf4ae 100644
--- a/exe/webui/images/stock-printer-default.png
+++ b/exe/resources/exportable/images/stock-printer-default.png
diff --git a/exe/webui/images/stock-properties.png b/exe/resources/exportable/images/stock-properties.png
index 432485c..432485c 100644
--- a/exe/webui/images/stock-properties.png
+++ b/exe/resources/exportable/images/stock-properties.png
diff --git a/exe/webui/images/stock-quit.png b/exe/resources/exportable/images/stock-quit.png
index 2bc0626..2bc0626 100644
--- a/exe/webui/images/stock-quit.png
+++ b/exe/resources/exportable/images/stock-quit.png
diff --git a/exe/webui/images/stock-redo.png b/exe/resources/exportable/images/stock-redo.png
index 2f2585e..2f2585e 100644
--- a/exe/webui/images/stock-redo.png
+++ b/exe/resources/exportable/images/stock-redo.png
diff --git a/exe/webui/images/stock-refresh.png b/exe/resources/exportable/images/stock-refresh.png
index 092a6b7..092a6b7 100644
--- a/exe/webui/images/stock-refresh.png
+++ b/exe/resources/exportable/images/stock-refresh.png
diff --git a/exe/webui/images/stock-remove.png b/exe/resources/exportable/images/stock-remove.png
index 85be656..85be656 100644
--- a/exe/webui/images/stock-remove.png
+++ b/exe/resources/exportable/images/stock-remove.png
diff --git a/exe/webui/images/stock-revert-to-saved.png b/exe/resources/exportable/images/stock-revert-to-saved.png
index a4e1c65..a4e1c65 100644
--- a/exe/webui/images/stock-revert-to-saved.png
+++ b/exe/resources/exportable/images/stock-revert-to-saved.png
diff --git a/exe/webui/images/stock-save-as.png b/exe/resources/exportable/images/stock-save-as.png
index 2799f44..2799f44 100644
--- a/exe/webui/images/stock-save-as.png
+++ b/exe/resources/exportable/images/stock-save-as.png
diff --git a/exe/webui/images/stock-save.png b/exe/resources/exportable/images/stock-save.png
index 0406264..0406264 100644
--- a/exe/webui/images/stock-save.png
+++ b/exe/resources/exportable/images/stock-save.png
diff --git a/exe/webui/images/stock-select-color.png b/exe/resources/exportable/images/stock-select-color.png
index 0bcc76e..0bcc76e 100644
--- a/exe/webui/images/stock-select-color.png
+++ b/exe/resources/exportable/images/stock-select-color.png
diff --git a/exe/webui/images/stock-send-link.png b/exe/resources/exportable/images/stock-send-link.png
index ebc314b..ebc314b 100644
--- a/exe/webui/images/stock-send-link.png
+++ b/exe/resources/exportable/images/stock-send-link.png
diff --git a/exe/webui/images/stock-sort-ascending.png b/exe/resources/exportable/images/stock-sort-ascending.png
index 213ae04..213ae04 100644
--- a/exe/webui/images/stock-sort-ascending.png
+++ b/exe/resources/exportable/images/stock-sort-ascending.png
diff --git a/exe/webui/images/stock-sort-descending.png b/exe/resources/exportable/images/stock-sort-descending.png
index 453bcf4..453bcf4 100644
--- a/exe/webui/images/stock-sort-descending.png
+++ b/exe/resources/exportable/images/stock-sort-descending.png
diff --git a/exe/webui/images/stock-spell-check.png b/exe/resources/exportable/images/stock-spell-check.png
index bc2f011..bc2f011 100644
--- a/exe/webui/images/stock-spell-check.png
+++ b/exe/resources/exportable/images/stock-spell-check.png
diff --git a/exe/webui/images/stock-stop.png b/exe/resources/exportable/images/stock-stop.png
index db8436b..db8436b 100644
--- a/exe/webui/images/stock-stop.png
+++ b/exe/resources/exportable/images/stock-stop.png
diff --git a/exe/webui/images/stock-strikethrough.png b/exe/resources/exportable/images/stock-strikethrough.png
index 402e4d3..402e4d3 100644
--- a/exe/webui/images/stock-strikethrough.png
+++ b/exe/resources/exportable/images/stock-strikethrough.png
diff --git a/exe/webui/images/stock-undelete.png b/exe/resources/exportable/images/stock-undelete.png
index 98ded3a..98ded3a 100644
--- a/exe/webui/images/stock-undelete.png
+++ b/exe/resources/exportable/images/stock-undelete.png
diff --git a/exe/webui/images/stock-underline.png b/exe/resources/exportable/images/stock-underline.png
index a65b73c..a65b73c 100644
--- a/exe/webui/images/stock-underline.png
+++ b/exe/resources/exportable/images/stock-underline.png
diff --git a/exe/webui/images/stock-undo.png b/exe/resources/exportable/images/stock-undo.png
index f7c22a4..f7c22a4 100644
--- a/exe/webui/images/stock-undo.png
+++ b/exe/resources/exportable/images/stock-undo.png
diff --git a/exe/webui/images/stock-volume-max.png b/exe/resources/exportable/images/stock-volume-max.png
index f8747be..f8747be 100644
--- a/exe/webui/images/stock-volume-max.png
+++ b/exe/resources/exportable/images/stock-volume-max.png
diff --git a/exe/webui/images/stock-volume-med.png b/exe/resources/exportable/images/stock-volume-med.png
index 8bdf8af..8bdf8af 100644
--- a/exe/webui/images/stock-volume-med.png
+++ b/exe/resources/exportable/images/stock-volume-med.png
diff --git a/exe/webui/images/stock-volume-min.png b/exe/resources/exportable/images/stock-volume-min.png
index e4877b2..e4877b2 100644
--- a/exe/webui/images/stock-volume-min.png
+++ b/exe/resources/exportable/images/stock-volume-min.png
diff --git a/exe/webui/images/stock-volume-zero.png b/exe/resources/exportable/images/stock-volume-zero.png
index 3d05d94..3d05d94 100644
--- a/exe/webui/images/stock-volume-zero.png
+++ b/exe/resources/exportable/images/stock-volume-zero.png
diff --git a/exe/webui/images/stock-volume.png b/exe/resources/exportable/images/stock-volume.png
index 69f9f79..69f9f79 100644
--- a/exe/webui/images/stock-volume.png
+++ b/exe/resources/exportable/images/stock-volume.png
diff --git a/exe/webui/images/stock-zoom-100.png b/exe/resources/exportable/images/stock-zoom-100.png
index 54beb9f..54beb9f 100644
--- a/exe/webui/images/stock-zoom-100.png
+++ b/exe/resources/exportable/images/stock-zoom-100.png
diff --git a/exe/webui/images/stock-zoom-fit.png b/exe/resources/exportable/images/stock-zoom-fit.png
index db24e2a..db24e2a 100644
--- a/exe/webui/images/stock-zoom-fit.png
+++ b/exe/resources/exportable/images/stock-zoom-fit.png
diff --git a/exe/webui/images/stock-zoom-in.png b/exe/resources/exportable/images/stock-zoom-in.png
index cb1d8ce..cb1d8ce 100644
--- a/exe/webui/images/stock-zoom-in.png
+++ b/exe/resources/exportable/images/stock-zoom-in.png
diff --git a/exe/webui/images/stock-zoom-out.png b/exe/resources/exportable/images/stock-zoom-out.png
index d6ef098..d6ef098 100644
--- a/exe/webui/images/stock-zoom-out.png
+++ b/exe/resources/exportable/images/stock-zoom-out.png
diff --git a/exe/resources/exportable/scripts/commonExportable.js b/exe/resources/exportable/scripts/commonExportable.js
deleted file mode 100644
index d19dec1..0000000
--- a/exe/resources/exportable/scripts/commonExportable.js
+++ /dev/null
@@ -1,917 +0,0 @@
-// ===========================================================================
-// eXe
-// Copyright 2004-2005, University of Auckland
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// ===========================================================================
-
-// This module is for the common Javascript used in all webpages.
-
-// Called upon loading the page this function clears the hidden
-// action and object fields so they can be used by submitLink
-var objBrowse = navigator.appName;
-
-// An array of js strings to evaluate on document load
-var onLoadHandlers = [clearHidden];
-var beforeSubmitHandlers = new Array();
-
-// Called on document load
-function onLoadHandler() {
-    runFuncArray(onLoadHandlers)
-}
-
-// Calls function in an array where each 'row' of the array is in the format:
-// func
-// or
-// [func, arg]
-function runFuncArray(handlers) {
-    for (var i=0; i < handlers.length; i++) {
-        var row = handlers[i] 
-        if (typeof row=="function")
-            row()
-        else {
-            // row[0] is a function, row[1] are its args
-            row[0].apply(this, row[1]);
-        }
-    }
-}
-
-// Asks the user for an image, returns the path or an empty string
-function askUserForImage(multiple) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var nsIFilePicker = Components.interfaces.nsIFilePicker;
-    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    if (multiple) {
-        var mode = nsIFilePicker.modeOpenMultiple;
-    } else {
-        var mode = nsIFilePicker.modeOpen;
-    }
-    fp.init(window, "Select an image", mode);
-    fp.appendFilter("Image Files", "*.jpg; *.jpeg; *.png; *.gif");
-    fp.appendFilters(nsIFilePicker.filterAll);
-    var res = fp.show();
-    if (res == nsIFilePicker.returnOK) {
-        if (multiple) {
-            var result = new String("");
-            var lastFile = null;
-            var file     = null;
-            while (fp.files.hasMoreElements()) {
-                file = fp.files.getNext().QueryInterface(Components.interfaces.nsIFile)
-                if (file == lastFile) {
-                    break;
-                }
-                lastFile = file;
-                if (result != "") {
-                    result += "&";
-                }
-                result += escape(file.path);
-            }
-            return result;
-        } else {
-            return fp.file.path;
-        }
-    } else {
-        return ""
-    }
-}
-
-// Called by the user to provide an image or flash file name to add to the package
-function addImage(elementId) {
-    var imagePath = askUserForImage()
-    if (imagePath != "") {
-        var image = document.getElementById('img'+elementId);
-        image.removeAttribute('width');
-        image.removeAttribute('height');
-        var path  = document.getElementById('path'+elementId);
-        path.value = imagePath;
-        image.src  = 'file://'+imagePath;
-    }
-}
-
-// Called by the user to provide an image or flash file name to add to the package
-function addJpgImage(elementId) {
-    var imagePath = askUserForJpgImage()
-    if (imagePath != "") {
-        var image = document.getElementById('img'+elementId);
-        image.removeAttribute('width');
-        image.removeAttribute('height');
-        var path  = document.getElementById('path'+elementId);
-        path.value = imagePath;
-        image.src  = 'file://'+imagePath;
-    }
-}
-
-// Asks the user for a jpg image, returns the path or an empty string
-function askUserForJpgImage(multiple) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var nsIFilePicker = Components.interfaces.nsIFilePicker;
-    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    if (multiple) {
-        var mode = nsIFilePicker.modeOpenMultiple;
-    } else {
-        var mode = nsIFilePicker.modeOpen;
-    }
-    fp.init(window, "Select an image ", mode);
-    fp.appendFilter("JPEG Files", "*.jpg; *.jpeg");
-    fp.appendFilters(nsIFilePicker.filterAll);
-    var res = fp.show();
-    if (res == nsIFilePicker.returnOK) {
-        if (multiple) {
-            var result = new String("");
-            var lastFile = null;
-            var file     = null;
-            while (fp.files.hasMoreElements()) {
-                file = fp.files.getNext().QueryInterface(Components.interfaces.nsIFile)
-                if (file == lastFile) {
-                    break;
-                }
-                lastFile = file;
-                if (result != "") {
-                    result += "&";
-                }
-                result += escape(file.path);
-            }
-            return result;
-        } else {
-            return fp.file.path;
-        }
-    } else {
-        return ""
-    }
-}
-// Called by the user to provide one or more image files name to add to the package
-function addGalleryImage(galleryId) {
-    var imagePath = askUserForImage(true);
-    if (imagePath != "") {
-        // Save the change
-        submitLink("gallery.addImage."+imagePath, galleryId, true);
-    }
-}
-
-// Called by the user to change an existing gallery image
-function changeGalleryImage(galleryId, imageId) {
-    var imagePath = askUserForImage(false)
-    if (imagePath != "") {
-        // Save the change
-        submitLink("gallery.changeImage."+imageId+"."+imagePath, galleryId, true);
-    }
-}
-
-
-function imageChanged(event) {
-    var id = event.currentTarget.getAttribute('id');
-    var elementId = id.substring(3, id.length);
-    var image  = document.getElementById('img'+elementId);
-    var width  = document.getElementById('width'+elementId);
-    var height = document.getElementById('height'+elementId);
-    width.value  = image.width;
-    height.value = image.height;
-}
-
-function magnifierImageChanged(event) {
-    var id = event.currentTarget.getAttribute('id');
-    var elementId = id.substring(3, id.length);
-    var image  = document.getElementById('img'+elementId);
-    var width  = document.getElementById('width'+elementId);
-    var height = document.getElementById('height'+elementId);
-    image.removeAttribute('height');
-    if (image.width > 700){
-        image.width = 600        
-        }
-    if (image.width <= 700 && image.width > 300)
-        image.width = image.width * 0.7
-        
-    if (image.height > 270){
-        width.value = image.width + 84
-    }else{
-        width.value = image.width + 144
-    }
-    height.value = image.height + 24
-    if (width.value < 180)
-        width.value = 180
-    if (height.value < 160)
-        height.value = 160
-}
-
-function changeImageWidth(elementId) {
-    var image  = document.getElementById('img'+elementId);
-    var width  = document.getElementById('width'+elementId);
-    var height = document.getElementById('height'+elementId);
-    image.removeAttribute('height');
-    if (width.value) {
-        image.width  = width.value;
-    } else {
-        image.removeAttribute('width');
-        width.value  = image.width;
-    }
-    height.value = image.height;
-}
-
-function changeMagnifierImageWidth(elementId) {
-    var image  = document.getElementById('img'+elementId);
-    var width  = document.getElementById('width'+elementId);
-    var height = document.getElementById('height'+elementId);
-    image.removeAttribute('height');
-    if (width.value) {
-        image.width  = width.value - 84;
-    } else {
-        image.removeAttribute('width');
-    }
-    if (image.width > 600){
-        image.removeAttribute('height')
-        image.width = 600;
-    }
-    if (image.height > 270){
-        width.value = image.width + 84
-    }else{
-        width.value = image.width + 144
-    }
-    height.value = image.height + 24
-    if (width.value < 180)
-        width.value = 180
-    if (height.value < 160)
-        height.value = 160
-}
-
-
-function changeMagnifierImageHeight(elementId) {
-    var image  = document.getElementById('img'+elementId);
-    var width  = document.getElementById('width'+elementId);
-    var height = document.getElementById('height'+elementId);
-    image.removeAttribute('width');
-    if (height.value) {
-        image.height = height.value - 24;
-    } else {
-        image.removeAttribute('height');
-    }
-    if (image.width > 600){
-        image.removeAttribute('height');
-        image.width = 600
-    }
-    if (image.height > 270){
-        width.value = image.width + 84
-    }else{
-        width.value = image.width + 144
-    }
-    height.value = image.height + 24
-    if (width.value < 180)
-        width.value = 180
-    if (height.value < 160)
-        height.value = 160
-}
-
-function changeImageHeight(elementId) {
-    var image  = document.getElementById('img'+elementId);
-    var width  = document.getElementById('width'+elementId);
-    var height = document.getElementById('height'+elementId);
-    image.removeAttribute('width');
-    if (height.value) {
-        image.height = height.value;
-    } else {
-        image.removeAttribute('height');
-        height.value = image.height;
-    }
-    width.value  = image.width;
-}
-
-
-// Called by the user to provide a flash movie file name to add to the package
-function addFlashMovie(blockId) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var nsIFilePicker = Components.interfaces.nsIFilePicker;
-    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    fp.init(window, "Select a file", nsIFilePicker.modeOpen);
-    fp.appendFilter("Flash Movie", "*.flv");
-    fp.appendFilters(nsIFilePicker.filterAll);
-    var res = fp.show();
-    if (res == nsIFilePicker.returnOK) {
-        var path  = document.getElementById('path'+blockId);
-        path.type  = 'text';
-        path.value = fp.file.path;
-    }
-}
-
-// Called by the user to provide a flash file name to add to the package
-function addFlash(blockId) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var nsIFilePicker = Components.interfaces.nsIFilePicker;
-    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    fp.init(window, "Select a file", nsIFilePicker.modeOpen);
-    fp.appendFilter("Flash Object", "*.swf");
-    fp.appendFilters(nsIFilePicker.filterAll);
-    var res = fp.show();
-    if (res == nsIFilePicker.returnOK) {
-        var path  = document.getElementById('path'+blockId);
-        path.type  = 'text';
-        path.value = fp.file.path;
-    }
-}
-
-function addMp3(blockId) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var nsIFilePicker = Components.interfaces.nsIFilePicker;
-    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    fp.init(window, "Select a mp3 file", nsIFilePicker.modeOpen);
-    fp.appendFilter("Mp3 Audio", "*.mp3");
-    fp.appendFilters(nsIFilePicker.filterAll);
-    var res = fp.show();
-    if (res == nsIFilePicker.returnOK) {
-        var path  = document.getElementById('path'+blockId);
-        path.type  = 'text';
-        path.value = fp.file.path;
-    }
-}
-
-
-// Called by the user to provide a file name to add to the package
-function addFile(blockId) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var nsIFilePicker = Components.interfaces.nsIFilePicker;
-    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    fp.init(window, "Select a file", nsIFilePicker.modeOpen);
-    fp.appendFilters(nsIFilePicker.filterAll);
-    var res = fp.show();
-    if (res == nsIFilePicker.returnOK) {
-        var path  = document.getElementById('path'+blockId);
-        path.value = fp.file.path;
-    }
-}
-
-function uploadFile(blockId) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var nsIFilePicker = Components.interfaces.nsIFilePicker;
-    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    fp.init(window, "Select a file", nsIFilePicker.modeOpen);
-    fp.appendFilters(nsIFilePicker.filterAll);
-    var res = fp.show();
-    if (res == nsIFilePicker.returnOK) {
-        var path  = document.getElementById('path'+blockId);
-        path.value = fp.file.path;
-    }
-    var theForm = top["authoringIFrame1"].document.getElementById('contentForm')
-    if (!theForm) {
-        // try and find the form for the authoring page
-        theForm = document.getElementById('contentForm')
-    }
-    theForm.submit();
-}
-
-function showMe(ident, w, h)
-{
-    var elmDiv = document.getElementById('popupmessage');
-
-    hideMe();
-        
-    if (!elmDiv || 
-        elmDiv.innerHTML != document.getElementById(ident).innerHTML){
-
-        elmDiv = document.createElement('div');
-        elmDiv.id = 'popupmessage';
-        elmDiv.className="popupDiv";
-        elmDiv.style.cssText = 'position:absolute; left: ' + 
-                               (xpos) + 'px; top: '+(ypos - h/2) + 
-                               'px; width: ' + w + 'px;';
-        elmDiv.innerHTML = document.getElementById(ident).innerHTML;
-        document.body.appendChild(elmDiv);
-        new dragElement('popupmessage');
-    }
-}
-            
-
-function hideMe() {
-    var elmDiv = document.getElementById('popupmessage');
-    if (elmDiv) {
-        // removes the div from the document
-        elmDiv.parentNode.removeChild(elmDiv);
-    }
-}
-
-
-function updateCoords(e) {
-    if (objBrowse == "Microsoft Internet Explorer") {
-        xpos = e.offsetX;
-        ypos = e.offsetY;
-
-    } else {
-        xpos = e.pageX;
-        ypos = e.pageY;
-    }
-}
-
-
-// Called upon loading the page this function clears the hidden
-// action and object fields so they can be used by submitLink
-function clearHidden()
-{
-    var theForm = top["authoringIFrame1"].document.getElementById('contentForm')
-    if (!theForm) {
-        // try and find the form for the authoring page
-        theForm = document.getElementById('contentForm')
-    }
-    theForm.action.value = "";
-    theForm.object.value = "";
-}
-
-// Sets the hidden action and object fields, then submits the 
-// contentForm to the server
-function submitLink(action, object, changed) 
-{
-    var theForm = top["authoringIFrame1"].document.getElementById('contentForm')
-    if (!theForm) {
-        // try and find the form for the authoring page
-        theForm = document.getElementById('contentForm')
-    }
-    theForm.action.value    = action;
-    theForm.object.value    = object;
-    theForm.isChanged.value = changed;
-    runFuncArray(beforeSubmitHandlers)
-    theForm.submit();
-}
-
-
-// Check the user really really wants to do this before submitting
-function confirmThenSubmitLink(message, action, object, changed) 
-{
-    if (confirm(message)) {
-        submitLink(action, object, changed);
-    }
-}
-
-function getFeedback(optionId, optionsNum, ideviceId, mode) {
-    for (i = 0; i< optionsNum; i++) { 
-        if (mode == "multi")
-            id = "sa" + i + "b" +ideviceId
-        else
-            id = "s" + i + "b" +ideviceId
-        if(i == optionId)
-            document.getElementById(id).style.display = "block";
-        else
-            document.getElementById(id).style.display = "None";
-    }
-}
-
-
-// Cloze Field Stuff /////////////////////////////////////////////////
-
-// Constants 
-NOT_ATTEMPTED = 0
-WRONG = 1
-CORRECT = 2
-
-// Functions 
-
-// Called when a learner types something into a cloze word space
-function onClozeChange(ele) {
-    var ident = getClozeIds(ele)[0];
-    var instant = eval(document.getElementById(
-        'clozeFlag'+ident+'.instantMarking').value);
-    if (instant) {
-        checkAndMarkClozeWord(ele);
-        // Hide the score paragraph if visible
-        var scorePara = document.getElementById('clozeScore' + ident);
-        scorePara.innerHTML = "";
-    }
-}
-
-// Recieves and marks answers from student
-function clozeSubmit(ident) {
-    // Mark all of the words
-    showClozeScore(ident, 1);
-    // Hide Submit
-    toggleElementVisible('submit'+ident);
-    // Show Restart
-    toggleElementVisible('restart'+ident);
-    // Show Show Answers Button
-    toggleElementVisible('showAnswersButton'+ident);
-    // Show feedback
-    toggleClozeFeedback(ident);
-}
-
-// Makes cloze idevice like new :)
-function clozeRestart(ident) {
-    // Hide Feedback
-    toggleClozeFeedback(ident);
-    // Clear the answers (Also hides score)
-    toggleClozeAnswers(ident, true);
-    // Hide Restart
-    toggleElementVisible('restart'+ident);
-    // Hide Show Answers Button
-    toggleElementVisible('showAnswersButton'+ident);
-    // Show Submit
-    toggleElementVisible('submit'+ident);
-}
-
-// Show/Hide all answers in the cloze idevice
-// 'clear' is an optional argument, that forces all the answers to be cleared
-// whether they are all finished and correct or not
-function toggleClozeAnswers(ident, clear){
-    // See if any have not been answered yet
-    var allCorrect = true;
-    var inputs = getCloseInputs(ident)
-    if (!clear) {
-        for (var i=0; i<inputs.length; i++) {
-            var input = inputs[i];
-            if (getClozeMark(input) != 2) {
-                allCorrect = false;
-                break;
-            }
-        }
-    }
-    if (allCorrect) {
-        // Clear all answers
-        clearClozeInputs(ident, inputs);
-    } else {
-        // Write all answers
-        fillClozeInputs(ident, inputs);
-    }
-    // Hide the score paragraph, irrelevant now
-    var scorePara = document.getElementById('clozeScore' + ident);
-    scorePara.innerHTML = "";
-    // If the get score button is visible and we just filled in all the right
-    // answers, disable it until they clear the scores again.
-    var getScoreButton = document.getElementById('getScore' + ident);
-    if (getScoreButton) {
-        getScoreButton.disabled = !allCorrect;
-    }
-}
-
-// Shows all answers for a cloze field
-// 'inputs' is an option argument containing a list of the 'input' elements for
-// the field
-function fillClozeInputs(ident, inputs) {
-    if (!inputs) {
-        var inputs = getCloseInputs(ident)
-    }
-    for (var i=0; i<inputs.length; i++) {
-        input = inputs[i];
-        input.value = getClozeAnswer(input);
-        markClozeWord(input, CORRECT);
-        // Toggle the readonlyness of the answers also
-        input.setAttribute('readonly', 'readonly');
-    }
-}
-
-// Blanks all the answers for a cloze field
-// 'inputs' is an option argument containing a list of the 'input' elements for
-// the field
-function clearClozeInputs(ident, inputs) {
-    if (!inputs) {
-        var inputs = getCloseInputs(ident)
-    }
-    for (var i=0; i<inputs.length; i++) {
-        input = inputs[i];
-        input.value="";
-        markClozeWord(input, NOT_ATTEMPTED);
-        // Toggle the readonlyness of the answers also
-        input.removeAttribute('readonly');
-    }
-}
-
-// Marks a cloze word in view mode.
-// Returns NOT_ATTEMPTED, CORRECT, or WRONG
-function checkAndMarkClozeWord(ele) {
-    var result = checkClozeWord(ele);
-    if (result != '') {
-        markClozeWord(ele, CORRECT);
-        ele.value = result;
-        return CORRECT;
-    } else if (!ele.value) {
-        markClozeWord(ele, NOT_ATTEMPTED);
-        return NOT_ATTEMPTED;
-    } else {
-        markClozeWord(ele, WRONG);
-        return WRONG;
-    }
-}
-
-// Marks a cloze question (at the moment just changes the color)
-// 'mark' should be 0=Not Answered, 1=Wrong, 2=Right
-function markClozeWord(ele, mark) {
-    switch (mark) {
-        case 0:
-            // Not attempted
-            ele.style.backgroundColor = "";
-            break;
-        case 1:
-            // Wrong
-            ele.style.backgroundColor = "red";
-            break;
-        case 2: 
-            // Correct
-            ele.style.backgroundColor = "lime";
-            break;
-    }
-    return mark
-}
-
-// Return the last mark applied to a word
-function getClozeMark(ele) {
-    // Return last mark applied
-    switch (ele.style.backgroundColor) {
-        case 'red':   return 1; // Wrong
-        case 'lime':  return 2; // Correct
-        default:      return 0; // Not attempted
-    }
-}
-
-// Decrypts and returns the answer for a certain cloze field word
-function getClozeAnswer(ele) {
-    var idents = getClozeIds(ele)
-    var ident = idents[0]
-    var inputId = idents[1]
-    var answerSpan = document.getElementById('clozeAnswer'+ident+'.'+inputId);
-    var code = answerSpan.innerHTML;
-    code = decode64(code)
-    code = unescape(code)
-    // XOR "Decrypt"
-    result = '';
-    var key = 'X'.charCodeAt(0);
-    for (var i=0; i<code.length; i++) {
-        var letter = code.charCodeAt(i);
-        key ^= letter
-        result += String.fromCharCode(key);
-    }
-    return result
-}
-
-// Base64 Decode
-// Base64 code from Tyler Akins -- http://rumkin.com
-function decode64(input) {
-   var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-   var output = "";
-   var chr1, chr2, chr3;
-   var enc1, enc2, enc3, enc4;
-   var i = 0;
-   // Remove all characters that are not A-Z, a-z, 0-9, +, /, or =
-   input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-   do {
-      enc1 = keyStr.indexOf(input.charAt(i++));
-      enc2 = keyStr.indexOf(input.charAt(i++));
-      enc3 = keyStr.indexOf(input.charAt(i++));
-      enc4 = keyStr.indexOf(input.charAt(i++));
-
-      chr1 = (enc1 << 2) | (enc2 >> 4);
-      chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-      chr3 = ((enc3 & 3) << 6) | enc4;
-
-      output = output + String.fromCharCode(chr1);
-
-      if (enc3 != 64) {
-         output = output + String.fromCharCode(chr2);
-      }
-      if (enc4 != 64) {
-         output = output + String.fromCharCode(chr3);
-      }
-   } while (i < input.length);
-   return output;
-}
-
-// Returns the corrected word or an empty string
-function checkClozeWord(ele) {
-    var guess = ele.value;
-    // Extract the idevice id and the input number out of the element's id
-    var original = getClozeAnswer(ele);
-    var answer = original;
-    var guess = ele.value
-    var ident = getClozeIds(ele)[0]
-    // Read the flags for checking answers
-    var strictMarking = eval(document.getElementById(
-        'clozeFlag'+ident+'.strictMarking').value);
-    var checkCaps = eval(document.getElementById(
-        'clozeFlag'+ident+'.checkCaps').value);
-    if (!checkCaps) {
-        guess = guess.toLowerCase();
-        answer = original.toLowerCase();
-    }
-    if (guess == answer)
-        // You are right!
-        return original
-    else if (strictMarking || answer.length <= 4)
-        // You are wrong!
-        return "";
-    else {
-        // Now use the similarity check algorythm
-        var i = 0;
-        var j = 0;
-        var orders = [[answer, guess], [guess, answer]];
-        var maxMisses = Math.floor(answer.length / 6) + 1;
-        var misses = 0;
-        if (guess.length <= maxMisses) {
-            misses = Math.abs(guess.length - answer.length);
-            for (i = 0; i < guess.length; i++ ) {
-                if (answer.search(guess[i]) == -1) {
-                    misses += 1;
-                }
-            }
-            if (misses <= maxMisses) {
-                return answer;
-            } else {
-                return "";
-            }
-        }
-        // Iterate through the different orders of checking
-        for (i = 0; i < 2; i++) {
-            var string1 = orders[i][0];
-            var string2 = orders[i][1];
-            while (string1) {
-                misses = Math.floor(
-                            (Math.abs(string1.length - string2.length) +
-                             Math.abs(guess.length - answer.length)) / 2)
-                var max = Math.min(string1.length, string2.length)
-                for (j = 0; j < max; j++) {
-                    var a = string2.charAt(j);
-                    var b = string1.charAt(j);
-                    if (a != b)
-                        misses += 1;
-                    if (misses > maxMisses)
-                        break;
-                }
-                if (misses <= maxMisses)
-                    // You are right
-                    return answer;
-                string1 = string1.substr(1);
-            }
-        }
-        // You are wrong!
-        return "";
-    }
-}
-
-// Extracts the idevice id and input id from a javascript element
-function getClozeIds(ele) {
-    // Extract the idevice id and the input number out of the element's id
-    // id is "clozeBlank%s.%s" % (idevice.id, input number)
-    var id = ele.id.slice(10); 
-    var dotindex = id.indexOf('.')
-    var ident = id.slice(0, dotindex)
-    var inputId = id.slice(id.indexOf('.')+1)
-    return [ident, inputId]
-}
-
-// Calculate the score for cloze idevice
-function showClozeScore(ident, mark) {
-    var score = 0
-    var div = document.getElementById('cloze' + ident)
-    var inputs = getCloseInputs(ident)
-    for (var i=0; i<inputs.length; i++) {
-        var input = inputs[i];
-        if (mark) {
-            var result = checkAndMarkClozeWord(input);
-        } else {
-            var result = getClozeMark(input);
-        }
-        if (result == 2) {
-            score++;
-        }
-    }
-    // Show it in a nice paragraph
-    var scorePara = document.getElementById('clozeScore' + ident);
-    scorePara.innerHTML = "Your score is " + score + "/" + inputs.length + ".";
-}
-
-// Returns an array of input elements that are associated with a certain idevice
-function getCloseInputs(ident) {
-    var result = new Array;
-    var clozeDiv = document.getElementById('cloze'+ident)
-    recurseFindClozeInputs(clozeDiv, ident, result)
-    return result
-}
-
-// Adds any cloze inputs found to result, recurses down
-function recurseFindClozeInputs(dad, ident, result) {
-    for (var i=0; i<dad.childNodes.length; i++) {
-        var ele = dad.childNodes[i];
-        // See if it is a blank
-        if (ele.id) {
-            if (ele.id.search('clozeBlank'+ident) == 0) {
-                result.push(ele);
-                continue;
-            }
-        }
-        // See if it contains blanks
-        if (ele.hasChildNodes()) {
-            recurseFindClozeInputs(ele, ident, result);
-        }
-    }
-}
-    
-
-// Pass the cloze element's id, and the visible property of the feedback element
-// associated with it will be toggled. If there is no feedback field, does
-// nothing
-function toggleClozeFeedback(ident) {
-    var feedbackIdEle = document.getElementById(
-        'clozeVar'+ident+'.feedbackId');
-    if (feedbackIdEle) {
-        var feedbackId = feedbackIdEle.value;
-        toggleElementVisible(feedbackId);
-    }
-}
-
-// Toggle the visiblity of an element from it's id
-function toggleElementVisible(ident) {
-    // Toggle the visibility of an element
-    var element = document.getElementById(ident);
-    if (element) {
-        if (element.style.display != "none") {
-            element.style.display = "none";
-        } else {
-            element.style.display = "";
-        }
-    }
-}
-
-// Reflection Idevice code ////////////////////////////////////////////////
-
-// Show or hide the feedback for reflection idevice
-function showAnswer(id,isShow) {
-    if (isShow==1) {
-        document.getElementById("s"+id).style.display = "block";
-        document.getElementById("hide"+id).style.display = "block";
-        document.getElementById("view"+id).style.display = "none";
-    } else {
-        document.getElementById("s"+id).style.display = "none";
-        document.getElementById("hide"+id).style.display = "none";
-        document.getElementById("view"+id).style.display = "block";
-    }
-}
-
-//change forum or discussion topic or lms for discussion idevice.
-function submitChange(action, selectId) 
-{
-    var form = document.getElementById("contentForm")      
-    form.action.value = action
-    var select = document.getElementById(selectId) 
-    form.object.value = select.value;
-    form.isChanged.value = 1;
-    form.submit();
-}
-
-
-// show or hide the feedback for cloze idevice
-function toggleFeedback(id) {
-    var ele = document.getElementById('fb'+id);
-    if (ele.style.display == "block") {
-        ele.style.display = "none";
-    } else {
-        ele.style.display = "block";
-    }
-}
-
-// Call the function like this:
-//insertAtCursor(document.formName.fieldName, this value);
-function insertAtCursor(myField, myValue, num) {
-    //MOZILLA/NETSCAPE support
-   
-    if (myField.selectionStart || myField.selectionStart == '0') {
-        var startPos = myField.selectionStart;
-        var endPos = myField.selectionEnd;
-        myField.value = myField.value.substring(0, startPos)
-            + myValue
-            + myField.value.substring(endPos, myField.value.length);
-        myField.selectionStart = startPos + myValue.length - num
-    } else {
-        myField.value += myValue;
-    } 
-    myField.selectionEnd = myField.selectionStart
-    myField.focus();
-}
-
-//used by maths idevice
-function insertSymbol(id, string, num){
-    var ele = document.getElementById(id);
-    insertAtCursor(ele, string, num)
-}
-
-//used for multiple select idevice for calculating score and showing feedback.
-function calcScore(num, ident){
-    var score = 0;
-    for(i=0; i<num; i++){
-        var chkele = document.getElementById(ident+i.toString());        
-        var ansele = document.getElementById("ans"+ident+i.toString())
-        chk = "False"
-        if (chkele.checked==1)
-            chk = "True"   
-        if (chk == chkele.value){
-            score++
-            ansele.style.color = "black"
-        }else{            
-            ansele.style.color = "red"
-        }
-    }
-    var fele = document.getElementById("f"+ident)
-    fele.style.display = "block"
-    alert("Your score is " + score + "/" + num)
-}
diff --git a/exe/resources/exportable/scripts/common_exportable.js b/exe/resources/exportable/scripts/common_exportable.js
new file mode 100644
index 0000000..c7ab5d6
--- /dev/null
+++ b/exe/resources/exportable/scripts/common_exportable.js
@@ -0,0 +1,508 @@
+// ===========================================================================
+// eXe
+// Copyright 2004-2005, University of Auckland
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// ===========================================================================
+
+function showMe(ident, w, h)
+{
+    var elmDiv = document.getElementById('popupmessage');
+
+    hideMe();
+        
+    if (!elmDiv || 
+        elmDiv.innerHTML != document.getElementById(ident).innerHTML){
+
+        elmDiv = document.createElement('div');
+        elmDiv.id = 'popupmessage';
+        elmDiv.className="popupDiv";
+        elmDiv.style.cssText = 'position:absolute; left: ' + 
+                               (xpos) + 'px; top: '+(ypos - h/2) + 
+                               'px; width: ' + w + 'px;';
+        elmDiv.innerHTML = document.getElementById(ident).innerHTML;
+        document.body.appendChild(elmDiv);
+        new dragElement('popupmessage');
+    }
+}
+            
+
+function hideMe() {
+    var elmDiv = document.getElementById('popupmessage');
+    if (elmDiv) {
+        // removes the div from the document
+        elmDiv.parentNode.removeChild(elmDiv);
+    }
+}
+
+
+function updateCoords(e) {
+    if (objBrowse == "Microsoft Internet Explorer") {
+        xpos = e.offsetX;
+        ypos = e.offsetY;
+
+    } else {
+        xpos = e.pageX;
+        ypos = e.pageY;
+    }
+}
+
+function getFeedback(optionId, optionsNum, ideviceId, mode) {
+    for (i = 0; i< optionsNum; i++) { 
+        if (mode == "multi")
+            id = "sa" + i + "b" +ideviceId
+        else
+            id = "s" + i + "b" +ideviceId
+        if(i == optionId)
+            document.getElementById(id).style.display = "block";
+        else
+            document.getElementById(id).style.display = "None";
+    }
+}
+
+
+// Cloze Field Stuff /////////////////////////////////////////////////
+
+// Constants 
+NOT_ATTEMPTED = 0
+WRONG = 1
+CORRECT = 2
+
+// Functions 
+
+// Called when a learner types something into a cloze word space
+function onClozeChange(ele) {
+    var ident = getClozeIds(ele)[0];
+    var instant = eval(document.getElementById(
+        'clozeFlag'+ident+'.instantMarking').value);
+    if (instant) {
+        checkAndMarkClozeWord(ele);
+        // Hide the score paragraph if visible
+        var scorePara = document.getElementById('clozeScore' + ident);
+        scorePara.innerHTML = "";
+    }
+}
+
+// Recieves and marks answers from student
+function clozeSubmit(ident) {
+    // Mark all of the words
+    showClozeScore(ident, 1);
+    // Hide Submit
+    toggleElementVisible('submit'+ident);
+    // Show Restart
+    toggleElementVisible('restart'+ident);
+    // Show Show Answers Button
+    toggleElementVisible('showAnswersButton'+ident);
+    // Show feedback
+    toggleClozeFeedback(ident);
+}
+
+// Makes cloze idevice like new :)
+function clozeRestart(ident) {
+    // Hide Feedback
+    toggleClozeFeedback(ident);
+    // Clear the answers (Also hides score)
+    toggleClozeAnswers(ident, true);
+    // Hide Restart
+    toggleElementVisible('restart'+ident);
+    // Hide Show Answers Button
+    toggleElementVisible('showAnswersButton'+ident);
+    // Show Submit
+    toggleElementVisible('submit'+ident);
+}
+
+// Show/Hide all answers in the cloze idevice
+// 'clear' is an optional argument, that forces all the answers to be cleared
+// whether they are all finished and correct or not
+function toggleClozeAnswers(ident, clear){
+    // See if any have not been answered yet
+    var allCorrect = true;
+    var inputs = getCloseInputs(ident)
+    if (!clear) {
+        for (var i=0; i<inputs.length; i++) {
+            var input = inputs[i];
+            if (getClozeMark(input) != 2) {
+                allCorrect = false;
+                break;
+            }
+        }
+    }
+    if (allCorrect) {
+        // Clear all answers
+        clearClozeInputs(ident, inputs);
+    } else {
+        // Write all answers
+        fillClozeInputs(ident, inputs);
+    }
+    // Hide the score paragraph, irrelevant now
+    var scorePara = document.getElementById('clozeScore' + ident);
+    scorePara.innerHTML = "";
+    // If the get score button is visible and we just filled in all the right
+    // answers, disable it until they clear the scores again.
+    var getScoreButton = document.getElementById('getScore' + ident);
+    if (getScoreButton) {
+        getScoreButton.disabled = !allCorrect;
+    }
+}
+
+// Shows all answers for a cloze field
+// 'inputs' is an option argument containing a list of the 'input' elements for
+// the field
+function fillClozeInputs(ident, inputs) {
+    if (!inputs) {
+        var inputs = getCloseInputs(ident)
+    }
+    for (var i=0; i<inputs.length; i++) {
+        input = inputs[i];
+        input.value = getClozeAnswer(input);
+        markClozeWord(input, CORRECT);
+        // Toggle the readonlyness of the answers also
+        input.setAttribute('readonly', 'readonly');
+    }
+}
+
+// Blanks all the answers for a cloze field
+// 'inputs' is an option argument containing a list of the 'input' elements for
+// the field
+function clearClozeInputs(ident, inputs) {
+    if (!inputs) {
+        var inputs = getCloseInputs(ident)
+    }
+    for (var i=0; i<inputs.length; i++) {
+        input = inputs[i];
+        input.value="";
+        markClozeWord(input, NOT_ATTEMPTED);
+        // Toggle the readonlyness of the answers also
+        input.removeAttribute('readonly');
+    }
+}
+
+// Marks a cloze word in view mode.
+// Returns NOT_ATTEMPTED, CORRECT, or WRONG
+function checkAndMarkClozeWord(ele) {
+    var result = checkClozeWord(ele);
+    if (result != '') {
+        markClozeWord(ele, CORRECT);
+        ele.value = result;
+        return CORRECT;
+    } else if (!ele.value) {
+        markClozeWord(ele, NOT_ATTEMPTED);
+        return NOT_ATTEMPTED;
+    } else {
+        markClozeWord(ele, WRONG);
+        return WRONG;
+    }
+}
+
+// Marks a cloze question (at the moment just changes the color)
+// 'mark' should be 0=Not Answered, 1=Wrong, 2=Right
+function markClozeWord(ele, mark) {
+    switch (mark) {
+        case 0:
+            // Not attempted
+            ele.style.backgroundColor = "";
+            break;
+        case 1:
+            // Wrong
+            ele.style.backgroundColor = "red";
+            break;
+        case 2: 
+            // Correct
+            ele.style.backgroundColor = "lime";
+            break;
+    }
+    return mark
+}
+
+// Return the last mark applied to a word
+function getClozeMark(ele) {
+    // Return last mark applied
+    switch (ele.style.backgroundColor) {
+        case 'red':   return 1; // Wrong
+        case 'lime':  return 2; // Correct
+        default:      return 0; // Not attempted
+    }
+}
+
+// Decrypts and returns the answer for a certain cloze field word
+function getClozeAnswer(ele) {
+    var idents = getClozeIds(ele)
+    var ident = idents[0]
+    var inputId = idents[1]
+    var answerSpan = document.getElementById('clozeAnswer'+ident+'.'+inputId);
+    var code = answerSpan.innerHTML;
+    code = decode64(code)
+    code = unescape(code)
+    // XOR "Decrypt"
+    result = '';
+    var key = 'X'.charCodeAt(0);
+    for (var i=0; i<code.length; i++) {
+        var letter = code.charCodeAt(i);
+        key ^= letter
+        result += String.fromCharCode(key);
+    }
+    return result
+}
+
+// Base64 Decode
+// Base64 code from Tyler Akins -- http://rumkin.com
+function decode64(input) {
+   var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+   var output = "";
+   var chr1, chr2, chr3;
+   var enc1, enc2, enc3, enc4;
+   var i = 0;
+   // Remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+   input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+   do {
+      enc1 = keyStr.indexOf(input.charAt(i++));
+      enc2 = keyStr.indexOf(input.charAt(i++));
+      enc3 = keyStr.indexOf(input.charAt(i++));
+      enc4 = keyStr.indexOf(input.charAt(i++));
+
+      chr1 = (enc1 << 2) | (enc2 >> 4);
+      chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+      chr3 = ((enc3 & 3) << 6) | enc4;
+
+      output = output + String.fromCharCode(chr1);
+
+      if (enc3 != 64) {
+         output = output + String.fromCharCode(chr2);
+      }
+      if (enc4 != 64) {
+         output = output + String.fromCharCode(chr3);
+      }
+   } while (i < input.length);
+   return output;
+}
+
+// Returns the corrected word or an empty string
+function checkClozeWord(ele) {
+    var guess = ele.value;
+    // Extract the idevice id and the input number out of the element's id
+    var original = getClozeAnswer(ele);
+    var answer = original;
+    var guess = ele.value
+    var ident = getClozeIds(ele)[0]
+    // Read the flags for checking answers
+    var strictMarking = eval(document.getElementById(
+        'clozeFlag'+ident+'.strictMarking').value);
+    var checkCaps = eval(document.getElementById(
+        'clozeFlag'+ident+'.checkCaps').value);
+    if (!checkCaps) {
+        guess = guess.toLowerCase();
+        answer = original.toLowerCase();
+    }
+    if (guess == answer)
+        // You are right!
+        return original
+    else if (strictMarking || answer.length <= 4)
+        // You are wrong!
+        return "";
+    else {
+        // Now use the similarity check algorythm
+        var i = 0;
+        var j = 0;
+        var orders = [[answer, guess], [guess, answer]];
+        var maxMisses = Math.floor(answer.length / 6) + 1;
+        var misses = 0;
+        if (guess.length <= maxMisses) {
+            misses = Math.abs(guess.length - answer.length);
+            for (i = 0; i < guess.length; i++ ) {
+                if (answer.search(guess[i]) == -1) {
+                    misses += 1;
+                }
+            }
+            if (misses <= maxMisses) {
+                return answer;
+            } else {
+                return "";
+            }
+        }
+        // Iterate through the different orders of checking
+        for (i = 0; i < 2; i++) {
+            var string1 = orders[i][0];
+            var string2 = orders[i][1];
+            while (string1) {
+                misses = Math.floor(
+                            (Math.abs(string1.length - string2.length) +
+                             Math.abs(guess.length - answer.length)) / 2)
+                var max = Math.min(string1.length, string2.length)
+                for (j = 0; j < max; j++) {
+                    var a = string2.charAt(j);
+                    var b = string1.charAt(j);
+                    if (a != b)
+                        misses += 1;
+                    if (misses > maxMisses)
+                        break;
+                }
+                if (misses <= maxMisses)
+                    // You are right
+                    return answer;
+                string1 = string1.substr(1);
+            }
+        }
+        // You are wrong!
+        return "";
+    }
+}
+
+// Extracts the idevice id and input id from a javascript element
+function getClozeIds(ele) {
+    // Extract the idevice id and the input number out of the element's id
+    // id is "clozeBlank%s.%s" % (idevice.id, input number)
+    var id = ele.id.slice(10); 
+    var dotindex = id.indexOf('.')
+    var ident = id.slice(0, dotindex)
+    var inputId = id.slice(id.indexOf('.')+1)
+    return [ident, inputId]
+}
+
+// Calculate the score for cloze idevice
+function showClozeScore(ident, mark) {
+    var score = 0
+    var div = document.getElementById('cloze' + ident)
+    var inputs = getCloseInputs(ident)
+    for (var i=0; i<inputs.length; i++) {
+        var input = inputs[i];
+        if (mark) {
+            var result = checkAndMarkClozeWord(input);
+        } else {
+            var result = getClozeMark(input);
+        }
+        if (result == 2) {
+            score++;
+        }
+    }
+    // Show it in a nice paragraph
+    var scorePara = document.getElementById('clozeScore' + ident);
+    scorePara.innerHTML = "Your score is " + score + "/" + inputs.length + ".";
+}
+
+// Returns an array of input elements that are associated with a certain idevice
+function getCloseInputs(ident) {
+    var result = new Array;
+    var clozeDiv = document.getElementById('cloze'+ident)
+    recurseFindClozeInputs(clozeDiv, ident, result)
+    return result
+}
+
+// Adds any cloze inputs found to result, recurses down
+function recurseFindClozeInputs(dad, ident, result) {
+    for (var i=0; i<dad.childNodes.length; i++) {
+        var ele = dad.childNodes[i];
+        // See if it is a blank
+        if (ele.id) {
+            if (ele.id.search('clozeBlank'+ident) == 0) {
+                result.push(ele);
+                continue;
+            }
+        }
+        // See if it contains blanks
+        if (ele.hasChildNodes()) {
+            recurseFindClozeInputs(ele, ident, result);
+        }
+    }
+}
+    
+
+// Pass the cloze element's id, and the visible property of the feedback element
+// associated with it will be toggled. If there is no feedback field, does
+// nothing
+function toggleClozeFeedback(ident) {
+    var feedbackIdEle = document.getElementById(
+        'clozeVar'+ident+'.feedbackId');
+    if (feedbackIdEle) {
+        var feedbackId = feedbackIdEle.value;
+        toggleElementVisible(feedbackId);
+    }
+}
+
+// Toggle the visiblity of an element from it's id
+function toggleElementVisible(ident) {
+    // Toggle the visibility of an element
+    var element = document.getElementById(ident);
+    if (element) {
+        if (element.style.display != "none") {
+            element.style.display = "none";
+        } else {
+            element.style.display = "";
+        }
+    }
+}
+
+// Reflection Idevice code ////////////////////////////////////////////////
+
+// Show or hide the feedback for reflection idevice
+function showAnswer(id,isShow) {
+    if (isShow==1) {
+        document.getElementById("s"+id).style.display = "block";
+        document.getElementById("hide"+id).style.display = "block";
+        document.getElementById("view"+id).style.display = "none";
+    } else {
+        document.getElementById("s"+id).style.display = "none";
+        document.getElementById("hide"+id).style.display = "none";
+        document.getElementById("view"+id).style.display = "block";
+    }
+}
+
+//change forum or discussion topic or lms for discussion idevice.
+function submitChange(action, selectId) 
+{
+    var form = document.getElementById("contentForm")      
+    form.action.value = action
+    var select = document.getElementById(selectId) 
+    form.object.value = select.value;
+    form.isChanged.value = 1;
+    form.submit();
+}
+
+
+// show or hide the feedback for cloze idevice
+function toggleFeedback(id) {
+    var ele = document.getElementById('fb'+id);
+    if (ele.style.display == "block") {
+        ele.style.display = "none";
+    } else {
+        ele.style.display = "block";
+    }
+}
+
+//used by maths idevice
+function insertSymbol(id, string, num){
+    var ele = document.getElementById(id);
+    insertAtCursor(ele, string, num)
+}
+
+//used for multiple select idevice for calculating score and showing feedback.
+function calcScore(num, ident){
+    var score = 0;
+    for(i=0; i<num; i++){
+        var chkele = document.getElementById(ident+i.toString());        
+        var ansele = document.getElementById("ans"+ident+i.toString())
+        chk = "False"
+        if (chkele.checked==1)
+            chk = "True"   
+        if (chk == chkele.value){
+            score++
+            ansele.style.color = "black"
+        }else{            
+            ansele.style.color = "red"
+        }
+    }
+    var fele = document.getElementById("f"+ident)
+    fele.style.display = "block"
+    alert("Your score is " + score + "/" + num)
+}
diff --git a/exe/webui/css/aboutDialog.css b/exe/resources/exportable/style/aboutDialog.css
index 2db72aa..2db72aa 100644
--- a/exe/webui/css/aboutDialog.css
+++ b/exe/resources/exportable/style/aboutDialog.css
diff --git a/exe/webui/css/controlpanel.css b/exe/resources/exportable/style/controlpanel.css
index 0088ec3..0088ec3 100644
--- a/exe/webui/css/controlpanel.css
+++ b/exe/resources/exportable/style/controlpanel.css
diff --git a/exe/webui/css/editing.css b/exe/resources/exportable/style/editing.css
index 995d136..995d136 100644
--- a/exe/webui/css/editing.css
+++ b/exe/resources/exportable/style/editing.css
diff --git a/exe/webui/css/exe.css b/exe/resources/exportable/style/exe.css
index 0b89228..0b89228 100644
--- a/exe/webui/css/exe.css
+++ b/exe/resources/exportable/style/exe.css
diff --git a/exe/webui/images/edit.gif b/exe/resources/internal/images/edit.gif
index cd3aaec..cd3aaec 100644
--- a/exe/webui/images/edit.gif
+++ b/exe/resources/internal/images/edit.gif
diff --git a/exe/webui/images/exe_logo.png b/exe/resources/internal/images/exe_logo.png
index 2c1f2f9..2c1f2f9 100644
--- a/exe/webui/images/exe_logo.png
+++ b/exe/resources/internal/images/exe_logo.png
diff --git a/exe/webui/images/feed-icon.png b/exe/resources/internal/images/feed-icon.png
index 291000e..291000e 100644
--- a/exe/webui/images/feed-icon.png
+++ b/exe/resources/internal/images/feed-icon.png
diff --git a/exe/webui/images/flash_placeholder.gif b/exe/resources/internal/images/flash_placeholder.gif
index 8a6af80..8a6af80 100644
--- a/exe/webui/images/flash_placeholder.gif
+++ b/exe/resources/internal/images/flash_placeholder.gif
diff --git a/exe/webui/images/help.gif b/exe/resources/internal/images/help.gif
index c8ec5ce..c8ec5ce 100644
--- a/exe/webui/images/help.gif
+++ b/exe/resources/internal/images/help.gif
diff --git a/exe/webui/images/hide.gif b/exe/resources/internal/images/hide.gif
index 54b3600..54b3600 100644
--- a/exe/webui/images/hide.gif
+++ b/exe/resources/internal/images/hide.gif
diff --git a/exe/webui/images/info.gif b/exe/resources/internal/images/info.gif
index b9d2ce4..b9d2ce4 100755
--- a/exe/webui/images/info.gif
+++ b/exe/resources/internal/images/info.gif
diff --git a/exe/webui/images/info.png b/exe/resources/internal/images/info.png
index 0d826bb..0d826bb 100644
--- a/exe/webui/images/info.png
+++ b/exe/resources/internal/images/info.png
diff --git a/exe/webui/images/mrX.png b/exe/resources/internal/images/mrX.png
index 8dc5b63..8dc5b63 100644
--- a/exe/webui/images/mrX.png
+++ b/exe/resources/internal/images/mrX.png
diff --git a/exe/webui/images/nav_bg.gif b/exe/resources/internal/images/nav_bg.gif
index 96d7b2a..96d7b2a 100644
--- a/exe/webui/images/nav_bg.gif
+++ b/exe/resources/internal/images/nav_bg.gif
diff --git a/exe/webui/images/nav_left.gif b/exe/resources/internal/images/nav_left.gif
index f3e3679..f3e3679 100644
--- a/exe/webui/images/nav_left.gif
+++ b/exe/resources/internal/images/nav_left.gif
diff --git a/exe/webui/images/nav_left_on.gif b/exe/resources/internal/images/nav_left_on.gif
index f9952e8..f9952e8 100644
--- a/exe/webui/images/nav_left_on.gif
+++ b/exe/resources/internal/images/nav_left_on.gif
diff --git a/exe/webui/images/nav_right.gif b/exe/resources/internal/images/nav_right.gif
index 4b27fc3..4b27fc3 100644
--- a/exe/webui/images/nav_right.gif
+++ b/exe/resources/internal/images/nav_right.gif
diff --git a/exe/webui/images/nav_right_on.gif b/exe/resources/internal/images/nav_right_on.gif
index fc8ac15..fc8ac15 100644
--- a/exe/webui/images/nav_right_on.gif
+++ b/exe/resources/internal/images/nav_right_on.gif
diff --git a/exe/resources/exportable/style/popup_bg.gif b/exe/resources/internal/images/popup_bg.gif
index c9f81ca..c9f81ca 100644
--- a/exe/resources/exportable/style/popup_bg.gif
+++ b/exe/resources/internal/images/popup_bg.gif
diff --git a/exe/webui/images/show.gif b/exe/resources/internal/images/show.gif
index ec26999..ec26999 100644
--- a/exe/webui/images/show.gif
+++ b/exe/resources/internal/images/show.gif
diff --git a/exe/webui/images/smileyface.png b/exe/resources/internal/images/smileyface.png
index 87b8747..87b8747 100644
--- a/exe/webui/images/smileyface.png
+++ b/exe/resources/internal/images/smileyface.png
diff --git a/exe/resources/internal/scripts/common.js b/exe/resources/internal/scripts/common.js
deleted file mode 100644
index e69de29..0000000
--- a/exe/resources/internal/scripts/common.js
+++ /dev/null
diff --git a/exe/resources/internal/scripts/common_internal.js b/exe/resources/internal/scripts/common_internal.js
new file mode 100644
index 0000000..bfb7457
--- /dev/null
+++ b/exe/resources/internal/scripts/common_internal.js
@@ -0,0 +1,425 @@
+// ===========================================================================
+// eXe
+// Copyright 2004-2005, University of Auckland
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// ===========================================================================
+
+// This module is for the common Javascript used in all webpages.
+
+// Called upon loading the page this function clears the hidden
+// action and object fields so they can be used by submitLink
+var objBrowse = navigator.appName;
+
+// An array of js strings to evaluate on document load
+var onLoadHandlers = [clearHidden];
+var beforeSubmitHandlers = new Array();
+
+// Called on document load
+function onLoadHandler() {
+    runFuncArray(onLoadHandlers)
+}
+
+// Calls function in an array where each 'row' of the array is in the format:
+// func
+// or
+// [func, arg]
+function runFuncArray(handlers) {
+    for (var i=0; i < handlers.length; i++) {
+        var row = handlers[i] 
+        if (typeof row=="function")
+            row()
+        else {
+            // row[0] is a function, row[1] are its args
+            row[0].apply(this, row[1]);
+        }
+    }
+}
+
+// Asks the user for an image, returns the path or an empty string
+function askUserForImage(multiple) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var nsIFilePicker = Components.interfaces.nsIFilePicker;
+    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+    if (multiple) {
+        var mode = nsIFilePicker.modeOpenMultiple;
+    } else {
+        var mode = nsIFilePicker.modeOpen;
+    }
+    fp.init(window, "Select an image", mode);
+    fp.appendFilter("Image Files", "*.jpg; *.jpeg; *.png; *.gif");
+    fp.appendFilters(nsIFilePicker.filterAll);
+    var res = fp.show();
+    if (res == nsIFilePicker.returnOK) {
+        if (multiple) {
+            var result = new String("");
+            var lastFile = null;
+            var file     = null;
+            while (fp.files.hasMoreElements()) {
+                file = fp.files.getNext().QueryInterface(Components.interfaces.nsIFile)
+                if (file == lastFile) {
+                    break;
+                }
+                lastFile = file;
+                if (result != "") {
+                    result += "&";
+                }
+                result += escape(file.path);
+            }
+            return result;
+        } else {
+            return fp.file.path;
+        }
+    } else {
+        return ""
+    }
+}
+
+// Called by the user to provide an image or flash file name to add to the package
+function addImage(elementId) {
+    var imagePath = askUserForImage()
+    if (imagePath != "") {
+        var image = document.getElementById('img'+elementId);
+        image.removeAttribute('width');
+        image.removeAttribute('height');
+        var path  = document.getElementById('path'+elementId);
+        path.value = imagePath;
+        image.src  = 'file://'+imagePath;
+    }
+}
+
+// Called by the user to provide an image or flash file name to add to the package
+function addJpgImage(elementId) {
+    var imagePath = askUserForJpgImage()
+    if (imagePath != "") {
+        var image = document.getElementById('img'+elementId);
+        image.removeAttribute('width');
+        image.removeAttribute('height');
+        var path  = document.getElementById('path'+elementId);
+        path.value = imagePath;
+        image.src  = 'file://'+imagePath;
+    }
+}
+
+// Asks the user for a jpg image, returns the path or an empty string
+function askUserForJpgImage(multiple) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var nsIFilePicker = Components.interfaces.nsIFilePicker;
+    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+    if (multiple) {
+        var mode = nsIFilePicker.modeOpenMultiple;
+    } else {
+        var mode = nsIFilePicker.modeOpen;
+    }
+    fp.init(window, "Select an image ", mode);
+    fp.appendFilter("JPEG Files", "*.jpg; *.jpeg");
+    fp.appendFilters(nsIFilePicker.filterAll);
+    var res = fp.show();
+    if (res == nsIFilePicker.returnOK) {
+        if (multiple) {
+            var result = new String("");
+            var lastFile = null;
+            var file     = null;
+            while (fp.files.hasMoreElements()) {
+                file = fp.files.getNext().QueryInterface(Components.interfaces.nsIFile)
+                if (file == lastFile) {
+                    break;
+                }
+                lastFile = file;
+                if (result != "") {
+                    result += "&";
+                }
+                result += escape(file.path);
+            }
+            return result;
+        } else {
+            return fp.file.path;
+        }
+    } else {
+        return ""
+    }
+}
+// Called by the user to provide one or more image files name to add to the package
+function addGalleryImage(galleryId) {
+    var imagePath = askUserForImage(true);
+    if (imagePath != "") {
+        // Save the change
+        submitLink("gallery.addImage."+imagePath, galleryId, true);
+    }
+}
+
+// Called by the user to change an existing gallery image
+function changeGalleryImage(galleryId, imageId) {
+    var imagePath = askUserForImage(false)
+    if (imagePath != "") {
+        // Save the change
+        submitLink("gallery.changeImage."+imageId+"."+imagePath, galleryId, true);
+    }
+}
+
+
+function imageChanged(event) {
+    var id = event.currentTarget.getAttribute('id');
+    var elementId = id.substring(3, id.length);
+    var image  = document.getElementById('img'+elementId);
+    var width  = document.getElementById('width'+elementId);
+    var height = document.getElementById('height'+elementId);
+    width.value  = image.width;
+    height.value = image.height;
+}
+
+function magnifierImageChanged(event) {
+    var id = event.currentTarget.getAttribute('id');
+    var elementId = id.substring(3, id.length);
+    var image  = document.getElementById('img'+elementId);
+    var width  = document.getElementById('width'+elementId);
+    var height = document.getElementById('height'+elementId);
+    image.removeAttribute('height');
+    if (image.width > 700){
+        image.width = 600        
+        }
+    if (image.width <= 700 && image.width > 300)
+        image.width = image.width * 0.7
+        
+    if (image.height > 270){
+        width.value = image.width + 84
+    }else{
+        width.value = image.width + 144
+    }
+    height.value = image.height + 24
+    if (width.value < 180)
+        width.value = 180
+    if (height.value < 160)
+        height.value = 160
+}
+
+function changeImageWidth(elementId) {
+    var image  = document.getElementById('img'+elementId);
+    var width  = document.getElementById('width'+elementId);
+    var height = document.getElementById('height'+elementId);
+    image.removeAttribute('height');
+    if (width.value) {
+        image.width  = width.value;
+    } else {
+        image.removeAttribute('width');
+        width.value  = image.width;
+    }
+    height.value = image.height;
+}
+
+function changeMagnifierImageWidth(elementId) {
+    var image  = document.getElementById('img'+elementId);
+    var width  = document.getElementById('width'+elementId);
+    var height = document.getElementById('height'+elementId);
+    image.removeAttribute('height');
+    if (width.value) {
+        image.width  = width.value - 84;
+    } else {
+        image.removeAttribute('width');
+    }
+    if (image.width > 600){
+        image.removeAttribute('height')
+        image.width = 600;
+    }
+    if (image.height > 270){
+        width.value = image.width + 84
+    }else{
+        width.value = image.width + 144
+    }
+    height.value = image.height + 24
+    if (width.value < 180)
+        width.value = 180
+    if (height.value < 160)
+        height.value = 160
+}
+
+
+function changeMagnifierImageHeight(elementId) {
+    var image  = document.getElementById('img'+elementId);
+    var width  = document.getElementById('width'+elementId);
+    var height = document.getElementById('height'+elementId);
+    image.removeAttribute('width');
+    if (height.value) {
+        image.height = height.value - 24;
+    } else {
+        image.removeAttribute('height');
+    }
+    if (image.width > 600){
+        image.removeAttribute('height');
+        image.width = 600
+    }
+    if (image.height > 270){
+        width.value = image.width + 84
+    }else{
+        width.value = image.width + 144
+    }
+    height.value = image.height + 24
+    if (width.value < 180)
+        width.value = 180
+    if (height.value < 160)
+        height.value = 160
+}
+
+function changeImageHeight(elementId) {
+    var image  = document.getElementById('img'+elementId);
+    var width  = document.getElementById('width'+elementId);
+    var height = document.getElementById('height'+elementId);
+    image.removeAttribute('width');
+    if (height.value) {
+        image.height = height.value;
+    } else {
+        image.removeAttribute('height');
+        height.value = image.height;
+    }
+    width.value  = image.width;
+}
+
+// Called by the user to provide a flash movie file name to add to the package
+function addFlashMovie(blockId) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var nsIFilePicker = Components.interfaces.nsIFilePicker;
+    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+    fp.init(window, "Select a file", nsIFilePicker.modeOpen);
+    fp.appendFilter("Flash Movie", "*.flv");
+    fp.appendFilters(nsIFilePicker.filterAll);
+    var res = fp.show();
+    if (res == nsIFilePicker.returnOK) {
+        var path  = document.getElementById('path'+blockId);
+        path.type  = 'text';
+        path.value = fp.file.path;
+    }
+}
+
+// Called by the user to provide a flash file name to add to the package
+function addFlash(blockId) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var nsIFilePicker = Components.interfaces.nsIFilePicker;
+    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+    fp.init(window, "Select a file", nsIFilePicker.modeOpen);
+    fp.appendFilter("Flash Object", "*.swf");
+    fp.appendFilters(nsIFilePicker.filterAll);
+    var res = fp.show();
+    if (res == nsIFilePicker.returnOK) {
+        var path  = document.getElementById('path'+blockId);
+        path.type  = 'text';
+        path.value = fp.file.path;
+    }
+}
+
+function addMp3(blockId) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var nsIFilePicker = Components.interfaces.nsIFilePicker;
+    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+    fp.init(window, "Select a mp3 file", nsIFilePicker.modeOpen);
+    fp.appendFilter("Mp3 Audio", "*.mp3");
+    fp.appendFilters(nsIFilePicker.filterAll);
+    var res = fp.show();
+    if (res == nsIFilePicker.returnOK) {
+        var path  = document.getElementById('path'+blockId);
+        path.type  = 'text';
+        path.value = fp.file.path;
+    }
+}
+
+
+// Called by the user to provide a file name to add to the package
+function addFile(blockId) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var nsIFilePicker = Components.interfaces.nsIFilePicker;
+    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+    fp.init(window, "Select a file", nsIFilePicker.modeOpen);
+    fp.appendFilters(nsIFilePicker.filterAll);
+    var res = fp.show();
+    if (res == nsIFilePicker.returnOK) {
+        var path  = document.getElementById('path'+blockId);
+        path.value = fp.file.path;
+    }
+}
+
+function uploadFile(blockId) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var nsIFilePicker = Components.interfaces.nsIFilePicker;
+    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+    fp.init(window, "Select a file", nsIFilePicker.modeOpen);
+    fp.appendFilters(nsIFilePicker.filterAll);
+    var res = fp.show();
+    if (res == nsIFilePicker.returnOK) {
+        var path  = document.getElementById('path'+blockId);
+        path.value = fp.file.path;
+    }
+    var theForm = top["authoringIFrame1"].document.getElementById('contentForm')
+    if (!theForm) {
+        // try and find the form for the authoring page
+        theForm = document.getElementById('contentForm')
+    }
+    theForm.submit();
+}
+
+// Called upon loading the page this function clears the hidden
+// action and object fields so they can be used by submitLink
+function clearHidden()
+{
+    var theForm = top["authoringIFrame1"].document.getElementById('contentForm')
+    if (!theForm) {
+        // try and find the form for the authoring page
+        theForm = document.getElementById('contentForm')
+    }
+    theForm.action.value = "";
+    theForm.object.value = "";
+}
+
+// Sets the hidden action and object fields, then submits the 
+// contentForm to the server
+function submitLink(action, object, changed) 
+{
+    var theForm = top["authoringIFrame1"].document.getElementById('contentForm')
+    if (!theForm) {
+        // try and find the form for the authoring page
+        theForm = document.getElementById('contentForm')
+    }
+    theForm.action.value    = action;
+    theForm.object.value    = object;
+    theForm.isChanged.value = changed;
+    runFuncArray(beforeSubmitHandlers)
+    theForm.submit();
+}
+
+
+// Check the user really really wants to do this before submitting
+function confirmThenSubmitLink(message, action, object, changed) 
+{
+    if (confirm(message)) {
+        submitLink(action, object, changed);
+    }
+}
+
+// Call the function like this:
+//insertAtCursor(document.formName.fieldName, this value);
+function insertAtCursor(myField, myValue, num) {
+    //MOZILLA/NETSCAPE support
+   
+    if (myField.selectionStart || myField.selectionStart == '0') {
+        var startPos = myField.selectionStart;
+        var endPos = myField.selectionEnd;
+        myField.value = myField.value.substring(0, startPos)
+            + myValue
+            + myField.value.substring(endPos, myField.value.length);
+        myField.selectionStart = startPos + myValue.length - num
+    } else {
+        myField.value += myValue;
+    } 
+    myField.selectionEnd = myField.selectionStart
+    myField.focus();
+}
diff --git a/exe/resources/internal/templates/mainpage.xul b/exe/resources/internal/templates/mainpage.xul
index 803f8d6..776e663 100644
--- a/exe/resources/internal/templates/mainpage.xul
+++ b/exe/resources/internal/templates/mainpage.xul
@@ -12,9 +12,9 @@
     <n:invisible n:render="liveglue"/>
 
     <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
-    <script language="JavaScript" src="/scripts/common.js"/>
-    <script language="JavaScript" src="/xulscripts/draganddrop.js"/>
-    <script language="JavaScript" src="/xulscripts/mainpage.js"/>
+    <script language="JavaScript" src="/common_internal.js"/>
+    <script language="JavaScript" src="/draganddrop.js"/>
+    <script language="JavaScript" src="/mainpage.js"/>
     <popupset> 
      <popup id="outlineMenu">
       <menuitem n:render="translate" label="Insert Package" oncommand="insertPackage()"/>
diff --git a/exe/webui/aboutpage.py b/exe/webui/aboutpage.py
index 20a5b7c..7079d1e 100644
--- a/exe/webui/aboutpage.py
+++ b/exe/webui/aboutpage.py
@@ -42,17 +42,6 @@ class AboutPage(RenderableResource):
         """
         RenderableResource.__init__(self, parent)
 
-        
-    def getChild(self, name, request):
-        """
-        Try and find the child for the name given
-        """
-        if name == "":
-            return self
-        else:
-            return Resource.getChild(self, name, request)
-
-
     def render_GET(self, request):
         """Called for all requests to this object"""
         log.debug("render_GET")
diff --git a/exe/webui/authoringpage.py b/exe/webui/authoringpage.py
index d5463b2..b3e7a67 100644
--- a/exe/webui/authoringpage.py
+++ b/exe/webui/authoringpage.py
@@ -48,17 +48,6 @@ class AuthoringPage(RenderableResource):
         RenderableResource.__init__(self, parent)
         self.blocks  = []
 
-
-    def getChild(self, name, request):
-        """
-        Try and find the child for the name given
-        """
-        if name == "":
-            return self
-        else:
-            return Resource.getChild(self, name, request)
-
-
     def _process(self, request):
         """
         Delegates processing of args to blocks
@@ -136,7 +125,7 @@ class AuthoringPage(RenderableResource):
         html += u'@import url(/style/base.css);\n'
         html += u'@import url(/style/%s/content.css);\n' % self.package.style
         html += u'</style>\n'
-        html += u'<script type="text/javascript" src="/scripts/common.js">'
+        html += u'<script type="text/javascript" src="common_internal.js">'
         html += u'</script>\n'
         html += u'<script type="text/javascript" '
         html += u'src="/tinymce/jscripts/tiny_mce/tiny_mce.js">'
@@ -168,7 +157,7 @@ class AuthoringPage(RenderableResource):
         html += u" });\n"
         html += u"//-->\n"
         html += u"</script>\n"
-        html += u'<script type="text/javascript" src="/scripts/libot_drag.js">'
+        html += u'<script type="text/javascript" src="libot_drag.js">'
         html += u'</script>\n'
         html += u'<title>"+_("eXe : elearning XHTML editor")+"</title>\n'
         html += u'<meta http-equiv="content-type" content="text/html; '
diff --git a/exe/webui/block.py b/exe/webui/block.py
index 5290594..ad77c91 100644
--- a/exe/webui/block.py
+++ b/exe/webui/block.py
@@ -230,11 +230,11 @@ class Block(Renderable):
             html += u'onmousedown="Javascript:updateCoords(event);" '
             html += u"onclick=\"Javascript:showMe('p"+self.id+"', 420, 240);\" "
             html += u'href="Javascript:void(0)" style="cursor:help;"> ' 
-            html += u'<img alt="%s" src="/images/info.png" ' % _('Information')
+            html += u'<img alt="%s" src="info.png" ' % _('Information')
             html += u'style="align:middle;" /></a>\n'
             html += u'<div id="p%s" style="display:none;">' % self.id
             html += u'<div style="float:right;">'
-            html += u'<img alt="%s" src="/images/stock-stop.png" ' % _('Close')
+            html += u'<img alt="%s" src="stock-stop.png" ' % _('Close')
             html += u' title="%s" ' % _(u"Close")
             html += u'onmousedown="Javascript:hideMe();"/></div>'
 
diff --git a/exe/webui/clozeblock.py b/exe/webui/clozeblock.py
index 7a06752..8f9ffc2 100644
--- a/exe/webui/clozeblock.py
+++ b/exe/webui/clozeblock.py
@@ -88,7 +88,7 @@ class ClozeBlock(Block):
         else:
             clozeContent = self.clozeElement.renderView()
         html = [
-            u'<script type="text/javascript" src="common.js"></script>\n',
+            u'<script type="text/javascript" src="common_exportable.js"></script>\n',
             u'<div class="iDevice_inner">\n',
             self.instructionElement.renderView(),
             clozeContent]
diff --git a/exe/webui/common.py b/exe/webui/common.py
index 52d9842..9a2f443 100644
--- a/exe/webui/common.py
+++ b/exe/webui/common.py
@@ -46,27 +46,6 @@ def docType():
             u'"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n')
 
 
-def header(style=u'default'):
-    """Generates the common header XHTML"""
-    # NB: Authoring Page has its own header
-    return (docType() + 
-            u'<html xmlns="http://www.w3.org/1999/xhtml">\n'
-            u'<head>\n'
-            u'<style type="text/css">\n'
-            u'  @import url(/css/exe.css);\n'
-            u'  @import url(/style/base.css);\n'
-            u'  @import url(/style/%s/content.css);</style>\n'
-            u'<script type="text/javascript" src="/scripts/common.js">'
-            u'</script>\n'
-            u'<script type="text/javascript" src="/scripts/libot_drag.js">'
-            u'</script>\n'
-            u'<title>%s</title>\n'
-            u'<meta http-equiv="content-type" '
-            u' content="text/html; charset=UTF-8"></meta>\n'
-            u'</head>\n'
-            % (style, _('eXe : elearning XHTML editor')))
-
-
 def footer():
     """Generates the common page footer XHTML"""
     return u'</form></body></html>\n'
@@ -282,12 +261,12 @@ def elementInstruc(instruc, imageFile="help.gif", label=None):
         html += u'onclick="Javascript:showMe(\'i%s\', 350, 100);" ' % id_
         html += u'href="Javascript:void(0)" style="cursor:help;"> ' 
         html += u'<img alt="%s" ' % _(u'Click for completion instructions')
-        html += u'src="/images/%s" style="vertical-align:middle;"/>' % imageFile
+        html += u'src="%s" style="vertical-align:middle;"/>' % imageFile
         html += u'</a>\n'
         html += u'<div id="i%s" style="display:none;">' % id_
         html += u'<div style="float:right;" >'
         html += u'<img alt="%s" ' % _("Close")
-        html += u'src="/images/stock-stop.png" title="%s" ' % _("Close")
+        html += u'src="stock-stop.png" title="%s" ' % _("Close")
         html += u' onmousedown="Javascript:hideMe();"/></div>'
         html += u'<div class="popupDivLabel">%s</div>%s' % (label, instruc)
         html += u'</div>\n'
diff --git a/exe/webui/editorpage.py b/exe/webui/editorpage.py
index 45e259b..a1eda86 100644
--- a/exe/webui/editorpage.py
+++ b/exe/webui/editorpage.py
@@ -50,16 +50,6 @@ class EditorPage(RenderableResource):
         self.isNewIdevice = True
         self.message      = ""
         
-    def getChild(self, name, request):
-        """
-        Try and find the child for the name given
-        """
-        if name == "":
-            return self
-        else:
-            return Resource.getChild(self, name, request)
-
-
     def process(self, request):
         """
         Process current package 
@@ -154,9 +144,9 @@ class EditorPage(RenderableResource):
         html += "@import url(/css/exe.css);\n"
         html += '@import url(/style/base.css);\n'
         html += "@import url(/style/standardwhite/content.css);</style>\n"
-        html += '<script type="text/javascript" src="/scripts/libot_drag.js">'
+        html += '<script type="text/javascript" src="libot_drag.js">'
         html += '</script>\n'
-        html += '<script type="text/javascript" src="/scripts/common.js">'
+        html += '<script type="text/javascript" src="common_internal.js">'
         html += '</script>\n'
         html += "<title>"+_("eXe : elearning XHTML editor")+"</title>\n"
         html += "<meta http-equiv=\"content-type\" content=\"text/html; "
diff --git a/exe/webui/editorpane.py b/exe/webui/editorpane.py
index abd9673..2cef19e 100644
--- a/exe/webui/editorpane.py
+++ b/exe/webui/editorpane.py
@@ -330,7 +330,7 @@ data is entered into this field.""")))
                 html += u'<div id="iconpanel" style="display:none; z-index:99;">'
                 html += u'<div style="float:right;" >\n'
                 html += u'<img alt="%s" ' % _("Close")
-                html += u'src="/images/stock-stop.png" title="%s"\n' % _("Close")
+                html += u'src="stock-stop.png" title="%s"\n' % _("Close")
                 html += u'onmousedown="Javascript:hideMe();"/></div><br/> \n'
                 html += u'<div align="center"><b>%s:</b></div><br/>' % _("Icons")
                 html += self.__renderIcons()
@@ -346,11 +346,11 @@ data is entered into this field.""")))
                 html += "onmousedown=\"Javascript:updateCoords(event);\" \n"
                 html += "onclick=\"Javascript:showMe('phelp', 380, 240);\" \n" 
                 html += "href=\"Javascript:void(0)\" style=\"cursor:help;\">\n " 
-                html += '<img alt="%s" src="/images/info.png" border="0" \n' % _('Info')
+                html += '<img alt="%s" src="info.png" border="0" \n' % _('Info')
                 html += "align=\"middle\" /></a>\n"
                 html += "<div id=\"phelp\" style=\"display:none;\">\n"
                 html += "<div style=\"float:right;\" "
-                html += '<img alt="%s" src="/images/stock-stop.png" \n' % _('Close')
+                html += '<img alt="%s" src="stock-stop.png" \n' % _('Close')
                 html += " title='"+_("Close")+"' border='0' align='middle' \n"
                 html += "onmousedown=\"Javascript:hideMe();\"/></div>\n"
                 if self.idevice.purpose != "":
diff --git a/exe/webui/errorpage.py b/exe/webui/errorpage.py
index b694f8a..1dd84d4 100644
--- a/exe/webui/errorpage.py
+++ b/exe/webui/errorpage.py
@@ -40,16 +40,6 @@ class ErrorPage(Resource):
         Resource.__init__(self)
         self.errMessage = errMessage
         
-    def getChild(self, name, request):
-        """
-        Get the child page for the name given
-        """
-        if name == '':
-            return self
-        else:
-            return Resource.getChild(self, name, request)
-
-
     def render_GET(self, request):
         """
         Create a new package and redirect the webrowser to the URL for it
diff --git a/exe/webui/galleryblock.py b/exe/webui/galleryblock.py
index af351e8..3514183 100644
--- a/exe/webui/galleryblock.py
+++ b/exe/webui/galleryblock.py
@@ -214,7 +214,7 @@ class GalleryBlock(Block):
                           # Edit button
                           changeGalleryImage,
                           u'          <img alt="%s"' % _(u'Change Image'),
-			  u'           src="/images/stock-edit.png"/>'
+			  u'           src="stock-edit.png"/>'
 			  u'        </a>']
                 # Move left button
                 if image.index > 0:
@@ -222,32 +222,32 @@ class GalleryBlock(Block):
                           u'        <a title="%s"' % _(u'Move Image Left'),
 			  u'           href="javascript:%s">' % submitLink('moveLeft'),
                           u'        <img alt="%s"' % _(u'Go Back'),
-			  u'         src="/images/stock-go-back.png"/>'
+			  u'         src="stock-go-back.png"/>'
                           u'        </a>',
                           ]
                 else:
                     result += [
-                          u'        <img src="/images/stock-go-back-off.png"/>']
+                          u'        <img src="stock-go-back-off.png"/>']
                 # Move right button
                 if image.index < len(image.parent.images)-1:
                     result += [
                           u'        <a title="%s"' % _(u'Move Image Right'),
 			  u'           href="javascript:%s">' % submitLink('moveRight'),
                           u'        <img alt="%s"' % _(u'Go Forward'),
-			  u'         src="/images/stock-go-forward.png"/>',
+			  u'         src="stock-go-forward.png"/>',
                           u'        </a>',
 			  ]
                 else:
                     result += [
                           u'        ' + 
                           u'<img alt="%s" ' % _(u'Go Forward (Not Available)'),
-			  u' src="/images/stock-go-forward-off.png"/>']
+			  u' src="stock-go-forward-off.png"/>']
                 result += [
                           # Delete button
                           u'        <a title="%s"' % _(u'Delete Image'),
 			  u'           href="javascript:%s">' % submitLink('delete'),
                           u'        <img alt="%s" ' % _(u'Delete'),
-                          u'             src="/images/stock-delete.png"/>',
+                          u'             src="stock-delete.png"/>',
                           u'        </a>',
                           u'      </span>']
                 return result
diff --git a/exe/webui/images/mp3player.swf b/exe/webui/images/mp3player.swf
deleted file mode 100755
index 6c0017d..0000000
--- a/exe/webui/images/mp3player.swf
+++ /dev/null
diff --git a/exe/webui/images/popup_bg.gif b/exe/webui/images/popup_bg.gif
deleted file mode 100644
index c9f81ca..0000000
--- a/exe/webui/images/popup_bg.gif
+++ /dev/null
diff --git a/exe/webui/multichoiceblock.py b/exe/webui/multichoiceblock.py
index 893990d..1c10ff0 100644
--- a/exe/webui/multichoiceblock.py
+++ b/exe/webui/multichoiceblock.py
@@ -113,7 +113,7 @@ class MultichoiceBlock(Block):
         """
         Returns an XHTML string for viewing this block
         """
-        html  = u'<script type="text/javascript" src="common.js"></script>\n'
+        html  = u'<script type="text/javascript" src="common_exportable.js"></script>\n'
         html += u'<script type="text/javascript" src="libot_drag.js"></script>\n'
         html += u"<div class=\"iDevice "
         html += u"emphasis"+unicode(self.idevice.emphasis)+"\">\n"
diff --git a/exe/webui/packageredirectpage.py b/exe/webui/packageredirectpage.py
index f23affd..e2b655d 100644
--- a/exe/webui/packageredirectpage.py
+++ b/exe/webui/packageredirectpage.py
@@ -25,7 +25,6 @@ anything it just redirects the user to a new package.
 import logging
 from exe.webui.renderable import RenderableResource
 from exe.xului.mainpage   import MainPage
-from twisted.web          import static
 
 log = logging.getLogger(__name__)
 
@@ -45,68 +44,11 @@ class PackageRedirectPage(RenderableResource):
         """
         RenderableResource.__init__(self, None, None, webServer)
         self.webServer = webServer
-        self.cache = self.makeCache()
-        self.styleCache = self.makeStyleCache
         # We only do ONE package at a time now!
         self.currentMainPage = None
         # This is a twisted timer
         self.stopping = None
 
-    def makeCache(self):
-        """
-        Creates a dictionary of magic filenames
-        """
-        dontImportDirs = ['.svn', 'style', 'tinymce', 'win-profile', 'linux-profile']
-        cache = {}
-        for fn in self.config.resourceDir.walkfiles():
-            name = str(fn.basename())
-            if name in cache:
-                raise Exception('Two resource files with same name: "%s" and "%s"' % (fn, cache[name].path))
-            for badDir in dontImportDirs:
-                if badDir in fn:
-                    break
-            else:
-                cache[name] = static.File(fn.abspath())
-        return cache
-
-    def makeStyleCache(self):
-        """
-        Returns a mapping of style name to {filename -> static.File} dict
-        """
-        cache = {}
-        for style in self.config.styles:
-            cache[style] = subCache = {}
-            for fn in self.config.resourceDir/'exportable'/'style'/style:
-                if name in cache:
-                    raise Exception('Two style files with same name: "%s" and "%s"' % (fn, cache[name].path))
-                subCache[str(fn.basename())] = static.File(fn)
-        return cache
-
-    def getChild(self, name, request):
-        """
-        Get the child page for the name given.
-        This is called if our ancestors can't find our child.
-        This is probably because the url is in unicode
-        """
-        if name == '':
-            return self
-        else:
-            # Get rid of any path components of 'name'
-            if request.postpath:
-                end = request.postpath[-1]
-            else:
-                end = name
-            result = self.cache.get(end)
-            ##print end, result.path
-            if result is None:
-                # Ask out 
-                # Check the style cache
-                result = self.styleCache.get(self.currentMainPage.packge.style)
-                if result is None:
-                    # This will just raise an error
-                    return RenderableResource.getChild(self, name, request)
-            return result
-
     def bindNewPackage(self, package):
         """
         Binds 'package' to the appropriate url
@@ -122,7 +64,6 @@ class PackageRedirectPage(RenderableResource):
             del self.children[self.currentMainPage.name]
         # Now this is our "ONLY" loaded package
         self.currentMainPage = MainPage(self, package)
-        print self.children
 
     def render_GET(self, request):
         """
diff --git a/exe/webui/preferencespage.py b/exe/webui/preferencespage.py
index 4bddd6c..dac3f90 100644
--- a/exe/webui/preferencespage.py
+++ b/exe/webui/preferencespage.py
@@ -51,17 +51,6 @@ class PreferencesPage(RenderableResource):
             self.localeNames.append((localeName, locale))
         self.localeNames.sort()
 
-        
-    def getChild(self, name, request):
-        """
-        Try and find the child for the name given
-        """
-        if name == "":
-            return self
-        else:
-            return Resource.getChild(self, name, request)
-
-
     def render_GET(self, request):
         """Render the preferences"""
         log.debug("render_GET")
diff --git a/exe/webui/reflectionblock.py b/exe/webui/reflectionblock.py
index 3dd9edb..3ab758c 100644
--- a/exe/webui/reflectionblock.py
+++ b/exe/webui/reflectionblock.py
@@ -81,7 +81,7 @@ class ReflectionBlock(Block):
         """
         Returns an XHTML string for this block
         """
-        html  = u'<script type="text/javascript" src="common.js"></script>\n'
+        html  = u'<script type="text/javascript" src="common_exportable.js"></script>\n'
         html += u'<div class="iDevice_inner">\n'
     
         html += self.activity   
diff --git a/exe/webui/renderable.py b/exe/webui/renderable.py
index 13ff8ef..b71c67b 100644
--- a/exe/webui/renderable.py
+++ b/exe/webui/renderable.py
@@ -30,10 +30,14 @@ but you don't have to use that functionality. It means you can use a rendering
 template to do your rendering, even if you're part of a bigger block.
 """
 
-from nevow import loaders
-from nevow.livepage import LivePage
+from nevow                import tags
+from nevow                import inevow
+from nevow                import loaders
+from nevow.livepage       import LivePage
+from nevow.appserver      import OldResourceAdapter
 from twisted.web.resource import Resource
-from nevow import tags
+from twisted.web          import static
+from exe.engine.path      import toUnicode
 import re
 
 # Constants
@@ -81,8 +85,7 @@ class Renderable(object):
             raise AssertionError('Element of class "%s" created with no name.' %
                                  self.__class__.__name__)
             
-        # Make pylint happy. These attributes will be gotten from
-        # self.application
+        # Make pylint happy. These attributes will be gotten from self.application
         self.config = Unset
         self.ideviceStore = Unset
         self.packageStore = Unset
@@ -155,7 +158,6 @@ class Renderable(object):
             setattr(self, attr, res)
         return res
 
-
     def process(self, request):
         """
         Called when a request comes in.
@@ -282,7 +284,117 @@ class _RenderablePage(Renderable):
         return ctx
 
 
-class RenderableResource(_RenderablePage, Resource):
+class MagicStepMixin(object):
+    """
+    A mixin to help pages find resources, without caring about the path
+    """
+
+    __implements__ = inevow.IResource,
+
+    def __init__(self):
+        self.oldResourceAdapter = OldResourceAdapter(self)
+        if self.parent and self.parent.cache:
+            self.cache = self.parent.cache
+            self.styleCache = self.parent.styleCache
+        else:
+            self.cache = self.makeCache()
+            self.styleCache = self.makeStyleCache()
+
+    def makeCache(self):
+        """
+        Creates a dictionary of magic filenames
+        """
+        dontImportDirs = ['.svn', 'tinymce', 'win-profile', 'linux-profile'] + map(toUnicode, self.config.styles)
+        cache = {}
+        for fn in self.config.resourceDir.walkfiles():
+            name = str(fn.basename())
+            for badDir in dontImportDirs:
+                if badDir in fn:
+                    break
+            else:
+                if name in cache:
+                    raise Exception('Two resource files with same name: "%s" and "%s"' % (fn, cache[name].path))
+                cache[name] = static.File(fn.abspath())
+        return cache
+
+    def makeStyleCache(self):
+        """
+        Returns a mapping of style name to {filename -> static.File} dict
+        """
+        cache = {}
+        for style in self.config.styles:
+            cache[style] = subCache = {}
+            for fn in (self.config.resourceDir/'exportable'/'style'/style).walkfiles():
+                if '.svn' in fn:
+                    continue
+                name = str(fn.basename())
+                if name in subCache:
+                    raise Exception('Two style files with same name: "%s" and "%s"' % (fn, cache[fn].path))
+                subCache[name] = static.File(fn)
+        return cache
+
+    def getChild(self, name, request):
+        """
+        Get the child page for the name given.
+        This is called if the child is not in our static self.children liset
+        This is probably because the url is in unicode
+        """
+        if name == '':
+            return self
+        else:
+            # See if we're a branch or a leaf
+            if len(request.postpath):
+                ##print 'Recursing', '/'.join(request.postpath)
+                return self
+            # We're here
+            result = self.cache.get(request.prepath[-1])
+            if result is None:
+                # Ask out 
+                # Check the style cache
+                result = self.styleCache.get(self.currentMainPage.package.style).get(request.prepath[-1])
+                if result is None:
+                    print self.__class__.__name__, request.path, 'not found'
+                    # This will just raise an error
+                    return RenderableResource.getChild(self, name, request)
+            return result
+
+    def getChildWithDefault(self, path, request):
+        """Retrieve a static or dynamically generated child resource from me.
+        First checks if a resource was added manually by putChild, and then
+        call getChild to check for dynamic resources. Only override if you want
+        to affect behaviour of all child lookups, rather than just dynamic
+        ones.
+        This will check to see if I have a pre-registered child resource of the
+        given name, and call getChild if I do not.
+        """
+        if self.children.has_key(path):
+            return self.children[path]
+        return self.getChild(path, request)
+
+    # IResource Implentation
+
+    def locateChild(self, ctx, segments):
+        print 'locateChild(', self, ctx, segments, ')'
+        return self.oldResourceAdapter.locateChild(ctx, segments)
+
+    def _handle_NOT_DONE_YET(self, data, request):
+        print '_handle_NOT_DONE_YET(', self, data, request, ')'
+        return self.oldResourceAdapter._handle_NOT_DONE_YET(data, request)
+    
+    def renderHTTP(self, ctx):
+        print 'renderHTTP(', self, ctx, ')'
+        return self.oldResourceAdapter.renderHTTP(ctx)
+
+    def willHandle_notFound(self, request):
+        print 'willHandle_notFound(', self, request, ')'
+        return self.oldResourceAdapter.willHandle_notFound(request)
+
+    def renderHTTP_notFound(self, ctx):
+        print 'renderHTTP_notFound(', self, ctx, ')'
+        return self.oldResourceAdapter.renderHTTP_notFound(ctx)
+
+
+class RenderableResource(_RenderablePage, MagicStepMixin, Resource):
     """
     It is a page and renderable, but not live
     """
@@ -293,9 +405,10 @@ class RenderableResource(_RenderablePage, Resource):
         """
         Resource.__init__(self)
         _RenderablePage.__init__(self, parent, package, config)
+        MagicStepMixin.__init__(self)
 
 
-class RenderableLivePage(_RenderablePage, LivePage):
+class RenderableLivePage(MagicStepMixin, _RenderablePage, LivePage):
     """
     This class is both a renderable and a LivePage/Resource
     """
@@ -306,6 +419,7 @@ class RenderableLivePage(_RenderablePage, LivePage):
         """
         LivePage.__init__(self)
         _RenderablePage.__init__(self, parent, package, config)
+        MagicStepMixin.__init__(self)
 
     def render_liveglue(self, ctx, data):
-        return tags.script(src='/xulscripts/nevow_glue.js')
+        return tags.script(src='nevow_glue.js')
diff --git a/exe/webui/truefalseblock.py b/exe/webui/truefalseblock.py
index f426c70..569d352 100644
--- a/exe/webui/truefalseblock.py
+++ b/exe/webui/truefalseblock.py
@@ -122,7 +122,7 @@ class TrueFalseBlock(Block):
         """
         Returns an XHTML string for viewing this block
         """
-        html  = u'<script type="text/javascript" src="common.js"></script>\n'
+        html  = u'<script type="text/javascript" src="common_exportable.js"></script>\n'
         html += u'<script type="text/javascript" src="libot_drag.js"></script>'
         html += u"\n<div class=\"iDevice "
         html += u"emphasis"+unicode(self.idevice.emphasis)+"\">\n"
diff --git a/exe/webui/webserver.py b/exe/webui/webserver.py
index 8d43d5a..997de3f 100755
--- a/exe/webui/webserver.py
+++ b/exe/webui/webserver.py
@@ -71,11 +71,11 @@ class WebServer:
         """
         log.debug("start web server running")
 
-        # web resources
+        # Web resources
         resourceDir = self.config.resourceDir
         self.root.putChild("tinymce", static.File(resourceDir/'internal'/'tinymce'))
 
-        # sub applications
+        # Sub pages
         self.root.putChild("editor",      self.editor)
         self.root.putChild("preferences", self.preferences)
         self.root.putChild("about",       self.about)
diff --git a/exe/xului/mainpage.py b/exe/xului/mainpage.py
index 748f8ee..0d5896c 100644
--- a/exe/xului/mainpage.py
+++ b/exe/xului/mainpage.py
@@ -76,15 +76,6 @@ class MainPage(RenderableLivePage):
         self.authoringPage  = AuthoringPage(self)
         self.propertiesPage = PropertiesPage(self)
 
-    def getChild(self, name, request):
-        """
-        Try and find the child for the name given
-        """
-        if name == '':
-            return self
-        else:
-            return super(self, self.__class__).getChild(self, name, request)
-
     def goingLive(self, ctx, client):
         """Called each time the page is served/refreshed"""
         inevow.IRequest(ctx).setHeader('content-type', 'application/vnd.mozilla.xul+xml')
diff --git a/nevow/appserver.py b/nevow/appserver.py
index 537cbcd..dbab5aa 100644
--- a/nevow/appserver.py
+++ b/nevow/appserver.py
@@ -253,6 +253,7 @@ class NevowSite(server.Site):
             context.RequestContext(tag=request))
 
     def handleSegment(self, result, request, path, pageContext):
+        print request.path, result
         if result is errorMarker:
             return errorMarker
author	matiu <matiu@38b22f21-9aea-0310-abfc-843a9883df58>	2006-11-12 22:55:10 (GMT)
committer	matiu <matiu@38b22f21-9aea-0310-abfc-843a9883df58>	2006-11-12 22:55:10 (GMT)
commit	5b24cd19511e73a055cae1349a6cacbc61c9dd12 (patch)
tree	19254e5d385d6cc7e8227b181be6f185f7f643a5
parent	b3e15644440213be14eb90e99010f6b8ad6f27bd (diff)