Merge branch 'rel_2_12' of git.evergreen-ils.org:Evergreen into rel_2_12_mergery_tpac

diff --cc Open-ILS/examples/opensrf.xml.example
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
index 83c1065,114de0c..8c01e4e
--- 1/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
--- 2/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
@@@ -196,10 -211,30 +211,30 @@@ sub load_record 
  
      $self->timelog("past expandies");
  
 -    $self->added_content_stage2($rec_id);
 +#    $self->added_content_stage2($rec_id);
  
 -    $self->timelog("past added content stage 2");
 +#    $self->timelog("past added content stage 2");
  
+     # Gather up metarecord info for display
+     # Let's start by getting the metarecord ID
+     my $mmr_id = OpenILS::Utils::CStoreEditor->new->json_query({
+         select   => { mmrsm => [ 'metarecord' ] },
+         from     => 'mmrsm',
+         where    => { 'source' => $rec_id }
+     })->[0]->{metarecord};
+     # If this record is apart of a meta group, I want to know more
+     if ( $mmr_id ) {
+         my (undef, @metarecord_data) = $self->get_records_and_facets([$mmr_id], undef, {
+             flesh => '{holdings_xml,mra}',
+             metarecord => 1,
+             site => $org_name,
+             depth => $depth,
+             pref_lib => $pref_ou
+         });
+         my ($rec) = grep { $_->{mmr_id} == $mmr_id } @metarecord_data;
+         $ctx->{mmr_id} = $mmr_id;
+         $ctx->{mmr_data} = $rec;
+     }
      return Apache2::Const::OK;
  }
  

