template updates for internationalization, including updated all.properties

webapp/themes/vitro/templates/footer.ftl

@@ -7,25 +7,25 @@
         <#if copyright??>
             <small>&copy;${copyright.year?c}
             <#if copyright.url??>
-                <a href="${copyright.url}" title="copyright">${copyright.text}</a>
+                <a href="${copyright.url}" title="${i18n().copyright}">${copyright.text}</a>
             <#else>
                 ${copyright.text}
             </#if>
-             | <a class="terms" href="${urls.termsOfUse}" title="terms of use">Terms of Use</a></small> | 
+             | <a class="terms" href="${urls.termsOfUse}" title="${i18n().terms_of_use}">Terms of Use</a></small> | 
         </#if>
         Powered by <a class="powered-by-vitro" href="http://vitro.sourceforge.net"><strong>Vitro</strong></a>
         <#if user.hasRevisionInfoAccess>
-             | Version <a href="${version.moreInfoUrl}" title="version">${version.label}</a>
+             | Version <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a>
         </#if>
     </p>
     
     <nav role="navigation">
         <ul id="footer-nav" role="list">
-            <li role="listitem"><a href="${urls.about}" title="about">About</a></li>
+            <li role="listitem"><a href="${urls.about}" title="${i18n().about}">${i18n().about}</a></li>
             <#if urls.contact??>
-                <li role="listitem"><a href="${urls.contact}" title="contact us">Contact Us</a></li>
+                <li role="listitem"><a href="${urls.contact}" title="${i18n().contact_us}">${i18n().contact_us}</a></li>
             </#if> 
-            <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="support">Support</a></li>
+            <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().support}">${i18n().support}</a></li>
         </ul>
     </nav>
 </footer>

webapp/themes/vitro/templates/identity.ftl

@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <header id="branding" role="banner">
-    <h1 class="vitro-logo"><a title="VITRO | web-based ontology & instance editor" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
+    <h1 class="vitro-logo"><a title="${siteName}" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
     <#-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
     <#if siteTagline?has_content>
         <em>${siteTagline}</em>
@@ -10,19 +10,19 @@
     <nav role="navigation">
         <ul id="header-nav" role="list">
             <#include "languageSelector.ftl">
-            <li role="listitem"><a href="${urls.index}" title="index">Index</a></li>
+            <li role="listitem"><a href="${urls.index}" title="${i18n().index}">${i18n().index}</a></li>
             <#if user.loggedIn>
                 <#if user.hasSiteAdminAccess>
-                    <li role="listitem"><a href="${urls.siteAdmin}" title="site admin">Site Admin</a></li>
+                    <li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().site_admin}">${i18n().site_admin}</a></li>
                 </#if>
                     <li>
                         <ul class="dropdown">
-                            <li id="user-menu"><a href="#" title="user">${user.loginName}</a>
+                            <li id="user-menu"><a href="#" title="${i18n().current_user}">${user.loginName}</a>
                                 <ul class="sub_menu">
                                      <#if urls.myAccount??>
-                                         <li role="listitem"><a href="${urls.myAccount}" title="my account">My account</a></li>
+                                         <li role="listitem"><a href="${urls.myAccount}" title="${i18n().myAccount_heading}">${i18n().myAccount_heading}</a></li>
                                      </#if>
-                                     <li role="listitem"><a href="${urls.logout}" title="log out">Log out</a></li>
+                                     <li role="listitem"><a href="${urls.logout}" title="${i18n().log_out}">${i18n().log_out}</a></li>
                                 </ul>
                             </li>
                          </ul>
@@ -31,7 +31,7 @@
                 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}
                 
             <#else>
-                <li role="listitem"><a class="log-out" title="log in to manage this site" href="${urls.login}">Log in</a></li>
+                <li role="listitem"><a class="log-out" title="${i18n().login_to_manage_site}" href="${urls.login}">${i18n().login_button}</a></li>
             </#if>
         </ul>
         

webapp/themes/vitro/templates/menu.ftl

@@ -5,7 +5,7 @@
 <nav role="navigation">
     <ul id="main-nav" role="list">
         <#list menu.items as item>
-            <li role="listitem"><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
+            <li role="listitem"><a href="${item.url}" <#if item.active> class="selected" </#if> title="${i18n().menu_item}">${item.linkText}</a></li>
         </#list>
     </ul>
 </nav>
@@ -25,6 +25,6 @@
     
     <!--[if lte IE 8]>
     <noscript>
-        <p class="ie-alert">This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser. Here are the <a href="http://www.enable-javascript.com" title="javascript instructions">instructions for enabling JavaScript in your web browser</a>.</p>
+        <p class="ie-alert">${i18n().javascript_ie_alert_text} Here are the <a href="http://www.enable-javascript.com" title="javascript instructions">${i18n().to_enable_javascript}</a>.</p>
     </noscript>
     <![endif]-->

webapp/themes/vitro/templates/page-home.ftl

@@ -15,34 +15,34 @@
         <#include "menu.ftl">
         
             <section id="intro" role="region">
-                <h2>What is VITRO?</h2>
+                <h2>${i18n().what_is_vitro}</h2>
                 
-                <p>Vitro is a general-purpose web-based ontology and instance editor with customizable public browsing. Vitro is a Java web application that runs in a Tomcat servlet container.</p>
+                <p>${i18n().vitro_description}</p>
-                <p>With Vitro, you can:</p>
+                <p>${i18n().with_vitro}</p>
                 
                 <ul>
-                    <li>Create or load ontologies in OWL format</li>
+                    <li>${i18n().vitro_bullet_one}</li>
-                    <li>Edit instances and relationships</li>
+                    <li>${i18n().vitro_bullet_two}</li>
-                    <li>Build a public web site to display your data</li>
+                    <li>${i18n().vitro_bullet_three}</li>
-                    <li>Search your data</li>
+                    <li>${i18n().vitro_bullet_four}</li>
                 </ul>
                 
                 <section id="search-home" role="region">
-                    <h3>Search VITRO <span class="search-filter-selected">filteredSearch</span></h3>
+                    <h3>${i18n().search_vitro} <span class="search-filter-selected">filteredSearch</span></h3>
                     
                     <fieldset>
                         <legend>Search form</legend>
                         <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" > 
                             <div id="search-home-field">
                                 <input type="text" name="querytext" class="search-homepage" value="${querytext!}" autocapitalize="off" />
-                                <input type="submit" value="Search" class="search" />
+                                <input type="submit" value="${i18n().search_button}" class="search" />
                                 <input type="hidden" name="classgroup" class="search-homepage" value="" autocapitalize="off" />
                             </div>
                             
-                            <a class="filter-search filter-default" href="#" title="Filter search"><span class="displace">filter search</span></a>
+                            <a class="filter-search filter-default" href="#" title="${i18n().filter_search}"><span class="displace">${i18n().filter_search}</span></a>
                             
                             <ul id="filter-search-nav">
-                                <li><a class="active" href="">All</a></li>
+                                <li><a class="active" href="">${i18n().all_capitalized}</a></li>
                                 <@lh.allClassGroupNames vClassGroups! />
                             </ul>
                         </form>

webapp/themes/vitro/templates/page.ftl

@@ -13,12 +13,12 @@
         
         <section id="search" role="region">
             <fieldset>
-                <legend>Search form</legend>
+                <legend>${i18n().search_form}</legend>
 
                 <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST"> 
                     <div id="search-field">
                         <input type="text" name="querytext" class="search-vitro" value="${querytext!}" autocapitalize="off" />
-                        <input type="submit" value="Search" class="search">
+                        <input type="submit" value="${i18n().search_button}" class="search">
                     </div>
                 </form>
             </fieldset>

webapp/web/i18n/all.properties

@@ -351,7 +351,7 @@ incorrect_email_password = Email or Password was incorrect.
 password_length = Password must be between 6 and 12 characters.
 password_mismatch = Passwords do not match.
 new_pwd_matches_existing = Your new password must be different from your existing password.
-enter_email_pasword = Enter the email address and password for your internal Vitro account.
+enter_email_password = Enter the email address and password for your internal Vitro account.
 change_password = You must change your password to log in.
 new_password = New Password
 confirm_password = Confirm Password
@@ -363,4 +363,381 @@ enter_id_to_login = Enter the userID that you want to sign in as, or click Cance
 username = Username
 submit_button = Submit
 
+#
+# body templates ( /templates/freemarker/body )
+#
+class_name = class name
+continued = cont'd
 
+expecting_content = Expecting content?
+try_rebuilding_index = Try rebuilding the search index
+
+please = Please
+login_to_manage_site = log in to manage this site
+log_in = log in
+to_manage_content = to manage content.
+no_content_in_system = There is currently no {0} content in the system
+you_can = You can
+add_content_manage_site = add content and manage this site
+from_site_admin_page = from the Site Administration page.
+view_list_in_rdf = View the {0} list in RDF format
+rdf = RDF
+pages = pages
+
+menu_management = Menu Management
+setup_navigation_menu = Setup the primary navigation menu for your website
+save_button = Save
+
+recompute_inferences = Recompute Inferences
+
+revision_info = Revision Information
+levels = Levels
+release = release
+revision = revision
+build_date = Build date
+
+dates = Dates
+current_date_time = Current date & time:
+current_date = Current date:
+current_time = Current time:
+formatted_date_time = Formatted date-time
+apples = Apples
+fruit = Fruit
+animal = Animal:
+book_title = Book Title:
+zoo_one = Zoo 1
+zoo_two = Zoo 2
+berries = Berries:
+raw_string_literals = Raw String Literals
+containers_do_not_pick_up_changes = Containers do not pick up changes to the value of their elements
+list_elements_of = List elements of
+contains_no_pears = contains no pears
+numbers = Numbers
+undo_camelcasing = Uncamelcasing
+
+run_sdb_setup = Run SDB Setup
+
+unrecognized_user = Unrecognized user
+no_individual_associated_with_id = For some reason, there is no individual in VIVO that is associated with your Net ID. Perhaps you should contact your VIVO administrator.
+
+#
+# site admin templates ( /templates/freemarker/body/siteAdmin )
+#
+advanced_data_tools = Advanced Data Tools
+add_remove_rdf = Add/Remove RDF data
+ingest_tools = Ingest tools
+rdf_export = RDF export
+sparql_query = SPARQL query
+sparql_query_builder = SPARQL query builder
+
+display_options = Display Options
+asserted_class_hierarchy = Asserted Class Hierarchy
+inferred_class_hierarchy = Inferred Class Hierarchy
+all_classes = All Classes
+classes_by_classgroup = Classes by Class Group
+add_new_classes = Add New Class
+add_new_group = Add New Group
+hide_show_subclasses = hide/show subclasses
+hide_subclasses = hide subclasses
+expand_all = expand all
+
+data_input = Data Input
+add_individual_of_class = Add individual of this class
+create_classgroup = Create a class group
+please_create = Please create
+a_classgroup = a class group
+associate_classes_with_group = and associate classes with the group created.
+
+refresh_content = Refresh Content
+rebuild_search_index = Rebuild search index
+rebuild_vis_cache = Rebuild visualization cache
+recompute_inferences = Recompute inferences
+
+site_administration = Site Administration
+
+add_property_group = Add new property group
+hide_show_properties = hide/show properties
+hide_properties = hide properties
+property_hierarchy = Property Hierarchy
+all_x_properties = All {0} Properties
+property_groups = Property Groups
+add_new = Add new
+object = object
+data = data
+property = property
+
+ontology_editor = Ontology Editor
+cause = Cause:
+ontology_list = Ontology list
+class_management = Class Management
+class_hierarchy = Class hierarchy
+class_groups = Class groups
+property_management = Property Management
+object_property_hierarchy = Object property hierarchy
+data_property_hierarchy = Data property hierarchy
+
+site_config = Site Configuration
+internal_class = Institutional internal class
+manage_profile_editing = Manage profile editing
+page_management = Page management
+menu_ordering = Menu ordering
+restrict_logins = Restrict Logins
+site_information = Site information
+user_accounts = User accounts
+
+#
+# search templates ( /templates/freemarker/body/search )
+#
+search_results_for = Search results for
+limited_to_type = limited to type
+search_help = search help
+not_expected_results = Not the results you expected?
+display_only = Display Only
+class_group_link = class group link
+limit = Limit
+limit_to = Limit to
+class_link = class link
+previous = Previous
+page_link = page link
+next_capitalized = Next
+
+#
+# shortview templates ( /templates/freemarker/body/partials/shortview ) 
+#
+view_profile_page_for = View the profile page for
+
+#
+# menupage templates ( /templates/freemarker/body/partials/menupage ) 
+#
+browse_page_javascript_one = This browse page requires javascript, but your browser is set to disable javascript. Either enable javascript or use the
+browse_page_javascript_two = to browse for information.
+index_page = index page
+
+browse_all_in_class = Browse all individuals in this class
+select_all = select all
+all = all
+browse_all_starts_with = Browse all individuals whose name starts with {0}
+browse_all_public_content = You can browse all of the public content currently in the system using the
+browse_all_content = browse all content
+
+#
+# partial templates ( /templates/freemarker/body/partials ) 
+#
+no_content_create_groups_classes = There is currently no content in the system, or you need to create class groups and assign your classes to them.
+browse_capitalized = Browse
+browse_by = Browse by
+
+#
+# partial account templates ( /templates/freemarker/body/partials/accounts ) 
+#
+delete_button = Delete
+accounts = accounts
+accounts_per_page = accounts per page
+update_button = Update
+
+#
+# pagemanagement templates ( /templates/freemarker/body/pagemanagement ) 
+#
+title_capitalized = Title
+uri_not_defined = URI for page not defined
+page_uri = page URI
+no_pages_defined = There are no pages defined yet.
+add_page = Add Page
+
+custom_template = Custom Template
+menu_page = Menu Page
+controls = Controls
+listed_page_title = listed page title
+untitled = -untitled-
+delete_page = delete this page
+view_profile_for_page = view the individual profile for this page
+menu_orering = Menu Ordering
+use_capitalized = Use
+to_order_menu_items = to set the order of menu items.
+
+#
+# menupage templates ( /templates/freemarker/body/menupage ) 
+#
+page_not_configured = This page is not yet configured.
+implement_capitalized = Implement
+a_link = a link
+configure_page_if_permissable = to configure this page if the user has permission.
+
+no_html_specified = No HTML specified.
+page_text = page text
+
+sparql_query_results = Sparql Query Results
+no_results_returned = No results were returned. 
+
+#
+# manage proxies templates ( /templates/freemarker/body/manageproxies ) 
+#
+manage_profile_editing = Manage profile editing
+operation_successful = The operation was successful.
+operation_unsuccessful = The operation was unsuccessful. Full details can be found in the system log.
+relate_editors_profiles = Relate profile editors and profiles
+info_icon = info icon
+profile_editing_title = The editors you select on the left hand side will have the ability to edit the VIVO profiles you select on the right hand side. You can select multiple editors and multiple profiles, but you must select a minimum of 1 each.
+select_editors = Select editors
+select_last_name = Select an existing last name
+processing_indicator = processing time indicator
+type_more_chars = type more character
+remove_selection = Remove selection
+select_profiles = Select profiles
+profile_editors = Profile editors
+search_button = Search
+view_profile_editors = View all profile editors
+delete_profile_editor = Delete profile editor
+add_profile = Add profile
+selected_profiles = Selected profiles
+save_profile_changes = Save changes to profiles
+
+#
+# page partials templates ( /templates/freemarker/page/partials ) 
+#
+copyright = copyright
+all_rights_reserved = All Rights Reserved.
+terms_of_use = Terms of Use
+
+site_name = site name
+end_your_Session = End your session
+log_out = Log out
+manage_site = Manage this site
+site_admin = Site Admin
+more_details_about_site = More details about this site
+about = About
+contact_us = Contact Us
+send_feedback_questions = Send us your feedback or ask a question
+visit_project_website = Visit the national project web site
+support = Support
+view_content_index = View an outline of the content in this site
+index = Index
+search_form = Search form
+
+select_locale = select locale
+menu_item = menu item
+version = Version
+
+#
+# widget templates ( /templates/freemarker/widgets ) 
+#
+individual_name = individual name
+vclassAlpha_not_implemented = vclassAlpha is not yet implemented.
+
+test_for_logged_in_users = This is the test widget for logged-in users.
+test_for_nonlogged_in_users = This is the test widget for non-logged-in users.
+login_status = Login status:
+
+alert_icon = Alert Icon
+javascript_require_to_edit = In order to edit content, you'll need to enable JavaScript.
+javascript_instructions = java script instructions
+to_enable_javascript = Here are the instructions for enabling JavaScript in your web browser
+external_auth_name = external authentication name
+account = account
+change_password_to_login = Change Password to Log in
+new_password_capitalized = New Password
+confirm_password_capitalized = Confirm Password
+minimum_six_chars = Minimum of 6 characters in length.
+already_logged_in = You are already logged in.
+
+#
+# lib templates ( /templates/freemarker/lib ) 
+#
+statistics = Statistics
+
+manage_list_of = Manage list of
+manage = manage
+add = add
+entry = entry
+edit_entry = edit this entry
+delete_entry = delete this entry
+click_to_view_larger = click to view larger image
+photo = Photo
+no_image = no image
+placeholder_image = placeholder image
+manage_labels = manage labels
+
+unsupported_ie_version = This form is not supported in versions of Internet Explorer below version 8. Please upgrade your browser, or switch to another browser, such as FireFox.
+
+#
+# edit templates ( /templates/freemarker/edit and edit/forms ) 
+#
+edit_capitalized = Edit
+add_capitalized = Add
+create_entry = Create Entry
+select_existing_collaborator = Select an existing Collaborator for {0}
+selected = Selected
+change_selection = change selection
+there_are_no_entries_for_selection = There are no entries in the system from which to select.
+editing_prohibited = This property is currently configured to prohibit editing.
+confirm_entry_deletion_from = Are you sure you want to delete the following entry from
+
+edit_date_time_value = Edit Date/Time Value
+create_date_time_value = Create Date/Time Value
+date_time_value_for = date time value for
+start_interval_must_precede_end_earlier = The Start interval must be earlier than the End interval.
+end_interval_must_follow_start_interval = The End interval must be later than the Start interval.
+start_capitalized = Start
+end_capitalized = End
+create_capitalized = Create
+delete_entry_capitalized = Delete this entry?
+add_new_of_type = Add a new item of this type
+create_new_entry = Please create a new entry.
+no_appropriate_entry = If you don't find the appropriate entry on the selection list above
+
+remove_menu_item = Remove menu item
+confirm_menu_item_delete = Are you sure you want to remove
+
+pretty_url = Pretty URL
+start_with_leading_slash = Must begin with a leading forward slash: / (e.g., /people)
+default = Default
+custom_template = Custom template
+change_content_type = Change content type
+select_page_content_type = Select content type for the associated page
+select_content_display = Select content to display
+all_capitalized = All
+template_capitalized = Template
+selected_page_content_type = Selected content type for the associated page
+
+create_new = Create a new
+enter_value_name_field = Please enter a value in the name field.
+class_group_all_caps = Class Group
+save_this_content = Save this content
+enter_fixed_html_here = Enter fixed HTML here
+
+query_model = Query Model
+variable_name_all_caps = Variable Name
+enter_sparql_query_here = Enter SPARQL query here
+add_new_page = Add New Page
+save_new_page = Save new page
+edit_page = Edit {0} Page
+content_type = Content Type
+select_type = Select a type
+browse_class_group = Browse Class Group
+fixed_html = Fixed HTML
+add_types = Add one or more types
+begin_with_slash_no_example = Must begin with a leading forward slash: /
+slash_example = (e.g., /people)
+custom_template_requiring_content = Custom template requiring content
+custom_template_containing_content = Custom template containing all content
+a_menu_page = This is a menu page
+menu_item_name = Menu Item Name
+if_blank_page_title_used = If left blank, the page title will be used.
+
+label = label
+no_classes_to_select = There are no Classes in the system from which to select.
+
+#
+# vitro theme templates ( /themes/vitro/templates ) 
+#
+javascript_ie_alert_text = This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser.
+
+what_is_vitro = What is VITRO?
+vitro_description = Vitro is a general-purpose web-based ontology and instance editor with customizable public browsing. Vitro is a Java web application that runs in a Tomcat servlet container.
+with_vitro = With Vitro, you can:
+vitro_bullet_one = Create or load ontologies in OWL format
+vitro_bullet_two = Edit instances and relationships
+vitro_bullet_three = Build a public web site to display your data
+vitro_bullet_four = Search your data
+search_vitro = Search VITRO
+filter_search filter search

