From a528b9f2f073cf458a8f0af5e460244c058b66b0 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Wed, 30 Nov 2016 18:01:36 -0500
Subject: [PATCH] OPAC Updates related to page text and translations. Also
 required are the en-PINES.po custom text file and the es-ES.po translation
 file.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

Conflicts:
	Open-ILS/src/templates/opac/parts/advanced/search.tt2
	Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
---
 Open-ILS/src/templates/opac/advanced.tt2           |  4 +-
 Open-ILS/src/templates/opac/browse.tt2             |  4 +-
 Open-ILS/src/templates/opac/myopac/circs.tt2       |  8 ++--
 .../src/templates/opac/myopac/hold_history.tt2     |  2 +-
 Open-ILS/src/templates/opac/myopac/holds.tt2       | 21 +++++------
 Open-ILS/src/templates/opac/myopac/lists.tt2       |  7 ++--
 Open-ILS/src/templates/opac/myopac/main.tt2        |  4 +-
 .../src/templates/opac/myopac/messages/list.tt2    |  3 +-
 Open-ILS/src/templates/opac/myopac/prefs.tt2       | 13 +++----
 .../src/templates/opac/myopac/prefs_my_lists.tt2   |  4 +-
 .../src/templates/opac/parts/advanced/expert.tt2   |  4 +-
 .../src/templates/opac/parts/advanced/numeric.tt2  |  4 +-
 .../src/templates/opac/parts/advanced/search.tt2   |  9 +++--
 Open-ILS/src/templates/opac/parts/footer.tt2       | 14 +++----
 Open-ILS/src/templates/opac/parts/homesearch.tt2   | 10 ++---
 Open-ILS/src/templates/opac/parts/login/form.tt2   |  8 ++++
 Open-ILS/src/templates/opac/parts/login/help.tt2   |  4 +-
 .../templates/opac/parts/login/password_hint.tt2   |  2 +-
 .../src/templates/opac/parts/myopac/main_base.tt2  |  5 +--
 .../src/templates/opac/parts/pref_lib_display.tt2  |  2 +-
 .../src/templates/opac/parts/record/cnbrowse.tt2   |  2 +-
 .../src/templates/opac/parts/record/contents.tt2   |  2 +-
 .../templates/opac/parts/record/copy_counts.tt2    |  2 +-
 .../src/templates/opac/parts/record/copy_table.tt2 |  4 +-
 .../src/templates/opac/parts/record/extras.tt2     |  6 +--
 .../src/templates/opac/parts/record/navigation.tt2 |  8 ++--
 .../src/templates/opac/parts/record/subjects.tt2   |  2 +-
 .../src/templates/opac/parts/record/summary.tt2    | 43 +---------------------
 .../src/templates/opac/parts/result/facets.tt2     |  2 +-
 .../src/templates/opac/parts/result/paginate.tt2   |  2 +-
 Open-ILS/src/templates/opac/parts/result/table.tt2 | 10 +++--
 Open-ILS/src/templates/opac/parts/topnav_links.tt2 |  4 +-
 Open-ILS/src/templates/opac/register.tt2           |  7 ++--
 Open-ILS/src/templates/opac/results.tt2            |  6 +--
 34 files changed, 96 insertions(+), 136 deletions(-)

diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index e113da800f..96b2b4d1bc 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -11,7 +11,7 @@
     <div id="search-wrapper">
         <div id="search-box">
             <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home') %]"
-                    id="home_adv_search_link">[%l('Basic Search')%]</a></span>
+                    id="home_adv_search_link">[%l('Search the Catalog')%]</a></span>
             <span class="search_catalog_lbl mobile_hide">[% l('Advanced Search') %]</span>
             <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[%
                     l('Browse the Catalog')%]</a></span>
@@ -26,7 +26,7 @@
                     id="num_search">[% l('Numeric Search') %]</a>
                 <a href="[% mkurl('', {pane => 'expert'}) %]"
                     [% IF pane == 'expert' %]class="on" [% END %]
-                    id="expert_search">[% l('MARC Record Search') %]</a>
+                    id="expert_search">[% l('Expert Search') %]</a>
             </div>
         </div>
     </div>
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2
index 5dac51535c..d92bc12cae 100644
--- a/Open-ILS/src/templates/opac/browse.tt2
+++ b/Open-ILS/src/templates/opac/browse.tt2
@@ -44,9 +44,7 @@
             <div id="browse-the-catalog">
                 <div id="browse-controls" class='searchbar'>
 				    <p style="font-style:italic;font-weight:normal;width:100%;max-width:800px;">
-					    Browse through a virtual index of titles, authors, subjects, or series for a
-					    particular library, for a library system, or for all of PINES. If browsing
-						by author, type in the first letters of the last name.
+                        [% l('PINES Browse Note') %]
 					</p>
                     <form method="get" onsubmit="$('browse-submit-spinner').className = ''; return true">
                         <input type="hidden" name="blimit"
diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2
index e2b54097a3..7ca69a02b8 100644
--- a/Open-ILS/src/templates/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circs.tt2
@@ -23,10 +23,9 @@
 
 
     <div class="header_middle">
-        <span class="float-left">[% l('Items Currently Checked Out') %]</span>
+        <span class="float-left">[% l('Current Items Checked Out') %]</span>
     </div>
-	<p>If you are having trouble renewing your items, please contact your 
-		<a href="http://pines.georgialibraries.org/pinesLocator/locator.html">local library</a>.</p>
+	<p>[% l("PINES Renewal Tip") %]</p>
 
     <div class="clear-both"></div>
     [% IF ctx.circs.size < 1 %]
@@ -211,8 +210,7 @@
                     END %]
                 </tbody>
             </table>