diff --cc Open-ILS/src/reporter/clark-kent.pl
Simple merge

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 29e3697,a657039..214c29f
--- 1/Open-ILS/src/sql/Pg/950.data.seed-values.sql
--- 2/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@@ -6294,17 -6434,10 +6434,17 @@@ INSERT INTO config.marc21_ff_pos_map (f
  INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('SpFm2', '008', 'MAP', 34, 1, ' ');
  
  
 +INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('File', '008', 'COM', 26, 1, 'u');
 +INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('File', '006', 'COM', 9, 1, 'u');
 +INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Freq', '008', 'SER', 18, 1, ' ');
 +INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Freq', '006', 'SER', 1, 1, ' ');
 +INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Regl', '008', 'SER', 19, 1, ' ');
 +INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Regl', '006', 'SER', 2, 1, ' ');
 +
  -- record attributes
  INSERT INTO config.record_attr_definition (name,label,fixed_field) values ('alph','Alph','Alph');
- INSERT INTO config.record_attr_definition (name,label,fixed_field) values ('audience','Audn','Audn');
- INSERT INTO config.record_attr_definition (name,label,fixed_field,multi) values ('bib_level','BLvl','BLvl',FALSE);
+ INSERT INTO config.record_attr_definition (name,label,fixed_field,description) values ('audience','Audn','Audn', oils_i18n_gettext('audience', 'Audience', 'crad', 'label'));
+ INSERT INTO config.record_attr_definition (name,label,fixed_field,multi,description) values ('bib_level','BLvl','BLvl',FALSE,oils_i18n_gettext('bib_level', 'Bib Level', 'crad', 'label'));
  INSERT INTO config.record_attr_definition (name,label,fixed_field) values ('biog','Biog','Biog');
  INSERT INTO config.record_attr_definition (name,label,fixed_field) values ('conf','Conf','Conf');
  INSERT INTO config.record_attr_definition (name,label,fixed_field,multi) values ('control_type','Ctrl','Ctrl',FALSE);

diff --cc Open-ILS/src/templates/acq/common/li_table.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/advanced/search.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/record/authors.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/result/paginate.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/searchbar.tt2
Simple merge

diff --cc Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 932fd86,2b85fd0..c201fea
--- 1/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
--- 2/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@@ -260,16 -267,14 +267,17 @@@ within the "form" by name for validatio
  <div class="row reg-field-row" ng-show="show_field('au.dob')">
    [% draw_field_label('au', 'dob') %]
    <div class="col-md-3 reg-field-input">
-     <input eg-date-input 
-       name="dob"
-       ng-change="field_modified()" 
-       ng-required="field_required('au', 'dob')"
-       ng-blur="handle_field_changed(patron, 'dob')"
-       class="form-control" ng-model="patron.dob"/>
+     <eg-date-input 
+       ng-model="patron.dob"
+       ng-blur="handle_field_changed(patron, 'dob')">
+     </eg-date-input>
+   </div>
+   <div class="col-md-6 patron-reg-example">
+     [% draw_example_text('au', 'dob') %]
    </div>
 +  <div class="col-md-6 patron-reg-example">
 +    [% draw_example_text('au', 'dob') %]
 +  </div>
  </div>
  
  <!-- JUVENILE -->

diff --cc Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
index f7378f7,cec4dd7..e9c3475
--- 1/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
--- 2/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
@@@ -1,19 -1,6 +1,7 @@@
  
- <!-- patron search progress bar -->
- <div class="row" ng-show="show_search_progress">
-   <div class="col-md-6">
-     <div class="progress progress-striped active">
-       <div class="progress-bar" role="progressbar" aria-valuenow="100"
-         aria-valuemin="0" aria-valuemax="100" style="width: 100%">
-         <span class="sr-only">[% l('Loading...') %]</span>
-       </div>
-     </div>
-   </div>
- </div>
- 
  <!-- patron search results grid -->
  <eg-grid
 +  ng-hide="show_search_progress"
    idl-class="au" id-field="id"
    features="-sort,-display,-multisort"
    main-label="[% l('Patron Search Results') %]"

diff --cc build/i18n/po/cat.properties/cat.properties.pot
Simple merge

diff --cc build/i18n/po/circ.properties/circ.properties.pot
Simple merge

diff --cc build/i18n/po/common.properties/common.properties.pot
Simple merge

diff --cc build/i18n/po/tpac/fr-CA.po
index dd51b21,5740923..dd3386d
--- 1/build/i18n/po/tpac/fr-CA.po
--- 2/build/i18n/po/tpac/fr-CA.po
+++ b/build/i18n/po/tpac/fr-CA.po
@@@ -2697,6 -2801,10 +2806,10 @@@ msgstr "Non, la réservation est suspen
  msgid "None"
  msgstr "Aucun"
  
 -msgstr ""
+ #: ../../Open-ILS/src/templates/opac/parts/result/adv_filter.tt2:16 ../../Open-ILS/src/templates/opac/parts/result/adv_filter.tt2:47 ../../Open-ILS/src/templates/opac/parts/result/adv_filter.tt2:70
+ msgid "Not"
++msgstr "Non"
+ 
  #: ../../Open-ILS/src/templates/opac/parts/record/copy_table.tt2:159
  msgid "Not holdable"
  msgstr "Aucune réservation possible"
@@@ -4358,14 -4507,10 +4512,14 @@@ msgstr "Période : 
  msgid "Tip:"
  msgstr "Astuce :"
  
- #: ../../Open-ILS/src/templates/opac/css/style.css.tt2:2083 ../../Open-ILS/src/templates/opac/myopac/circ_history.tt2:92 ../../Open-ILS/src/templates/opac/myopac/circs.tt2:69 ../../Open-ILS/src/templates/opac/myopac/hold_history.tt2:59 ../../Open-ILS/src/templates/opac/myopac/holds.tt2:108 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:299 ../../Open-ILS/src/templates/opac/myopac/main.tt2:28 ../../Open-ILS/src/templates/opac/parts/anon_list.tt2:26 ../../Open-ILS/src/templates/opac/parts/qtype_selector.tt2:1
- msgid "Title"
- msgstr "Titre"
- 
 +#: ../../Open-ILS/src/templates/opac/css/style.css.tt2:2050
 +msgid "Title / Author"
 +msgstr "Titre / Auteur"
 +
+ #: ../../Open-ILS/src/templates/opac/css/style.css.tt2:2210 ../../Open-ILS/src/templates/opac/css/style.css.tt2:2218 ../../Open-ILS/src/templates/opac/css/style.css.tt2:2227 ../../Open-ILS/src/templates/opac/css/style.css.tt2:2235 ../../Open-ILS/src/templates/opac/myopac/circ_history.tt2:97 ../../Open-ILS/src/templates/opac/myopac/circs.tt2:74 ../../Open-ILS/src/templates/opac/myopac/ebook_circs.tt2:32 ../../Open-ILS/src/templates/opac/myopac/ebook_holds.tt2:40 ../../Open-ILS/src/templates/opac/myopac/ebook_holds_ready.tt2:40 ../../Open-ILS/src/templates/opac/myopac/hold_history.tt2:66 ../../Open-ILS/src/templates/opac/myopac/holds.tt2:116 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:299 ../../Open-ILS/src/templates/opac/myopac/main.tt2:28 ../../Open-ILS/src/templates/opac/parts/anon_list.tt2:26 ../../Open-ILS/src/templates/opac/parts/qtype_selector.tt2:1
+ msgid "Title"
+ msgstr "Titre"
+ 
  #: ../../Open-ILS/src/templates/opac/parts/filtersort.tt2:6
  msgid "Title: A to Z"
  msgstr "Titre : A à Z"
@@@ -4787,12 -4978,16 +4987,16 @@@ msgstr "
  
  #: ../../Open-ILS/src/templates/opac/record/email.tt2:0
  msgid "here"
--msgstr ""
++msgstr "ici"
  
- #: ../../Open-ILS/src/templates/opac/parts/result/lowhits.tt2:56
+ #: ../../Open-ILS/src/templates/opac/parts/result/lowhits.tt2:59
  msgid "stone"
  msgstr ""
  
 -msgstr ""
+ #: ../../Open-ILS/src/templates/opac/parts/place_hold_result.tt2:138
+ msgid "title"
++msgstr "titre"
+ 
  #: ../../Open-ILS/src/templates/opac/parts/topnav.tt2:33
  msgid "unread"
  msgstr ""
@@@ -4801,81 -4996,6 +5005,84 @@@
  msgid "view"
  msgstr ""
  
 +#: ../../Open-ILS/src/templates_boreal/opac/parts/footer.tt2:6 ../../Open-ILS/src/templates_boreal/opac/parts/topnav_links.tt2:7
 +msgid " Catalogue de tous les collèges"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates_laurentian/opac/parts/login/form.tt2:4
 +msgid " Or <a href='https://passwordreset.laurentian.ca/'>reset your password</a>."
 +msgstr " Ou <a href='https://passwordreset.laurentian.ca/'>réinitialiser votre mot de passe</a>."
 +
 +#: ../../Open-ILS/src/templates_algoma/opac/parts/footer.tt2:5 ../../Open-ILS/src/templates_algoma/opac/parts/topnav_links.tt2:6 ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:14 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:9
 +msgid "Contact Us"
 +msgstr "Nous joindre"
 +
 +#: ../../Open-ILS/src/templates_hrsrh/opac/parts/footer.tt2:8 ../../Open-ILS/src/templates_hrsrh/opac/parts/topnav_links.tt2:9
 +msgid "Contact us"
 +msgstr "Nous joindre"
 +
 +#: ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:13 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:8
 +msgid "Course Reserves"
 +msgstr "Liste de réserves"
 +
 +#: ../../Open-ILS/src/templates_algoma/opac/parts/footer.tt2:3 ../../Open-ILS/src/templates_algoma/opac/parts/topnav_links.tt2:4 ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:11 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:6
 +msgid "Databases"
 +msgstr "Bases de données"
 +
 +#: ../../Open-ILS/src/templates_hrsrh/opac/parts/footer.tt2:6 ../../Open-ILS/src/templates_hrsrh/opac/parts/topnav_links.tt2:7
 +msgid "EBSCO Databases"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:10 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:5
 +msgid "Electronic Journals (A-Z)"
 +msgstr "Périodiques électroniques (A-Z)"
 +
 +#: ../../Open-ILS/src/templates_hrsrh/opac/parts/footer.tt2:5 ../../Open-ILS/src/templates_hrsrh/opac/parts/topnav_links.tt2:6 ../../Open-ILS/src/templates_huntington/opac/parts/footer.tt2:3 ../../Open-ILS/src/templates_huntington/opac/parts/topnav_links.tt2:4 ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:8 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:4 ../../Open-ILS/src/templates_nosm/opac/parts/footer.tt2:3 ../../Open-ILS/src/templates_nosm/opac/parts/topnav_links.tt2:4 ../../Open-ILS/src/templates_sjcg/opac/parts/footer.tt2:3 ../../Open-ILS/src/templates_sjcg/opac/parts/topnav_links.tt2:4
 +msgid "Library Home"
 +msgstr "Accueil"
 +
 +#: ../../Open-ILS/src/templates_usudbury/opac/parts/footer.tt2:3 ../../Open-ILS/src/templates_usudbury/opac/parts/topnav_links.tt2:4
 +msgid "Library home"
 +msgstr "Accueil"
 +
 +#: ../../Open-ILS/src/templates_conifer/opac/parts/record/extras.tt2:23
 +msgid "Summaries &amp; More"
 +msgstr "Résumés &amp; autres"
 +
 +#: ../../Open-ILS/src/templates_laurentian/opac/parts/login/form.tt2:26
 +msgid "Your username and password are the same as your Laurentian ID and Desire2Learn account."
 +msgstr ""
 +"Votre nom d'utilisateur et mot de passe sont les mêmes que votre identité de la "
 +"Laurentienne (LUID) et Desire2Learn."
 +
 +#: ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:11 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:6
 +msgid "http://biblio.laurentian.ca/research/guides"
 +msgstr "http://biblio.laurentian.ca/research/fr/guides"
 +
 +#: ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:12 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:7
 +msgid "http://biblio.laurentian.ca/research/guides/archives"
 +msgstr "http://biblio.laurentian.ca/research/fr/guides/archives"
 +
 +#: ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:13 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:8
 +msgid "http://biblio.laurentian.ca/reserves/"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:8 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:4
 +msgid "http://laurentian.ca/library"
 +msgstr "http://laurentienne.ca/bibliotheque"
 +
 +#: ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:10 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:5
 +msgid "http://sfx.scholarsportal.info/laurentian/az"
 +msgstr "http://sfx.scholarsportal.info/laurentian/az?lang=fre"
 +
 +#: ../../Open-ILS/src/templates_usudbury/opac/parts/footer.tt2:3 ../../Open-ILS/src/templates_usudbury/opac/parts/topnav_links.tt2:4
 +msgid "http://usudbury.ca/index.php/en/library"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates_laurentian/opac/parts/footer.tt2:14 ../../Open-ILS/src/templates_laurentian/opac/parts/topnav_links.tt2:9
 +msgid "https://biblio.laurentian.ca/research/contact-us"
 +msgstr "https://biblio.laurentian.ca/research/fr/coordonnées-et-renseignements"
 +
+ #: ../../Open-ILS/src/templates/opac/parts/place_hold_result.tt2:138
+ msgid "volume"
+ msgstr ""

diff --cc build/i18n/po/tpac/tpac.pot
index a1ee8b3,a44c74a..2d21720
--- 1/build/i18n/po/tpac/tpac.pot
--- 2/build/i18n/po/tpac/tpac.pot
+++ b/build/i18n/po/tpac/tpac.pot
@@@ -456,48 -435,20 +435,44 @@@ msgstr "
  msgid "Are you sure you wish to continue?"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Art director"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Artist"
 +#: ../../Open-ILS/src/templates/opac/myopac/circ_history.tt2:62
 +msgid "Are you sure you wish to delete the selected item(s)?"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/myopac/messages/list.tt2:53
 +msgid "Are you sure you wish to permanently delete the selected messsage(s)?"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/myopac/messages/single_message.tt2:16
 +msgid "Are you sure you wish to permanently delete this messsage?"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/myopac/circs.tt2:37
 +msgid "Are you sure you wish to renew the selected item(s)?"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Arranger"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Art copyist"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/myopac/circ_history.tt2:67
+ msgid "Are you sure you wish to delete the selected item(s)?"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Artistic director"
+ #: ../../Open-ILS/src/templates/opac/myopac/messages/list.tt2:53
+ msgid "Are you sure you wish to permanently delete the selected message(s)?"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Assignee"
+ #: ../../Open-ILS/src/templates/opac/myopac/messages/single_message.tt2:16
+ msgid "Are you sure you wish to permanently delete this message?"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Associated name"
+ #: ../../Open-ILS/src/templates/opac/myopac/circs.tt2:42
+ msgid "Are you sure you wish to renew the selected item(s)?"
  msgstr ""
  
  #: ../../Open-ILS/src/templates/opac/browse.tt2:112
@@@ -676,11 -605,7 +629,11 @@@ msgstr "
  msgid "Biographical or Historical Data: "
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:74
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Blurb writer"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:77
  msgid "Book cover"
  msgstr ""
  
@@@ -765,19 -666,15 +698,19 @@@ msgstr "
  msgid "Call Number Browse"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/css/style.css.tt2:2054 ../../Open-ILS/src/templates/opac/myopac/circs.tt2:74 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:326
- msgid "Call number"
++#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
++msgid "Calligrapher"
 +msgstr ""
 +
- #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:170
- msgid "Call number:"
+ #: ../../Open-ILS/src/templates/opac/css/style.css.tt2:2850 ../../Open-ILS/src/templates/opac/css/style.css.tt2:2859 ../../Open-ILS/src/templates/opac/myopac/circs.tt2:79 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:329
+ msgid "Call number"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Calligrapher"
+ #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:176
+ msgid "Call number:"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/myopac/holds.tt2:67 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:56 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:57 ../../Open-ILS/src/templates/opac/myopac/main_payment_form.tt2:214 ../../Open-ILS/src/templates/opac/myopac/main_payment_form.tt2:37 ../../Open-ILS/src/templates/opac/myopac/prefs_settings.tt2:22 ../../Open-ILS/src/templates/opac/parts/place_hold.tt2:209 ../../Open-ILS/src/templates/opac/parts/place_hold_result.tt2:129
+ #: ../../Open-ILS/src/templates/opac/myopac/holds.tt2:75 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:56 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:57 ../../Open-ILS/src/templates/opac/myopac/main_payment_form.tt2:214 ../../Open-ILS/src/templates/opac/myopac/main_payment_form.tt2:37 ../../Open-ILS/src/templates/opac/myopac/prefs_settings.tt2:22 ../../Open-ILS/src/templates/opac/parts/place_hold.tt2:210 ../../Open-ILS/src/templates/opac/parts/place_hold_result.tt2:133
  msgid "Cancel"
  msgstr ""
  
@@@ -793,14 -690,10 +726,14 @@@ msgstr "
  msgid "Cancel unless filled by"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/myopac/hold_history.tt2:106
- msgid "Canceled"
- msgstr ""
- 
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Cartographer"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/parts/hold_status.tt2:15
+ msgid "Canceled"
+ msgstr ""
+ 
  #: ../../Open-ILS/src/templates/opac/parts/record/contents.tt2:1
  msgid "Case File Characteristics Note: "
  msgstr ""
@@@ -1305,14 -978,10 +1110,14 @@@ msgstr "
  msgid "Did you mean %1?"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Director"
+ #: ../../Open-ILS/src/templates/opac/myopac/prefs_settings.tt2:18
+ msgid "Disabling checkout or holds history will permanently remove all items from your history."
  msgstr ""
  
 +#: ../../Open-ILS/src/templates/opac/myopac/prefs_settings.tt2:18
 +msgid "Disabling checkout or holds history will permanently remove all items from your history."
 +msgstr ""
 +
  #: ../../Open-ILS/src/templates/opac/myopac/prefs.tt2:210
  msgid "Discard Pending Address"
  msgstr ""
@@@ -1330,15 -995,7 +1131,15 @@@ msgstr "
  msgid "Dissertation Note: "
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:280 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:217
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Distribution place"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Distributor"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:380 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:220
  msgid "Distributor:"
  msgstr ""
  
@@@ -1407,39 -1084,19 +1228,36 @@@ msgstr "
  msgid "Editing Hold"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:214 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:271
- msgid "Edition:"
- msgstr ""
- 
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Editor"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Editor of compilation"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Editor of moving image work"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Electrician"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:305
- msgid "Electronic resource"
+ #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:314 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:274
+ msgid "Edition:"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:106 ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:130
- msgid "Electronic resources"
+ #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:308
+ msgid "Electronic resource"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Electrotyper"
+ #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:143 ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:167
+ msgid "Electronic resources"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/myopac/main_payments.tt2:50 ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:75
+ #: ../../Open-ILS/src/templates/opac/myopac/main_payments.tt2:50 ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:110
  msgid "Email"
  msgstr ""
  
@@@ -1742,11 -1337,7 +1498,11 @@@ msgstr "
  msgid "Geographic Setting: "
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/myopac/circ_history.tt2:72 ../../Open-ILS/src/templates/opac/myopac/circ_history.tt2:73 ../../Open-ILS/src/templates/opac/myopac/circs.tt2:46 ../../Open-ILS/src/templates/opac/myopac/circs.tt2:47 ../../Open-ILS/src/templates/opac/myopac/holds.tt2:71 ../../Open-ILS/src/templates/opac/myopac/holds.tt2:72 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:326 ../../Open-ILS/src/templates/opac/myopac/messages/list.tt2:68 ../../Open-ILS/src/templates/opac/myopac/messages/list.tt2:69 ../../Open-ILS/src/templates/opac/parts/anon_list.tt2:43
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Geographic information specialist"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/myopac/circ_history.tt2:77 ../../Open-ILS/src/templates/opac/myopac/circ_history.tt2:78 ../../Open-ILS/src/templates/opac/myopac/circs.tt2:51 ../../Open-ILS/src/templates/opac/myopac/circs.tt2:52 ../../Open-ILS/src/templates/opac/myopac/holds.tt2:79 ../../Open-ILS/src/templates/opac/myopac/holds.tt2:80 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:326 ../../Open-ILS/src/templates/opac/myopac/messages/list.tt2:68 ../../Open-ILS/src/templates/opac/myopac/messages/list.tt2:69 ../../Open-ILS/src/templates/opac/parts/anon_list.tt2:43
  msgid "Go"
  msgstr ""
  
@@@ -1771,11 -1362,7 +1527,11 @@@ msgstr "
  msgid "Google Preview"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/advanced/search.tt2:133 ../../Open-ILS/src/templates/opac/results.tt2:90
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Graphic technician"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/parts/advanced/search.tt2:139 ../../Open-ILS/src/templates/opac/results.tt2:90
  msgid "Group Formats and Editions"
  msgstr ""
  
@@@ -1856,19 -1448,7 +1617,19 @@@ msgstr "
  msgid "Home Library"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:360
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Honoree"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Host"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Host institution"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:368
  msgid "I have checked this item out before"
  msgstr ""
  
@@@ -2143,39 -1671,11 +1856,27 @@@ msgstr "
  msgid "Later issues"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Lead"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Lender"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Libelant"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Libelant-appellant"
+ #: ../../Open-ILS/src/templates/opac/parts/filtersort.tt2:25
+ msgid "Least Popular"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/myopac/messages/list.tt2:91 ../../Open-ILS/src/templates/opac/myopac/messages/single_message.tt2:35 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:324
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Libelant-appellee"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Libelee"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Libelee-appellant"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Libelee-appellee"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/myopac/messages/list.tt2:91 ../../Open-ILS/src/templates/opac/myopac/messages/single_message.tt2:35 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:327
  msgid "Library"
  msgstr ""
  
@@@ -2352,15 -1832,7 +2033,15 @@@ msgstr "
  msgid "Make Default List"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:294 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:224
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Manufacture place"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Manufacturer"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:394 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:227
  msgid "Manufacturer:"
  msgstr ""
  
@@@ -2887,15 -2271,11 +2480,15 @@@ msgstr "
  msgid "Phone Number"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/place_hold.tt2:189
- msgid "Phone Number:"
- msgstr ""
- 
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Photographer"
 +msgstr ""
 +
- #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:295
+ #: ../../Open-ILS/src/templates/opac/parts/place_hold.tt2:190
+ msgid "Phone Number:"
+ msgstr ""
+ 
+ #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:298
  msgid "Phys. Desc.:"
  msgstr ""
  
@@@ -3052,99 -2416,43 +2629,43 @@@ msgid "Previously Held Items
  msgstr ""
  
  #: ../../Open-ILS/src/templates/opac/myopac/prefs.tt2:80
- msgid "Primary Identification"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/myopac/main_payments.tt2:46 ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:74
- msgid "Print"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:73
- msgid "Print / Email Actions Image"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/record/print.tt2:4
- msgid "Print Record"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/myopac/main_pay.tt2:41
- msgid "Print receipt"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Printer"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Printer of plates"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Printmaker"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/myopac/list/update.tt2:13
- msgid "Problem with list management:"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/place_hold_result.tt2:82
- msgid "Problem:"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Process contact"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/myopac/main_pay_init.tt2:10
- msgid "Processing your payment may take some time."
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/myopac/main_pay_init.tt2:9
- msgid "Processing..."
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Producer"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:266 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:210
- msgid "Producer:"
+ msgid "Primary Identification"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Production company"
+ #: ../../Open-ILS/src/templates/opac/myopac/main_payments.tt2:46 ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:109
+ msgid "Print"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Production designer"
+ #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:108
+ msgid "Print / Email Actions Image"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Production manager"
+ #: ../../Open-ILS/src/templates/opac/record/print.tt2:5
+ msgid "Print Record"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Production personnel"
+ #: ../../Open-ILS/src/templates/opac/myopac/main_pay.tt2:41
+ msgid "Print receipt"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Production place"
+ #: ../../Open-ILS/src/templates/opac/myopac/list/update.tt2:13
+ msgid "Problem with list management:"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Programmer"
+ #: ../../Open-ILS/src/templates/opac/parts/place_hold_result.tt2:86
+ msgid "Problem:"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Project director"
+ #: ../../Open-ILS/src/templates/opac/myopac/main_pay_init.tt2:10
+ msgid "Processing your payment may take some time."
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Proofreader"
+ #: ../../Open-ILS/src/templates/opac/myopac/main_pay_init.tt2:9
+ msgid "Processing..."
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Provider"
 -#: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:366 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:213
++#: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:366 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:213 ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
+ msgid "Producer:"
  msgstr ""
  
  #: ../../Open-ILS/src/templates/opac/myopac/lists.tt2:308
@@@ -3163,11 -2467,7 +2680,7 @@@ msgstr "
  msgid "Publications About Described Materials Note: "
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
- msgid "Publisher"
- msgstr ""
- 
- #: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:235 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:187
 -#: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:335 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:190
++#: ../../Open-ILS/src/templates/opac/parts/record/summary.tt2:335 ../../Open-ILS/src/templates/opac/parts/result/table.tt2:190 ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
  msgid "Publisher:"
  msgstr ""
  
@@@ -3187,15 -2479,7 +2692,15 @@@ msgstr "
  msgid "RSS Feed"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:419
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Radio director"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Radio producer"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/parts/result/table.tt2:429
  msgid "Ratings Icon"
  msgstr ""
  
@@@ -3235,19 -2523,7 +2744,19 @@@ msgstr "
  msgid "Record details"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/parts/searchbar.tt2:106
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Recording engineer"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Recordist"
 +msgstr ""
 +
 +#: ../../Open-ILS/src/templates/opac/parts/relators.tt2:1
 +msgid "Redaktor"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/parts/searchbar.tt2:167
  msgid "Refine My Original Search"
  msgstr ""
  
@@@ -4242,14 -3383,10 +3624,14 @@@ msgstr "
  msgid "Tip:"
  msgstr ""
  
- #: ../../Open-ILS/src/templates/opac/css/style.css.tt2:2083 ../../Open-ILS/src/templates/opac/myopac/circ_history.tt2:92 ../../Open-ILS/src/templates/opac/myopac/circs.tt2:69 ../../Open-ILS/src/templates/opac/myopac/hold_history.tt2:59 ../../Open-ILS/src/templates/opac/myopac/holds.tt2:108 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:299 ../../Open-ILS/src/templates/opac/myopac/main.tt2:28 ../../Open-ILS/src/templates/opac/parts/anon_list.tt2:26 ../../Open-ILS/src/templates/opac/parts/qtype_selector.tt2:1
- msgid "Title"
- msgstr ""
- 
 +#: ../../Open-ILS/src/templates/opac/css/style.css.tt2:2050
 +msgid "Title / Author"
 +msgstr ""
 +
+ #: ../../Open-ILS/src/templates/opac/css/style.css.tt2:2845 ../../Open-ILS/src/templates/opac/css/style.css.tt2:2853 ../../Open-ILS/src/templates/opac/css/style.css.tt2:2862 ../../Open-ILS/src/templates/opac/css/style.css.tt2:2870 ../../Open-ILS/src/templates/opac/css/style.css.tt2:2876 ../../Open-ILS/src/templates/opac/css/style.css.tt2:2881 ../../Open-ILS/src/templates/opac/myopac/circ_history.tt2:97 ../../Open-ILS/src/templates/opac/myopac/circs.tt2:74 ../../Open-ILS/src/templates/opac/myopac/ebook_circs.tt2:32 ../../Open-ILS/src/templates/opac/myopac/ebook_holds.tt2:40 ../../Open-ILS/src/templates/opac/myopac/ebook_holds_ready.tt2:40 ../../Open-ILS/src/templates/opac/myopac/hold_history.tt2:66 ../../Open-ILS/src/templates/opac/myopac/holds.tt2:116 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:299 ../../Open-ILS/src/templates/opac/myopac/main.tt2:28 ../../Open-ILS/src/templates/opac/parts/anon_list.tt2:26 ../../Open-ILS/src/templates/opac/parts/qtype_selector.tt2:1
+ msgid "Title"
+ msgstr ""
+ 
  #: ../../Open-ILS/src/templates/opac/parts/filtersort.tt2:6
  msgid "Title: A to Z"
  msgstr ""