webapp/web/js/individual/propertyGroupControls.js

@@ -86,6 +86,9 @@ $(document).ready(function(){
                     // show the selected tab section
                     $('section#' + tabName).show();                
                 }
+                // if there is a more link, "click" more to show all the researchers
+                // we need the timeout delay so that the more link can get rendered                
+                setTimeout(geoFocusExpand,250);
             }
             else {
                 retrieveLocalStorage();
@@ -96,6 +99,21 @@ $(document).ready(function(){
         }
     }
 
+    function geoFocusExpand() {
+        // if the ontology is set to collate by subclass, $list.length will be > 0 
+        // this ensures both possibilities are covered
+        var $list = $('ul#geographicFocusOfList').find('ul');
+        if ( $list.length > 0 )
+        {
+            var $more = $list.find('a.more-less');
+            $more.click();
+        }
+        else {
+            var $more = $('ul#geographicFocusOfList').find('a.more-less');
+            $more.click();
+        }
+    }
+    
     //  Next two functions --  keep track of which property group tab was selected,
     //  so if we return from a custom form or a related individual, even via the back button,
     //  the same property group will be selected as before.
@@ -167,14 +185,14 @@ $(document).ready(function(){
         }
     }
     // if there are so many tabs that they wrap to a second line, adjust the font size to 
-    // prevent wrapping
+    //prevent wrapping
     function adjustFontSize() {
         var width = 0;
         $('ul.propertyTabsList li').each(function() {
             width += $(this).outerWidth();
         });
         if ( width < 922 ) {
-            var diff = 925-width;
+            var diff = 927-width;
             $('ul.propertyTabsList li:last-child').css('width', diff + 'px');
         }
         else {
@@ -194,17 +212,11 @@ $(document).ready(function(){
             else if ( diff > 130 && diff < 175 ) {
                 $('ul.propertyTabsList li').css('font-size', "0.8em");
             }
-            else if ( diff > 175 && diff < 240 ) {
+            else if ( diff > 175 && diff < 260 ) {
                 $('ul.propertyTabsList li').css('font-size', "0.73em");
             }
-            else if ( diff > 240 && diff < 280 ) {
-                $('ul.propertyTabsList li').css('font-size', "0.7em");
-            }
-            else if ( diff > 280 && diff < 310 ) {
-                $('ul.propertyTabsList li').css('font-size', "0.675em");
-            }
             else {
-                $('ul.propertyTabsList li').css('font-size', "0.65em");
+                $('ul.propertyTabsList li').css('font-size', "0.7em");
             }
 
             // get the new width
@@ -212,7 +224,7 @@ $(document).ready(function(){
             $('ul.propertyTabsList li').each(function() {
                 newWidth += $(this).outerWidth();
             });
-            var newDiff = 925-newWidth;
+            var newDiff = 926-newWidth;
             $('ul.propertyTabsList li:last-child').css('width', newDiff + 'px');
         }
     }

webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl

@@ -30,7 +30,7 @@
 
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}" />
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}" />
             <p>${errorMessage}</p>
         </section>
     </#if>

webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl

@@ -16,7 +16,7 @@
 
 <#if errorMessage?has_content>
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}"/>
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}"/>
         <p>${errorMessage}</p>
     </section>
 </#if>

webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl

@@ -30,7 +30,7 @@
     
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}" />
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}" />
             <p>${errorMessage}</p>
         </section>
     </#if>

webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl

@@ -20,7 +20,7 @@
 
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}" />
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}" />
             <p>${errorMessage}</p>
         </section>
     </#if>

webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl

@@ -28,7 +28,7 @@
 
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}" />
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}" />
             <p>${errorMessage}</p>
         </section>
     </#if>

webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl

@@ -18,7 +18,7 @@
 
 <#if errorMessage?has_content>
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}"/>
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}"/>
         <p>${errorMessage}</p>
     </section>
 </#if>

webapp/web/templates/freemarker/body/admin/admin-restrictLogins.ftl

@@ -13,7 +13,7 @@
     
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${i18n().error_alert_icon}" />
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
             <p>${errorMessage}</p>
         </section>
     </#if>

webapp/web/templates/freemarker/body/admin/searchIndex.ftl

@@ -9,7 +9,7 @@
 <#if !indexIsConnected>
     <!-- Can't contact the Solr server. Indexing would be impossible. Show an error message. -->
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="Error alert icon" />
         <p>${i18n().search_index_not_connected}</p>
         <p><tt>SolrServer.ping()</tt> ${i18n().failed}.
         <p>${i18n().check_startup_status}</p>

webapp/web/templates/freemarker/body/classGroups.ftl

@@ -19,14 +19,14 @@
                             <#list classGroup.classes as class> 
                                 <#-- Only render populated classes -->
                                 <#if (class.individualCount > 0)>
-                                    <li role="listitem"><a href="${class.url}" title="class name">${class.name}</a> (${class.individualCount})</li>
+                                    <li role="listitem"><a href="${class.url}" title="${i18n().class_name}">${class.name}</a> (${class.individualCount})</li>
                                 <#assign classCount = classCount + 1 >
                                 </#if>
                                 <#if (classCount > 34) && !splitGroup >
                                    <#assign splitGroup = true >
                                    </ul></div>
                                    <div class="class-group">
-                                       <h2>${classGroup.displayName} (cont'd)</h2>
+                                       <h2>${classGroup.displayName} (${i18n().continued})</h2>
                                           <ul role="list">
                                 </#if>
                             </#list>

webapp/web/templates/freemarker/body/displayEdit/displayConfig.ftl

@@ -5,7 +5,7 @@
     
     <#if errorMessage??>
         <div id="errorAlert">
-            <img src="../images/iconAlert.png" alert="Error alert icon" height="31" width="32">
+            <img src="../images/iconAlert.png" alt="Error alert icon" height="31" width="32">
             <p>${errorMessage}</p>
         </div>
     </#if>

webapp/web/templates/freemarker/body/individualList-checkForData.ftl

@@ -10,19 +10,19 @@
     <#if user.loggedIn>
         <#if user.authorizedToRebuildSearchIndex>
             <span class="contentNote">
-                <h4>Expecting content?</h4>
+                <h4>${i18n().expecting_content}</h4>
-                <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
+                <p><a title="${i18n().try_rebuilding_index}" href="${urls.base}/SearchIndex">${i18n().try_rebuilding_index}</a>.</p>
             </span>
         </#if>
     <#else>
         <span class="contentNote">
-            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+            <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </span>
     </#if>
     
-    <h3>There is currently no ${title} content in the system</h3>
+    <h3>${i18n().no_content_in_system(title)}</h3>
     
     <#if user.loggedIn && user.hasSiteAdminAccess>
-        <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+        <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="${i18n().add_content_manage_site}">${i18n().add_content_manage_site}</a> ${i18n().from_site_admin_page}</p>
     </#if>
 </#assign>

webapp/web/templates/freemarker/body/individualList.ftl

@@ -11,7 +11,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
 <section class="individualList">
     <h2>${title} 
         <#if rdfUrl?has_content>
-            <span class="rdfLink"><a class="icon-rdf" href="${rdfUrl}" title="View the ${title} list in RDF format">RDF</a></span>
+            <span class="rdfLink"><a class="icon-rdf" href="${rdfUrl}" title="${i18n().view_list_in_rdf(title)}">${i18n().rdf}</a></span>
         </#if>
     </h2>
     <#if subtitle?has_content>
@@ -24,7 +24,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
         <#else>
             <#assign pagination>
                 <#if (pages?has_content && pages?size > 1)>
-                    pages:
+                    ${i18n().pages}:
                     <ul class="pagination">
                         <#list pages as page>
                             <#if page.selected>

webapp/web/templates/freemarker/body/login/adminLogin.ftl

@@ -35,13 +35,13 @@
     
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${i18n().error_alert_icon}"/>
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}"/>
             <p>${errorMessage}</p>
         </section>
     </#if>
     
     <#if !newPasswordRequired??>
-        <p>${i18n().enter_email_pasword}</p>
+        <p>${i18n().enter_email_password}</p>
     <#else>
         <p>${i18n().change_password}</p>
     </#if>

webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl

@@ -2,36 +2,36 @@
 
 <#-- Template for displaying list of user accounts -->
 
-<h3>Manage profile editing</h3>
+<h3>${i18n().manage_profile_editing}</h3>
 
 <#if message??>
     <section class="account-feedback" role="region">
         <#if message.success?? > 
-            <p>The operation was successful.</p>
+            <p>${i18n().operation_successful}</p>
         </#if>
     
         <#if message.failure?? >
-            <p> The operation was unsuccessful. Full details can be found in the system log.</p>
+            <p>${i18n().operation_unsuccessful}</p>
         </#if>
     </section>
 </#if>
 
 <section id="error-alert" role="alert" class="hidden">
-    <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+    <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
     <p></p>
 </section>
 
 <section class="proxy-profile">
-    <h4>Relate profile editors and profiles <img src="${urls.images}/iconInfo.png" alt="info icon" title="The editors you select on the left hand side will have the ability to edit the VIVO profiles you select on the right hand side. You can select multiple editors and multiple profiles, but you must select a minimum of 1 each." /></h4>
+    <h4>${i18n().relate_editors_profiles} <img src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}" title="${i18n().profile_editing_title}" /></h4>
     
     <form id="add-relation" action="${formUrls.create}" method="POST">
         <fieldset class="proxy">
-            <legend>Select editors</legend>
+            <legend>${i18n().select_editors}</legend>
             
             <section name="proxyProxiesPanel" role="section">
-                <label for="selectProfileEditors">Select editors</label>
+                <label for="selectProfileEditors">${i18n().select_editors}</label>
-                <input id="selectProfileEditors" type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name" role="input" /><span><img class="loading-relateEditor hidden" src="${urls.images}/indicatorWhite.gif" /></span>
+                <input id="selectProfileEditors" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-relateEditor hidden" src="${urls.images}/indicatorWhite.gif" alt="${i18n().processing_indicator}"/></span>
-                <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='type more characters' noMatchText='no match'>&nbsp;</span></p>
+                <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
     
                 <#-- Magic div that holds all of the proxy data and the template that shows how to display it. -->
                 <ul name="proxyData" role="navigation">
@@ -48,7 +48,7 @@
                             <p class="proxy-info">
                                 %label% | <span class="class-label">%classLabel%</span>
                                 <br />
-                                <a class='remove-proxy' href="." templatePart="remove" title="remove selection">Remove selection</a>
+                                <a class='remove-proxy' href="." templatePart="remove" title="${i18n().remove_selection}">${i18n().remove_selection}</a>
                                 <input type="hidden" name="proxyUri" value="%uri%" >
                             </p>
                         </li>
@@ -58,13 +58,13 @@
         </fieldset>
     
         <fieldset class="profile">
-          <legend>Select profiles</legend>  
+          <legend>${i18n().select_profiles}</legend>  
       
           <section name="proxyProfilesPanel" role="region">
-              <label for="selectProfiles">Select profiles</label>
+              <label for="selectProfiles">${i18n().select_profiles}</label>
-              <input id="selectProfiles" type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name" role="input" /><span><img class="loading-relateProfile hidden" src="${urls.images}/indicatorWhite.gif" /></span>
+              <input id="selectProfiles" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-relateProfile hidden" src="${urls.images}/indicatorWhite.gif"  alt="${i18n().processing_indicator}"/></span>
             
-              <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='type more characters' noMatchText='no match'>&nbsp;</span></p>
+              <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
 
                 <#-- Magic div thst holds all of the proxy data and the template that shows how to display it. -->
                 <ul name="proxyData" role="navigation">
@@ -79,7 +79,7 @@
                             <img class="photo-profile" width="60" alt="%label%" src="%imageUrl%">
                             
                             <p class="proxy-info-profile">%label% | <span class="class-label">%classLabel%</span>
-                                <br /><a class='remove-proxy' href="." templatePart="remove" title="remove selection">Remove selection</a>
+                                <br /><a class='remove-proxy' href="." templatePart="remove" title="${i18n().remove_selection}">${i18n().remove_selection}</a>
                             </p>
     
                             <input type="hidden" name="profileUri" templatePart="uriField" value="%uri%" role="input" />
@@ -89,19 +89,19 @@
             </section>
         </fieldset>
 
-        <input class="submit pos-submit" type="submit" name="createRelationship" value="Save"  role="button" />
+        <input class="submit pos-submit" type="submit" name="createRelationship" value="${i18n().save_button}"  role="button" />
     </form>
 </section>
 
 
-<h4 class="profile-editors">Profile editors</h4>
+<h4 class="profile-editors">${i18n().profile_editors}</h4>
 
 <section id="search-proxy" role="region">
     <form action="${formUrls.list}" method="POST">
         <input type="text" name="searchTerm" role="input" />
-        <input class="submit" type="submit" name="searchByProxy" value="Search" role="button" /> 
+        <input class="submit" type="submit" name="searchByProxy" value="${i18n().search_button}" role="button" /> 
             <#if page.previous??>
-               | <a href="${formUrls.list}?pageIndex=${page.previous}&searchTerm=${searchTerm}" title="previous">Previous</a>
+               | <a href="${formUrls.list}?pageIndex=${page.previous}&searchTerm=${searchTerm}" title="${i18n().previous}">${i18n().previous}</a>
             </#if>
             
             <#if page.last != 0>
@@ -109,11 +109,11 @@
             </#if>
             
             <#if page.next??>
-                <a href="${formUrls.list}?pageIndex=${page.next}&searchTerm=${searchTerm}" title="next">Next</a>
+                <a href="${formUrls.list}?pageIndex=${page.next}&searchTerm=${searchTerm}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a>
             </#if>
 
             <#if searchTerm?has_content>
-                <p>Search results for "<span class="blue">${searchTerm}</span>" | <a href="${formUrls.list}" title="view all profile editors">View all profile editors</a></p>
+                <p>${i18n().search_results_for} '<span class="blue">${searchTerm}</span>' | <a href="${formUrls.list}" title="${i18n().view_profile_editors}">${i18n().view_profile_editors}</a></p>
             </#if>
     </form>
 </section>
@@ -129,22 +129,22 @@
                 <p class="proxyInfoElement proxy-info">
                     ${p.label} | <span class="class-label">${p.classLabel}</span>
                     <br>
-                    <a class="remove-proxyUri" href="${formUrls.edit}?proxyUri=${p.uri}&deleteProxy=Delete proxy" title="delete profile editor">Delete profile editor</a>
+                    <a class="remove-proxyUri" href="${formUrls.edit}?proxyUri=${p.uri}&deleteProxy=Delete proxy" title="${i18n().delete_profile_editor}">${i18n().delete_profile_editor}</a>
                     <input type="hidden" value="${p.uri}" name="proxyUri">
                 </p>
             </div>       
         </fieldset>  
         
         <fieldset class="profile">
-            <legend>Add profile</legend>
+            <legend>${i18n().add_profile}</legend>
             
             <section name="proxyProfilesPanel" role="region">