-			<p style="font-style:italic;">* You will be unable to renew items if other patrons have holds on them, 
-			if your account is expired, or if you have more than $10.00 in fines and fees.</p>
+			<p style="font-style:italic;">[% l("PINES Renewal Note") %]</p>
         </form>
     </div>
     [% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
index f6998f5401..f338617f77 100644
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -29,7 +29,7 @@
     </div>
 
     <div class="header_middle">
-        <span style="float:left;">[% l("Previously Requested Items") %]</span>
+        <span style="float:left;">[% l("Previously Held Items") %]</span>
 		<!-- HIDE BECAUSE OF BUG
         <span class='float-left' style='padding-left: 10px;'>
             <a href='[% mkurl('hold_history', {limit => limit,offset => (offset - limit)}) %]'
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index 14bf25c066..1098ce8350 100644
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -33,7 +33,7 @@
             [%  IF CGI.param("available");
                     l("Items Ready for Pickup");
                 ELSE;
-                    l("Items Currently On Hold");
+                    l("Current Items on Hold");
                 END
             %]
         </span>
@@ -59,8 +59,7 @@
     </div>
     <div class="clear-both"></div>
     <div id='holds_main'>
-		<p>If you require assistance placing a hold or have a question about a hold that you have placed, please contact your 
-		<a href="http://pines.georgialibraries.org/pinesLocator/locator.html">local library</a>.</p>
+		<p>[% l("PINES Hold Tip") %]</p>
         <form method="post">
         <table class="table_no_border_space table_no_cell_pad opac-auto-097"
             title="[% l('Actions for Items on Hold') %]">
@@ -71,10 +70,10 @@
                         <option id='myopac_holds_actions_none' value=''>
                         -- [% l("Actions for selected holds") %] --
                         </option>
-                        <option value='suspend'>[% l("Suspend selected holds") %]</option>
-                        <option value='activate'>[% l("Activate selected holds") %]</option>
+                        <option value='suspend'>[% l("Suspend") %]</option>
+                        <option value='activate'>[% l("Activate") %]</option>
                         <!-- XXX maybe later <option value='thaw_date'>[% l("Set Active Date") %]</option> -->
-                        <option value='cancel'>[% l("Cancel selected holds") %]</option>
+                        <option value='cancel'>[% l("Cancel") %]</option>
                     </select>
                 </td>
                 <td style="padding-left:9px;">
@@ -98,10 +97,10 @@
                 <td align="right">
                     [% IF CGI.param("available") -%]
                     <a href="[% mkurl('holds', {}, ['limit','offset','available']) %]">[% l('Show all holds') %]</a> |
-                    <strong>[% l("Holds that are ready to pick up") %]</strong>
+                    <strong>[% l("Show only available holds") %]</strong>
                     [% ELSE -%]
-                    <strong>[% l("All holds") %]</strong> |
-                    <a href="[% mkurl('holds',{available => 1},['limit','offset']) %]">[% l("Show holds that are ready to pick up") %]</a>
+                    <strong>[% l("Show all holds") %]</strong> |
+                    <a href="[% mkurl('holds',{available => 1},['limit','offset']) %]">[% l("Show only available holds") %]</a>
                     [% END -%]
                 </td>
             </tr>
@@ -123,9 +122,9 @@
                 <th>[% l('Pickup Location') %]</th>
                 <th>[% l('Activate') %]</th>
                 <th>[% l('Cancel if not filled by') %]</th>
-                <th>[% l('Active?') %]</th>
+                <th>[% l('Active') %]</th>
                 <th>[% l('Status') %]</th>
-				<th>[% l('Edit') %]</th>
+				<th>[% l('Notes') %]</th>
             </tr>
             </thead>
             <tbody id="holds_temp_parent">
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index 4b1c2334ad..cd4faf9f1c 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -14,11 +14,10 @@
 <h3 class="sr-only">[% l('My Lists') %]</h3>
 <div id='myopac_bookbag_div' style="padding:5px;">
 
+
     <!-- PINES Customization -->
-    <p><i>Lists allow you to keep track of books you'd like to read in the future, recommendations you'd like 
-    to share with other people, and more. <a href="http://pines.georgialibraries.org/catalog-help#my_list" 
-    target="_new">Learn more about using lists.</a></i></p>
-    
+    <p><i>[% l("PINES List Tips") %]</i></p>
+
     <!-- new list creation -->
     <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" id="create_form">
         <h1>[% l('Create New List') %]</h1><a name="createnewlist"></a>
diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2
index 5340507a25..923bddfc87 100644
--- a/Open-ILS/src/templates/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main.tt2
@@ -150,8 +150,8 @@
         <br/>
         <hr class='opac-auto-013'  color="#dcdbdb" />
         <br/>
-		<div class="header_middle">[% l("Other Fees") %]</div>
-        <table width='100%' cellspacing=0 id='myopac_trans_table' title="[% l('Other Fines and Fees') %]">
+		<div class="header_middle">[% l("Other Fines and Fees") %]</div>
+        <table width='100%' cellspacing=0 id='myopac_trans_table' title="[% l('Other Fees') %]">
             <thead class="myopac_payments_table">
                 <tr>
                     <th width='16%'>[% l("Transaction Start Time") %]</th>
diff --git a/Open-ILS/src/templates/opac/myopac/messages/list.tt2 b/Open-ILS/src/templates/opac/myopac/messages/list.tt2
index 030138844c..f7ddb3a860 100644
--- a/Open-ILS/src/templates/opac/myopac/messages/list.tt2
+++ b/Open-ILS/src/templates/opac/myopac/messages/list.tt2
@@ -1,8 +1,7 @@
 <div id="myopac_messages_div">
     <div class="header_middle">
         <span id="acct_messages_header" style="float:left;">[% l("Messages") %]</div>
-		<p>If you require assistance, please contact your 
-		<a href="http://pines.georgialibraries.org/pinesLocator/locator.html">local library</a>.</p>
+		<p>[% l("PINES Account Tips") %]</p>
         <span class='float-left' style='padding-left: 10px;'>
             <a href='[% mkurl('messages', { limit => limit, offset => (offset - limit)} ) %]'
                 [% IF offset <= 0 %] class='invisible' [% END %]><span class="nav_arrow_fix">&#9668;</span>[% l('Previous') %]</a>
diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index b296f92531..431aaeb133 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -5,8 +5,7 @@
 
 <h3 class="sr-only">[% l('Account Preferences') %]</h3>
 <div id="acct_info_main">
-    <p style="font-weight:bold;font-style:italic;">If you need to change your phone number or address, please visit your  
-		<a href="http://pines.georgialibraries.org/pinesLocator/locator.html">local library</a>.</p>
+    <p style="font-weight:bold;font-style:italic;">[% l("PINES Account Info Tip") %]</p>
     <table title="[% l('Account preference') %]"
         class='light_border data_grid' style="width:100%;max-width:600px;">
         <tbody id='myopac_summary_tbody'>
@@ -25,7 +24,7 @@
             </tr>
 
             <tr>
-                <td class='color_4 light_border'>[% l("Day (Primary) Phone") %]</td>
+                <td class='color_4 light_border'>[% l("Day Phone") %]</td>
                 <td class='light_border'>[% ctx.user.day_phone | html %]</td>
                 <td></td>
             </tr>
@@ -52,7 +51,7 @@
                 <td></td>
                 [%- ELSE %]
                 <td class='light_border'><a href='update_username'
-                    title="[% l('Change Username') %]">[% l("Change User Name") %]</a></td>
+                    title="[% l('Change Username') %]">[% l("Change") %]</a></td>
                 [%- END %]
             </tr>
             <tr>
@@ -62,7 +61,7 @@
                 <td></td>
                 [%- ELSE %]
                 <td class='light_border'><a href='update_password'
-                    title="[% l('Change Password') %]">[% l("Change Password") %]</a></td>
+                    title="[% l('Change Password') %]">[% l("Change") %]</a></td>
                 [%- END %]
             </tr>
             <tr>
@@ -72,7 +71,7 @@
                 <td></td>
                 [%- ELSE %]
                 <td class='light_border'><a href='update_email'
-                    title="[% l('Update Email Address') %]">[% l('Change Email Address') %]</a></td>
+                    title="[% l('Update Email Address') %]">[% l('Change') %]</a></td>
                 [%- END %]
             </tr>
 
@@ -194,7 +193,7 @@
                             {label => l("County"), name => 'county', value => update_addr.county},
                             {label => l("State"), name => 'state', value => update_addr.state},
                             {label => l("Country"), name => 'country', value => update_addr.country},
-                            {label => l("ZIP"), name => 'post_code', value => update_addr.post_code},
+                            {label => l("Zip"), name => 'post_code', value => update_addr.post_code},
                         ];
                         FOR field IN addr_fields %]
                             <tr>
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
index be8719db51..65caf5ef24 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
@@ -6,9 +6,7 @@
 
     <h3 class="sr-only">[% l('List Preferences') %]</h3>
     <form method='post'>