-                <label for="addProfile">Add profile</label>
+                <label for="addProfile">${i18n().add_profile}</label>
-                <input id="addProfile" type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name" role="input" /><span><img class="loading-addProfile hidden" src="${urls.images}/indicatorWhite.gif" /></span>
+                <input id="addProfile" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-addProfile hidden"  alt="${i18n().processing_indicator}" src="${urls.images}/indicatorWhite.gif" /></span>
                 
-                <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='type more characters' noMatchText='no match'>&nbsp;</span></p>
+                <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
                 <p name="excludeUri" style="display: none">${r.proxyInfos[0].profileUri}<p>
-                <p class="selected-editors">Selected profiles:</p>
+                <p class="selected-editors">${i18n().selected_profiles}:</p>
     
                 <#-- Magic div that holds all of the proxy data and the template that shows how to display it. -->
                 <ul name="proxyData" role="navigation">
@@ -168,7 +168,7 @@
                             <img class="photo-profile" width="60" alt="%label%" src="%imageUrl%">
                              
                             <p class="proxy-info-profile">%label% | <span class="class-label">%classLabel%</span>
-                                <br /><a class='remove-proxy' href="." templatePart="remove" title="remove selection">Remove selection</a>
+                                <br /><a class='remove-proxy' href="." templatePart="remove" title="${i18n().remove_selection}">${i18n().remove_selection}</a>
                             </p>
                         </li>
                         
@@ -177,7 +177,7 @@
                 </ul>
             </section>
             
-            <input class="submit" type="submit" name="modifyProfileList" value="Save changes to profiles" role="button" />
+            <input class="submit" type="submit" name="modifyProfileList" value="${i18n().save_profile_changes}" role="button" />
         </fieldset> 
     </form>
 </section>

webapp/web/templates/freemarker/body/menuN3Edit.ftl

@@ -1,11 +1,11 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <div id="navigationManagement">
-    <h2>Menu Management</h2>
+    <h2>${i18n().menu_management}</h2>
     
     <#if errorMessage??>
         <div id="errorAlert">
-            <img src="../images/iconAlert.png" alert="Error alert icon" height="31" width="32">
+            <img src="../images/iconAlert.png" alt="${i18n().error_alert_icon}" height="31" width="32">
             <p>${errorMessage}</p>
         </div>
     </#if>
@@ -16,11 +16,11 @@
     
     <#if menuN3??>
         <form class="" action="${urls.currentPage}" method="post">
-            <label for="navigatioN3">Setup the primary navigation menu for your website</label>
+            <label for="navigatioN3">${i18n().setup_navigation_menu}</label>
             <textarea name="navigationN3" id="navigationN3" cols="45" rows="40" class="maxWidth">
                 ${menuN3}<#t><#-- The trim directive here is to trim leading and trailing white-space -->
             </textarea><#lt><#-- This directive trims only leading white-space -->
-            <input name="submit" id="submit" value="Save" type="submit"/> or <a href="${urls.base}${cancelUrl}" title="cancel">Cancel</a>
+            <input name="submit" id="submit" value="${i18n().save_button}" type="submit"/> or <a href="${urls.base}${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
         </form>
     </#if>
 </div>

webapp/web/templates/freemarker/body/menupage/emptyPage.ftl

@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <div>
-<p>This page is not yet configured.</p> 
+<p>${i18n().page_not_configured}</p> 
 
-<p>Implement a <a href="${urls.base}/display?uri=${page.pageUri?url}&switchToDisplayModel=1">link</a> to configure this page if the user has permission.</p>
+<p>${i18n().implement_capitalized} <a href="${urls.base}/display?uri=${page.pageUri?url}&switchToDisplayModel=1" title="${i18n().a_link}">${i18n().a_link}</a> ${i18n().configure_page_if_permissable}</p>
 
 
 

webapp/web/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl

@@ -9,7 +9,7 @@
 <#if htmlExists>
 	${.globals[variableName]}
 <#else>
-	No HTML specified.  
+	${i18n().no_html_specified}  
 </#if>
 
 

webapp/web/templates/freemarker/body/menupage/menupage--defaultSolrIndividuals.ftl

@@ -21,14 +21,14 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
         <#else>
             <#assign pagination>
                 <#if (pages?has_content && pages?size > 1)>
-                    pages:
+                    ${i18n().pages}:
                     <ul class="pagination">
                         <#list pages as page>
                             <#if page.selected>
                                 <li class="selectedNavPage">${page.text}</li>
                             <#else>
                                 <#-- RY Ideally the urls would be generated by the controller; see search-pagedResults.ftl -->
-                                <li><a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}" title="page text">${page.text}</a></li>
+                                <li><a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}" title="${i18n().page_text}">${page.text}</a></li>
                             </#if>
                         </#list>
                     </ul>

webapp/web/templates/freemarker/body/menupage/menupage--defaultSparql.ftl

@@ -10,7 +10,7 @@
 	<#assign sparqlResults = .globals[variableName]/>
 </#if>
 
-<h3>Sparql Query Results</h3>
+<h3>${i18n().sparql_query_results}</h3>
 <#if resultsExist>
 	<#assign numberRows = sparqlResults?size/>
 	<#assign firstRow = false/>
@@ -31,7 +31,7 @@
 		</div>
 	</#list>
 <#else>
-	No results were returned.  
+	${i18n().no_results_returned} 
 </#if>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/sparqlresults.css" />')}

webapp/web/templates/freemarker/body/menupage/page-pageList.ftl

@@ -4,29 +4,29 @@
 
 <#if pages?has_content >  
   <table>
-    <th>Title</th><th>URI</th>
+    <th>${i18n().title_capitalized}</th><th>URI</th>
     
     <#list pages as pagex>      
       <tr>                
-        <td>${(pagex.title)!'-untitled-'}</td>                  
+        <td>${(pagex.title)!i18n().untitled}</td>                  
         <#if pagex.pageUri??>
-            <td><a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1">${pagex.pageUri}</a></td>
+            <td><a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1" title="${i18n().page_uri}">${pagex.pageUri}</a></td>
         <#else>        
-            <td>URI for page not defined</td>
+            <td>${i18n().uri_not_defined}</td>
         </#if>                 
       </tr>    
     </#list>    
   </table>
   
 <#else>
-    <p>There are no pages defined yet.</p>
+    <p>${i18n().no_pages_defined}</p>
 </#if>
   
   <form id="addIndividualClass" action="${urls.base}/editRequestDispatch" method="get">
       <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">              
       <input type="hidden" name="switchToDisplayModel" value="1">
       <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualFormGenerator" role="input">
-      <input type="submit" id="submit" value="Add Page" role="button">
+      <input type="submit" id="submit" value="${i18n().add_page}" role="button">
   </form>
 
 </div> 

webapp/web/templates/freemarker/body/pagemanagement/page-pageList.ftl

@@ -4,29 +4,29 @@
 
 <#if pages?has_content >  
   <table>
-    <th>Title</th><th>URI</th>
+    <th>${i18n().title_capitalized}</th><th>URI</th>
     
     <#list pages as pagex>      
       <tr>                
         <td>${(pagex.title)!'-untitled-'}</td>                  
         <#if pagex.pageUri??>
-            <td><a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1">${pagex.pageUri}</a></td>
+            <td><a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1" title="${i18n().page_uri}">${pagex.pageUri}</a></td>
         <#else>        
-            <td>URI for page not defined</td>
+            <td>${i18n().uri_not_defined}</td>
         </#if>                 
       </tr>    
     </#list>    
   </table>
   
 <#else>
-    <p>There are no pages defined yet.</p>
+    <p>${i18n().no_pages_defined}</p>
 </#if>
   
   <form id="addIndividualClass" action="${urls.base}/editRequestDispatch" method="get">
       <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">              
       <input type="hidden" name="switchToDisplayModel" value="1">
       <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualFormGenerator" role="input">
-      <input type="submit" id="submit" value="Add Page" role="button">
+      <input type="submit" id="submit" value="${i18n().Add_page}" role="button">
   </form>
 
 </div> 

webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl

@@ -11,12 +11,12 @@
   
     <thead>
       <tr>
-        <th scope="col">Title</th>
+        <th scope="col">${i18n().title_capitalized}</th>
-        <!--th scope="col">Type</th-->
+        <!--th scope="col">${i18n().type_capitalized}</th-->
         <th scope="col">URL</th>
-        <th scope="col">Custom Template</th>
+        <th scope="col">${i18n().custom_template}</th>
-        <th id="isMenuPage" scope="col" >Menu Page</th>
+        <th id="isMenuPage" scope="col" >${i18n().menu_page}</th>
-        <th id="iconColumns" scope="col">Controls</th>
+        <th id="iconColumns" scope="col">${i18n().controls}</th>
       </tr>
     </thead>
     
@@ -28,11 +28,11 @@
             	    <#if pagex.listedPageTitle == "Home" >
             	        ${pagex.listedPageTitle!}
             	    <#else>
-            		<a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator">${(pagex.listedPageTitle)!'-untitled-'}</a>
+            		<a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" title="${i18n().listed_page_title}">${(pagex.listedPageTitle)!i18n().untitled}</a>
             		</#if>
             		
             	<#else>
-            		No URI defined for page. 
+            		${i18n().uri_not_defined} 
             	</#if>
             </td>                  
             <!--td> {pagex.dataGetterLabel}</td-->
@@ -44,12 +44,12 @@
             </#if>
             </td>
             <td>
-                <a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator"><img src="${urls.images!}/individual/editIcon.gif" title="edit this page" alt="edit"></a>
+                <a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" title=""><img src="${urls.images!}/individual/editIcon.gif" alt="${i18n().edit_page}"></a>
                 &nbsp;&nbsp;
-                <a href="${urls.base}/individual?uri=${pagex.listedPageUri?url}&switchToDisplayModel=1"><img src="${urls.images!}/profile-page-icon.png" title="view the individual profile for this page" alt="profile page"></a>
+                <a href="${urls.base}/individual?uri=${pagex.listedPageUri?url}&switchToDisplayModel=1" title="${i18n().view_profile_for_page}"><img src="${urls.images!}/profile-page-icon.png" alt="${i18n().view_profile_for_page}"></a>
                 &nbsp;&nbsp;
                 <#if !pagex.listedPageCannotDeletePage?has_content >
-                    <a cmd="deletePage" pageTitle=" ${pagex.listedPageTitle!}"  href="${urls.base}/deletePageController?pageURI=${pagex.listedPageUri?url}"><img src="${urls.images!}/individual/deleteIcon.gif" title="delete this page" alt="delete"></a>
+                    <a cmd="deletePage" pageTitle=" ${pagex.listedPageTitle!}"  href="${urls.base}/deletePageController?pageURI=${pagex.listedPageUri?url}" title="${i18n().delete_page}"><img src="${urls.images!}/individual/deleteIcon.gif" alt="${i18n().delete_page}"></a>
                 </#if>
             </td>
         </tr>    
@@ -60,17 +60,17 @@
   </table>
   
 <#else>
-    <p>There are no pages defined yet.</p>
+    <p>${i18n().no_pages_defined}</p>
 </#if>
   
   <form id="pageListForm" action="${urls.base}/editRequestDispatch" method="get">
       <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">              
       <input type="hidden" name="switchToDisplayModel" value="1">
       <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" role="input">
- 	<input id="submit" value="Add Page" role="button" type="submit" >
+ 	<input id="submit" value="${i18n().add_page}" role="button" type="submit" >
   </form>
   <br />
- <p style="margin-top:10px">Use <a id="menuMgmtLink" href="${urls.base}/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true">Menu Ordering</a> to set the order of menu items.</p>
+ <p style="margin-top:10px">${i18n().use_capitalized} <a id="menuMgmtLink" href="${urls.base}/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true" title="">${i18n().menu_orering}</a> ${i18n().to_order_menu_items}</p>
 </section>
 
 

webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl

@@ -11,14 +11,14 @@
 <#macro accountsNav accountsCount=counts>
 
   <section class="accounts">
-      <input type="submit" name="delete-account" class="delete-account delete" value="Delete" onClick="changeAction(this.form, '${formUrls.delete}')" />
+      <input type="submit" name="delete-account" class="delete-account delete" value="${i18n().delete_button}" onClick="changeAction(this.form, '${formUrls.delete}')" />
       <!-- 
           When this is clicked, the checkboxes are noticed and all other fields are ignored. 
           submit the form (submit action is formUrls.delete)
       -->
 
       <nav class="display-tools">
-          <span>| ${total} accounts | </span>  
+          <span>| ${total} ${i18n().accounts} | </span>  
 
           <select name="accountsPerPage" class="accounts-per-page">
               <#list accountsCount as count>
@@ -32,14 +32,14 @@
               -->     
           </select>
 
-          accounts per page <input type="submit" name="accounts-per-page" value="Update" /> | 
+          ${i18n().accounts_per_page} <input type="submit" name="accounts-per-page" value="${i18n().update_button}" /> | 
 
           <#if page.previous?has_content>
-              <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.previous}" title="previous">Previous</a> <!-- only present if current page is not 1.-->
+              <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.previous}" title="${i18n().previous}">${i18n().previous}</a> <!-- only present if current page is not 1.-->
           </#if>
               ${page.current} of ${page.last} 
           <#if page.next?has_content>
-              <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.next}" title="next">Next</a><!-- only present if current page is not last page.-->
+              <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.next}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a><!-- only present if current page is not last page.-->
           </#if>
       </nav>
   </section>

webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl

@@ -24,7 +24,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
                 <#elseif classGroup.uri == group.uri>
                     <#assign activeGroup = selected />
                 </#if>
-                <li role="listitem"><a ${activeGroup}href="${urls.currentPage}?classgroupUri=${group.uri?url}#browse" title="Browse ${group.displayName?capitalize}" data-uri="${group.uri}" data-count="${group.individualCount}">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
+                <li role="listitem"><a ${activeGroup}href="${urls.currentPage}?classgroupUri=${group.uri?url}#browse" title="${i18n().browse_capitalized} ${group.displayName?capitalize}" data-uri="${group.uri}" data-count="${group.individualCount}">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
             </#if>
         </#list>
     </#assign>
@@ -32,7 +32,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
     <#-- Display the class group browse only if we have at least one populated class group -->
     <#if firstPopulatedClassGroup??>
         <section id="browse" role="region">
-            <h4>Browse by</h4>
+            <h4>${i18n().browse_by}</h4>
             
             <ul id="browse-classgroups" role="list">
                 ${classGroupList}
@@ -77,14 +77,14 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
     <#else>
         <#-- Would be nice to update classgroups-checkForData.ftl with macro so it could be used here as well -->
         <#-- <#include "classgroups-checkForData.ftl"> -->
-        <h3>There is currently no content in the system, or you need to create class groups and assign your classes to them.</h3>
+        <h3>${i18n().no_content_create_groups_classes}</h3>
         
         <#if user.loggedIn>
             <#if user.hasSiteAdminAccess>
-                <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+                <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="${i18n().add_content_manage_site}">${i18n().add_content_manage_site}</a> ${i18n().from_site_admin_page}</p>
             </#if>
         <#else>
-            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+            <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </#if>
     </#if>
 </#macro>

webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl

@@ -18,19 +18,19 @@
     <#if user.loggedIn>
         <#if user.authorizedToRebuildSearchIndex>
             <span class="contentNote">
-                <h4>Expecting content?</h4>
+                <h4>${i18n().expecting_content}</h4>
-                <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
+                <p><a title="${i18n().try_rebuilding_index}" href="${urls.base}/SearchIndex">${i18n().try_rebuilding_index}</a>.</p>
             </span>
         </#if>
     <#else>
         <span class="contentNote">
-            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+            <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </span>
     </#if>
     
-    <h3>There is currently no content in the system, or you need to create class groups and assign your classes to them.</h3>
+    <h3>${i18n().no_content_create_groups_classes}</h3>
     
     <#if user.loggedIn && user.hasSiteAdminAccess>
-        <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+        <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="${i18n().add_content_manage_site}">${i18n().add_content_manage_site}</a> ${i18n().from_site_admin_page}</p>
     </#if>
 </#assign>

webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl

@@ -4,7 +4,7 @@
 
 <#import "lib-string.ftl" as str>
 <noscript>
-<p style="padding: 20px 20px 20px 20px;background-color:#f8ffb7">This browse page requires javascript, but your browser is set to disable javascript. Either enable javascript or use the <a href="http://localhost:8080/vivo/browse" title="index page">index page</a> to browse for information.</p>
+<p style="padding: 20px 20px 20px 20px;background-color:#f8ffb7">${i18n().browse_page_javascript_one} <a href="${urls.base}/browse" title="${i18n().index_page}">${i18n().index_page}</a> ${i18n().browse_page_javascript_two}</p>
 </noscript>
 
 <section id="noJavascriptContainer" class="hidden">
@@ -20,7 +20,7 @@
                 <#assign vClassCamel = str.camelCase(vClass.name) />
                 <#-- Only display vClasses with individuals -->
                 <#if (vClass.entityCount > 0)>
-                    <li id="${vClassCamel}"><a href="#${vClassCamel}" title="Browse all individuals in this class" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
+                    <li id="${vClassCamel}"><a href="#${vClassCamel}" title="${i18n().browse_all_in_class}" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
                 </#if>
             </#list>
         </ul>
@@ -28,9 +28,9 @@
             <h3 class="selected-class"></h3>
             <#assign alphabet = ["A", "B", "C", "D", "E", "F", "G" "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] />
             <ul id="alpha-browse-individuals">
-                <li><a href="#" class="selected" data-alpha="all" title="select all">All</a></li>
+                <li><a href="#" class="selected" data-alpha="all" title="${i18n().select_all}">${i18n().all}</a></li>
                 <#list alphabet as letter>