-	   <p style="width:100%;max-width:600px;">Lists allow you to keep track of books you'd like to read in the future, 
-	recommendations you'd like to share with other people, and more. 
-	<a href="http://pines.georgialibraries.org/catalog-help#my_list">Learn more about using lists.</a></p>
+	   <p style="width:100%;max-width:600px;">[% l("PINES List Tips") %]</p>
 
        <table class="full-width data_grid" id="acct_search_main"   style="width:100%;max-width:600px;"
             title="[% l('List Preferences') %]">
diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 94018b8760..a424bc4114 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -1,5 +1,5 @@
 <form action="[% ctx.opac_root %]/results" method="get">
-    <div class="header_middle">[% l("MARC Record Search") %]</div>
+    <div class="header_middle">[% l("Expert Search") %]</div>
     <input type="hidden" name="_special" value="1" />
     <input id="detail" type="hidden" name="detail_record_view"
            value="[% show_detail_view %]"/>
@@ -37,7 +37,7 @@
             <tr>
                [%- lib_select_id = "expert_search_library"; -%]
                <td colspan="5" class="expert-search-row">
-                   <label for="[% lib_select_id %]"><strong>[% l("Search within:") %]</strong>
+                   <label for="[% lib_select_id %]"><strong>[% l("Search Library:") %]</strong>
                        [%- PROCESS "opac/parts/org_selector.tt2";
                            INCLUDE build_org_selector id=lib_select_id show_loc_groups=1 
                        %]
diff --git a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
index 16291646c5..aae42f8ec3 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
@@ -5,7 +5,7 @@
     <input id="detail" type="hidden" name="detail_record_view"
            value="[% show_detail_view %]"/>
     <div id='adv_numeric_block'>
-            <label for="numeric_qtype"><strong>[% l("Search by:") %]</strong></label>
+            <label for="numeric_qtype"><strong>[% l("Field:") %]</strong></label>
                 <select id="numeric_qtype" name="qtype">
                     <!-- TODO: Pull labels from config.metabib_field.label -->
                     <option value="identifier|isbn">[% l('ISBN') %]</option>
@@ -20,7 +20,7 @@
                 <input type="text" name="query" size="16" autofocus placeholder='[% l("Identifier") %]' />
 	    <br/> <br/>
             [%- lib_select_id="numeric_search_library" -%]
-            <label for="[% lib_select_id %]"><strong>[% l("Search within:") %]</strong>
+            <label for="[% lib_select_id %]"><strong>[% l("Search Library:") %]</strong>
                   [% PROCESS "opac/parts/org_selector.tt2";
                      INCLUDE build_org_selector id=lib_select_id show_loc_groups=1
                   %]
diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index 77ad3f18e6..55b9e101aa 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -30,10 +30,10 @@
         </div>
     </div>
 
-
     <div id='adv_search_filters'>
-        <div class="header_middle">Choose Search Limits:</div>
-        <p style="font-style:italic;margin-bottom:0px;">Tip: Ctrl-Click to select multiple lines or to deselect lines (Shift-Click for Macs).</p>
+        <div class="header_middle">[% l('Search Filters') %]</div>
+        <p style="font-style:italic;margin-bottom:0px;">[% l("PINES Advanced Search Note") %]</p>
+
 [%
     in_row = 0;
     FOR adv_chunk IN search.adv_config;
@@ -108,6 +108,7 @@
                     %]
 
 <<<<<<< HEAD
+<<<<<<< HEAD
                     [% IF NOT metarecords.disabled %]
                         <br/><!-- <br> may seem redundant, but it allows the
                             <input> (below) to drop down inline w/ its label -->
@@ -123,6 +124,8 @@
 =======
 >>>>>>> 099a674... OPAC advanced search page UI tweaks. (Terran)
 
+=======
+>>>>>>> 03ad13e... OPAC Updates related to page text and translations. Also required are the
                 [% CASE "copy_location" %]
                     <select id="adv_copy_location_selector"
                         title="[% l('Select Shelving Location') %]"