-                    <li><a href="#" data-alpha="${letter?lower_case}" title="Browse all individuals whose name starts with ${letter}">${letter}</a></li>
+                    <li><a href="#" data-alpha="${letter?lower_case}" title="${i18n().browse_all_starts_with(letter)}">${letter}</a></li>
                 </#list>
             </ul>
         </nav>

webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl

@@ -22,19 +22,19 @@
         <#if user.authorizedToRebuildSearchIndex>
             <span class="contentNote">
                 <h4>Expecting content?</h4>
-                <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
+                <p><a title="${i18n().try_rebuilding_index}" href="${urls.base}/SearchIndex">${i18n().try_rebuilding_index}</a>.</p>
             </span>
         </#if>
     <#else>
         <span class="contentNote">
-            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+            <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </span>
     </#if>
     
-    <h3>There is currently no ${page.title} content in the system</h3>
+    <h3>${i18n().no_content_in_system(page.title)}</h3>
     <#if user.loggedIn && user.hasSiteAdminAccess>
-        <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+        <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="Manage content">${i18n().add_content_manage_site}</a> ${i18n().from_site_admin_page}</p>
     </#if>
     
-    <p>You can browse all of the public content currently in the system using the <a href="${urls.index}" title="browse all content">index page</a>.</p>
+    <p>${i18n().browse_all_public_content} <a href="${urls.index}" title="${i18n().browse_all_content}">${i18n().index_page}</a>.</p>
 </#assign>

webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl

@@ -13,7 +13,7 @@
             <#else>
                 <#assign classGroupIndividualCount = classGroupIndividualCount + vClass.entityCount />
             </#if>
-            <li role="listitem"><a href="#browse-by" title="Browse all individuals in this class" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
+            <li role="listitem"><a href="#browse-by" title="${i18n().browse_all_in_class}" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
         </#if>
     </#list>
     </ul>

webapp/web/templates/freemarker/body/partials/shortview/view-browse-default.ftl

@@ -9,11 +9,11 @@
 <#if (individual.thumbUrl)??>
     <img src="${individual.thumbUrl}" width="90" alt="${individual.name}" />
     <h1 class="thumb">
-        <a href="${individual.profileUrl}" title="View the profile page for ${individual.name}}">${individual.name}</a>
+        <a href="${individual.profileUrl}" title="${i18n().view_profile_page_for} ${individual.name}}">${individual.name}</a>
     </h1>
 <#else>
     <h1>
-        <a href="${individual.profileUrl}" title="View the profile page for ${individual.name}}">${individual.name}</a>
+        <a href="${individual.profileUrl}" title="${i18n().view_profile_page_for} ${individual.name}}">${individual.name}</a>
     </h1>
 </#if>
 

webapp/web/templates/freemarker/body/partials/shortview/view-index-default.ftl

@@ -4,6 +4,6 @@
 
 <#import "lib-properties.ftl" as p>
 
-<a href="${individual.profileUrl}" title="name">${individual.name}</a>
+<a href="${individual.profileUrl}" title="${i18n().name}">${individual.name}</a>
 
 <@p.mostSpecificTypes individual  />

webapp/web/templates/freemarker/body/partials/shortview/view-search-default.ftl

@@ -4,7 +4,7 @@
 
 <#import "lib-properties.ftl" as p>
 
-<a href="${individual.profileUrl}" title="name">${individual.name}</a>
+<a href="${individual.profileUrl}" title="${i18n().name}">${individual.name}</a>
 
 <@p.mostSpecificTypes individual />
 

webapp/web/templates/freemarker/body/recomputeInferences.ftl

@@ -2,7 +2,7 @@
 
 <#if formAction?has_content>
     <form method="post" action="${formAction}">
-        <input class="submit" type="submit" value="Recompute Inferences" name="submit" role="input" />
+        <input class="submit" type="submit" value="${i18n().recompute_inferences}" name="submit" role="input" />
     </form>
 </#if>
 

webapp/web/templates/freemarker/body/revisionInfo.ftl

@@ -5,17 +5,17 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/revision.css" />')}
 
 <section role="region">
-    <h2>Revision Information</h2>
+    <h2>${i18n().revision_info}</h2>
     
     <section id="revision-levels" role="region">
         
         <table summary="VIVO revision's levels table">
-            <caption>Levels:</caption>
+            <caption>${i18n().levels}:</caption>
             
             <tr>
-                <th>name</th>
+                <th>${i18n().name}</th>
-                <th>release</th>
+                <th>${i18n().release}</th>
-                <th>revision</th>
+                <th>${i18n().revision}</th>
             </tr>
             <#list revisionInfoBean.levelInfos as level>
                 <tr>
@@ -28,7 +28,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/revision.css" /
     </section>
     
     <section id="revision-build-date" role="region">
-        <h3>Build date:</h3>
+        <h3>${i18n().build_date}:</h3>
     
         <p>${revisionInfoBean.buildDate?datetime?string.full}</p>
     </section>

webapp/web/templates/freemarker/body/samples.ftl

@@ -9,60 +9,58 @@
 
 <@widget name="test" />
 
-<h3>Dates</h3>
+<h3>${i18n().dates}</h3>
 <ul>
-    <li>Current date & time: ${.now?datetime}</li>
+    <li>${i18n().current_date_time} ${.now?datetime}</li>
-    <li>Current date: ${.now?date}</li>
+    <li>${i18n().current_date} ${.now?date}</li>
-    <li>Current time: ${.now?time}</li>
+    <li>${i18n().current_time} ${.now?time}</li>
 </ul>
-<h3>Dates</h3>
 
-
+<h3>${i18n().formatted_date_time}</h3>
-<h3>Formatted datetime</h3>
 <p><p>${dt.xsdDateTimeToYear(xsddatetime)}</p>
 
-<h3>Apples</h3>
+<h3>${i18n().apples}</h3>
 <ul>
 <#list apples as apple>
     <li>${apple}</li>
 </#list>
 </ul>
 
-<h3>Fruit</h3>
+<h3>${i18n().fruit}</h3>
 <ul>
 <#list fruit as f>
     <li>${f}</li>
 </#list>
 </ul>
 
-<p><strong>Animal:</strong> ${animal}</p>
+<p><strong>${i18n().animal}</strong> ${animal}</p>
 
-<p><strong>Book Title:</strong> ${bookTitle}</p>
+<p><strong>${i18n().book_title}</strong> ${bookTitle}</p>
 
 
-<h3>Zoo 1</h3>
+<h3>${i18n().zoo_one}</h3>
 <ul>
 <#list zoo1.animals as animal>
     <li>${animal}</li>
 </#list>
 </ul>
 
-<h3>Zoo 2</h3>
+<h3>${i18n().zoo_two}</h3>
 <ul>
 <#list zoo2.animals as animal>
     <li>${animal}</li>
 </#list>
 </ul>
 
-<p><strong>Berries: </strong>${berries}</p>
+<p><strong>${i18n().berries} </strong>${berries}</p>
 
 <p>${year?number?c}</p>
 
-<h3>Raw String Literals</h3>
+<h3>${i18n().raw_string_literals}</h3>
 <p>${r"#{title}"}</p>
 <p>${r"${title}"}</p>
 
-<h2>Containers do not pick up changes to the value of their elements</h2>
+<h2>${i18n().containers_do_not_pick_up_changes}</h2>
 <#assign
     fruit = ["apples", "oranges", "bananas"]
     veg = ["beans", "peas", "carrots"]
@@ -79,12 +77,12 @@
     ><br />
 </#noparse>
 
-<h3>List elements of ${r"${fruit}"}</h3>
+<h3>${i18n().list_elements_of} ${r"${fruit}"}</h3>
 <#list fruit as f>
     ${f}<br />
 </#list>
 
-<h3>List elements of ${r"${food}"}: contains no pears</h3>
+<h3>${i18n().list_elements_of} ${r"${food}"}: ${i18n().contains_no_pears}</h3>
 <#list food as item>
     <#list item as i>
         ${i}<br />
@@ -92,7 +90,7 @@
 </#list>
 
 
-<h3>Numbers</h3>
+<h3>${i18n().numbers}</h3>
 
 <#assign
     one = 1
@@ -116,7 +114,7 @@ ${r"${two}"}: ${two}<br />
 ${r"${numbers[1]}"}: ${numbers[1]}<br />
 ${r"${numbers2[1]}"}: ${numbers2[1]}<br />
 
-<h3>Uncamelcasing</h3>
+<h3>${i18n().undo_camelcasing}</h3>
 <#assign s1 = "FreemarkerTest">
 ${s1} => ${str.unCamelCase(s1)}<br />
 <#assign s2 = "Freemarker">

webapp/web/templates/freemarker/body/sdbSetup.ftl

@@ -3,7 +3,7 @@
 <#if link??>
     <form method="post" action="sdbsetup">
         <p>${sdbstatus}</p>
-        <input type="submit" value="Run SDB Setup" name="submit"/>
+        <input type="submit" value="${i18n().run_sdb_setup}" name="submit"/>
         <input type="hidden" value="setup" name="setupsignal">
     </form>
 </#if>

webapp/web/templates/freemarker/body/search/search-help_es.ftl

@@ -0,0 +1,42 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#if origination?has_content && origination == "helpLink">
+    <h2>Consejos Para la Búsqueda</h2>
+    <span id="searchHelp">
+        <a href="#" onClick="history.back();return false;" title="regresar a los resultados">regresar a los resultados</a>
+    </span>
+<#else>
+    <h3>Consejos Para la Búsqueda</h3>        
+</#if>
+<ul class="searchTips">
+    <li>Debe ser sencillo. Utilice corto, único a menos que las búsquedas están regresando muchos resultados.</li>
+    <li>Utilice comillas para buscar una frase entera -- por ejemplo, "<i>el plegamiento de proteínas</i>".</li>
+    <li>A excepción de los operadores booleanos, búsquedas <strong>no distinguen</strong> entre mayúsculas y minúsculas, por lo que "Ginebra" y "ginebra" son equivalentes</li>
+    <li>Si no está seguro de la ortografía correcta, ponga ~ al final de su término de búsqueda -- por ejemplo, <i>cabage~</i> encuentra <i>cabbage</i>, <i>steven~</i> encuentra <i>Stephen</i> y <i>Stefan</i> (así como otros nombres similares).</li>
+</ul>
+    
+<h4><a id="advTipsLink" href="#">Consejos Avanzados</a></h4>    
+<ul id="advanced" class="searchTips" style="visibility:hidden">
+    <li>Cuando se introduce más de un término, la búsqueda devolverá resultados que contengan todas ellas a menos que agregue el operador booleano "OR" -- por ejemplo, <i>pollo</i> OR <i>huevos</i>.</li>
+    <li>"NOT" puede ayudar búsquedas límite -- por ejemplo, <i>clima</i> NOT <i>cambiar</i>.</li>
+    <li>Las búsquedas de frases se pueden combinar con operadores booleanos -- por exemplo, "<i>cambio climático</i>" OR "<i>calentamiento global</i>".</li>
+    <li>Asimismo, se encuentra cerca variaciones de palabras -- por exemplo, <i>secuencia</i> emparejas <i>secuencias</i> y <i>secuenciación</i>.</li>
+    <li>Utilice el carácter comodín * para que coincida con una variación aún mayor -- por exemplo, <i>nano*</i> emparejas <i>nanotechnology</i> y <i>nanofabrication</i>.</li>
+    <li>Search utiliza versiones acortadas de palabras -- por exemplo, una búsqueda de "cogni*" no encuentra nada, mientras que la "cogn*" encuentra tanto <i>cognitivo</i> and <i>cognición</i>.</li> 
+</ul>
+<a id="closeLink" href="#"  style="visibility:hidden;font-size:.825em;padding-left:8px">Close</a>
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/search.css" />')}
+<script type="text/javascript">
+    $(document).ready(function(){
+        $('a#advTipsLink').click(function() {
+           $('ul#advanced').css("visibility","visible"); 
+           $('a#closeLink').css("visibility","visible");
+           $('a#closeLink').click(function() {
+              $('ul#advanced').css("visibility","hidden"); 
+              $('a#closeLink').css("visibility","hidden");
+           });
+
+        });
+    });
+    
+</script>

webapp/web/templates/freemarker/body/search/search-pagedResults.ftl

@@ -4,21 +4,21 @@
 
 <h2>
 <#escape x as x?html>
-    Search results for '${querytext}'
+    ${i18n().search_results_for} '${querytext}'
-    <#if classGroupName?has_content>limited to type '${classGroupName}'</#if>
+    <#if classGroupName?has_content>${i18n().limited_to_type} '${classGroupName}'</#if>
-    <#if typeName?has_content>limited to type '${typeName}'</#if>
+    <#if typeName?has_content>${i18n().limited_to_type} '${typeName}'</#if>
 </#escape>
 </h2>
-<span id="searchHelp"><a href="${urls.base}/searchHelp" title="search help">Not the results you expected?</a></span>
+<span id="searchHelp"><a href="${urls.base}/searchHelp" title="${i18n().search_help}">${i18n().not_expected_results}</a></span>
 <div class="contentsBrowseGroup">
 
     <#-- Refinement links -->
     <#if classGroupLinks?has_content>
         <div class="searchTOC">
-            <h4>Display only</h4>           
+            <h4>${i18n().display_only}</h4>           
             <ul>           
             <#list classGroupLinks as link>
-                <li><a href="${link.url}" title="class group link">${link.text}</a></li>
+                <li><a href="${link.url}" title="${i18n().class_group_link}">${link.text}</a></li>
             </#list>
             </ul>           
         </div>
@@ -27,13 +27,13 @@
     <#if classLinks?has_content>
         <div class="searchTOC">
             <#if classGroupName?has_content>
-                <h4>Limit ${classGroupName} to</h4>
+                <h4>${i18n().limit} ${classGroupName} to</h4>
             <#else>
-                <h4>Limit to</h4>
+                <h4>${i18n().limit_to}</h4>
             </#if>
             <ul>           
             <#list classLinks as link>
-                <li><a href="${link.url}" title="class link">${link.text}</a></li>
+                <li><a href="${link.url}" title="${i18n().class_link}">${link.text}</a></li>
             </#list>
             </ul>
         </div>
@@ -53,15 +53,15 @@
     <#if (pagingLinks?size > 0)>
         <div class="searchpages">
             Pages: 
-            <#if prevPage??><a class="prev" href="${prevPage}" title="previous">Previous</a></#if>
+            <#if prevPage??><a class="prev" href="${prevPage}" title="${i18n().previous}">${i18n().previous}</a></#if>
             <#list pagingLinks as link>
                 <#if link.url??>
-                    <a href="${link.url}" title="page link">${link.text}</a>
+                    <a href="${link.url}" title="${i18n().page_link}">${link.text}</a>
                 <#else>
                     <span>${link.text}</span> <#-- no link if current page -->
                 </#if>
             </#list>
-            <#if nextPage??><a class="next" href="${nextPage}" title="next">Next</a></#if>
+            <#if nextPage??><a class="next" href="${nextPage}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a></#if>
         </div>
     </#if>
     <br />

webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl

@@ -4,23 +4,23 @@
 
 <#if dataTools?has_content>
     <section class="pageBodyGroup" role="region">
-        <h3>Advanced Data Tools</h3>
+        <h3>${i18n().advanced_data_tools}</h3>
         
         <ul role="navigation">
             <#if dataTools.rdfData?has_content>
-                <li role="listitem"><a href="${dataTools.rdfData}" title="Add/Remove RDF data">Add/Remove RDF data</a></li>
+                <li role="listitem"><a href="${dataTools.rdfData}" title="${i18n().add_remove_rdf}">${i18n().add_remove_rdf}</a></li>
             </#if>     
             <#if dataTools.ingest?has_content>
-                <li role="listitem"><a href="${dataTools.ingest}" title="Ingest tools">Ingest tools</a></li>
+                <li role="listitem"><a href="${dataTools.ingest}" title="${i18n().ingest_tools}">${i18n().ingest_tools}</a></li>
             </#if>     
             <#if dataTools.rdfExport?has_content>
-                <li role="listitem"><a href="${dataTools.rdfExport}" title="RDF export">RDF export</a></li>
+                <li role="listitem"><a href="${dataTools.rdfExport}" title="${i18n().rdf_export}">${i18n().rdf_export}</a></li>
             </#if>     
             <#if dataTools.sparqlQuery?has_content>
-                <li role="listitem"><a href="${dataTools.sparqlQuery}" title="SPARQL query">SPARQL query</a></li>
+                <li role="listitem"><a href="${dataTools.sparqlQuery}" title="${i18n().sparql_query}">${i18n().sparql_query}</a></li>
             </#if>     
             <#if dataTools.sparqlQueryBuilder?has_content>
-                <li role="listitem"><a href="${dataTools.sparqlQueryBuilder}" title="SPARQL query builder">SPARQL query builder</a></li>
+                <li role="listitem"><a href="${dataTools.sparqlQueryBuilder}" title="${i18n().sparql_query_builder}">${i18n().sparql_query_builder}</a></li>
             </#if>     
         </ul>
     </section>

webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl

@@ -8,23 +8,23 @@
         <#assign displayOption = "asserted">
     </#if>
     <form name="classHierarchyForm" id="classHierarchyForm" action="showClassHierarchy" method="post" role="classHierarchy">
-        <label id="displayOptionLabel" class="inline">Display Options</label>
+        <label id="displayOptionLabel" class="inline">${i18n().display_options}</label>
         <select id="displayOption" name="displayOption">
-            <option value="asserted" <#if displayOption == "asserted">selected</#if> >Asserted Class Hierarchy</option>
+            <option value="asserted" <#if displayOption == "asserted">selected</#if> >${i18n().asserted_class_hierarchy}</option>
-            <option  value="inferred" <#if displayOption == "inferred">selected</#if> >Inferred Class Hierarchy</option>
+            <option  value="inferred" <#if displayOption == "inferred">selected</#if> >${i18n().inferred_class_hierarchy}</option>
-            <option value="all" <#if displayOption == "all">selected</#if> >All Classes</option>
+            <option value="all" <#if displayOption == "all">selected</#if> >${i18n().all_classes}</option>
-            <option value="group" <#if displayOption == "group">selected</#if> >Classes by Class Group</option>
+            <option value="group" <#if displayOption == "group">selected</#if> >${i18n().classes_by_classgroup}</option>
         </select>
-        <input id="addClass" value="Add New Class" class="form-button" type="submit" />
+        <input id="addClass" value="${i18n().add_new_classes}" class="form-button" type="submit" />
         <#if displayOption == "group">
-                <input type="submit" id="addGroup" class="form-button" value="Add New Group"/>
+                <input type="submit" id="addGroup" class="form-button" value="${i18n().add_new_group}"/>
         </#if>
     </form>
         
     <#if displayOption == "group">
-        <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="hide/show subclasses">hide subclasses</a></span></div>
+        <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="${i18n().hide_show_subclasses}">${i18n().hide_subclasses}</a></span></div>
     <#else>
-        <div id="expandLink"><span id="expandAll" ><a href="#" title="expand all">expand all</a></span></div>
+        <div id="expandLink"><span id="expandAll" ><a href="#" title="${i18n().expand_all}">${i18n().expand_all}</a></span></div>
     </#if>
     <section id="container">
 

webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl

@@ -6,18 +6,18 @@
 
 <#if dataInput?has_content>
     <section class="pageBodyGroup" role="region">
-        <h3>Data Input</h3>
+        <h3>${i18n().data_input}</h3>
 
         <form id="addIndividualClass" action="${dataInput.formAction}" method="get">
             <select id="VClassURI" name="typeOfNew" class="form-item long-options" role="select">
                 <@form.optionGroups groups=dataInput.groupedClassOptions />
             </select>
             <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualFormGenerator" role="input" />
-            <input type="submit" id="submit" value="Add individual of this class" role="button" />
+            <input type="submit" id="submit" value="${i18n().add_individual_of_class}" role="button" />
         </form>
         
         <section id="addClassBubble" role="region">
-            <p>Please create a <a title="Create a class gorup" href="${urls.base}/editForm?controller=Classgroup">class group</a> and associate classes with the group created.</p>
+            <p>${i18n().please_create} <a title="${i18n().create_classgroup}" href="${urls.base}/editForm?controller=Classgroup">${i18n().a_classgroup}</a> ${i18n().associate_classes_with_group}</p>
         </section>
     </section>
 </#if>

webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl

@@ -4,19 +4,19 @@
 
 <#if indexCacheRebuild?has_content>
     <section class="pageBodyGroup indexCacheRebuild" role="region">
-        <h3>Refresh Content</h3>
+        <h3>${i18n().refresh_content}</h3>
         
         <ul role="navigation">                        
             <#if indexCacheRebuild.rebuildSearchIndex?has_content>
-                <li role="listitem"><a href="${indexCacheRebuild.rebuildSearchIndex }" title="Rebuild search index">Rebuild search index</a></li>
+                <li role="listitem"><a href="${indexCacheRebuild.rebuildSearchIndex }" title="${i18n().rebuild_search_index}">${i18n().rebuild_search_index}</a></li>
             </#if>
             
             <#if indexCacheRebuild.rebuildVisCache?has_content>
-                <li role="listitem"><a href="${indexCacheRebuild.rebuildVisCache}" title="Rebuild visualization cache">Rebuild visualization cache</a></li>
+                <li role="listitem"><a href="${indexCacheRebuild.rebuildVisCache}" title="${i18n().rebuild_vis_cache}">${i18n().rebuild_vis_cache}</a></li>
             </#if>
             
             <#if indexCacheRebuild.recomputeInferences?has_content>
-                <li role="listitem"><a href="${indexCacheRebuild.recomputeInferences}" title="Recompute inferences">Recompute inferences</a></li>
+                <li role="listitem"><a href="${indexCacheRebuild.recomputeInferences}" title="${i18n().recompute_inferences}">${i18n().recompute_inferences}</a></li>
             </#if>
         </ul>
     </section>

webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl

@@ -5,7 +5,7 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/admin.css" />')}
 
 <div class="tab">
-    <h2>Site Administration</h2>
+    <h2>${i18n().site_administration}</h2>
 </div>
 
 <div id="adminDashboard">

webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl

@@ -22,21 +22,21 @@
    
     <#if propType == "group">
         <form action="editForm" method="get">
-            <input type="submit" class="form-button" id="addProperty" value="Add new property group"/>
+            <input type="submit" class="form-button" id="addProperty" value="${i18n().add_property_group}"/>
             <input type="hidden" name="controller" value="PropertyGroup"/>
         </form>
-        <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="hide/show properties">hide properties</a></span></div>
+        <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="${i18n().hide_show_properties}">${i18n().hide_properties}</a></span></div>
     <#else>
         <form name="classHierarchyForm" id="classHierarchyForm" action="show<#if propType == "object">Object<#else>Data</#if>PropertyHierarchy" method="post" role="classHierarchy">
-        <label id="displayOptionLabel" class="inline">Display Options</label>
+        <label id="displayOptionLabel" class="inline">${i18n().display_options}</label>
             <select id="displayOption" name="displayOption">
-                <option value="hierarchy" <#if displayOption == "asserted">selected</#if> >${propType?capitalize} Property Hierarchy</option>
+                <option value="hierarchy" <#if displayOption == "asserted">selected</#if> >${propType?capitalize} ${i18n().property_hierarchy}</option>
-                <option value="all" <#if displayOption == "all">selected</#if> >All ${propType?capitalize} Properties</option>
+                <option value="all" <#if displayOption == "all">selected</#if> >${i18n().all_x_properties(propType?capitalize)}</option>
-                <option value="group" <#if displayOption == "group">selected</#if> >Property Groups</option>
+                <option value="group" <#if displayOption == "group">selected</#if> >${i18n().property_groups}</option>
             </select>
-            <input type="submit" class="form-button" id="addProperty" value="Add new <#if propType == "object">object<#else>data</#if> property"/>
+            <input type="submit" class="form-button" id="addProperty" value="${i18n().add_new} <#if propType == "object">${i18n().object}<#else>${i18n().data}</#if> ${i18n().property}"/>
         </form>
-        <div id="expandLink"><span id="expandAll" ><a href="#" title="expand all">expand all</a></span></div>
+        <div id="expandLink"><span id="expandAll" ><a href="#" title="${i18n().expand_all}">${i18n().expand_all}</a></span></div>
     </#if>
 
     <section id="container">

webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl

@@ -4,36 +4,36 @@
 
 <#if ontologyEditor?has_content>
     <section class="pageBodyGroup" role="region">
-        <h3>Ontology Editor</h3>
+        <h3>${i18n().ontology_editor}</h3>
         
         <#if ontologyEditor.pellet?has_content>
             <div class="notice">
                 <p>${ontologyEditor.pellet.error}</p>
                 <#if ontologyEditor.pellet.explanation?has_content>
-                    <p>Cause: ${ontologyEditor.pellet.explanation}</p>
+                    <p>${i18n().cause} ${ontologyEditor.pellet.explanation}</p>
                 </#if>
             </div>
         </#if>
         
         <ul role="navigation">
             <li role="listitem">
-                <a href="${ontologyEditor.urls.ontologies}" title="Ontology list">Ontology list</a></h4>
+                <a href="${ontologyEditor.urls.ontologies}" title="${i18n().ontology_list}"></a>${i18n().ontology_list}</h4>
             </li>
         </ul>
     
-        <h4>Class Management</h4>
+        <h4>${i18n().class_management}</h4>
         
         <ul role="navigation">
-            <li role="listitem"><a href="${ontologyEditor.urls.classHierarchy}" title="Class hierarchy">Class hierarchy</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.classHierarchy}" title="${i18n().class_hierarchy}">${i18n().class_hierarchy}</a></li>
-            <li role="listitem"><a href="${ontologyEditor.urls.classGroups}" title="Class groups">Class groups</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.classGroups}" title="${i18n().class_groups}">${i18n().class_groups}</a></li>
         </ul>
         
-        <h4>Property Management</h4>
+        <h4>${i18n().property_management}</h4>
         
         <ul role="navigation">
-            <li role="listitem"><a href="${ontologyEditor.urls.objectPropertyHierarchy}" title="Object property hierarchy">Object property hierarchy</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.objectPropertyHierarchy}" title="${i18n().object_property_hierarchy}">${i18n().object_property_hierarchy}</a></li>
-            <li role="listitem"><a href="${ontologyEditor.urls.dataPropertyHierarchy}" title="Data property hierarchy">Data property hierarchy</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.dataPropertyHierarchy}" title="${i18n().data_property_hierarchy}">${i18n().data_property_hierarchy}</a></li>
-            <li role="listitem"><a href="${ontologyEditor.urls.propertyGroups}" title="Property groups">Property groups</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.propertyGroups}" title="${i18n().property_groups}">${i18n().property_groups}</a></li>
         </ul>
         
     </section>

webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl

@@ -4,44 +4,44 @@
 
 <#if siteConfig?has_content>
     <section class="pageBodyGroup" role="region">
-        <h3>Site Configuration</h3>
+        <h3>${i18n().site_config}</h3>
         
         <ul role="navigation">
             <#if siteConfig.internalClass?has_content>
-                <li role="listitem"><a href="${siteConfig.internalClass}" title="Institutional internal class">Institutional internal class</a></li>
+                <li role="listitem"><a href="${siteConfig.internalClass}" title="${i18n().internal_class}">${i18n().internal_class}</a></li>
             </#if>     
             
             <#if siteConfig.manageProxies?has_content>
-                <li role="listitem"><a href="${siteConfig.manageProxies}" title="Manage profile editing">Manage profile editing</a></li>
+                <li role="listitem"><a href="${siteConfig.manageProxies}" title="${i18n().manage_profile_editing}">${i18n().manage_profile_editing}</a></li>
             </#if>  
             
             <#if siteConfig.pageManagement?has_content>
-                <li role="listitem"><a href="${siteConfig.pageManagement}" title="Page management">Page management</a></li>
+                <li role="listitem"><a href="${siteConfig.pageManagement}" title="${i18n().page_management}">${i18n().page_management}</a></li>
             </#if>        
             
             <#if siteConfig.menuManagement?has_content>
-                <li role="listitem"><a href="${siteConfig.menuManagement}" title="Menu ordering">Menu ordering</a></li>
+                <li role="listitem"><a href="${siteConfig.menuManagement}" title="${i18n().menu_ordering}">${i18n().menu_ordering}</a></li>
             </#if>      
             
             <#if siteConfig.restrictLogins?has_content>
-                <li role="listitem"><a href="${siteConfig.restrictLogins}" title="Restrict Logins">Restrict Logins</a></li>
+                <li role="listitem"><a href="${siteConfig.restrictLogins}" title="${i18n().restrict_logins}">${i18n().restrict_logins}</a></li>
             </#if>
             
             <#if siteConfig.siteInfo?has_content>
-                <li role="listitem"><a href="${siteConfig.siteInfo}" title="Site information">Site information</a></li>
+                <li role="listitem"><a href="${siteConfig.siteInfo}" title="${i18n().site_information}">${i18n().site_information}</a></li>
             </#if>
             
             <#if siteConfig.startupStatus?has_content>
                 <li role="listitem">
-                    <a href="${siteConfig.startupStatus}" title="Startup status">Startup status</a>
+                    <a href="${siteConfig.startupStatus}" title="${i18n().startup_status}">${i18n().startup_status}</a>
                     <#if siteConfig.startupStatusAlert>
-                        <img id="alertIcon" src="${urls.images}/iconAlert.png" width="20" height="20" alert="Error alert icon" />
+                        <img id="alertIcon" src="${urls.images}/iconAlert.png" width="20" height="20" alt="${i18n().error_alert_icon}" />
                     </#if>
                 </li>
             </#if>   
             
              <#if siteConfig.userAccounts?has_content>
-                <li role="listitem"><a href="${siteConfig.userAccounts}" title="User accounts">User accounts</a></li>
+                <li role="listitem"><a href="${siteConfig.userAccounts}" title="${i18n().user_accounts}">${i18n().user_accounts}</a></li>
              </#if>        
         </ul>
     </section>

webapp/web/templates/freemarker/body/termsOfUse_es.ftl

@@ -0,0 +1,41 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<section id="terms" role="region">
+    <h2>Condiciones de uso</h2>
+    
+    <h3>Aviso legal</h3>
+
+    <p>Este ${termsOfUse.siteName} sitio web contiene material&mdash;información de texto, la publicación
+    citas, enlaces e imágenes&mdash;proporcionado por ${termsOfUse.siteHost} y varios terceros, tanto de los
+    individuos y las organizaciones, comerciales y de otro tipo. En la medida de derecho de autor, la información
+    presentada en el sitio web VIVO y disponible como Resource Description Framework (RDF) datos de VIVO en
+    ${termsOfUse.siteHost} se destina para uso público y se distribuye libremente bajo los términos de la 
+    <a href="http://creativecommons.org/licenses/by/3.0/" target="_blank" title="creative commons">Creative Commons
+    CC-BY 3.0</a> licencia, que le permite copiar, distribuir, mostrar y hacer que los derivados de esta
+    información, siempre le das crédito a ${termsOfUse.siteHost}. Cualquier información que no sea derecho de autor
+    está disponible para usted en virtud de una 
+    <a href="http://creativecommons.org/publicdomain/zero/1.0/"  target="_blank" title="cco waiver">exención
+    CC0</a>. Sin embargo, los documentos originales, imágenes o páginas web adjuntas o vinculado desde VIVO podrán
+    contener información con derechos de autor y sólo deben ser utilizados o distribuidos en los términos que se
+    incluyen con cada fuente o de acuerdo con los principios del uso justo.</p>    
+
+    <h3>Descargo de responsabilidad</h3>
+
+    <p>${termsOfUse.siteHost?cap_first} ofrece ninguna garantía, expresa o implícita, incluyendo las garantías de
+    comerciabilidad y adecuación a un propósito particular, o asume cualquier responsabilidad legal o responsabilidad
+    por la exactitud, integridad, actualidad o utilidad de cualquier material mostrado o distribuido a través de la
+    página web ${termsOfUse.siteName} o representa que su uso no infringiría derechos de propiedad privada.
+    ${termsOfUse.siteHost?cap_first} renuncia a cualquier garantía con respecto a la información proporcionada. Si
+    usted confía en dicha información es a su propio riesgo. En ningún caso ${termsOfUse.siteHost} será responsable
+    ante usted por daños o pérdidas que resulten de o causados ​​por el sitio web ${termsOfUse.siteName} o su
+    contenido.</p> 
+
+    <h3>Renuncia de aprobación</h3>
+
+    <p>La referencia en este documento a cualquier producto comercial específico, proceso o servicio por nombre
+    comercial, marca, fabricante, o de otro modo, no constituye necesariamente ni implica un endoso o recomendación 
+    por parte de ${termsOfUse.siteHost}. Los puntos de vista y opiniones de los autores expresadas en este documento 
+    no representan ni reflejan necesariamente las de Cornell y no podrá ser utilizado para fines publicitarios o 
+    endoso de productos.</p> 
+    
+</section>

webapp/web/templates/freemarker/body/unrecognizedUser.ftl

@@ -3,13 +3,12 @@
 <#-- Template for the Unrecognized User page. -->
 
 <section role="region">
-    <h2>Unrecognized user</h2>
+    <h2>${i18n().unrecognized_user}</h2>
     
     <p>
-      For some reason, there is no individual in VIVO that is associated with your Net ID. 
+      ${i18n().no_individual_associated_with_id}
-      Perhaps you should contact your VIVO administrator.
     </p>
 
     <br/>
-    <a href="${urls.home}" title="continue">Continue</a>
+    <a href="${urls.home}" title="${i18n().continue}">${i18n().continue}</a>
 </section>

webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl

@@ -27,19 +27,19 @@
 	<#assign propertyNameForDisplay = editConfiguration.objectPropertyNameForDisplay />
 </#if>
 <#if editMode = "edit" >
-	<#assign titleVerb = "Edit" />
+	<#assign titleVerb = "${i18n().edit_capitalized}" />
 	<#assign objectLabel = editConfiguration.pageData.objectLabel />
 	<#assign selectedObjectUri = editConfiguration.objectUri />
-	<#assign submitButtonText = "Save Change" />
+	<#assign submitButtonText = "${i18n().save_button}" />
 <#else>
-	<#assign titleVerb = "Add" >
+	<#assign titleVerb = "${i18n().add_capitalized}" >
 	<#assign objectLabel = "" />
 	<#assign selectedObjectUri = ""/>
-	<#assign submitButtonText = "Create Entry" />
+	<#assign submitButtonText = "${i18n().create_entry}" />
 </#if>
 
 <#if editConfiguration.formTitle?contains("collaborator") >
-    <#assign formTitle = "Select an existing Collaborator for ${editConfiguration.subjectName}" />
+    <#assign formTitle = i18n().select_existing_collaborator(editConfiguration.subjectName) />
 <#else>
     <#assign formTitle = editConfiguration.formTitle />
 </#if>
@@ -58,16 +58,16 @@
              
             <#---This section should become autocomplete instead--> 
             <p>
-				<label for="object"> ${propertyNameForDisplay?capitalize} Name<span class='requiredHint'> *</span></label>
+				<label for="object"> ${propertyNameForDisplay?capitalize} ${i18n().name_capitalized}<span class='requiredHint'> *</span></label>
 				<input class="acSelector" size="50"  type="text" id="object" name="objectLabel" acGroupName="object" value="${objectLabel}" />
 			</p>
 								
 			<div class="acSelection" acGroupName="object" > 
 				<p class="inline">