diff --git a/Open-ILS/src/templates/opac/parts/footer.tt2 b/Open-ILS/src/templates/opac/parts/footer.tt2
index ea5ffd6e05..746a6022e3 100644
--- a/Open-ILS/src/templates/opac/parts/footer.tt2
+++ b/Open-ILS/src/templates/opac/parts/footer.tt2
@@ -6,11 +6,11 @@
     [% IF ctx.get_org_setting(
         ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %]
     <a href="[% mkurl(ctx.opac_root _ '/register') %]">
-	    <img alt="[% l('Apply for a Card') %]" src="[% ctx.media_prefix %]/images/navbar-card.png" />
-		[% l('Apply for a PINES Library Card') %]</a> &nbsp; &nbsp; &nbsp; &nbsp;
+	    <img alt="[% l('Request Library Card') %]" src="[% ctx.media_prefix %]/images/navbar-card.png" />
+		[% l('Request Library Card') %]</a> &nbsp; &nbsp; &nbsp; &nbsp;
     [% END %]
-    <!-- <a href="/eg/kpac/home">[% l("Kids' Catalog") %]</a> &nbsp;|&nbsp; -->
-    <!-- <a href="http://pines.georgialibraries.org/pinesLocator/locator.html">[% l('Find a Library Near Me') %]</a> &nbsp;|&nbsp;-->
+    <!-- <a href="/eg/kpac/home">[% l("Kids Catalog") %]</a> &nbsp;|&nbsp; -->
+    <!-- <a href="http://pines.georgialibraries.org/pinesLocator/locator.html">[% l('Library Locations') %]</a> &nbsp;|&nbsp;-->
     <!-- <a href="http://pines.georgialibraries.org/catalog-help">[% l('Help') %]</a> &nbsp;|&nbsp; -->
     <a href="http://pines.georgialibraries.org/about">
 	    <img alt="[% l('About PINES') %]" src="[% ctx.media_prefix %]/images/navbar-about.png" />[%- l('Learn More About PINES') %]</a> <!-- &nbsp;|&nbsp; -->
@@ -27,7 +27,7 @@
     [% IF ctx.get_org_setting(
         ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %]
     <a href="[% mkurl(ctx.opac_root _ '/register') %]">
-	    [% l('Apply for a PINES Library Card') %]</a><br/>
+	    [% l('Request Library Card') %]</a><br/>
     [% END %]   
     [% IF ctx.physical_loc;
         # patron is at the branch, no redirect needed
@@ -65,9 +65,7 @@
                 alt="[% l('Evergreen') %]"
             />
         </a>
-		<p style="font-weight:normal;font-style:italic;">This Web site and other Georgia Public Library Service programs are partially assisted with 
-		funds from the Library Services and Technology Act through the <a href="http://www.imls.gov/">
-		Institute of Museum and Library Services</a>.</p>		
+		<p style="font-weight:normal;font-style:italic;">[% l('Funding Note') %]</p>		
     </div>
 </div>
 </div>
diff --git a/Open-ILS/src/templates/opac/parts/homesearch.tt2 b/Open-ILS/src/templates/opac/parts/homesearch.tt2
index db8a44baa7..c02f6faba7 100644
--- a/Open-ILS/src/templates/opac/parts/homesearch.tt2
+++ b/Open-ILS/src/templates/opac/parts/homesearch.tt2
@@ -5,15 +5,15 @@
 	<div style="border:0px;text-align:center;height:300px;width:300px;float:left;margin-left:100px;">
 	    <a href="http://pines.georgialibraries.org/pinesLocator/locator.html" target="_blank" style="text-decoration:none;">
 		    <img alt="[% l('Library Locations') %]" src="[% ctx.media_prefix %]/images/pines-map.gif" style="height:150px;" /><br/>
-			<span style="font-size:125%;font-weight:bold;">Find a PINES Library</span>
+			<span style="font-size:125%;font-weight:bold;">[% l('Library Locations') %]</span>
 		</a><br/>
-		<p>Your PINES card gives you access to<br/>more than 275 libraries across Georgia!</p>
+		<p>[% l('PINES Library Locations Note') %]</p>
     </div>
 	<div style="border:0px;text-align:center;height:300px;width:300px;float:left;margin-left:50px;">
 	    <a href="http://pines.georgialibraries.org/catalog-help" target="_blank" style="text-decoration:none;">
-		    <img alt="[% l('Help') %]" src="[% ctx.media_prefix %]/images/home-largehelp.png" style="height:150px;" /><br/>
-			<span style="font-size:125%;font-weight:bold;">PINES Catalog Help</span>
+		    <img alt="[% l('PINES Catalog Help') %]" src="[% ctx.media_prefix %]/images/home-largehelp.png" style="height:150px;" /><br/>
+			<span style="font-size:125%;font-weight:bold;">[% l('PINES Catalog Help') %]</span>
 		</a><br/>
-		<p>Tips on searching the catalog, placing holds, and other frequently asked questions.</p>
+		<p>[% l('PINES Help Note') %]</p>
     </div>
 </div>
diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index 35dd3e0f96..cba2b7db53 100644
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -22,8 +22,10 @@
             <div class="input_bg">
                 <input type='text' id="username_field" name="username" autofocus style="width:250px;" />
             </div>
+            <!--
             <div style="font-size:normal;padding:15px 0px 5px 12px;width:300px;font-style:italic;">[% l('Enter your PINES library card number. Example: 220110026626051') %]
 			<br/>[% l('If you have set up a user name, you may enter that instead of the card number.') %]</div>
+            -->
         </div>
         <div class='float-left'>
             <label for="password_field" class="lbl1" >[% l('PIN Number or Password') %]</label>
@@ -54,9 +56,15 @@
             END;
                 redirect = redirect  | replace('^http:', 'https:');
             %]
+<<<<<<< HEAD
             <input type='hidden' name='redirect_to' value='[% redirect | html %]'/>
             <input type="checkbox" name="persist" id="login_persist" /><label for="login_persist"> [% l('Stay logged in?') %]</label>
             <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" />
+=======
+            <input type='hidden' name='redirect_to' value='[% redirect %]'/>
+            <input type="checkbox" name="persist" id="login_persist"/><label for="login_persist" style="font-weight:bold;"> [% l('Stay logged in?') %]</label>
+            <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" style="padding:10px 30px 10px 30px;" />
+>>>>>>> 03ad13e... OPAC Updates related to page text and translations. Also required are the
         </div>
         <input id="client_tz_id" name="client_tz" type="hidden" />
     </form>
diff --git a/Open-ILS/src/templates/opac/parts/login/help.tt2 b/Open-ILS/src/templates/opac/parts/login/help.tt2
index df472bdfc8..49f4aa4512 100644
--- a/Open-ILS/src/templates/opac/parts/login/help.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/help.tt2
@@ -1,9 +1,9 @@
 <div class="login-help-box">
     <div class="login-help-button">
-        <a href="http://pines.georgialibraries.org/catalog-help#my_account" class="opac-button">[% l('Account Help') %]</a>
+        <a href="http://pines.georgialibraries.org/catalog-help#my_account" class="opac-button">[% l('Questions?') %]</a>
     </div>
     <div>
-        <!--[% l('Learn more about using your PINES account.') %] -->
+        <!--[% l('Visit our FAQs section for answers to common questions about how to use your account.') %] -->
     </div>
 
 	<!--
diff --git a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
index f9552d30e0..e70c041c0c 100644
--- a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
@@ -1,3 +1,3 @@
 <div style="font-size:normal;padding:15px 0px 5px 12px;width:300px;font-style:italic;">
-[%- l('If this is your first time logging in, please enter the 4 digit PIN you were assigned by library staff. Example: 0926'); %]
+[%- l('If this is your first time logging in, please enter the last 4 digits of your phone number. Example: 0926'); %]
 </div>
diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index 9830cf5b8a..01a27d32d4 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -7,8 +7,7 @@
 
     <div class='div-left'>
         <div class="header_middle">[% l('Account Summary') %]</div>
-		<p>If you require assistance with your account, please contact your 
-		<a href="http://pines.georgialibraries.org/pinesLocator/locator.html">local library</a>.</p>
+		<p>[% l("PINES Account Tips") %]</p>
     </div>
 
     <!-- fines summary along the right of the page -->
@@ -42,7 +41,7 @@
             [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s');
                 fmt_expire_date = date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT);
             %]
-			    <span class="alert" style="font-weight:bold;">[% l("Your library card expired on [_1]. Please visit a PINES library to renew your card.", fmt_expire_date) %]</span>
+			    <span class="alert" style="font-weight:bold;">[% l("Your library card expired on [_1]. Please contact a librarian to resolve this issue.", fmt_expire_date) %]</span>
             [% END %]
             </div>
             <table class="acct_sum_table" title="[% l('Account Summary') %]">
diff --git a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
index 08067c9cda..22c6a2f22c 100644
--- a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
+++ b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
@@ -1,5 +1,5 @@
 [%- IF ctx.pref_ou && ctx.pref_ou != ctx.search_ou; %]
 <span class="preflib">
-    [% l('Preferred search location: [_1]', '<span class="bold">' _ ctx.get_aou(ctx.pref_ou).name _ '</span>'); %]
+    [% l('Preferred library: [_1]', '<span class="bold">' _ ctx.get_aou(ctx.pref_ou).name _ '</span>'); %]
 </span>
 [%- END; %]
diff --git a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
index dc6cf0f3c7..8c0af53e9f 100644
--- a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
@@ -7,7 +7,7 @@
     <div id='cn_browse_div'> 
         <p class='color_4'>
             [% l("You are now browsing [_1]", ctx.browsing_ou.name) | html %]<br/>
-            <span style="font-style:italic;font-weight:normal;">(Shelf browsing works best if you are browsing a single library location and not an entire library system.)</span>
+            <span style="font-style:italic;font-weight:normal;">[% l("PINES Shelf Browse Tip") %]</span>
         </p>
         <table class='data_grid bookshelf' width='100%'>
                 <tr>
diff --git a/Open-ILS/src/templates/opac/parts/record/contents.tt2 b/Open-ILS/src/templates/opac/parts/record/contents.tt2
index df0f0ff216..8822c9cd62 100644
--- a/Open-ILS/src/templates/opac/parts/record/contents.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/contents.tt2
@@ -196,7 +196,7 @@ END
 [%-  content_html = PROCESS render_all_contents;
     IF content_html.length > 0;
 %]
-<h2 class='rdetail_contents'>[% l('Contents / Notes') %]</h2>
+<h2 class='rdetail_contents'>[% l('Content descriptions') %]</h2>
 <table class='rdetail_content'>
     <tbody>
 [%- content_html %]
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
index bb41a7b94a..b58e9cdbcc 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
@@ -1,5 +1,5 @@
 <span id="rdetail_copy_counts">
-    <h2>[% l('Currently available copies') %]</h2>
+    <h2>[% l('Available copies') %]</h2>
     <ul>
     [%- depths = ctx.copy_summary.size;
         depth = 0;
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index bef574e454..c9ddf0a732 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -36,8 +36,8 @@ IF has_copies or ctx.foreign_copies;
             [% IF serial_holdings -%]
             <th scope='col'>[% l("Issue Label") %]</th>
             [%- ELSE -%]
-            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Library System: Library Branch Name") %]<br/>
-			    <span style="font-size:smaller;font-style:italic;">(Click library name for locations and hours)</span>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("PINES Location") %]<br/>
+			    <span style="font-size:smaller;font-style:italic;">[% l("PINES Location Tip") %]</span>
 			</th>
             [%- END %]
             <th scope='col' style="text-align:left;vertical-align:top;">[% l("Shelving Location") %]</th>
diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2
index 9ff6de9571..095c7824dd 100644
--- a/Open-ILS/src/templates/opac/parts/record/extras.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2
@@ -55,13 +55,13 @@
         extras = [
             {name => 'summaryplus',  label => l('Summaries & More'), hide => hide_summary},
             {name => 'annotation', label => l('Annotation'), hide => 1}, 
-            {name => 'awards',  label => l('Recommended Reads and Reviews')}, 
+            {name => 'awards',  label => l('Awards, Reviews, & Suggested Reads')}, 
             {name => 'excerpt',  label => l('Excerpt'), hide => 1},
             {name => 'issues',   label => l('Issues Held'), hide => !(ctx.have_holdings_to_show || ctx.have_mfhd_to_show)},
             {name => 'preview',  label => l('Preview'), hide => 1}, 
             {name => 'addedcontent',  label => l('Additional Content'), hide => hide_ac},  # hide if all content is known to not exist
-            {name => 'cnbrowse', label => l('Browse the Shelves')},
-            {name => 'marchtml', label => l('View MARC Record')}
+            {name => 'cnbrowse', label => l('Shelf Browser')},
+            {name => 'marchtml', label => l('MARC Record')}
         ];
 
         FOREACH extra IN extras;
diff --git a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
index c0e489b458..a6b132173f 100644
--- a/Open-ILS/src/templates/opac/parts/record/navigation.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
@@ -1,14 +1,14 @@
 [% IF ctx.search_result_index.defined && ctx.search_result_index >= 0 %]
 <div class="rdetail_header">
     <span class="rdetail_results">
-        <a href='[% mkurl(ctx.opac_root _ '/results', {}, stop_parms); %]'><span class="nav_arrow_fix">&#9668;</span> [% l('Return to Search Results') %]</a>
+        <a href='[% mkurl(ctx.opac_root _ '/results', {}, stop_parms); %]'><span class="nav_arrow_fix">&#9668;</span> [% l('Search Results') %]</a>
         <!-- stash these in JS for the web staff client to find -->
         <script>
             window.search_result_hit_count = [% ctx.hit_count %];
             window.search_result_index = [% ctx.search_result_index %];
         </script>
                 <span class="rdetail_result_count">
-            [% l('Now showing item [_1] of about [_2]', ctx.search_result_index + 1, ctx.hit_count) %]
+            [% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %]
         </span>
     </span>
     [%- INCLUDE "opac/parts/pref_lib_display.tt2" %]
@@ -23,7 +23,7 @@
                 ctx.prev_rec_url = mkurl(ctx.prev_search_record, prev_args, stop_parms);
         %]
         <a class='np_nav_link classic_link' title='[% l("Previous Record") %]'