-					<label>Selected:</label> 
+					<label>${i18n().selected}:</label> 
 					<span class="acSelectionInfo"></span>
-					<a href="" class="verifyMatch"  title="verify match">(Verify this match</a> or 
+					<a href="" class="verifyMatch"  title="${i18n().verify_this_match}">(${i18n().verify_this_match}</a> ${i18n().or} 
-                    <a href="#" class="changeSelection" id="changeSelection">change selection)</a>
+                    <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
                 </p>
                 <input class="acUriReceiver" type="hidden" id="objectVar" name="objectVar" value="${selectedObjectUri}" />
 			</div>
@@ -78,11 +78,11 @@
                 <input type="submit" id="submit" value="${submitButtonText}" role="button" disabled="disabled"/>
            
                 <span class="or"> or </span>
-                <a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a>
+                <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
             </p>
         </form>
     <#else>
-        <p> There are no entries in the system from which to select.  </p>  
+        <p> ${i18n().there_are_no_entries_for_selection}  </p>  
     </#if>
 </#if>
 <p>&nbsp;</p>
@@ -92,7 +92,7 @@
 </#if>
 
 <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false>
-<p>This property is currently configured to prohibit editing. </p>
+<p>${i18n().editing_prohibited} </p>
 </#if>
 
 

webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl

@@ -16,7 +16,7 @@
 <#assign deletionTemplateName = editConfiguration.deleteTemplate/>
 
 <form action="${editConfiguration.deleteProcessingUrl}" method="get">
-    <h2>Are you sure you want to delete the following entry from <em>${editConfiguration.propertyName}</em>?</h2>
+    <h2>${i18n().confirm_entry_deletion_from} <em>${editConfiguration.propertyName}</em>?</h2>
     
     <p class="toBeDeleted ${toBeDeletedClass}">
         <#if editConfiguration.objectProperty = true>
@@ -42,9 +42,9 @@
     <#if editConfiguration.objectProperty = true>
     <p class="submit">
     </#if>
-        <input type="submit" id="submit" value="Delete" role="button"/>
+        <input type="submit" id="submit" value="${i18n().delete_button}" role="button"/>
         or 
-        <a class="cancel" title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
+        <a class="cancel" title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
     <#if editConfiguration.objectProperty = true>
     </p>
     </#if>

webapp/web/templates/freemarker/edit/forms/dateTimeIntervalForm.ftl

@@ -7,12 +7,12 @@
 <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
 
 <#if editMode == "edit">        
-        <#assign titleVerb="Edit">        
+        <#assign titleVerb="${i18n().edit_capitalized}">        
-        <#assign submitButtonText="Edit Date/Time Value">
+        <#assign submitButtonText="${i18n().edit_date_time_value}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="Create">        
+        <#assign titleVerb="${i18n().create_capitalized}">        
-        <#assign submitButtonText="Create Date/Time Value">
+        <#assign submitButtonText="${i18n().create_date_time_value}">
         <#assign disabledVal=""/>
 </#if>
 <#--If edit submission exists, then retrieve validation errors if they exist-->
@@ -21,25 +21,25 @@
 </#if>
 
 
-<h2>${titleVerb} date time value for ${editConfiguration.subjectName}</h2>
+<h2>${titleVerb} ${i18n().date_time_value_for} ${editConfiguration.subjectName}</h2>
 
 <#--Display error messages if any-->
 <#if submissionErrors?has_content>
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         <#--below shows examples of both printing out all error messages and checking the error message for a specific field-->
         <#list submissionErrors?keys as errorFieldName>
         	<#if errorFieldName == "startField">
         	    <#if submissionErrors[errorFieldName]?contains("before")>
-        	        The Start interval must be earlier than the End interval.
+        	        ${i18n().start_interval_must_precede_end_earlier}
         	    <#else>
         	        ${submissionErrors[errorFieldName]}
         	    </#if>
         	    <br />
         	<#elseif errorFieldName == "endField">
     	        <#if submissionErrors[errorFieldName]?contains("after")>
-    	            The End interval must be later than the Start interval.
+    	            ${i18n().end_interval_must_follow_start_interval}
     	        <#else>
     	            ${submissionErrors[errorFieldName]}
     	        </#if>
@@ -52,20 +52,20 @@
 <p></p>
 <#--Need to draw edit elements for dates here-->
  <#if htmlForElements?keys?seq_contains("startField")>
-	Start&nbsp; ${htmlForElements["startField"]}
+	${i18n().start_capitalized}&nbsp; ${htmlForElements["startField"]}
  </#if>
  <br /><br />
  <#if htmlForElements?keys?seq_contains("endField")>
-	End&nbsp; ${htmlForElements["endField"]}
+	${i18n().end_capitalized}&nbsp; ${htmlForElements["endField"]}
  </#if>
 
     <p class="submit">
         <input type="hidden" name="editKey" value="${editKey}" />
         <input type="submit" id="submit" value="${submitButtonText}" role="button" />
     
-        <span class="or"> or </span>
+        <span class="or"> ${i18n().or} </span>
     
-        <a class="cancel" href="${editConfiguration.cancelUrl}" title="Cancel">Cancel</a>
+        <a class="cancel" href="${editConfiguration.cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </p>
 </form>
 

webapp/web/templates/freemarker/edit/forms/dateTimeValueForm.ftl

@@ -7,16 +7,16 @@
 <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
 
 <#if editMode == "edit">        
-        <#assign titleVerb="Edit">        
+        <#assign titleVerb="${i18n().edit_capitalized}">        
-        <#assign submitButtonText="Edit Date/Time Value">
+        <#assign submitButtonText="${i18n().edit_date_time_value}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="Create">        
+        <#assign titleVerb="${i18n().create_capitalized}">        
-        <#assign submitButtonText="Create Date/Time Value">
+        <#assign submitButtonText="${i18n().create_date_time_value}">
         <#assign disabledVal=""/>
 </#if>
 
-<h2>${titleVerb} date time value for ${editConfiguration.subjectName}</h2>
+<h2>${titleVerb} ${i18n().date_time_value_for} ${editConfiguration.subjectName}</h2>
 
 <form class="customForm" action ="${submitUrl}" class="customForm">
 <#--Need to draw edit elements for dates here-->
@@ -28,9 +28,9 @@
         <input type="hidden" name="editKey" value="${editKey}" />
         <input type="submit" id="submit" value="${submitButtonText}" role="button" />
     
-        <span class="or"> or </span>
+        <span class="or"> ${i18n().or} </span>
     
-        <a class="cancel" href="${editConfiguration.cancelUrl}" title="Cancel">Cancel</a>
+        <a class="cancel" href="${editConfiguration.cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </p>
 </form>
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />',

webapp/web/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl

@@ -4,11 +4,11 @@
  "${editConfiguration.propertyPublicDomainTitle}" entry for ${editConfiguration.subjectName}
 </#assign>
 <#if editConfiguration.objectUri?has_content>
-    <#assign formTitle>Edit ${formTitle} </#assign>
+    <#assign formTitle>${i18n().edit_capitalized} ${formTitle} </#assign>
-    <#assign submitLabel>Save changes</#assign>
+    <#assign submitLabel>${i18n().save_changes}</#assign>
 <#else>
-    <#assign formTitle>Create ${formTitle} </#assign>
+    <#assign formTitle>${i18n().create_capitalized} ${formTitle} </#assign>
-    <#assign submitLabel>Create "${editConfiguration.propertyPublicDomainTitle}" entry</#assign>
+    <#assign submitLabel>${i18n().create_capitalized} "${editConfiguration.propertyPublicDomainTitle}" ${i18n().entry}</#assign>
 </#if>
 
 <h2>${formTitle}</h2>
@@ -20,6 +20,6 @@
     <p class="submit">
         <input type="submit" id="submit" value="${submitLabel}" role="submit" />
         <span class="or"> or </span>
-        <a title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
+        <a title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
     </p>     
 </form>

webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl

@@ -11,7 +11,7 @@
 <#--Display error messages if any-->
 <#if submissionErrors?has_content>
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         
         <#list submissionErrors?keys as errorFieldName>
@@ -39,7 +39,7 @@
     but that method may not return the correct result for other custom forms-->
     <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button"/>
     <span class="or"> or </span>
-    <a title="Cancel" href="${cancelUrl}">Cancel</a>
+    <a title="${i18n().cancel_title}" href="${cancelUrl}">${i18n().cancel_link}</a>
 
 </form>
 

webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl

@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <form class="deleteForm" action="${editConfiguration.mainEditUrl}" method="get"> 
-    <h3 class="delete-entry">Delete this entry?</h3>
+    <h3 class="delete-entry">${i18n().delete_entry_capitalized}</h3>
           
     <label for="delete"></label>
     
@@ -11,7 +11,7 @@
     <input type="hidden" name="editKey" value="${editConfiguration.editKey}"/>
     <#if editConfiguration.dataProperty = true>
         <input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" />
-        <input type="submit" id="delete" value="Delete" role="button "/>
+        <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
     </#if>
     
     <#--The original jsp included vinput tag with cancel=empty string for case where both select from existing
@@ -21,15 +21,15 @@
     
         <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false>
             <p>
-                <input type="submit" id="delete" value="Delete" role="button "/>
+                <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
-                <span class="or"> or </span>
+                <span class="or"> ${i18n().or} </span>
-                <a title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
+                <a title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
             </p> 
         </#if>
         
         <#if editConfiguration.propertySelectFromExisting = true || editConfiguration.propertyOfferCreateNewOption = true>
             <p>
-                <input type="submit" id="delete" value="Delete" role="button "/>
+                <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
             </p>      
         </#if>
     </#if>

webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl

@@ -1,9 +1,9 @@
  <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
  
  <#if rangeOptionsExist  = true >
-        <p>If you don't find the appropriate entry on the selection list above:</p>
+        <p>${i18n().no_appropriate_entry}:</p>
  <#else>
-        <p>Please create a new entry.</p>           
+        <p>${i18n().create_new_entry}</p>           
  </#if>
  
  <#if editConfiguration.objectUri?has_content>
@@ -26,10 +26,10 @@
     </#list>
     </select>
     
-    <input type="submit" id="offerCreate" class="submit"  value="Add a new item of this type" role="button" />  
+    <input type="submit" id="offerCreate" class="submit"  value="${i18n().add_new_of_type}" role="button" />  
     <#if rangeOptionsExist  = false >
-        <span class="or"> or </span>
+        <span class="or"> ${i18n().or} </span>
-        <a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a>
+        <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
     </#if>
 </form>          
 

webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl

@@ -25,12 +25,12 @@
             
             <p>
                 <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button "/>
-                <span class="or"> or </span>
+                <span class="or"> ${i18n().or} </span>
-                <a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a>
+                <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
             </p>
         </form>
     <#else>
-        <p> There are no entries in the system from which to select.  </p>  
+        <p> ${i18n().there_are_no_entries_for_selection}  </p>  
     </#if>
 </#if>
 
@@ -40,7 +40,7 @@
 </#if>
 
 <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false>
-<p>This property is currently configured to prohibit editing. </p>
+<p>${i18n().editing_prohibited} </p>
 </#if>
 
 

webapp/web/templates/freemarker/edit/forms/menuManagement-remove.ftl

@@ -2,7 +2,7 @@
 
 <#--Template for removing menu items -->
 
-<h3>Remove menu item</h3>
+<h3>${i18n().remove_menu_item}</h3>
 
 <section id="remove-menu-item" role="region">
     <form method="POST" action="${formUrls}" class="customForm" role="remove menu item">
@@ -10,9 +10,9 @@
         <input type="hidden" name="cmd" id="cmd" value="Remove" role="input" />
         <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="true" role="input" />
 
-        <p>Are you sure you want to remove <em>${menuName}</em> menu item?</p>
+        <p>${i18n().confirm_menu_item_delete} <em>${menuName}</em> ${i18n().menu_item}?</p>
 
-        <input type="submit" name="removeMenuItem" value="Remove menu item" class="submit" role="input" /> or <a class="cancel" href="${cancelUrl}" title="cancel">Cancel</a>
+        <input type="submit" name="removeMenuItem" value="${i18n().remove_menu_item}" class="submit" role="input" /> ${i18n().or} <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </form>
 </section>
 

webapp/web/templates/freemarker/edit/forms/menuManagement.ftl

@@ -11,11 +11,11 @@
     <#assign selectClassGroupStyle = " " />
 </#if>
 <section id="error-alert" role="alert" class="hidden">
-    <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+    <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
     <p></p>
 </section>
 
-<h3>${menuAction} menu item</h3>
+<h3>${menuAction} ${i18n().menu_item}</h3>
 
 <section id="${menuAction?lower_case}-menu-item" role="region">
     <form method="POST" action="${formUrls}" class="customForm" role="${menuAction} menu item">
@@ -23,39 +23,39 @@
         <input type="hidden" name="menuItem" id="menuItem" value="${menuItem}" role="input" />
         <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="true" role="input" />
          
-        <label for="menu-name">Name<span class="requiredHint"> *</span></label>
+        <label for="menu-name">${i18n().name}<span class="requiredHint"> *</span></label>
         <input type="text" name="menuName" value="${menuName}" role="input" />
 
-        <label for="pretty-url">Pretty URL<span class="requiredHint"> *</span></label> 
+        <label for="pretty-url">${i18n().pretty_url}<span class="requiredHint"> *</span></label> 
         <input type="text" name="prettyUrl" value="${prettyUrl}" role="input" />
-        <p class="note">Must begin with a leading forward slash: / (e.g., /people)</p>
+        <p class="note">${i18n().start_with_leading_slash}</p>
         
-        <p>Template<span class="requiredHint"> *</span></p>
+        <p>${i18n().template_capitalized}<span class="requiredHint"> *</span></p>
         
         <input type="radio" class="default-template" name="selectedTemplate" value="default" <#if selectedTemplateType = "default">checked</#if> role="radio" />
-        <label class="inline" for="default"> Default</label>
+        <label class="inline" for="default"> ${i18n().default}</label>
         <br />
         <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked</#if> role="input" />
-        <label class="inline" for="custom"> Custom template</label>
+        <label class="inline" for="custom"> ${i18n().custom_template}</label>
         
         <section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region">
             <input type="text" name="customTemplate" value="${customTemplate!}" size="40" role="input" /><span class="requiredHint"> *</span>
         </section>
         
         <section id="existingContentType" name="existingContentType" ${existingClassGroupStyle} role="region">
-            <p>Selected content type for the associated page</p>
+            <p>${i18n().selected_page_content_type}</p>
             <p>
                 <span id="selectedContentTypeValue" name="selectedContentTypeValue">${associatedPage}</span>
-                <a href="#" id="changeContentType" name="changeContentType" title="change content type">Change content type</a>
+                <a href="#" id="changeContentType" name="changeContentType" title="${i18n().change_content_type}">${i18n().change_content_type}</a>
             </p>
         </section>
         
         <#-- Select class group -->
         <section id="selectContentType" name="selectContentType" ${selectClassGroupStyle} role="region">     
-           <label for="selectClassGroup">Select content type for the associated page<span class="requiredHint"> *</span></label>
+           <label for="selectClassGroup">${i18n().select_page_content_type}<span class="requiredHint"> *</span></label>
            
            <select name="selectClassGroup" id="selectClassGroup" role="combobox">
-               <option value="-1" role="option">Select one</option>
+               <option value="-1" role="option">${i18n().select_one}</option>
                <#list classGroups as aClassGroup>
                     <option value="${aClassGroup.URI}" <#if aClassGroup.URI = associatedPageURI>selected</#if> role="option">${aClassGroup.publicName}</option>
                </#list>
@@ -64,7 +64,7 @@
         
         <section id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
             <#-- Select classes in a class group -->    
-            <p id="selectClassesMessage" name="selectClassesMessage">Select content to display<span class="requiredHint"> *</span></p>
+            <p id="selectClassesMessage" name="selectClassesMessage">${i18n().select_content_display}<span class="requiredHint"> *</span></p>
             
             <#include "menuManagement--classIntersections.ftl">
             
@@ -72,7 +72,7 @@
                 <#--Adding a default class for "ALL" in case all classes selected-->
                 <li class="ui-state-default" role="menuitem">
                     <input type="checkbox" name="allSelected" id="allSelected" value="all" <#if !isIndividualsForClassesPage?has_content>checked</#if> />
-                    <label class="inline" for="All"> All</label>
+                    <label class="inline" for="All"> ${i18n().all_capitalized}</label>
                 </li>
                 <#list classGroup as classInClassGroup>
                 <li class="ui-state-default" role="menuitem">
@@ -92,9 +92,9 @@
             </ul>
         </section>
         
-        <input type="submit" name="submit-${menuAction}" value="Save changes" class="submit" role="input" /> or <a class="cancel" href="${cancelUrl}" title="cancel">Cancel</a>
+        <input type="submit" name="submit-${menuAction}" value="${i18n().save_changes}" class="submit" role="input" /> ${i18n().or} <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
 
-        <p class="requiredHint">* required fields</p>
+        <p class="requiredHint">* ${i18n().required_fields}</p>
     </form>
 </section>
 

webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl

@@ -11,15 +11,15 @@
 </#if>
 
 
-<h2>Create a new ${typeName}</h2>
+<h2>${i18n().create_new} ${typeName}</h2>
 
 <#if submissionErrors?has_content >
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         <#list submissionErrors?keys as errorFieldName>
         	<#if  errorFieldName == "label">
-        	    Please enter a value in the name field.
+        	    ${i18n().enter_value_name_field}
     	    </#if>
     	    <br />
     	</#list>
@@ -36,17 +36,17 @@
     <form id="newIndividual" class="customForm noIE67" action="${submitUrl}"  role="add new individual">
  
       <p>
-          <label for="name">Name ${requiredHint}</label>
+          <label for="name">${i18n().name} ${requiredHint}</label>
           <input size="30"  type="text" id="label" name="label" value="" />
       </p>
 
       <p class="submit">
           <input type="hidden" name = "editKey" value="${editKey}"/>
-          <input type="submit" id="submit" value="Create ${typeName}"/>
+          <input type="submit" id="submit" value="${i18n().create_capitalized} ${typeName}"/>
-          <span class="or"> or <a class="cancel" href="${urls.base}/siteAdmin" title="cancel">Cancel</a>
+          <span class="or"> or <a class="cancel" href="${urls.base}/siteAdmin" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
       </p>
 
-      <p id="requiredLegend" class="requiredHint">* required fields</p>
+      <p id="requiredLegend" class="requiredHint">* ${i18n().required_fields}</p>
 
     </form>
 

webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl

@@ -21,9 +21,9 @@
                        
                 <section id="selectContentType" name="selectContentType" ${selectClassGroupStyle} role="region">     
                     
-                    <label for="selectClassGroup">Class Group<span class="requiredHint"> *</span></label>
+                    <label for="selectClassGroup">${i18n().class_group_all_caps}<span class="requiredHint"> *</span></label>
                     <select name="selectClassGroup" id="selectClassGroup" role="combobox">
-                        <option value="-1" role="option">Select one</option>
+                        <option value="-1" role="option">${i18n().select_one}</option>
                         <#list classGroups as aClassGroup>
                             <option value="${aClassGroup.URI}"  role="option">${aClassGroup.publicName}</option>
                         </#list>
@@ -33,7 +33,7 @@
                 
                 <section id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
                     <#-- Select classes in a class group -->    
-                    <p id="selectClassesMessage" name="selectClassesMessage">Select content to display<span class="requiredHint"> *</span></p>
+                    <p id="selectClassesMessage" name="selectClassesMessage">${i18n().select_content_display}<span class="requiredHint"> *</span></p>
 
                     <#include "pageManagement--classIntersections.ftl">
 
@@ -41,7 +41,7 @@
                         <#--Adding a default class for "ALL" in case all classes selected-->
                         <li class="ui-state-default" role="menuitem">
                             <input type="checkbox" name="allSelected" id="allSelected" value="all" checked="checked" />
-                            <label class="inline" for="All"> All</label>
+                            <label class="inline" for="All"> ${i18n().all_capitalized}</label>
                         </li>
                         <#list classGroup as classInClassGroup>
                         <li class="ui-state-default" role="menuitem">
@@ -51,9 +51,9 @@
                         </li>
                         </#list>
                     </ul><br />
-                    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Save this content" />
+                    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" />
                     <#if menuAction == "Add">
-                        <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
+                        <span id="cancelContent"> ${i18n().or} <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
                     </#if>
                 </section>
             </section>

webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl

@@ -2,13 +2,13 @@
 <#--This contains the template for the fixed HTML content type that is to be cloned and used in page management-->
 
 <section id="fixedHtml" class="contentSectionContainer">
-    <label id="fixedHTMLVariableLabel" for="fixedHTMLVariable">Variable Name<span class="requiredHint"> *</span></label>
+    <label id="fixedHTMLVariableLabel" for="fixedHTMLVariable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
     <input type="text" name="saveToVar" size="20" value="" id="fixedHTMLSaveToVar" role="input" />
-    <label id="fixedHTMLValueLabel" for="fixedHTMLValue">Enter fixed HTML here<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label>
+    <label id="fixedHTMLValueLabel" for="fixedHTMLValue">${i18n().enter_fixed_html_here}<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label>
     <textarea id="fixedHTMLValue" name="htmlValue" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
-    <input  type="button" id="doneWithContent" name="doneWithContent" value="Save this content" class="doneWithContent" />
+    <input  type="button" id="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" class="doneWithContent" />
     <#if menuAction == "Add">
-        <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
+        <span id="cancelContent"> ${i18n().or} <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
     </#if>
 </section>
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processFixedHTMLDataGetterContent.js"></script>')}

webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl

@@ -1,16 +1,16 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 <#--This contains the template for the Sparql Query content type that is to be cloned and used in page management-->
 <section id="sparqlQuery" class="contentSectionContainer">
-    <label id="variableLabel" for="variable">Variable Name<span class="requiredHint"> *</span></label>
+    <label id="variableLabel" for="variable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
     <input type="text" name="saveToVar" size="20" value="" id="saveToVar" role="input" />
     <#--Hiding query model for now-->
-    <#-- <label id="queryModelLabel" for="queryModel">Query Model</label>  -->
+    <#-- <label id="queryModelLabel" for="queryModel">${i18n().query_model}</label>  -->
     <input type="text" name="queryModel" size="20" value="" id="queryModel" role="input" style="display:none"/>
-    <label id="queryLabel" for="queryLabel"><span id="querySpan">Enter SPARQL query here</span><span class="requiredHint"> *</span></label>
+    <label id="queryLabel" for="queryLabel"><span id="querySpan">${i18n().enter_sparql_query_here}</span><span class="requiredHint"> *</span></label>
     <textarea id="query" name="query" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
-    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Save this content" />
+    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" />
     <#if menuAction == "Add">
-        <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
+        <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
     </#if>
 </section>
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processSparqlDataGetterContent.js"></script>')}

webapp/web/templates/freemarker/edit/forms/pageManagement.ftl

@@ -12,8 +12,8 @@
 <#assign menuLinkText = "" />
 <#assign menuPosition = pageData.highestMenuPosition />
 <#assign addMenuItem = "" />
-<#assign pageHeading = "Add New Page" />
+<#assign pageHeading = "${i18n().add_new_page}" />
-<#assign saveBtnText = "Save new page" />
+<#assign saveBtnText = "${i18n().save_new_page}" />
 <#if pageData.addMenuItem?has_content>
 	<#assign addMenuItem = pageData.addMenuItem />
 </#if>
@@ -27,8 +27,8 @@
 	<#assign menuLinkText =  lvf.getFormFieldValue(editSubmission, editConfiguration, "menuLinkText")/>
 	<#assign customTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "customTemplate")/>
 	<#assign selfContainedTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "isSelfContainedTemplate")/>
-	<#assign pageHeading = "Edit ${pageName} Page" />
+	<#assign pageHeading = "${i18n().edit_page(pageName)}" />
-    <#assign saveBtnText = "Save changes" />
+    <#assign saveBtnText = "${i18n().save_changes}" />
 	<#if customTemplate?has_content>
 	    <#if selfContainedTemplate?has_content>
 		    <#assign selectedTemplateType = "selfContained" />
@@ -49,7 +49,7 @@
 
 <#------------HTML Portion------------->
 <section id="error-alert" role="alert" <#if !submissionErrors?has_content>class="hidden"</#if>>
-    <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+    <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
     <p>
     <#if submissionErrors?has_content>
     	<#list submissionErrors?keys as errorFieldName>
@@ -70,13 +70,13 @@
     <section id="floatRight">
         <div id="rightSide" <#if selectedTemplateType="selfContained">style="display:none;"</#if>>
             <section id="addPageOne" role="region" >
-            <label for="contentType">Content Type<span class="requiredHint"> *</span></label> 
+            <label for="contentType">${i18n().content_type}<span class="requiredHint"> *</span></label> 
             <select id="typeSelect"  name="typeSelect" >
-                <option value="" selected="selected">Select a type</option>
+                <option value="" selected="selected">${i18n().select_type}</option>
-                <option value="browseClassGroup">Browse Class Group</option>           
+                <option value="browseClassGroup">${i18n().browse_class_group}</option>           
-                <option value="fixedHtml">Fixed HTML</option>           
+                <option value="fixedHtml">${i18n().fixed_html}</option>           
-                <option value="sparqlQuery">SPARQL Query Results</option>           
+                <option value="sparqlQuery">${i18n().sparql_query_results}</option>           
-             </select>&nbsp;<span class="note">Add one or more types</span>
+             </select>&nbsp;<span class="note">${i18n().add_types}</span>
             </section>
             <section id="contentDivs"></section>
             <section id="headerBar" >
@@ -91,27 +91,27 @@
     <!--Information for page or menu item level-->
     <div id="leftSide">
         <section id="pageDetails" role="region" >
-            <label for="page-name">Title<span class="requiredHint"> *</span></label>
+            <label for="page-name">${i18n().title_capitalized}<span class="requiredHint"> *</span></label>
             <input id="pageName" type="text" name="pageName" value="${pageName!''}" role="input" />
-            <label for="pretty-url">Pretty URL<span class="requiredHint"> *</span></label> 
+            <label for="pretty-url">${i18n().pretty_url}<span class="requiredHint"> *</span></label> 
             <input type="text" name="prettyUrl" value="${prettyUrl!''}" role="input" />
-            <p class="note">Must begin with a leading forward slash: / <br />(e.g., /people)</p>
+            <p class="note">${i18n().begin_with_slash_no_example} <br />${i18n().slash_example}</p>
-            <p id="templatePTag">Template<span class="requiredHint"> *</span></p>
+            <p id="templatePTag">${i18n().template_capitalized}<span class="requiredHint"> *</span></p>
             <input type="radio" class="default-template" name="selectedTemplate" value="default" <#if selectedTemplateType = "default">checked="checked"</#if> role="radio" />
-            <label class="inline" for="default"> Default</label>
+            <label class="inline" for="default"> ${i18n().default}</label>
             <br />
             <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked="checked"</#if> role="input" />
-            <label class="inline" for="custom"> Custom template requiring content</label>
+            <label class="inline" for="custom"> ${i18n().custom_template_requiring_content}</label>
             <br /><div id="selfContainedDiv">
             <input type="radio" name="selectedTemplate" class="selfContained-template" value="selfContained" <#if selectedTemplateType = "selfContained">checked="checked"</#if> role="input" />
-            <label class="inline" for="selfContained"> Custom template containing all content</label></div>
+            <label class="inline" for="selfContained"> ${i18n().custom_template_containing_content}</label></div>
             <section id="custom-template" <#if selectedTemplateType ="default">class="hidden" </#if>role="region">
                 <input type="text" name="customTemplate" value="${customTemplate!''}" size="33" role="input" /><span class="requiredHint"> *</span>
                 <input type="hidden" name="selfContainedTemplate" value="${selfContainedTemplate!''}"/>
             </section>
             <p id="menuCheckboxPTag"><input id="menuCheckbox" type="checkbox" name="menuCheckbox"
             <#if (menuAction="Edit" && menuItem?has_content) || (menuAction="Add" && addMenuItem = "true")>checked="checked"</#if>
-            > This is a menu page</p>
+            > ${i18n().a_menu_page}</p>
             <section id="menu" role="region" 
             <#--Do not display menu section unless editing an existing menu item-->
             <#if (menuAction = "Add" && addMenuItem != "true")  || (menuAction="Edit" && (!menuItem?has_content || menuItem = "")) >
@@ -120,20 +120,20 @@
             class="showMenuSection"
             </#if>
             >
-                <label for="default">Menu Item Name</label>
+                <label for="default">${i18n().menu_item_name}</label>
                 <input type="hidden" id="menuItem" name="menuItem" value="${menuItem!''}" />
                 <input type="text" id="menuLinkText" name="menuLinkText" value="${menuLinkText!''}" size="28" role="input" />
                 <input type="hidden" id="menuPosition" name="menuPosition" value="${menuPosition!''}" />
-                <p class="note">If left blank, the page title will be used.</p>
+                <p class="note">${i18n().if_blank_page_title_used}</p>
             </section>
             <br />
         </section>
     </div>
     <section >
         <span id="saveButton" ><input  id="pageSave" type="submit" name="submit-Add" value="${saveBtnText}" class="submit" role="input" /> or </span> 
-        <a class="cancel" href="${cancelUrl!}"  id="cancelPage" >Cancel</a>
+        <a class="cancel" href="${cancelUrl!}"  id="cancelPage" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
         <br />
-        <p class="requiredHint">* required fields</p>
+        <p class="requiredHint">* ${i18n().required_fields}</p>
     </section>
     <!--Hidden input with JSON objects added will be included here.  This is the field with the page content information
     mirroring what is required by the Data getter server side objects. -->

webapp/web/templates/freemarker/edit/forms/rdfTypeForm.ftl

@@ -22,12 +22,12 @@
             
             <p>
                 <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button "/>
-                <span class="or"> or </span>
+                <span class="or"> ${i18n().or} </span>
-                <a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a>
+                <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
             </p>
         </form>
     <#else>
-        <p> There are no Classes in the system from which to select.  </p>  
+        <p> ${i18n().no_classes_to_select}  </p>  
     </#if>
 
 <#if editConfiguration.propertyOfferCreateNewOption = true>
@@ -36,7 +36,7 @@
 </#if>
 
 <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false>
-<p>This property is currently configured to prohibit editing. </p>
+<p>${i18n().editing_prohibited} </p>
 </#if>
 
 <#if editConfiguration.includeDeletionForm = true>

webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl

@@ -1,12 +1,12 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#assign actionText = "Add new" />
+<#assign actionText = "${i18n().add_new}" />
 <#if editConfiguration.dataPropertyStatement?has_content>
-    <#assign actionText = "Edit"/>
+    <#assign actionText = "${i18n().edit_capitalized}"/>
 </#if>
-<#assign submitLabel>${actionText} label</#assign>
+<#assign submitLabel>${actionText} ${i18n().label}</#assign>
 
-<h2>${actionText} <em>label</em> for ${editConfiguration.subjectName}</h2>
+<h2>${actionText} <em>${i18n().label}</em> for ${editConfiguration.subjectName}</h2>
 
 <#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
 
@@ -17,7 +17,7 @@
     
     <p class="submit">
         <input type="submit" id="submit" value="${submitLabel}" role="input"/>
-        or <a href="${cancelUrl}" class="cancel" title="cancel">Cancel</a>
+        or <a href="${cancelUrl}" class="cancel" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </p>
     
 </form>

webapp/web/templates/freemarker/lib/lib-home-page.ftl

@@ -18,7 +18,7 @@
     <#assign selected = 'class="selected" ' />
     <#assign classGroupList>
         <section id="home-stats" class="home-sections" >
-            <h4>Statistics</h4>
+            <h4>${i18n().statistics}</h4>
             <ul id="stats">
                 <#assign groupCount = 1>
                 <#list classGroups as group>
@@ -31,6 +31,7 @@
                         <#if !firstPopulatedClassGroup??>
                             <#assign firstPopulatedClassGroup = group />
                         </#if>
+                        <#-- MAY BE NECESSARY FOR A SITE TO UPDATE THIS LINE BASED ON HOW IT CUSTOMIZES CLASS GROUP NAMES -->
                         <#if group.displayName != "equipment" && group.displayName != "courses" >
                             <li>
                                 <a href="#">
@@ -61,14 +62,14 @@
     <#if firstPopulatedClassGroup??>
             ${classGroupList}
     <#else>
-        <h3 id="noContentMsg">There is currently no content in the system, or you need to create class groups and assign your classes to them.</h3>
+        <h3 id="noContentMsg">${i18n().no_content_create_groups_classes}</h3>
         
         <#if user.loggedIn>
             <#if user.hasSiteAdminAccess>
-                <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+                <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="${i18n().add_content_manage_site}">${i18n().add_content_manage_site}</a>${i18n().from_site_admin_page}</p>
             </#if>
         <#else>
-            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+            <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content.}</p>
         </#if>
     </#if>
             

webapp/web/templates/freemarker/lib/lib-properties.ftl

@@ -115,11 +115,11 @@ name will be used as the label. -->
 
 <#macro showAddLink propertyLocalName label url>
     <#if propertyLocalName == "informationResourceInAuthorship" || propertyLocalName == "webpage" || propertyLocalName == "hasResearchArea">
-        <a class="add-${propertyLocalName}" href="${url}" title="Manage list of ${label?lower_case}">
+        <a class="add-${propertyLocalName}" href="${url}" title="${i18n().manage_list_of} ${label?lower_case}">
-        <img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="manage" /></a>
+        <img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${i18n().manage}" /></a>
     <#else>
-        <a class="add-${propertyLocalName}" href="${url}" title="Add new ${label?lower_case} entry">
+        <a class="add-${propertyLocalName}" href="${url}" title="${i18n().add_new} ${label?lower_case} ${i18n().entry}">
-        <img class="add-individual" src="${urls.images}/individual/addIcon.gif" alt="add" /></a>
+        <img class="add-individual" src="${urls.images}/individual/addIcon.gif" alt="${i18n().add}" /></a>
     </#if>
 </#macro>
 
@@ -151,7 +151,7 @@ name will be used as the label. -->
 </#macro>
 
 <#macro showEditLink propertyLocalName url>
-    <a class="edit-${propertyLocalName}" href="${url}" title="edit this entry"><img class="edit-individual" src="${urls.images}/individual/editIcon.gif" alt="edit" /></a>
+    <a class="edit-${propertyLocalName}" href="${url}" title="${i18n().edit_entry}"><img class="edit-individual" src="${urls.images}/individual/editIcon.gif" alt="${i18n().edit_entry}" /></a>
 </#macro>
 
 <#macro deleteLink propertyLocalName statement> 
@@ -162,14 +162,14 @@ name will be used as the label. -->
 </#macro>
 
 <#macro showDeleteLink propertyLocalName url>
-    <a class="delete-${propertyLocalName}" href="${url}" title="delete this entry"><img  class="delete-individual" src="${urls.images}/individual/deleteIcon.gif" alt="delete" /></a>
+    <a class="delete-${propertyLocalName}" href="${url}" title="${i18n().delete_entry}"><img  class="delete-individual" src="${urls.images}/individual/deleteIcon.gif" alt="${i18n().delete_entry}" /></a>
 </#macro>
 
 <#macro verboseDisplay property>
     <#local verboseDisplay = property.verboseDisplay!>
     <#if verboseDisplay?has_content>       
         <section class="verbosePropertyListing">