-            href='[% ctx.prev_rec_url %]' rel="nofollow" vocab=""><span class="nav_arrow_fix">&#9668;</span> [% l('Previous Item') %]</a> &nbsp; &nbsp; &nbsp;
+            href='[% ctx.prev_rec_url %]' rel="nofollow" vocab=""><span class="nav_arrow_fix">&#9668;</span> [% l('Previous') %]</a> &nbsp; &nbsp; &nbsp;
         [% END %]
 
         [% 
@@ -35,7 +35,7 @@
                 ctx.next_rec_url = mkurl(ctx.next_search_record, next_args, stop_parms);
         %]
         <a class='np_nav_link classic_link' title='[% l("Next Record") %]'
-            href='[% ctx.next_rec_url %]' rel="nofollow" vocab="">[% l('Next Item') %] <span class="nav_arrow_fix">&#9658;</span></a>
+            href='[% ctx.next_rec_url %]' rel="nofollow" vocab="">[% l('Next') %] <span class="nav_arrow_fix">&#9658;</span></a>
         [% END %]
 
     </div>
diff --git a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates/opac/parts/record/subjects.tt2
index 34293dbf9b..b0702a427d 100644
--- a/Open-ILS/src/templates/opac/parts/record/subjects.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/subjects.tt2
@@ -101,6 +101,6 @@
 [%-  subject_html = PROCESS render_all_subjects;
     IF subject_html.length > 0;
 %]