-            <a class="propertyLink" href="${verboseDisplay.propertyEditUrl}" title="name">${verboseDisplay.localName}</a> 
+            <a class="propertyLink" href="${verboseDisplay.propertyEditUrl}" title="${i18n().name}">${verboseDisplay.localName}</a> 
             (<span>${property.type?lower_case}</span> property);
             order in group: <span>${verboseDisplay.displayRank};</span> 
             display level: <span>${verboseDisplay.displayLevel};</span>
@@ -194,15 +194,15 @@ name will be used as the label. -->
     <#-- Don't assume that if the mainImage property is populated, there is a thumbnail image (though that is the general case).
          If there's a mainImage statement but no thumbnail image, treat it as if there is no image. -->
     <#if (mainImage.statements)?has_content && thumbUrl?has_content>
-        <a href="${individual.imageUrl}" title="individual photo">
+        <a href="${individual.imageUrl}" title="${i18n().alt_thumbnail_photo}">
-        	<img class="individual-photo" src="${thumbUrl}" title="click to view larger image" alt="${individual.name}" width="${imageWidth!}" />
+        	<img class="individual-photo" src="${thumbUrl}" title="${i18n().click_to_view_larger}" alt="${individual.name}" width="${imageWidth!}" />
         </a>
         <@editingLinks "${mainImage.localName}" mainImage.first() editable />
     <#else>
-        <#local imageLabel><@addLinkWithLabel mainImage editable "Photo" /></#local>
+        <#local imageLabel><@addLinkWithLabel mainImage editable "${i18n().photo}" /></#local>
         ${imageLabel}
         <#if showPlaceholder == "always" || (showPlaceholder="with_add_link" && imageLabel?has_content)>
-            <img class="individual-photo" src="${placeholderImageUrl(individual.uri)}" title = "no image" alt="placeholder image" width="${imageWidth!}" />
+            <img class="individual-photo" src="${placeholderImageUrl(individual.uri)}" title = "${i18n().no_image}" alt="${i18n().placeholder_image}" width="${imageWidth!}" />
         </#if>
     </#if>
 </#macro>
@@ -214,7 +214,7 @@ name will be used as the label. -->
     <#if (labelCount > 1)  && editable >
         <span class="inline">
             <a id="manageLabels" href="${urls.base}/manageLabels?subjectUri=${individual.uri!}">
-                manage labels
+                ${i18n().manage_labels}
             </a>
         </span>
     <#else>

webapp/web/templates/freemarker/lib/lib-vitro-form.ftl

@@ -6,9 +6,8 @@
 <#macro unsupportedBrowser  urlsBase>
 <div id="ie67DisableWrapper">
     <div id="ie67DisableContent">
-	    <img src="${urlsBase}/images/iconAlertBig.png" alt="Alert Icon"/>
+	    <img src="${urlsBase}/images/iconAlertBig.png" alt="${i18n().alert_icon}"/>
-	    <p>This form is not supported in versions of Internet Explorer below version 8. Please upgrade your browser, or
+	    <p>${i18n().unsupported_ie_version}</p>
-	    switch to another browser, such as FireFox.</p>
     </div>
 </div>
 </#macro>

webapp/web/templates/freemarker/page/partials/copyright.ftl

@@ -4,7 +4,7 @@
     <div class="copyright">
         &copy;${copyright.year?c}
         <#if copyright.url??>
-            <a href="${copyright.url}" title="copyright">${copyright.text}</a>
+            <a href="${copyright.url}" title="${i18n().copyright}">${copyright.text}</a>
         <#else>
             ${copyright.text}
         </#if>                 

webapp/web/templates/freemarker/page/partials/footer.ftl

@@ -18,7 +18,7 @@
 
     <#include "copyright.ftl">
 
-    All Rights Reserved. <a href="${urls.termsOfUse}" title="terms of use">Terms of Use</a>
+    ${i18n().all_rights_reserved} <a href="${urls.termsOfUse}" title="${i18n().terms_of_use}">${i18n().terms_of_use}</a>
 
     <#include "version.ftl">
 </div>

webapp/web/templates/freemarker/page/partials/identity.ftl

@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <header id="branding" role="banner">
-    <h1 class="vivo-logo"><a href="${urls.home}" title="site name"><span class="displace">${siteName}</span></a></h1>
+    <h1 class="vivo-logo"><a href="${urls.home}" title="${siteName}"><span class="displace">${siteName}</span></a></h1>
     <#if siteTagline?has_content>
         <em>${siteTagline}</em>
     </#if>
@@ -11,31 +11,31 @@
             <#include "languageSelector.ftl">
             <#if user.loggedIn>
                 <li role="listitem">${user.loginName}</li>
-                <li role="listitem"><a href="${urls.logout}" title="End your session">Log out</a></li>
+                <li role="listitem"><a href="${urls.logout}" title="${i18n().end_your_Session}">${i18n().log_out}</a></li>
                 <#if user.hasSiteAdminAccess>
-                    <li role="listitem"><a href="${urls.siteAdmin}" title="Manage this site">Site Admin</a></li>
+                    <li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().manage_site}">${i18n().site_admin}</a></li>
                 </#if>
             <#else>
-                <li role="listitem"><a href="${urls.login}" title="Log in to manage this site" >Log in</a></li>
+                <li role="listitem"><a href="${urls.login}" title="${i18n().login_to_manage_site}" >${i18n().login_button}</a></li>
             </#if>
             <#-- List of links that appear in submenus, like the header and footer. -->
-                <li role="listitem"><a href="${urls.about}" title="More details about this site">About</a></li>
+                <li role="listitem"><a href="${urls.about}" title="${i18n().more_details_about_site}">${i18n().about}</a></li>
             <#if urls.contact??>
-                <li role="listitem"><a href="${urls.contact}" title="Send us your feedback or ask a question">Contact Us</a></li>
+                <li role="listitem"><a href="${urls.contact}" title="${i18n().send_feedback_questions}">${i18n().contact_us}</a></li>
             </#if>
-                <li role="listitem"><a href="http://www.vivoweb.org/support" title="Visit the national project web site" target="blank">Support</a></li>
+                <li role="listitem"><a href="http://www.vivoweb.org/support" title="${i18n().visit_project_website}" target="blank">${i18n().support}</a></li>
-                <li role="listitem"><a href="${urls.index}" title="View an outline of the content in this site">Index</a></li>
+                <li role="listitem"><a href="${urls.index}" title="${i18n().view_content_index}">${i18n().index}</a></li>
         </ul>
     </nav>
     
     <section id="search" role="region">
         <fieldset>
-            <legend>Search form</legend>
+            <legend>${i18n().search_form}</legend>
             
             <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST"> 
                 <div id="search-field">
                     <input type="text" name="querytext" class="search-vitro" value="${querytext!}" autocapitalize="off" />
-                    <input type="submit" value="Search" class="submit">
+                    <input type="submit" value="${i18n().search_button}" class="submit">
                 </div>
             </form>
         </fieldset>

webapp/web/templates/freemarker/page/partials/languageSelector.ftl

@@ -10,7 +10,7 @@
 <#if selectLocale??>
     <li>
       <#list selectLocale.locales as locale>
-        <a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}">
+        <a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale}">
           <img src="${locale.imageUrl}" height="15" align="middle" alt="${locale.label}"/>
         </a>
         <#if locale_has_next>|</#if>

webapp/web/templates/freemarker/page/partials/menu.ftl

@@ -3,7 +3,7 @@
 <nav role="navigation">
     <ul id="main-nav" role="list">
         <#list menu.items as item>
-            <li role="listitem"><a href="${item.url}" <#if item.active> class="selected" </#if> title="menu item">${item.linkText}</a></li>
+            <li role="listitem"><a href="${item.url}" <#if item.active> class="selected" </#if> title="${i18n().menu_item}">${item.linkText}</a></li>
         </#list>
     </ul>
 </nav>

webapp/web/templates/freemarker/page/partials/search.ftl

@@ -2,8 +2,8 @@
 
 <div id="searchBlock">
     <form id="searchForm" action="${urls.search}" accept-charset="UTF-8" method="POST">                    
-        <label for="search">Search </label>
+        <label for="search">${i18n().search_button}</label>
         <input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" autocapitalize="off" />
-        <input class="search-form-submit" name="submit" type="submit"  value="Search" />
+        <input class="search-form-submit" name="submit" type="submit"  value="${i18n().search_button}" />
     </form>
 </div> <!-- end searchBlock -->

webapp/web/templates/freemarker/page/partials/subMenuLinks.ftl

@@ -6,5 +6,5 @@
 <#if urls.contact??>
     <li><a href="${urls.contact}">Contact Us</a></li>
 </#if> 
-<li><a href="http://www.vivoweb.org/support" title="support">Support</a></li>
+<li><a href="http://www.vivoweb.org/support" title="${i18n().support}">${i18n().support}</a></li>
-<li><a href="${urls.index}" title="index">Index</a></li>
+<li><a href="${urls.index}" title="${i18n().index}">${i18n().index}</a></li>

webapp/web/templates/freemarker/page/partials/version.ftl

@@ -5,6 +5,6 @@
 <#-- Only show version info if user has access -->
 <#if user.hasRevisionInfoAccess>
     <div id="revision">
-        Version <a href="${version.moreInfoUrl}" title="version">${version.label}</a>
+        ${i18n().version} <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a>
     </div>
 </#if>

webapp/web/templates/freemarker/widgets/widget-browse.ftl

@@ -12,12 +12,12 @@
 
 <#macro allClassGroups>
     <section id="browse" role="region">
-        <h4>Browse</h4>
+        <h4>${i18n().browse_capitalized}</h4>
         
         <ul id="browse-classgroups" role="list">
         <#list vclassGroupList as group>
             <#if (group.individualCount > 0)>
-                <li role="listitem"><a href="${urls.currentPage}?classgroupUri=${group.uri?url}" title="group name">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
+                <li role="listitem"><a href="${urls.currentPage}?classgroupUri=${group.uri?url}" title="${i18n().group_name}">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
             </#if>
         </#list>
         </ul>
@@ -28,14 +28,14 @@
 
 <#macro classGroup>
     <section id="browse" role="region">
-        <h4>Browse</h4>
+        <h4>${i18n().browse_capitalized}</h4>
         
          <section id="browse-classes" role="navigation">
              <nav>
                  <ul id="classes-in-classgroup" role="list">
                      <#list classes as class>
                         <#if (class.individualCount > 0)>
-                            <li role="listitem"><a href="${urls.currentPage}?classgroupUri=${classGroup.uri?url}&vclassUri=${class.uri?url}" title="class name">${class.name} <span class="count-individuals"> (${class.individualCount})</span></a></li>
+                            <li role="listitem"><a href="${urls.currentPage}?classgroupUri=${classGroup.uri?url}&vclassUri=${class.uri?url}" title="${i18n().class_name}">${class.name} <span class="count-individuals"> (${class.individualCount})</span></a></li>
                         </#if>
                      </#list>
                  </ul>
@@ -46,7 +46,7 @@
 
 <#macro vclass>
     <section id="browse" role="region">
-    <h4>Browse</h4>    
+    <h4>${i18n().browse_capitalized}</h4>    
         <div>
             vclass ${class.name} from ${classGroup.displayName}
             This has classGroup, classes, individualsInClass and class.
@@ -54,14 +54,14 @@
          
         <ul>
             <#list individualsInClass as ind>
-                <li><a href="${urls.base}/individual?uri=${ind.uri?url}" title="individual name">${ind.name}</a></li>
+                <li><a href="${urls.base}/individual?uri=${ind.uri?url}" title="${i18n().individual_nam}">${ind.name}</a></li>
             </#list>
         </section>
 </#macro>
 
 <#macro vclassAlpha>
     <section id="browse" role="region">
-    <h4>Browse</h4>     
+    <h4>${i18n().browse_capitalized}</h4>     
-        <div>vclassAlpha is not yet implemented.</div> 
+        <div>${i18n().vclassAlpha_not_implemented}</div> 
     </section>
 </#macro>

webapp/web/templates/freemarker/widgets/widget-login.ftl

@@ -22,14 +22,14 @@
     <#if currentServlet != 'home'>
         <noscript>
             <section id="error-alert">
-                <img src="${urls.images}/iconAlertBig.png" alt="Alert Icon"/>
+                <img src="${urls.images}/iconAlertBig.png" alt="${i18n().alert_icon}"/>
-                <p>In order to edit content, you'll need to enable JavaScript. Here are the <a href="http://www.enable-javascript.com" title="java script instructions">instructions for enabling JavaScript in your web browser</a>.</p>
+                <p>${i18n().javascript_require_to_edit} <a href="http://www.enable-javascript.com" title="${i18n().javascript_instructions}">${i18n().to_enable_javascript}</a>.</p>
             </section>
         </noscript>
     </#if>
 
     <section id="login" class="hidden">
-        <h2>Log in</h2>
+        <h2>${i18n().login_button}</h2>
     
         <#if infoMessage??>
             <h3>${infoMessage}</h3>
@@ -38,7 +38,7 @@
         <#if errorMessage??>
             <#assign infoClassShow = ' id="vivoAccountError"'/>
         
-            <section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alert="Error alert icon" />
+            <section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alt="${i18n().error_alert_icon}" />
                 <p class="login-alert">${errorMessage}</p>
             </section>
         </#if>
@@ -47,29 +47,29 @@
             <#if externalAuthUrl??>
                 <#assign infoClassHide = 'class="vivoAccount"'/>
             
-                <p class="external-auth"><a class="blue button" href="${externalAuthUrl}" title="external authentication name">${externalAuthName}</a></p>
+                <p class="external-auth"><a class="blue button" href="${externalAuthUrl}" title="${i18n().external_auth_name}">${externalAuthName}</a></p>
                 <!--<p class="or-auth">or</p>-->
-                <h3 class="internal-auth"><!--Log in using your--> <b>or</b> ${siteName} account</h3>
+                <h3 class="internal-auth"><!--Log in using your--> <b>${i18n().or}</b> ${siteName} ${i18n().account}</h3>
                 
             </#if>
             
             <div ${infoClassHide} ${infoClassShow}>
             
-                <label for="loginName">Email</label>
+                <label for="loginName">${i18n().email_capitalized}</label>
                 <input id="loginName" name="loginName" class="text-field focus" type="text" value="${loginName!}" autocapitalize="off" required autofocus />
 
-                <label for="loginPassword">Password</label>
+                <label for="loginPassword">${i18n().password_capitalized}</label>
                 <input id="loginPassword" name="loginPassword" class="text-field" type="password" required />
           
-                <p class="submit"><input name="loginForm" class="green button" type="submit" value="Log in"/></p>
+                <p class="submit"><input name="loginForm" class="green button" type="submit" value="${i18n().login_button}"/></p>
           
                 <#-- NC: remember me won't be ready for r1.2
                 <input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />  
                 <label class="label-remember-me" for="remember-me">Remember me</label> -->
                 <#-- mb863: forgot password and request an account won't be part of VIVO r1.2
                 <p class="forgot-password"><a href="#" title="forgot password">Forgot your password?</a></p>
-                <p class="request-account"><a class="blue button" href="#" title="request an account">Request an account</a> </p> -->
+                <p class="request-account"><a class="blue button" href="#" title="request an account">Request an account</a> </p>
-            
+                -->
             </div>
         </form>
 
@@ -78,33 +78,33 @@
 
 <#macro forcePasswordChange>
     <section id="login">
-        <h2>Change Password to Log in</h2>
+        <h2>${i18n().change_password_to_login}</h2>
            
             <#if errorMessage??>
-                <div id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
+                <div id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}"/>
                     <p>${errorMessage}</p>
                 </div>
             </#if>
            
             <form role="form" id="login-form" action="${formAction}" method="post" name="login-form" />
-                <label for="newPassword">New Password</label>
+                <label for="newPassword">${i18n().new_password_capitalized}</label>
                 <input id="newPassword" name="newPassword" class="text-field focus" type="password" required autofocus/>
                 
-                <p class="password-note">Minimum of 6 characters in length.</p>
+                <p class="password-note">${i18n().minimum_six_chars}</p>
                 
-                <label for="confirmPassword">Confirm Password</label>
+                <label for="confirmPassword">${i18n().confirm_password_capitalized}</label>
                 <input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />
                 
-                 <p class="submit-password"><input name="passwordChangeForm" class="green button" type="submit" value="Log in"/> <span class="or">or <a class="cancel" href="${cancelUrl}" title="cancel">Cancel</a></span></p>
+                 <p class="submit-password"><input name="passwordChangeForm" class="green button" type="submit" value="${i18n().login_button}"/> <span class="or">or <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span></p>
             </form>
     </section>
 </#macro>
 
 <#macro alreadyLoggedIn>
-    <h2>Log in</h2>
+    <h2>${i18n().login_button}</h2>
-    <p>You are already logged in.</p>
+    <p>${i18n().already_logged_in}</p>
 </#macro>
 
 <#macro error>
-    <p>There was an error in the system.</p>
+    <p>${i18n().we_have_an_error}</p>
 </#macro>

webapp/web/templates/freemarker/widgets/widget-test.ftl

@@ -10,14 +10,14 @@
 
 <#macro loggedIn>
     <div class="testWidget">
-        <h4>This is the test widget for logged-in users.</h4>    
+        <h4>${i18n().test_for_logged_in_users}</h4>    
-        <p>Login status: ${status}.</p>
+        <p>${i18n().login_status} ${status}.</p>
     </div>
 </#macro>
 
 <#macro notLoggedIn>
     <div class="testWidget">
-        <h4>This is the test widget for non-logged-in users.</h4>    
+        <h4>${i18n().test_for_nonlogged_in_users}</h4>    
-        <p>Login status: ${status}.</p>
+        <p>${i18n().login_status} ${status}.</p>
     </div>
 </#macro>