-<h2 class='rdetail_related_subjects'>[% l('Find similar items by subject') %]</h2>
+<h2 class='rdetail_related_subjects'>[% l('Search for related items by subject') %]</h2>
 [%- subject_html %]
 [%- END %]
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index f4594ebbbe..fdb58a0ae6 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -103,11 +103,7 @@
             %]
             [%  ELSE;
                 operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add";
-<<<<<<< HEAD
                 label = (operation == "add") ? l("Add to my list") : l("Remove from my list");
-=======
-                label = (operation == "add") ? l("Add To My List") : l("Remove From My List"); 
->>>>>>> fe23cd5... OPAC UI modifications as per OPAC Working Group suggestions.
             %]
                 <a href="[% mkurl(ctx.opac_root _ '/mylist/' _ operation, {record => ctx.bre_id}, stop_parms) %]" class="no-dec" rel="nofollow" vocab="">
                     <img src="[% ctx.media_prefix %]/images/clipboard.png[% ctx.cache_key %]" alt="" />
@@ -118,7 +114,6 @@
             [% END %]
         [% END %]
             </div>
-<<<<<<< HEAD
             <div class="rdetail_aux_utils toggle_list">
                      [% IF ctx.mylist.size %]
                         [%- IF ctx.user; %]
@@ -144,26 +139,6 @@
                     </a>
                 </div>
             [% END %]
-=======
-			<!-- Hide for PINES since they do not include call number or holdings information
-            <div class="rdetail_aux_utils">
-                <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="[% l('Print / Email Actions Image') %]" />
-                <a href="[% mkurl(ctx.opac_root _ '/record/print/' _ ctx.bre_id) %]" class="no-dec" rel="nofollow" vocab="">[% l('Print') %]</a> /
-                <a href="[% mkurl(ctx.opac_root _ '/record/email/' _ ctx.bre_id) %]" class="no-dec" rel="nofollow" vocab="">[% l('Email') %]</a>
-            </div>
-			-->
-            [%- IF ctx.refworks.enabled == 'true' %]
-                [%- INCLUDE 'opac/parts/record/refworks.tt2' %]
-            [%- END %]
-			[% IF !ctx.is_staff %]
-				<div class="rdetail_aux_utils share_record">
-					<a href="[% mkurl('', {locg =>CGI.param('locg'), copy_depth =>CGI.param('copy_depth')}, 1) %]" class="no-dec">
-						 <img src="[% ctx.media_prefix %]/images/link.png" alt="[% l('Permalink') %]" />
-						 [% l('Permalink') %]
-					</a>
-				</div>
-			[% END %]
->>>>>>> fe23cd5... OPAC UI modifications as per OPAC Working Group suggestions.
             [%- IF ctx.is_staff %]
             <div class="rdetail_aux_utils clear_addedcontent_cache">
                 <a href="[% ctx.media_prefix %]/opac/extras/ac/clearcache/all/r/[% ctx.bre_id | uri %]" class="no-dec" target="_blank">
@@ -232,17 +207,10 @@ IF num_uris > 0;
     [%- END %]
     [%- IF num_uris > 1 %]</ul>[% END %]
 </div>
-<<<<<<< HEAD
 [%
 IF ebook_api.enabled == 'true';
     INCLUDE "opac/parts/ebook_api/avail.tt2";
 END;
-=======
-[%- END %]
-
-[%- # Hold/copy summary
-    IF ctx.copy_summary.0.count
->>>>>>> fe23cd5... OPAC UI modifications as per OPAC Working Group suggestions.
 %]
 [%- END %]
 <div id="copy_hold_counts">
@@ -265,18 +233,11 @@ INCLUDE "opac/parts/record/copy_counts.tt2";
                     END;
                     count_entry = count_entry + 1;
                 END;
-                l("[quant,_1,current hold,current holds] on [quant,_2,total copy,total copies]", 
+                l("[quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].", 
                     ctx.record_hold_count, ctx.copy_summary.$count_entry.count) 
             %]
         </p>
     </span>
-<<<<<<< HEAD
-=======
-
-[%- INCLUDE "opac/parts/record/copy_table.tt2" copies=ctx.copies %]
-
-</div>
->>>>>>> fe23cd5... OPAC UI modifications as per OPAC Working Group suggestions.
 [%- END %]
 <div id="metarecord_population">
 [%-
@@ -338,7 +299,7 @@ END;
  %]
 </div>
 
-<h2 id='rdetail_record_details'>[% l("Item details") %]</h2>
+<h2 id='rdetail_record_details'>[% l("Record details") %]</h2>
 <ul>
     [%- IF attrs.isbns.0;
           FOR isbn IN attrs.isbns;
diff --git a/Open-ILS/src/templates/opac/parts/result/facets.tt2 b/Open-ILS/src/templates/opac/parts/result/facets.tt2
index 321f6a7cd1..98311ca8e5 100644
--- a/Open-ILS/src/templates/opac/parts/result/facets.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/facets.tt2
@@ -4,7 +4,7 @@
 	    <div class="header_middle">
 		    [% l('Narrow Your Search') %]
 	    </div>
-	    <i>Tip: Click on the links below to narrow down your search results. To remove a search limit you've selected, click on the link again.</i>
+	    <i>[% l('PINES Facet Tip') %]</i>
 	</div>
 	[% END %]
 [% 
diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
index 0ffe6be63d..7f4f031c4d 100644
--- a/Open-ILS/src/templates/opac/parts/result/paginate.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
@@ -6,7 +6,7 @@
                 [%~ |l('<span class="result_count_number">' _ ctx.result_start _'</span>',
                 '<span class="result_count_number">' _ ctx.result_stop _ '</span>',
                 '<span class="result_count_number">' _ ctx.hit_count _ '</span>')  ~%]
-                Now showing results [_1] - [_2] of about [_3]
+                Results [_1] - [_2] of about [_3]
                 [%~ END %]
                 <span class='padding-left-6'>
                     [%~ |l('<span class="result_count_number">' _ (page + 1) _ '</span>',
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index b346784655..44fefae7d7 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -154,10 +154,12 @@ END;
                                                             OR show_more_details.default == 'hide');
                                                             IF attrs.pubdate;
                                                                 pubdate_clean = attrs.pubdate | html;
-                                                                l("Publication Date: ([_1])", pubdate_clean);
+                                                                l("Publication Date:");
+                                                                l(" ([_1])", pubdate_clean);
                                                             ELSIF attrs.copyright;
                                                                 copyright_clean = attrs.copyright | html;
-                                                                l("Copyright Date: ([_1])", copyright_clean);                                                                
+                                                                l("Copyright Date:");
+                                                                l(" ([_1])", copyright_clean);                                                                
                                                             END;
                                                         END
                                                     -%]
@@ -175,7 +177,7 @@ END;
                                                            [% IF args.holdings.size > 0 %]
                                                         <tr name='bib_cn_list' class='result_table_title_cell'>
                                                             <td valign='top'>
-                                                                <strong>[% l('Call Number:') %]</strong>
+                                                                <strong>[% l('Call number:') %]</strong>
                                                             </td>
                                                             <td><strong>[% args.holdings.0.label | html %]</strong></td>
                                                         </tr>
@@ -428,7 +430,7 @@ END;
                                                             %]
                                                             [%  ELSE;
                                                                 operation = ctx.mylist.grep(rec.id).size ? "delete" : "add";
-                                                                label = (operation == "add") ?  l("Add To My List") : l("Remove From List");
+                                                                label = (operation == "add") ?  l("Add to my list") : l("Remove from my list");
                                                                 title_label = (operation == "add") ? 
                                                                   l("Add [_1] to my list", attrs.title) : 
                                                                   l("Remove [_1] from my list", attrs.title);
diff --git a/Open-ILS/src/templates/opac/parts/topnav_links.tt2 b/Open-ILS/src/templates/opac/parts/topnav_links.tt2
index e5223a59bf..6ec43542fa 100644
--- a/Open-ILS/src/templates/opac/parts/topnav_links.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav_links.tt2
@@ -16,7 +16,7 @@
 		[% l('Library Locations') %]</a>
 	<a href="/eg/kpac/home">
 	    <img alt="[% l('Kids Catalog') %]" src="[% ctx.media_prefix %]/images/navbar-kids.png" />
-		[% l("Kids' Catalog") %]</a> 
+		[% l("Kids Catalog") %]</a> 
     <!-- <a href="http://pines.georgialibraries.org/about">[% l('About PINES') %]</a> -->
     [% IF ctx.physical_loc;
         # patron is at the branch, no redirect needed
@@ -27,7 +27,7 @@
     END %]
    <a href="[% gurl %]">
 	    <img alt="[% l('GALILEO') %]" src="[% ctx.media_prefix %]/images/navbar-galileo.png" />
-		[% l('GALILEO Research Databases') %]</a>
+		[% l('GALILEO') %]</a>
     <a href="http://pines.georgialibraries.org/catalog-help">
 	    <img alt="[% l('Help') %]" src="[% ctx.media_prefix %]/images/navbar-help.png" />
 		[% l('Help') %]</a>
diff --git a/Open-ILS/src/templates/opac/register.tt2 b/Open-ILS/src/templates/opac/register.tt2
index c51c03ac67..c3626d4541 100644
--- a/Open-ILS/src/templates/opac/register.tt2
+++ b/Open-ILS/src/templates/opac/register.tt2
@@ -51,12 +51,12 @@ END;
 <div id="content-wrapper">
     <div id="main-content-register">
         <div class="common-full-pad"></div>
-        <h1>[% l('Apply for a PINES Library Card')%]</h1>
+        <h1>[% l('Request a Library Card')%]</h1>
         <hr/>
 
         [% IF ctx.register.success %]
             <h3>[% l('Registration successful!') %]<h3>
-            <h4>[% l('Please visit your Home Library within 14 days to complete your registration.') %]</h4>
+            <h4>[% l('Please see library staff to complete your registration.') %]</h4>
 
             [% IF ctx.register.username_taken %]
             <p>
@@ -109,8 +109,7 @@ END;
                             valid_org_list=ctx.register.valid_orgs
                         %]<br/>
 						<div style="font-size:small;font-style:italic;">
-						    <a href="http://pines.georgialibraries.org/pinesLocator/locator.html" target="_blank">
-                               Find the name of the library system and branch closest to you.</a>
+                            [% l("PINES Location Tip") %]
 					    </div>
                     </td>
                     <td>
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index 00da4cc23a..133c8feb23 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -68,7 +68,7 @@
                 </div>
                 [% END %]
 				
-				    <label class="results_header_lbl" for="opac.result.sort">[% l('Sort search results:') %]
+				    <label class="results_header_lbl" for="opac.result.sort">[% l('Sort by') %]
                     [% INCLUDE "opac/parts/filtersort.tt2" value=CGI.param('sort') submit_on_change=1 %]
                     </label>
 
@@ -84,7 +84,7 @@
                         <input type="checkbox" id="limit_to_available" name="modifier" value="available"
                             onchange="search_modifier_onchange('available', this, true)"
                             [% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %] />
-                        [% l('Limit results to available items') %]
+                        [% l('Limit to available items') %]
                     </label>
                     [% IF NOT metarecords.disabled %]
                         <label class="results_header_lbl" for="metabib_search_modifier">
@@ -92,7 +92,7 @@
                                 name="modifier" value="metabib"
                                 onchange="search_modifier_onchange('metabib', this, true)"
                                 [% CGI.param('modifier').grep('metabib').size ? ' checked="checked"' : '' %] />
-                            [% l('Group results by format and edition') %]
+                            [% l('Group Formats and Editions') %]
                         </label>
                     [% END %]
                     [% IF ctx.depth_sel_checkbox %]
-- 
2.11.0