[open-ils-commits] r1290 - in servres/branches/i18n/conifer: . locale locale/en_CA locale/en_CA/LC_MESSAGES locale/en_US/LC_MESSAGES locale/eo/LC_MESSAGES locale/fr_CA/LC_MESSAGES (gfawcett)

Mon Mar 28 20:56:16 EDT 2011

Author: gfawcett
Date: 2011-03-28 20:56:15 -0400 (Mon, 28 Mar 2011)
New Revision: 1290

Added:
   servres/branches/i18n/conifer/locale/en_CA/
   servres/branches/i18n/conifer/locale/en_CA/LC_MESSAGES/
   servres/branches/i18n/conifer/locale/en_CA/LC_MESSAGES/django.po
Removed:
   servres/branches/i18n/conifer/locale/en_US/LC_MESSAGES/django.po
Modified:
   servres/branches/i18n/conifer/README
   servres/branches/i18n/conifer/babel.cfg
   servres/branches/i18n/conifer/locale/django.pot
   servres/branches/i18n/conifer/locale/eo/LC_MESSAGES/django.po
   servres/branches/i18n/conifer/locale/fr_CA/LC_MESSAGES/django.po
   servres/branches/i18n/conifer/pybabel-extract
   servres/branches/i18n/conifer/settings.py
Log:
i18n cleanup. New POT and PO files; en_CA is default, with fr_CA and eo l10ns.

I think we're ready for someone to look at the POT and tell us whether it's
clean enough to translate.

As mentioned before, the Esperanto translation isn't Esperanto, it's a faked
translation using Ned Batchelder's "poxx" technique.[1] If you're running
pybabel-extract, you'll need 'polib' (easy_install polib).

I overhauled pybabel-extract so that it creates a proper PO header, without
all the dummy variables. (It seems that Babel was designed to be used
primarily via 'setuptools'; if you use the command-line approach, you get
fewer options.)

en_CA is the default language; fr_CA can be selected via 'Preferences'.

[1]: http://nedbatchelder.com/blog/201012/faked_translations_poxxpy.html

Modified: servres/branches/i18n/conifer/README
===================================================================

--- servres/branches/i18n/conifer/README	2011-03-29 00:56:10 UTC (rev 1289)
+++ servres/branches/i18n/conifer/README	2011-03-29 00:56:15 UTC (rev 1290)
@@ -43,6 +43,7 @@
     BabelDjango-0.2.2-py2.5
     Genshi-0.5.1-py2.5
     South-0.7
+    polib-0.6.3   (only required for doing i18n/l10n work)
 
 Getting this thing to run
 ------------------------------

Modified: servres/branches/i18n/conifer/babel.cfg
===================================================================
--- servres/branches/i18n/conifer/babel.cfg	2011-03-29 00:56:10 UTC (rev 1289)
+++ servres/branches/i18n/conifer/babel.cfg	2011-03-29 00:56:15 UTC (rev 1290)
@@ -1,6 +1,6 @@
 [python:**.py]
 [genshi:**.xhtml]
-include_attrs = alt title summary value
+include_attrs = alt title summary
 #ignore_tags = script style {http://www.w3.org/1999/xhtml}script {http://www.w3.org/1999/xhtml}style
 [extractors]
 django = babeldjango.extract:extract_django

Modified: servres/branches/i18n/conifer/locale/django.pot
===================================================================
--- servres/branches/i18n/conifer/locale/django.pot	2011-03-29 00:56:10 UTC (rev 1289)
+++ servres/branches/i18n/conifer/locale/django.pot	2011-03-29 00:56:15 UTC (rev 1290)
@@ -1,117 +1,91 @@
-# Translations template for Syrup Reserves.
-# Copyright (C) 2011 Project Conifer
+### Translations template for Syrup Reserves.
+# Copyright (C) 2011 Project Conifer (http://conifer.mcmaster.ca/)
 # This file is distributed under the same license as the Syrup Reserves project.
-# Art Rhyno <artrhyno at uwindsor.ca>, 2011.
-#
+# Art Rhyno <artrhyno at uwindsor.ca>.
 msgid ""
 msgstr ""
 "Project-Id-Version: Syrup Reserves 0.1\n"
-"Report-Msgid-Bugs-To: graham.fawcett at gmail.com\n"
-"POT-Creation-Date: 2011-03-28 18:27-0400\n"
+"Report-Msgid-Bugs-To: Graham Fawcett <graham.fawcett at gmail.com>\n"
+"POT-Creation-Date: 2011-03-28 20:26-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
+"Generated-By: 0.9.4\n"
 
-#: integration/linktool/templates/associate.xhtml:13
+#: integration/linktool/templates/associate.xhtml:14
 msgid "No associated reserves items."
 msgstr ""
 
-#: integration/linktool/templates/associate.xhtml:15
+#: integration/linktool/templates/associate.xhtml:16
 msgid ""
-"There are no reserves materials associated with this course\n"
-"      site. As an instructor, you can choose one of the following\n"
-"      options:"
+"There are no reserves materials associated with this course site. As an "
+"instructor, you can choose one of the following options:"
 msgstr ""
 
-#: integration/linktool/templates/associate.xhtml:20
+#: integration/linktool/templates/associate.xhtml:19
 msgid "Link this course site to one of my current reserves list"
 msgstr ""
 
-#: integration/linktool/templates/associate.xhtml:22
+#: integration/linktool/templates/associate.xhtml:21
 msgid "None available."
 msgstr ""
 
-#: integration/linktool/templates/associate.xhtml:43
-msgid "Or, you can just"
+#: integration/linktool/templates/associate.xhtml:42
+msgid "Or, you can just [1:browse the reserves]."
 msgstr ""
 
-#: integration/linktool/templates/associate.xhtml:43
-msgid "browse the reserves"
+#: integration/linktool/templates/associate.xhtml:46
+msgid "There are no reserves materials associated with this course site."
 msgstr ""
 
 #: integration/linktool/templates/associate.xhtml:47
+#, python-format
 msgid ""
-"There are no reserves materials associated with this course\n"
-"      site."
+"You can create reserves lists for course sites associated with a current "
+"or future term. But this site is associated with the term \"%(term)s\" "
+"and the course \"%(course)s\" — so a reserves list cannot be created."
 msgstr ""
 
 #: integration/linktool/templates/associate.xhtml:48
-msgid ""
-"You can create reserves lists for course sites\n"
-"      associated with a current or future term. But this site is\n"
-"      associated with the term \""
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:50
-msgid "\" and the course \""
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:50
-msgid ""
-"\" — so\n"
-"      a reserves list cannot be created."
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:52
 msgid "Browse the reserves"
 msgstr ""
 
 #: integration/linktool/templates/index.xhtml:6
-#: integration/linktool/templates/new_site_cannot.xhtml:6
+#: integration/linktool/templates/new_site_cannot.xhtml:7
 msgid "testing"
 msgstr ""
 
-#: integration/linktool/templates/index.xhtml:13
-msgid "Welcome"
+#: integration/linktool/templates/index.xhtml:13 templates/master.xhtml:62
+msgid "Welcome!"
 msgstr ""
 
-#: integration/linktool/templates/new_site_cannot.xhtml:13
+#: integration/linktool/templates/new_site_cannot.xhtml:14
 msgid "Cannot create site..."
 msgstr ""
 
-#: integration/linktool/templates/new_site_cannot.xhtml:14
-msgid "Sorry, but your site's course code ("
-msgstr ""
-
-#: integration/linktool/templates/new_site_cannot.xhtml:14
-msgid ""
-")\n"
-"    and/or term code ("
-msgstr ""
-
 #: integration/linktool/templates/new_site_cannot.xhtml:15
+#, python-format
 msgid ""
-") do not match any known\n"
-"    codes in the reserves system."
+"Sorry, but your site's course code (%(course)s) and/or term code "
+"(%(term)s) do not match any known codes in the reserves system."
 msgstr ""
 
-#: integration/linktool/templates/new_site_cannot.xhtml:18
+#: integration/linktool/templates/new_site_cannot.xhtml:16
 #: templates/simplemessage.xhtml:11 templates/admin/staff_add.xhtml:50
 msgid "Go back"
 msgstr ""
 
 #: integration/linktool/templates/whichsite.xhtml:7
-msgid "Please choose a set of reserves materials"
+msgid "Please choose a set of reserves materials."
 msgstr ""
 
 #: integration/linktool/templates/whichsite.xhtml:8
 msgid ""
-"There is more than one set of reserves materials related to this\n"
-"    site. Please choose from the list below:"
+"There is more than one set of reserves materials related to this site. "
+"Please choose from the list below:"
 msgstr ""
 
 #: syrup/models.py:133
@@ -227,7 +201,7 @@
 msgid "Physical Book or Document"
 msgstr ""
 
-#: syrup/models.py:565 templates/item/item_add_url.xhtml:37
+#: syrup/models.py:565 templates/item/item_add_url.xhtml:38
 #: templates/item/item_delete_confirm.xhtml:30
 #: templates/item/item_metadata.xhtml:98
 msgid "URL"
@@ -468,16 +442,10 @@
 msgid "All Reserves, by Department"
 msgstr ""
 
-#: templates/browse_index.xhtml:16
-msgid ""
-"(Note: some reserve materials may require you\n"
-"    to"
+#: templates/browse_index.xhtml:17
+msgid "(Note: some reserve materials may require you to [1:log in])"
 msgstr ""
 
-#: templates/browse_index.xhtml:18
-msgid "log in"
-msgstr ""
-
 #: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
 msgid "lock"
 msgstr ""
@@ -515,9 +483,7 @@
 msgstr ""
 
 #: templates/edit_site.xhtml:74 templates/edit_site_permissions.xhtml:43
-#: templates/site_invitation.xhtml:28 templates/phys/checkout.xhtml:63
-#: templates/phys/circlist_index.xhtml:18 templates/phys/mark_arrived.xhtml:31
-#: templates/phys/mark_arrived_outcome.xhtml:20
+#: templates/site_invitation.xhtml:24
 msgid "Continue"
 msgstr ""
 
@@ -638,10 +604,6 @@
 msgid "Preferences"
 msgstr ""
 
-#: templates/master.xhtml:62
-msgid "Welcome!"
-msgstr ""
-
 #: templates/master.xhtml:63
 msgid "Log In"
 msgstr ""
@@ -671,18 +633,17 @@
 msgstr ""
 
 #: templates/open_sites.xhtml:19 templates/search_results.xhtml:31
-#: templates/item/item_add_cat_search.xhtml:61
+#: templates/item/item_add_cat_search.xhtml:62
 #: templates/item/item_delete_confirm.xhtml:28
 #: templates/item/item_metadata.xhtml:46
-#: templates/phys/circlist_for_term.xhtml:22
 msgid "Title"
 msgstr ""
 
-#: templates/paginate.xhtml:21 templates/item/item_add_cat_search.xhtml:50
+#: templates/paginate.xhtml:21
 msgid "Previous"
 msgstr ""
 
-#: templates/paginate.xhtml:30 templates/item/item_add_cat_search.xhtml:54
+#: templates/paginate.xhtml:30
 msgid "Next"
 msgstr ""
 
@@ -704,8 +665,7 @@
 msgstr ""
 
 #: templates/search_results.xhtml:31
-#: templates/item/item_add_cat_search.xhtml:61
-#: templates/phys/circlist_for_term.xhtml:22
+#: templates/item/item_add_cat_search.xhtml:62
 msgid "Author"
 msgstr ""
 
@@ -743,14 +703,13 @@
 
 #: templates/site_invitation.xhtml:18
 msgid ""
-"Your instructor may have provided you with an Invitation Code,\n"
-"  which will give you access to your course's reserves. Enter the\n"
-"  invitation code below to continue. Note that not all courses require\n"
-"  an invitation code; contact your instructor or the library staff for\n"
-"  more information."
+"Your instructor may have provided you with an Invitation Code, which will"
+" give you access to your course's reserves. Enter the invitation code "
+"below to continue. Note that not all courses require an invitation code; "
+"contact your instructor or the library staff for more information."
 msgstr ""
 
-#: templates/site_invitation.xhtml:26
+#: templates/site_invitation.xhtml:22
 msgid "Invitation Code:"
 msgstr ""
 
@@ -760,11 +719,11 @@
 
 #: templates/site_join.xhtml:16
 msgid ""
-"If you choose to join this site, it will be added to your \"My\n"
-"    Reserves\" list."
+"If you choose to join this site, it will be added to your \"My Reserves\""
+" list."
 msgstr ""
 
-#: templates/site_join.xhtml:19
+#: templates/site_join.xhtml:18
 msgid "Yes, join this site"
 msgstr ""
 
@@ -841,7 +800,7 @@
 msgstr ""
 
 #: templates/admin/su.xhtml:17
-msgid "UWin ID to impersonate:"
+msgid "User ID to impersonate:"
 msgstr ""
 
 #: templates/admin/su.xhtml:19
@@ -880,138 +839,136 @@
 msgid "search this site..."
 msgstr ""
 
-#: templates/components/site.xhtml:48 templates/components/site.xhtml:56
+#: templates/components/site.xhtml:49 templates/components/site.xhtml:57
 #: templates/item/item_metadata.xhtml:73 templates/item/item_metadata.xhtml:81
 msgid "2 Hour Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:49 templates/components/site.xhtml:57
+#: templates/components/site.xhtml:50 templates/components/site.xhtml:58
 #: templates/item/item_metadata.xhtml:74 templates/item/item_metadata.xhtml:82
 msgid "3 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:50 templates/item/item_metadata.xhtml:75
+#: templates/components/site.xhtml:51 templates/item/item_metadata.xhtml:75
 msgid "4 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:51 templates/components/site.xhtml:59
+#: templates/components/site.xhtml:52 templates/components/site.xhtml:60
 #: templates/item/item_metadata.xhtml:76 templates/item/item_metadata.xhtml:84
 msgid "7 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:52 templates/item/item_metadata.xhtml:77
+#: templates/components/site.xhtml:53 templates/item/item_metadata.xhtml:77
 msgid "1 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:53 templates/item/item_metadata.xhtml:78
+#: templates/components/site.xhtml:54 templates/item/item_metadata.xhtml:78
 msgid "1 Hour Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:54 templates/item/item_metadata.xhtml:79
+#: templates/components/site.xhtml:55 templates/item/item_metadata.xhtml:79
 msgid "14 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:55 templates/item/item_metadata.xhtml:80
+#: templates/components/site.xhtml:56 templates/item/item_metadata.xhtml:80
 msgid "2 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:58 templates/item/item_metadata.xhtml:83
+#: templates/components/site.xhtml:59 templates/item/item_metadata.xhtml:83
 msgid "4 Hour Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:61
+#: templates/components/site.xhtml:62
 msgid "Ask for:"
 msgstr ""
 
-#: templates/components/site.xhtml:62
-msgid "NEXT DUE:"
+#. The next copy is due back:
+#: templates/components/site.xhtml:63
+#, python-format
+msgid "NEXT DUE: %(due_info)s"
 msgstr ""
 
-#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:87
+#: templates/components/site.xhtml:66 templates/item/item_metadata.xhtml:87
 msgid "Availability unknown."
 msgstr ""
 
-#: templates/components/site.xhtml:90
+#: templates/components/site.xhtml:91
 msgid "Show status of all copies"
 msgstr ""
 
-#: templates/components/site.xhtml:93
+#: templates/components/site.xhtml:94
 msgid "Hide status details"
 msgstr ""
 
-#: templates/components/site.xhtml:103
+#: templates/components/site.xhtml:104
 msgid "Sorry, this document is not available to you."
 msgstr ""
 
-#: templates/components/site.xhtml:115
+#: templates/components/site.xhtml:116
 msgid "Awaiting copyright clearance: Not available to students."
 msgstr ""
 
-#: templates/components/site.xhtml:119
+#: templates/components/site.xhtml:120
 msgid "About this item"
 msgstr ""
 
-#: templates/components/site.xhtml:123
+#: templates/components/site.xhtml:124
 msgid "Edit"
 msgstr ""
 
-#: templates/components/site.xhtml:124
+#: templates/components/site.xhtml:125
 msgid "Relocate"
 msgstr ""
 
-#: templates/components/site.xhtml:125 templates/generic/delete.xhtml:20
+#: templates/components/site.xhtml:126 templates/generic/delete.xhtml:20
 msgid "Delete"
 msgstr ""
 
-#: templates/components/site.xhtml:135
-msgid "0"
-msgstr ""
-
-#: templates/components/site.xhtml:135
+#: templates/components/site.xhtml:136
 msgid "Top Level"
 msgstr ""
 
-#: templates/components/site.xhtml:151
+#: templates/components/site.xhtml:152
 msgid "Top"
 msgstr ""
 
-#: templates/components/site.xhtml:162
+#: templates/components/site.xhtml:163
 msgid "Add a new item"
 msgstr ""
 
-#: templates/components/site.xhtml:164
+#: templates/components/site.xhtml:165
 msgid "Link to external resource"
 msgstr ""
 
-#: templates/components/site.xhtml:165
+#: templates/components/site.xhtml:166
 msgid "Uploaded electronic document"
 msgstr ""
 
-#: templates/components/site.xhtml:166
+#: templates/components/site.xhtml:167
 msgid "Catalogued item (e.g., book)"
 msgstr ""
 
-#: templates/components/site.xhtml:167
+#: templates/components/site.xhtml:168
 msgid "Subheading"
 msgstr ""
 
-#: templates/components/site.xhtml:182
+#: templates/components/site.xhtml:183
 msgid "Show more attributes"
 msgstr ""
 
-#: templates/components/site.xhtml:187
+#: templates/components/site.xhtml:188
 msgid "Attribute"
 msgstr ""
 
-#: templates/components/site.xhtml:187
+#: templates/components/site.xhtml:188
 msgid "Value"
 msgstr ""
 
-#: templates/components/site.xhtml:187
+#: templates/components/site.xhtml:188
 msgid "Delete?"
 msgstr ""
 
-#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:39
+#: templates/components/site.xhtml:200 templates/item/item_metadata.xhtml:39
 msgid "Delete this item"
 msgstr ""
 
@@ -1060,80 +1017,80 @@
 msgid "Add %(thing)s"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:15
+#: templates/item/common_metadata.xhtml:16
 msgid "Title of document"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:16
+#: templates/item/common_metadata.xhtml:17
 #: templates/item/item_metadata.xhtml:47
 msgid "Title of source"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:18
-msgid "Author #"
+#: templates/item/common_metadata.xhtml:19
+#, python-format
+msgid "Author #%(num)s"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:20
-#: templates/item/item_add_cat_search.xhtml:61
+#: templates/item/common_metadata.xhtml:21
+#: templates/item/item_add_cat_search.xhtml:62
 #: templates/item/item_metadata.xhtml:50
-#: templates/phys/circlist_for_term.xhtml:22
 msgid "Publisher"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:21
+#: templates/item/common_metadata.xhtml:22
 #: templates/item/item_metadata.xhtml:51
 msgid "Published"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:22
+#: templates/item/common_metadata.xhtml:23
 #: templates/item/item_metadata.xhtml:52
 msgid "Volume"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:23
+#: templates/item/common_metadata.xhtml:24
 #: templates/item/item_metadata.xhtml:53
 msgid "Issue"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:24
+#: templates/item/common_metadata.xhtml:25
 #: templates/item/item_metadata.xhtml:54
 msgid "Pages"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:25
+#: templates/item/common_metadata.xhtml:26
 #: templates/item/item_metadata.xhtml:55
 msgid "ISBN"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:26
+#: templates/item/common_metadata.xhtml:27
 msgid "Bib Id of Item"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:28
+#: templates/item/common_metadata.xhtml:29
 msgid "Copyright Status"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:39
+#: templates/item/common_metadata.xhtml:40
 msgid "Catalogue Settings"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:44
+#: templates/item/common_metadata.xhtml:45
 msgid "Update"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:54
+#: templates/item/common_metadata.xhtml:55
 msgid "Barcode"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:60
+#: templates/item/common_metadata.xhtml:61
 msgid "Location"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:70
+#: templates/item/common_metadata.xhtml:71
 msgid "Modifier"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:80
+#: templates/item/common_metadata.xhtml:81
 msgid "Call Number"
 msgstr ""
 
@@ -1145,36 +1102,42 @@
 msgid "Use keywords or CCL syntax for searching, for example:"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:42
+#: templates/item/item_add_cat_search.xhtml:43
 msgid "Search"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:48
-msgid "of"
+#: templates/item/item_add_cat_search.xhtml:49
+#, python-format
+msgid "%(first)s–%(last)s of %(total)s results."
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:48
-msgid "results."
+#: templates/item/item_add_cat_search.xhtml:51
+#, python-format
+msgid "Previous %(count)s"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:61
-#: templates/phys/circlist_for_term.xhtml:22
+#: templates/item/item_add_cat_search.xhtml:55
+#, python-format
+msgid "Next %(count)s"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:62
 msgid "PubDate"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:69
+#: templates/item/item_add_cat_search.xhtml:70
 msgid "details"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:70
+#: templates/item/item_add_cat_search.xhtml:71
 msgid "Electronic resource."
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:71
+#: templates/item/item_add_cat_search.xhtml:72
 msgid "view"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:81
+#: templates/item/item_add_cat_search.xhtml:82
 msgid "Pick this item"
 msgstr ""
 
@@ -1187,7 +1150,7 @@
 msgstr ""
 
 #: templates/item/item_add_elec.xhtml:32 templates/item/item_add_elec.xhtml:50
-msgid "File"
+msgid "Electronic file"
 msgstr ""
 
 #: templates/item/item_add_elec.xhtml:34
@@ -1243,26 +1206,27 @@
 msgid "Add a new URL"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:26
+#. Refworks Import Format
+#: templates/item/item_add_url.xhtml:27
 msgid "Import RIS"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:32
+#: templates/item/item_add_url.xhtml:33
 msgid ""
 "Paste the Refworks/RIS citation in the space below. Note, the citation "
 "must include a \"UR\" (URL) attribute. (Tip: RIS citations can be dragged"
 " and dropped from Zotero.)"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:42 templates/item/item_metadata.xhtml:128
+#: templates/item/item_add_url.xhtml:43 templates/item/item_metadata.xhtml:124
 msgid "Display MARC Record"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:54
+#: templates/item/item_add_url.xhtml:55
 msgid "Add URL"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:55
+#: templates/item/item_add_url.xhtml:56
 msgid "Update URL"
 msgstr ""
 
@@ -1332,7 +1296,8 @@
 msgstr ""
 
 #: templates/item/item_metadata.xhtml:70
-msgid "DUE:"
+#, python-format
+msgid "DUE: %(duedate)s"
 msgstr ""
 
 #: templates/item/item_metadata.xhtml:96
@@ -1351,34 +1316,26 @@
 
 #: templates/item/item_metadata.xhtml:108
 msgid ""
-"By pressing the 'Request' button\n"
-"\tbelow, I am requesting a digital copy of a reading (chapter, article)\n"
-"\tfor my own private study and research use. I agree that I will not\n"
-"\treproduce, redistribute or transmit a copy of the reading in any\n"
-"\tformat."
+"By pressing the 'Request' button below, I am requesting a digital copy of"
+" a reading (chapter, article) for my own private study and research use. "
+"I agree that I will not reproduce, redistribute or transmit a copy of the"
+" reading in any format."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:113
+#: templates/item/item_metadata.xhtml:109
 msgid "Request to download this document"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:112
 msgid "Click here to download the document."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:117
-msgid "Document type:"
+#: templates/item/item_metadata.xhtml:113
+#, python-format
+msgid "Document type: %(type)s. Size: %(bytes)s bytes."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:117
-msgid ". Size:"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:117
-msgid "bytes."
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:123
+#: templates/item/item_metadata.xhtml:119
 msgid "View status of all copies in catalogue"
 msgstr ""
 
@@ -1406,113 +1363,3 @@
 msgid "Move item"
 msgstr ""
 
-#: templates/phys/checkout.xhtml:1 templates/phys/index.xhtml:15
-msgid "Patron Checkout of Item"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:27
-msgid "Patron Barcode"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:38 templates/phys/mark_arrived.xhtml:24
-#: templates/phys/mark_arrived_choose.xhtml:25
-msgid "Item Barcode"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:51
-msgid "The checkout was successful. Due Date:"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:52
-msgid "The checkout failed."
-msgstr ""
-
-#: templates/phys/checkout.xhtml:54
-msgid "Show details"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:63 templates/phys/mark_arrived.xhtml:31
-msgid "Check out another item"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:67
-msgid "Done"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:1
-#, python-format
-msgid "Wanted items: %s"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:31
-msgid "MARC"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:34
-msgid "Catalogue"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:38
-msgid "Reserves"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:42
-msgid "View Electronic"
-msgstr ""
-
-#: templates/phys/circlist_index.xhtml:1 templates/phys/index.xhtml:20
-msgid "Notify Circulation of wanted items"
-msgstr ""
-
-#: templates/phys/circlist_index.xhtml:13
-msgid "Please select a term:"
-msgstr ""
-
-#: templates/phys/index.xhtml:1
-msgid "Physical Item Processing"
-msgstr ""
-
-#: templates/phys/index.xhtml:13
-msgid "Patron assistance"
-msgstr ""
-
-#: templates/phys/index.xhtml:18
-msgid "Circulations workflow"
-msgstr ""
-
-#: templates/phys/index.xhtml:21
-msgid "Mark items as Arrived"
-msgstr ""
-
-#: templates/phys/mark_arrived.xhtml:1
-msgid "Mark Items as Arrived"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:1
-msgid "Mark Items as Arrived: Choose Match"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:29
-msgid "Detail"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:36
-msgid "Matches"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:38
-msgid "Optional: Small-number ID for this item:"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:42
-msgid "Associate item with matches selected below"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:54
-msgid "detail"
-msgstr ""
-
-#: templates/phys/mark_arrived_outcome.xhtml:1
-msgid "Matches saved; item marked as received"
-msgstr ""
-

Copied: servres/branches/i18n/conifer/locale/en_CA/LC_MESSAGES/django.po (from rev 1289, servres/branches/i18n/conifer/locale/en_US/LC_MESSAGES/django.po)
===================================================================
--- servres/branches/i18n/conifer/locale/en_CA/LC_MESSAGES/django.po	                        (rev 0)
+++ servres/branches/i18n/conifer/locale/en_CA/LC_MESSAGES/django.po	2011-03-29 00:56:15 UTC (rev 1290)
@@ -0,0 +1,1367 @@
+# ## English (Canada) translations for Syrup Reserves.
+# Copyright (C) 2011 Project Conifer (http://conifer.mcmaster.ca/)
+# This file is distributed under the same license as the Syrup Reserves
+# project.
+# Art Rhyno <artrhyno at uwindsor.ca>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Syrup Reserves 0.1\n"
+"Report-Msgid-Bugs-To: Graham Fawcett <graham.fawcett at gmail.com>\n"
+"POT-Creation-Date: 2011-03-28 20:22+0400\n"
+"PO-Revision-Date: 2011-03-28 20:26-0400\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: en_CA <LL at li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.4\n"
+
+#: integration/linktool/templates/associate.xhtml:14
+msgid "No associated reserves items."
+msgstr ""
+
+#: integration/linktool/templates/associate.xhtml:16
+msgid ""
+"There are no reserves materials associated with this course site. As an "
+"instructor, you can choose one of the following options:"
+msgstr ""
+
+#: integration/linktool/templates/associate.xhtml:19
+msgid "Link this course site to one of my current reserves list"
+msgstr ""
+
+#: integration/linktool/templates/associate.xhtml:21
+msgid "None available."
+msgstr ""
+
+#: integration/linktool/templates/associate.xhtml:42
+msgid "Or, you can just [1:browse the reserves]."
+msgstr ""
+
+#: integration/linktool/templates/associate.xhtml:46
+msgid "There are no reserves materials associated with this course site."
+msgstr ""
+
+#: integration/linktool/templates/associate.xhtml:47
+#, python-format
+msgid ""
+"You can create reserves lists for course sites associated with a current "
+"or future term. But this site is associated with the term \"%(term)s\" "
+"and the course \"%(course)s\" — so a reserves list cannot be created."
+msgstr ""
+
+#: integration/linktool/templates/associate.xhtml:48
+msgid "Browse the reserves"
+msgstr ""
+
+#: integration/linktool/templates/index.xhtml:6
+#: integration/linktool/templates/new_site_cannot.xhtml:7
+msgid "testing"
+msgstr ""
+
+#: integration/linktool/templates/index.xhtml:13 templates/master.xhtml:62
+msgid "Welcome!"
+msgstr ""
+
+#: integration/linktool/templates/new_site_cannot.xhtml:14
+msgid "Cannot create site..."
+msgstr ""
+
+#: integration/linktool/templates/new_site_cannot.xhtml:15
+#, python-format
+msgid ""
+"Sorry, but your site's course code (%(course)s) and/or term code "
+"(%(term)s) do not match any known codes in the reserves system."
+msgstr ""
+
+#: integration/linktool/templates/new_site_cannot.xhtml:16
+#: templates/simplemessage.xhtml:11 templates/admin/staff_add.xhtml:50
+msgid "Go back"
+msgstr ""
+
+#: integration/linktool/templates/whichsite.xhtml:7
+msgid "Please choose a set of reserves materials."
+msgstr ""
+
+#: integration/linktool/templates/whichsite.xhtml:8
+msgid ""
+"There is more than one set of reserves materials related to this site. "
+"Please choose from the list below:"
+msgstr ""
+
+#: syrup/models.py:133
+msgid "ILS patron ID"
+msgstr ""
+
+#: syrup/models.py:154 syrup/models.py:171 syrup/models.py:188
+#: templates/courses.xhtml:19 templates/edit_site_permissions.xhtml:90
+#: templates/instructors.xhtml:19 templates/zsearch_results.xhtml:28
+msgid "Name"
+msgstr ""
+
+#: syrup/models.py:155 syrup/models.py:189
+msgid "Is active?"
+msgstr ""
+
+#: syrup/models.py:156
+msgid "External ID"
+msgstr ""
+
+#: syrup/models.py:159
+msgid "service desk"
+msgstr ""
+
+#: syrup/models.py:160
+msgid "service desks"
+msgstr ""
+
+#: syrup/models.py:170 syrup/models.py:202 templates/open_sites.xhtml:19
+msgid "Code"
+msgstr ""
+
+#: syrup/models.py:172
+msgid "Start (Y-M-D)"
+msgstr ""
+
+#: syrup/models.py:173
+msgid "Finish (Y-M-D)"
+msgstr ""
+
+#: syrup/models.py:176
+msgid "term"
+msgstr ""
+
+#: syrup/models.py:177
+msgid "terms"
+msgstr ""
+
+#: syrup/models.py:190 syrup/models.py:244
+msgid "Service desk"
+msgstr ""
+
+#: syrup/models.py:193 templates/departments.xhtml:19
+msgid "Department"
+msgstr ""
+
+#: syrup/models.py:194 syrup/views/admin.py:71 templates/departments.xhtml:1
+#: templates/admin/index.xhtml:23
+msgid "Departments"
+msgstr ""
+
+#: syrup/models.py:240
+msgid "Course"
+msgstr ""
+
+#: syrup/models.py:241
+msgid "Start term"
+msgstr ""
+
+#: syrup/models.py:242
+msgid "End term"
+msgstr ""
+
+#: syrup/models.py:247
+msgid "World-accessible"
+msgstr ""
+
+#: syrup/models.py:248
+msgid "Accessible to all logged-in users"
+msgstr ""
+
+#: syrup/models.py:249
+msgid ""
+"Accessible to all logged-in users, but only course-site members can read "
+"electronic documents."
+msgstr ""
+
+#: syrup/models.py:250
+msgid "Accessible to course-site members"
+msgstr ""
+
+#: syrup/models.py:251
+msgid "Accessible only to course-site owners"
+msgstr ""
+
+#: syrup/models.py:518
+msgid "Instructor"
+msgstr ""
+
+#: syrup/models.py:519
+msgid "Assistant/Support"
+msgstr ""
+
+#: syrup/models.py:520
+msgid "Student"
+msgstr ""
+
+#: syrup/models.py:563
+msgid "Attached Electronic Document"
+msgstr ""
+
+#: syrup/models.py:564
+msgid "Physical Book or Document"
+msgstr ""
+
+#: syrup/models.py:565 templates/item/item_add_url.xhtml:38
+#: templates/item/item_delete_confirm.xhtml:30
+#: templates/item/item_metadata.xhtml:98
+msgid "URL"
+msgstr ""
+
+#: syrup/models.py:566 templates/item/item_add_heading.xhtml:24
+msgid "Heading"
+msgstr ""
+
+#: syrup/models.py:590
+msgid "Bib Record ID"
+msgstr ""
+
+#: syrup/models.py:591
+msgid "MARCXML"
+msgstr ""
+
+#: syrup/models.py:646
+msgid "Normal"
+msgstr ""
+
+#: syrup/models.py:647
+msgid "2 Hour"
+msgstr ""
+
+#: syrup/models.py:648
+msgid "1 Day"
+msgstr ""
+
+#: syrup/models.py:649
+msgid "3 Day"
+msgstr ""
+
+#: syrup/models.py:650
+msgid "7 Day"
+msgstr ""
+
+#: syrup/models.py:660
+msgid "Reserves Counter"
+msgstr ""
+
+#: syrup/models.py:661
+msgid "Circulating Collection"
+msgstr ""
+
+#: syrup/models.py:688
+msgid "Item Type"
+msgstr ""
+
+#: syrup/models.py:811
+msgid "Status information not available."
+msgstr ""
+
+#: syrup/models.py:815
+#, python-format
+msgid ""
+"%d of %d copies available at reserves desk; %d total copies in library "
+"system"
+msgstr ""
+
+#: syrup/models.py:820
+msgid "videocartridge"
+msgstr ""
+
+#: syrup/models.py:821
+msgid "videodisc"
+msgstr ""
+
+#: syrup/models.py:822
+msgid "videocassette"
+msgstr ""
+
+#: syrup/models.py:823
+msgid "videoreel"
+msgstr ""
+
+#: syrup/models.py:824
+msgid "video, other format"
+msgstr ""
+
+#: syrup/models.py:832
+msgid "video, unknown format"
+msgstr ""
+
+#: syrup/views/_common.py:60 syrup/views/items.py:433
+msgid "Access denied."
+msgstr ""
+
+#: syrup/views/_common.py:74
+msgid "Only instructors are allowed here."
+msgstr ""
+
+#: syrup/views/_common.py:87
+msgid "Please log in, so that you can enter this site."
+msgstr ""
+
+#: syrup/views/_common.py:89
+msgid "Sorry, but you can no longer access this site."
+msgstr ""
+
+#: syrup/views/_common.py:91
+msgid "Only site members are allowed here."
+msgstr ""
+
+#: syrup/views/_common.py:105
+msgid "Only administrators are allowed here."
+msgstr ""
+
+#: syrup/views/_common.py:131
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: syrup/views/_common.py:136
+msgid "Not found"
+msgstr ""
+
+#: syrup/views/_common.py:137
+msgid "The page you requested could not be found"
+msgstr ""
+
+#: syrup/views/admin.py:17 templates/courses.xhtml:1
+#: templates/admin/index.xhtml:24
+msgid "Courses"
+msgstr ""
+
+#: syrup/views/admin.py:33 templates/admin/index.xhtml:22
+msgid "Service Desks"
+msgstr ""
+
+#: syrup/views/admin.py:48 templates/admin/index.xhtml:21
+msgid "Terms"
+msgstr ""
+
+#: syrup/views/admin.py:60
+msgid "start must precede finish"
+msgstr ""
+
+#: syrup/views/admin.py:87
+msgid "Targets"
+msgstr ""
+
+#: syrup/views/admin.py:103
+msgid "Configs"
+msgstr ""
+
+#: syrup/views/auth.py:24
+msgid "Invalid username or password. Please try again."
+msgstr ""
+
+#: syrup/views/auth.py:27
+msgid "Sorry, this account has been disabled."
+msgstr ""
+
+#: syrup/views/general.py:149
+#, python-format
+msgid "Courses taught by %s"
+msgstr ""
+
+#: syrup/views/general.py:165
+#, python-format
+msgid "Courses with Materials in %s"
+msgstr ""
+
+#: syrup/views/items.py:76 syrup/views/items.py:238 syrup/views/items.py:266
+msgid "You can only add items to headings!"
+msgstr ""
+
+#: syrup/views/items.py:85 syrup/views/items.py:269
+msgid "You are not an editor."
+msgstr ""
+
+#: syrup/views/items.py:88
+msgid "No item_type parameter was provided."
+msgstr ""
+
+#: syrup/views/items.py:92
+msgid "Sorry, only HEADINGs, URLs and ELECs can be added right now."
+msgstr ""
+
+#: syrup/views/items.py:395
+msgid "Unable to update"
+msgstr ""
+
+#: syrup/views/items.py:396
+msgid "Sorry, unable to update at this time, please try again."
+msgstr ""
+
+#: syrup/views/items.py:428
+msgid "Can only download ELEC documents!"
+msgstr ""
+
+#: syrup/views/items.py:434
+msgid "Sorry, but you are not allowed to access this resource."
+msgstr ""
+
+#: syrup/views/items.py:505
+msgid "Impossible item-move!"
+msgstr ""
+
+#: syrup/views/items.py:506
+msgid "You cannot make an item a descendant of itself!"
+msgstr ""
+
+#: syrup/views/sites.py:34
+msgid "You are not allowed to create sites."
+msgstr ""
+
+#: syrup/views/sites.py:89
+msgid "Everyone: no login required."
+msgstr ""
+
+#: syrup/views/sites.py:90
+msgid "Login required."
+msgstr ""
+
+#: syrup/views/sites.py:91
+msgid "Login required; only members can access electronic documents."
+msgstr ""
+
+#: syrup/views/sites.py:92
+msgid "Members only."
+msgstr ""
+
+#: syrup/views/sites.py:93
+msgid "Instructors only: this site is closed."
+msgstr ""
+
+#: syrup/views/sites.py:202
+msgid "You cannot join this site."
+msgstr ""
+
+#: syrup/views/sites.py:203
+msgid "Sorry, but you cannot join this site at this time."
+msgstr ""
+
+#: templates/browse_index.xhtml:1
+msgid "All Reserves, by Department"
+msgstr ""
+
+#: templates/browse_index.xhtml:17
+msgid "(Note: some reserve materials may require you to [1:log in])"
+msgstr ""
+
+#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
+msgid "lock"
+msgstr ""
+
+#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
+msgid "This resource is access-controlled."
+msgstr ""
+
+#: templates/edit_site.xhtml:1
+msgid "Site setup"
+msgstr ""
+
+#: templates/edit_site.xhtml:1
+msgid "Create a new site"
+msgstr ""
+
+#: templates/edit_site.xhtml:39
+msgid "e.g.,"
+msgstr ""
+
+#: templates/edit_site.xhtml:46
+msgid "Primary Instructor"
+msgstr ""
+
+#: templates/edit_site.xhtml:51 templates/edit_site_permissions.xhtml:105
+#: templates/admin/staff_add.xhtml:34
+msgid ""
+"Type a partial name or userid into the box; then select one of the "
+"matches."
+msgstr ""
+
+#: templates/edit_site.xhtml:62 templates/edit_site_permissions.xhtml:115
+#: templates/admin/staff_add.xhtml:42
+msgid "change"
+msgstr ""
+
+#: templates/edit_site.xhtml:74 templates/edit_site_permissions.xhtml:43
+#: templates/site_invitation.xhtml:24
+msgid "Continue"
+msgstr ""
+
+#: templates/edit_site.xhtml:78 templates/edit_site.xhtml:83
+msgid "Delete this site"
+msgstr ""
+
+#: templates/edit_site.xhtml:81
+msgid "Yes, I want to delete this site and all of its contents."
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:1
+msgid "Site permissions"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:47
+msgid "Who has permission to view resources in this site?"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:49
+msgid "Change security level"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:56
+msgid "Class lists and groups"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:57
+msgid "No external lists are currently associated."
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:61
+msgid "Class/group code"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:61
+msgid "Known members"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:67
+msgid "delete"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:72
+msgid "Add external group"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:74
+msgid "Add the class list for"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:75
+msgid ", section"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:77
+msgid "Add a class list or group by its group code:"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:80
+msgid "Add class list or group"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:87
+msgid "Current membership"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:90
+msgid "Role"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:90
+msgid "User ID"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:90
+msgid "Group"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:101
+msgid "Add new member"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:118
+msgid "Role for this user:"
+msgstr ""
+
+#: templates/edit_site_permissions.xhtml:125 templates/admin/staff_add.xhtml:46
+msgid "Add this user"
+msgstr ""
+
+#: templates/instructors.xhtml:1
+msgid "Instructors"
+msgstr ""
+
+#: templates/master.xhtml:1
+msgid "Syrup Reserves System"
+msgstr ""
+
+#: templates/master.xhtml:1
+msgid "search..."
+msgstr ""
+
+#: templates/master.xhtml:17
+msgid "unAPI"
+msgstr ""
+
+#: templates/master.xhtml:57
+#, python-format
+msgid "Welcome, %(user)s!"
+msgstr ""
+
+#: templates/master.xhtml:58
+msgid "Log Out"
+msgstr ""
+
+#: templates/master.xhtml:59 templates/master.xhtml:65 templates/prefs.xhtml:1
+msgid "Preferences"
+msgstr ""
+
+#: templates/master.xhtml:63
+msgid "Log In"
+msgstr ""
+
+#: templates/master.xhtml:75
+msgid "Syrup is a subproject of [1:Project Conifer] © 2011"
+msgstr ""
+
+#: templates/master.xhtml:83
+msgid "or go back"
+msgstr ""
+
+#: templates/my_sites.xhtml:1 templates/tabbar.xhtml:14
+msgid "My Reserves"
+msgstr ""
+
+#: templates/my_sites.xhtml:19
+msgid "You are not part of any course-reserve sites at this time."
+msgstr ""
+
+#: templates/open_sites.xhtml:1
+msgid "Open Sites"
+msgstr ""
+
+#: templates/open_sites.xhtml:19
+msgid "Term"
+msgstr ""
+
+#: templates/open_sites.xhtml:19 templates/search_results.xhtml:31
+#: templates/item/item_add_cat_search.xhtml:62
+#: templates/item/item_delete_confirm.xhtml:28
+#: templates/item/item_metadata.xhtml:46
+msgid "Title"
+msgstr ""
+
+#: templates/paginate.xhtml:21
+msgid "Previous"
+msgstr ""
+
+#: templates/paginate.xhtml:30
+msgid "Next"
+msgstr ""
+
+#: templates/prefs.xhtml:16
+msgid "Preferred Language"
+msgstr ""
+
+#: templates/prefs.xhtml:23
+msgid "Change"
+msgstr ""
+
+#: templates/search_results.xhtml:1
+msgid "Search Results"
+msgstr ""
+
+#: templates/search_results.xhtml:26
+#, python-format
+msgid "You searched for: [1:%(query)s.] Found %(num)s matches."
+msgstr ""
+
+#: templates/search_results.xhtml:31
+#: templates/item/item_add_cat_search.xhtml:62
+msgid "Author"
+msgstr ""
+
+#: templates/search_results.xhtml:31
+msgid "Site"
+msgstr ""
+
+#: templates/search_results.xhtml:54
+msgid "Your searches may return more results if you [1:log in] before searching."
+msgstr ""
+
+#: templates/site_detail.xhtml:18
+msgid "There are no items associated with this site yet."
+msgstr ""
+
+#: templates/site_detail.xhtml:28
+msgid "Setup"
+msgstr ""
+
+#: templates/site_detail.xhtml:29
+msgid "Permissions"
+msgstr ""
+
+#: templates/site_detail.xhtml:32
+msgid "Join this site"
+msgstr ""
+
+#: templates/site_detail.xhtml:35
+msgid "Feeds"
+msgstr ""
+
+#: templates/site_invitation.xhtml:1
+msgid "Join a site using an Invitation Code"
+msgstr ""
+
+#: templates/site_invitation.xhtml:18
+msgid ""
+"Your instructor may have provided you with an Invitation Code, which will"
+" give you access to your course's reserves. Enter the invitation code "
+"below to continue. Note that not all courses require an invitation code; "
+"contact your instructor or the library staff for more information."
+msgstr ""
+
+#: templates/site_invitation.xhtml:22
+msgid "Invitation Code:"
+msgstr ""
+
+#: templates/site_join.xhtml:1
+msgid "Join this site?"
+msgstr ""
+
+#: templates/site_join.xhtml:16
+msgid ""
+"If you choose to join this site, it will be added to your \"My Reserves\""
+" list."
+msgstr ""
+
+#: templates/site_join.xhtml:18
+msgid "Yes, join this site"
+msgstr ""
+
+#: templates/tabbar.xhtml:11
+msgid "Return to CLEW"
+msgstr ""
+
+#: templates/tabbar.xhtml:15 templates/tabbar_anonymous.xhtml:11
+msgid "Browse"
+msgstr ""
+
+#: templates/tabbar.xhtml:18
+msgid "Admin Options"
+msgstr ""
+
+#: templates/tabbar.xhtml:20 templates/tabbar_anonymous.xhtml:12
+msgid "Faculty, How to place materials on Course Reserve"
+msgstr ""
+
+#: templates/z3950_test.xhtml:1
+msgid "Z39.50 Test"
+msgstr ""
+
+#: templates/zsearch.xhtml:1
+msgid "Search via Z39.50"
+msgstr ""
+
+#: templates/zsearch.xhtml:17
+msgid "Title:"
+msgstr ""
+
+#: templates/zsearch.xhtml:19
+msgid "Search this target"
+msgstr ""
+
+#: templates/zsearch_results.xhtml:1
+msgid "Z39.50 Search Results"
+msgstr ""
+
+#: templates/admin/index.xhtml:1
+msgid "Administrative Options"
+msgstr ""
+
+#: templates/admin/index.xhtml:18
+msgid "Create a new course site"
+msgstr ""
+
+#: templates/admin/index.xhtml:25
+msgid "Z39.50 Targets"
+msgstr ""
+
+#: templates/admin/index.xhtml:26
+msgid "Configuration settings"
+msgstr ""
+
+#: templates/admin/index.xhtml:33 templates/admin/staff_add.xhtml:1
+msgid "Add new staff user"
+msgstr ""
+
+#: templates/admin/index.xhtml:37
+msgid "Automatically update departments and courses"
+msgstr ""
+
+#: templates/admin/index.xhtml:40
+msgid "Automatically update terms"
+msgstr ""
+
+#: templates/admin/index.xhtml:44
+msgid "Advanced Administration"
+msgstr ""
+
+#: templates/admin/su.xhtml:1
+msgid "Impersonate another user"
+msgstr ""
+
+#: templates/admin/su.xhtml:17
+msgid "User ID to impersonate:"
+msgstr ""
+
+#: templates/admin/su.xhtml:19
+msgid "Impersonate"
+msgstr ""
+
+#: templates/admin/term.xhtml:1
+msgid "Add a new Term"
+msgstr ""
+
+#: templates/admin/term.xhtml:15
+msgid "Save"
+msgstr ""
+
+#: templates/auth/login.xhtml:1
+msgid "Please log in."
+msgstr ""
+
+#: templates/auth/login.xhtml:16
+msgid "You must log in to access this resource."
+msgstr ""
+
+#: templates/auth/login.xhtml:22
+msgid "User ID:"
+msgstr ""
+
+#: templates/auth/login.xhtml:26
+msgid "Password:"
+msgstr ""
+
+#: templates/auth/login.xhtml:30
+msgid "Log in"
+msgstr ""
+
+#: templates/components/site.xhtml:1
+msgid "search this site..."
+msgstr ""
+
+#: templates/components/site.xhtml:49 templates/components/site.xhtml:57
+#: templates/item/item_metadata.xhtml:73 templates/item/item_metadata.xhtml:81
+msgid "2 Hour Loan"
+msgstr ""
+
+#: templates/components/site.xhtml:50 templates/components/site.xhtml:58
+#: templates/item/item_metadata.xhtml:74 templates/item/item_metadata.xhtml:82
+msgid "3 Day Loan"
+msgstr ""
+
+#: templates/components/site.xhtml:51 templates/item/item_metadata.xhtml:75
+msgid "4 Day Loan"
+msgstr ""
+
+#: templates/components/site.xhtml:52 templates/components/site.xhtml:60
+#: templates/item/item_metadata.xhtml:76 templates/item/item_metadata.xhtml:84
+msgid "7 Day Loan"
+msgstr ""
+
+#: templates/components/site.xhtml:53 templates/item/item_metadata.xhtml:77
+msgid "1 Day Loan"
+msgstr ""
+
+#: templates/components/site.xhtml:54 templates/item/item_metadata.xhtml:78
+msgid "1 Hour Loan"
+msgstr ""
+
+#: templates/components/site.xhtml:55 templates/item/item_metadata.xhtml:79
+msgid "14 Day Loan"
+msgstr ""
+
+#: templates/components/site.xhtml:56 templates/item/item_metadata.xhtml:80
+msgid "2 Day Loan"
+msgstr ""
+
+#: templates/components/site.xhtml:59 templates/item/item_metadata.xhtml:83
+msgid "4 Hour Loan"
+msgstr ""
+
+#: templates/components/site.xhtml:62
+msgid "Ask for:"
+msgstr ""
+
+#. The next copy is due back:
+#: templates/components/site.xhtml:63
+#, python-format
+msgid "NEXT DUE: %(due_info)s"
+msgstr ""
+
+#: templates/components/site.xhtml:66 templates/item/item_metadata.xhtml:87
+msgid "Availability unknown."
+msgstr ""
+
+#: templates/components/site.xhtml:91
+msgid "Show status of all copies"
+msgstr ""
+
+#: templates/components/site.xhtml:94
+msgid "Hide status details"
+msgstr ""
+
+#: templates/components/site.xhtml:104
+msgid "Sorry, this document is not available to you."
+msgstr ""
+
+#: templates/components/site.xhtml:116
+msgid "Awaiting copyright clearance: Not available to students."
+msgstr ""
+
+#: templates/components/site.xhtml:120
+msgid "About this item"
+msgstr ""
+
+#: templates/components/site.xhtml:124
+msgid "Edit"
+msgstr ""
+
+#: templates/components/site.xhtml:125
+msgid "Relocate"
+msgstr ""
+
+#: templates/components/site.xhtml:126 templates/generic/delete.xhtml:20
+msgid "Delete"
+msgstr ""
+
+#: templates/components/site.xhtml:136
+msgid "Top Level"
+msgstr ""
+
+#: templates/components/site.xhtml:152
+msgid "Top"
+msgstr ""
+
+#: templates/components/site.xhtml:163
+msgid "Add a new item"
+msgstr ""
+
+#: templates/components/site.xhtml:165
+msgid "Link to external resource"
+msgstr ""
+
+#: templates/components/site.xhtml:166
+msgid "Uploaded electronic document"
+msgstr ""
+
+#: templates/components/site.xhtml:167
+msgid "Catalogued item (e.g., book)"
+msgstr ""
+
+#: templates/components/site.xhtml:168
+msgid "Subheading"
+msgstr ""
+
+#: templates/components/site.xhtml:183
+msgid "Show more attributes"
+msgstr ""
+
+#: templates/components/site.xhtml:188
+msgid "Attribute"
+msgstr ""
+
+#: templates/components/site.xhtml:188
+msgid "Value"
+msgstr ""
+
+#: templates/components/site.xhtml:188
+msgid "Delete?"
+msgstr ""
+
+#: templates/components/site.xhtml:200 templates/item/item_metadata.xhtml:39
+msgid "Delete this item"
+msgstr ""
+
+#: templates/feeds/site_feed_index.xhtml:1
+#: templates/feeds/site_feed_index.xhtml:14
+msgid "Available Feeds"
+msgstr ""
+
+#: templates/feeds/site_feed_index.xhtml:16
+msgid "Recent changes"
+msgstr ""
+
+#: templates/feeds/site_feed_index.xhtml:17
+msgid "Top level items in this site"
+msgstr ""
+
+#: templates/feeds/site_feed_index.xhtml:18
+msgid "Tree-walk of all items in this site"
+msgstr ""
+
+#: templates/generic/delete.xhtml:1
+#, python-format
+msgid "Delete %s?"
+msgstr ""
+
+#: templates/generic/edit.xhtml:1
+#, python-format
+msgid "Modify %s"
+msgstr ""
+
+#: templates/generic/edit.xhtml:1
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: templates/generic/edit.xhtml:18
+msgid "Save changes"
+msgstr ""
+
+#: templates/generic/edit.xhtml:19
+msgid "Delete this record"
+msgstr ""
+
+#: templates/generic/index.xhtml:36
+#, python-format
+msgid "Add %(thing)s"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:16
+msgid "Title of document"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:17
+#: templates/item/item_metadata.xhtml:47
+msgid "Title of source"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:19
+#, python-format
+msgid "Author #%(num)s"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:21
+#: templates/item/item_add_cat_search.xhtml:62
+#: templates/item/item_metadata.xhtml:50
+msgid "Publisher"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:22
+#: templates/item/item_metadata.xhtml:51
+msgid "Published"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:23
+#: templates/item/item_metadata.xhtml:52
+msgid "Volume"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:24
+#: templates/item/item_metadata.xhtml:53
+msgid "Issue"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:25
+#: templates/item/item_metadata.xhtml:54
+msgid "Pages"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:26
+#: templates/item/item_metadata.xhtml:55
+msgid "ISBN"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:27
+msgid "Bib Id of Item"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:29
+msgid "Copyright Status"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:40
+msgid "Catalogue Settings"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:45
+msgid "Update"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:55
+msgid "Barcode"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:61
+msgid "Location"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:71
+msgid "Modifier"
+msgstr ""
+
+#: templates/item/common_metadata.xhtml:81
+msgid "Call Number"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:1
+msgid "Add physical or electronic item, by catalogue search"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:1
+msgid "Use keywords or CCL syntax for searching, for example:"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:43
+msgid "Search"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:49
+#, python-format
+msgid "%(first)s–%(last)s of %(total)s results."
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:51
+#, python-format
+msgid "Previous %(count)s"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:55
+#, python-format
+msgid "Next %(count)s"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:62
+msgid "PubDate"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:70
+msgid "details"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:71
+msgid "Electronic resource."
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:72
+msgid "view"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:82
+msgid "Pick this item"
+msgstr ""
+
+#: templates/item/item_add_elec.xhtml:1
+msgid "Electronic document: Metadata"
+msgstr ""
+
+#: templates/item/item_add_elec.xhtml:1
+msgid "Add a new electronic document"
+msgstr ""
+
+#: templates/item/item_add_elec.xhtml:32 templates/item/item_add_elec.xhtml:50
+msgid "Electronic file"
+msgstr ""
+
+#: templates/item/item_add_elec.xhtml:34
+msgid "Upload file and Create item"
+msgstr ""
+
+#: templates/item/item_add_elec.xhtml:45
+msgid "Update metadata"
+msgstr ""
+
+#: templates/item/item_add_elec.xhtml:47
+msgid "Replace file contents"
+msgstr ""
+
+#: templates/item/item_add_elec.xhtml:52
+msgid "Upload new file contents"
+msgstr ""
+
+#: templates/item/item_add_heading.xhtml:1
+msgid "Edit a subheading"
+msgstr ""
+
+#: templates/item/item_add_heading.xhtml:1
+msgid "Add a new subheading"
+msgstr ""
+
+#: templates/item/item_add_heading.xhtml:30
+#: templates/item/item_add_phys.xhtml:28
+msgid "Add heading"
+msgstr ""
+
+#: templates/item/item_add_heading.xhtml:31
+msgid "Update heading"
+msgstr ""
+
+#: templates/item/item_add_phys.xhtml:1
+msgid "Edit a physical-item request"
+msgstr ""
+
+#: templates/item/item_add_phys.xhtml:1
+msgid "Add a physical-item request"
+msgstr ""
+
+#: templates/item/item_add_phys.xhtml:29
+msgid "Update physical-item request"
+msgstr ""
+
+#: templates/item/item_add_url.xhtml:1
+msgid "Edit a URL"
+msgstr ""
+
+#: templates/item/item_add_url.xhtml:1
+msgid "Add a new URL"
+msgstr ""
+
+#. Refworks Import Format
+#: templates/item/item_add_url.xhtml:27
+msgid "Import RIS"
+msgstr ""
+
+#: templates/item/item_add_url.xhtml:33
+msgid ""
+"Paste the Refworks/RIS citation in the space below. Note, the citation "
+"must include a \"UR\" (URL) attribute. (Tip: RIS citations can be dragged"
+" and dropped from Zotero.)"
+msgstr ""
+
+#: templates/item/item_add_url.xhtml:43 templates/item/item_metadata.xhtml:124
+msgid "Display MARC Record"
+msgstr ""
+
+#: templates/item/item_add_url.xhtml:55
+msgid "Add URL"
+msgstr ""
+
+#: templates/item/item_add_url.xhtml:56
+msgid "Update URL"
+msgstr ""
+
+#: templates/item/item_delete_confirm.xhtml:1
+msgid "Delete this heading?"
+msgstr ""
+
+#: templates/item/item_delete_confirm.xhtml:1
+msgid "Delete this item?"
+msgstr ""
+
+#: templates/item/item_delete_confirm.xhtml:23
+msgid "Are you sure you want to delete this?"
+msgstr ""
+
+#: templates/item/item_delete_confirm.xhtml:25
+msgid "Note: this will also delete all items under the heading!"
+msgstr ""
+
+#: templates/item/item_delete_confirm.xhtml:29
+#: templates/item/item_metadata.xhtml:60
+msgid "Type"
+msgstr ""
+
+#: templates/item/item_delete_confirm.xhtml:34
+msgid "Yes, delete it"
+msgstr ""
+
+#: templates/item/item_heading_detail.xhtml:21
+msgid "Edit this heading"
+msgstr ""
+
+#: templates/item/item_heading_detail.xhtml:24
+msgid "Delete this heading"
+msgstr ""
+
+#: templates/item/item_heading_detail.xhtml:27
+msgid "Relocate this heading"
+msgstr ""
+
+#: templates/item/item_heading_detail.xhtml:32
+msgid "There are no items in this section."
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:36
+msgid "Edit this item"
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:42
+msgid "Relocate this item"
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:48
+msgid "Format"
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:49
+msgid "Author(s)"
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:59
+msgid "Copyright status"
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:68
+msgid "Call Number (take this to the counter)"
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:70
+#, python-format
+msgid "DUE: %(duedate)s"
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:96
+msgid "Status"
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:102
+msgid "Download the document"
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:103
+msgid ""
+"Note: this item is awaiting [1:copyright clearance]. Only staff and "
+"instructors may download it."
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:108
+msgid ""
+"By pressing the 'Request' button below, I am requesting a digital copy of"
+" a reading (chapter, article) for my own private study and research use. "
+"I agree that I will not reproduce, redistribute or transmit a copy of the"
+" reading in any format."
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:109
+msgid "Request to download this document"
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:112
+msgid "Click here to download the document."
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:113
+#, python-format
+msgid "Document type: %(type)s. Size: %(bytes)s bytes."
+msgstr ""
+
+#: templates/item/item_metadata.xhtml:119
+msgid "View status of all copies in catalogue"
+msgstr ""
+
+#: templates/item/item_relocate.xhtml:1
+msgid "Move item under a different heading"
+msgstr ""
+
+#: templates/item/item_relocate.xhtml:16
+msgid "Please choose the heading under which this item should be moved:"
+msgstr ""
+
+#: templates/item/item_relocate.xhtml:20
+msgid "Item title:"
+msgstr ""
+
+#: templates/item/item_relocate.xhtml:21
+msgid "Current heading:"
+msgstr ""
+
+#: templates/item/item_relocate.xhtml:24
+msgid "New heading:"
+msgstr ""
+
+#: templates/item/item_relocate.xhtml:32
+msgid "Move item"
+msgstr ""
+

Deleted: servres/branches/i18n/conifer/locale/en_US/LC_MESSAGES/django.po
===================================================================
--- servres/branches/i18n/conifer/locale/en_US/LC_MESSAGES/django.po	2011-03-29 00:56:10 UTC (rev 1289)
+++ servres/branches/i18n/conifer/locale/en_US/LC_MESSAGES/django.po	2011-03-29 00:56:15 UTC (rev 1290)
@@ -1,1520 +0,0 @@
-# English (United States) translations for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2011.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-03-27 13:48+0400\n"
-"PO-Revision-Date: 2011-03-27 15:44-0400\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: en_US <LL at li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
-
-#: integration/linktool/templates/associate.xhtml:13
-msgid "No associated reserves items."
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:15
-msgid ""
-"There are no reserves materials associated with this course\n"
-"      site. As an instructor, you can choose one of the following\n"
-"      options:"
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:20
-msgid "Link this course site to one of my current reserves list"
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:22
-msgid "None available."
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:43
-msgid "Or, you can just"
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:43
-msgid "browse the reserves"
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:47
-msgid ""
-"There are no reserves materials associated with this course\n"
-"      site."
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:48
-msgid ""
-"You can create reserves lists for course sites\n"
-"      associated with a current or future term. But this site is\n"
-"      associated with the term \""
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:50
-msgid "\" and the course \""
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:50
-msgid ""
-"\" — so\n"
-"      a reserves list cannot be created."
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:52
-msgid "Browse the reserves"
-msgstr ""
-
-#: integration/linktool/templates/index.xhtml:6
-#: integration/linktool/templates/new_site_cannot.xhtml:6
-msgid "testing"
-msgstr ""
-
-#: integration/linktool/templates/index.xhtml:13
-msgid "Welcome"
-msgstr ""
-
-#: integration/linktool/templates/new_site_cannot.xhtml:13
-msgid "Cannot create site..."
-msgstr ""
-
-#: integration/linktool/templates/new_site_cannot.xhtml:14
-msgid "Sorry, but your site's course code ("
-msgstr ""
-
-#: integration/linktool/templates/new_site_cannot.xhtml:14
-msgid ""
-")\n"
-"    and/or term code ("
-msgstr ""
-
-#: integration/linktool/templates/new_site_cannot.xhtml:15
-msgid ""
-") do not match any known\n"
-"    codes in the reserves system."
-msgstr ""
-
-#: integration/linktool/templates/new_site_cannot.xhtml:18
-#: templates/simplemessage.xhtml:11 templates/admin/staff_add.xhtml:50
-msgid "Go back"
-msgstr ""
-
-#: integration/linktool/templates/whichsite.xhtml:7
-msgid "Please choose a set of reserves materials"
-msgstr ""
-
-#: integration/linktool/templates/whichsite.xhtml:8
-msgid ""
-"There is more than one set of reserves materials related to this\n"
-"    site. Please choose from the list below:"
-msgstr ""
-
-#: syrup/models.py:133
-msgid "ILS patron ID"
-msgstr ""
-
-#: syrup/models.py:154 syrup/models.py:171 syrup/models.py:188
-#: templates/courses.xhtml:19 templates/edit_site_permissions.xhtml:90
-#: templates/instructors.xhtml:19 templates/zsearch_results.xhtml:28
-msgid "Name"
-msgstr ""
-
-#: syrup/models.py:155 syrup/models.py:189
-msgid "Is active?"
-msgstr ""
-
-#: syrup/models.py:156
-msgid "External ID"
-msgstr ""
-
-#: syrup/models.py:159
-msgid "service desk"
-msgstr ""
-
-#: syrup/models.py:160
-msgid "service desks"
-msgstr ""
-
-#: syrup/models.py:170 syrup/models.py:202 templates/open_sites.xhtml:19
-msgid "Code"
-msgstr ""
-
-#: syrup/models.py:172
-msgid "Start (Y-M-D)"
-msgstr ""
-
-#: syrup/models.py:173
-msgid "Finish (Y-M-D)"
-msgstr ""
-
-#: syrup/models.py:176
-msgid "term"
-msgstr ""
-
-#: syrup/models.py:177
-msgid "terms"
-msgstr ""
-
-#: syrup/models.py:190 syrup/models.py:244
-msgid "Service desk"
-msgstr ""
-
-#: syrup/models.py:193 templates/departments.xhtml:19
-msgid "Department"
-msgstr ""
-
-#: syrup/models.py:194 syrup/views/admin.py:71 templates/departments.xhtml:1
-#: templates/admin/index.xhtml:23
-msgid "Departments"
-msgstr ""
-
-#: syrup/models.py:240
-msgid "Course"
-msgstr ""
-
-#: syrup/models.py:241
-msgid "Start term"
-msgstr ""
-
-#: syrup/models.py:242
-msgid "End term"
-msgstr ""
-
-#: syrup/models.py:247
-msgid "World-accessible"
-msgstr ""
-
-#: syrup/models.py:248
-msgid "Accessible to all logged-in users"
-msgstr ""
-
-#: syrup/models.py:249
-msgid ""
-"Accessible to all logged-in users, but only course-site members can read "
-"electronic documents."
-msgstr ""
-
-#: syrup/models.py:250
-msgid "Accessible to course-site members"
-msgstr ""
-
-#: syrup/models.py:251
-msgid "Accessible only to course-site owners"
-msgstr ""
-
-#: syrup/models.py:518
-msgid "Instructor"
-msgstr ""
-
-#: syrup/models.py:519
-msgid "Assistant/Support"
-msgstr ""
-
-#: syrup/models.py:520
-msgid "Student"
-msgstr ""
-
-#: syrup/models.py:563
-msgid "Attached Electronic Document"
-msgstr ""
-
-#: syrup/models.py:564
-msgid "Physical Book or Document"
-msgstr ""
-
-#: syrup/models.py:565 templates/item/item_add_url.xhtml:37
-#: templates/item/item_delete_confirm.xhtml:30
-#: templates/item/item_metadata.xhtml:98
-msgid "URL"
-msgstr ""
-
-#: syrup/models.py:566 templates/item/item_add_heading.xhtml:24
-msgid "Heading"
-msgstr ""
-
-#: syrup/models.py:590
-msgid "Bib Record ID"
-msgstr ""
-
-#: syrup/models.py:591
-msgid "MARCXML"
-msgstr ""
-
-#: syrup/models.py:646
-msgid "Normal"
-msgstr ""
-
-#: syrup/models.py:647
-msgid "2 Hour"
-msgstr ""
-
-#: syrup/models.py:648
-msgid "1 Day"
-msgstr ""
-
-#: syrup/models.py:649
-msgid "3 Day"
-msgstr ""
-
-#: syrup/models.py:650
-msgid "7 Day"
-msgstr ""
-
-#: syrup/models.py:660
-msgid "Reserves Counter"
-msgstr ""
-
-#: syrup/models.py:661
-msgid "Circulating Collection"
-msgstr ""
-
-#: syrup/models.py:688
-msgid "Item Type"
-msgstr ""
-
-#: syrup/models.py:811
-msgid "Status information not available."
-msgstr ""
-
-#: syrup/models.py:815
-#, python-format
-msgid ""
-"%d of %d copies available at reserves desk; %d total copies in library "
-"system"
-msgstr ""
-
-#: syrup/models.py:820
-msgid "videocartridge"
-msgstr ""
-
-#: syrup/models.py:821
-msgid "videodisc"
-msgstr ""
-
-#: syrup/models.py:822
-msgid "videocassette"
-msgstr ""
-
-#: syrup/models.py:823
-msgid "videoreel"
-msgstr ""
-
-#: syrup/models.py:824
-msgid "video, other format"
-msgstr ""
-
-#: syrup/models.py:832
-msgid "video, unknown format"
-msgstr ""
-
-#: syrup/views/_common.py:60 syrup/views/items.py:433
-msgid "Access denied."
-msgstr ""
-
-#: syrup/views/_common.py:74
-msgid "Only instructors are allowed here."
-msgstr ""
-
-#: syrup/views/_common.py:87
-msgid "Please log in, so that you can enter this site."
-msgstr ""
-
-#: syrup/views/_common.py:89
-msgid "Sorry, but you can no longer access this site."
-msgstr ""
-
-#: syrup/views/_common.py:91
-msgid "Only site members are allowed here."
-msgstr ""
-
-#: syrup/views/_common.py:105
-msgid "Only administrators are allowed here."
-msgstr ""
-
-#: syrup/views/_common.py:131
-#, python-format
-msgid "Error: %s"
-msgstr ""
-
-#: syrup/views/_common.py:136
-msgid "Not found"
-msgstr ""
-
-#: syrup/views/_common.py:137
-msgid "The page you requested could not be found"
-msgstr ""
-
-#: syrup/views/admin.py:17 templates/courses.xhtml:1
-#: templates/admin/index.xhtml:24
-msgid "Courses"
-msgstr ""
-
-#: syrup/views/admin.py:33 templates/admin/index.xhtml:22
-msgid "Service Desks"
-msgstr ""
-
-#: syrup/views/admin.py:48 templates/admin/index.xhtml:21
-msgid "Terms"
-msgstr ""
-
-#: syrup/views/admin.py:60
-msgid "start must precede finish"
-msgstr ""
-
-#: syrup/views/admin.py:87
-msgid "Targets"
-msgstr ""
-
-#: syrup/views/admin.py:103
-msgid "Configs"
-msgstr ""
-
-#: syrup/views/auth.py:24
-msgid "Invalid username or password. Please try again."
-msgstr ""
-
-#: syrup/views/auth.py:27
-msgid "Sorry, this account has been disabled."
-msgstr ""
-
-#: syrup/views/general.py:149
-#, python-format
-msgid "Courses taught by %s"
-msgstr ""
-
-#: syrup/views/general.py:165
-#, python-format
-msgid "Courses with Materials in %s"
-msgstr ""
-
-#: syrup/views/items.py:76 syrup/views/items.py:238 syrup/views/items.py:266
-msgid "You can only add items to headings!"
-msgstr ""
-
-#: syrup/views/items.py:85 syrup/views/items.py:269
-msgid "You are not an editor."
-msgstr ""
-
-#: syrup/views/items.py:88
-msgid "No item_type parameter was provided."
-msgstr ""
-
-#: syrup/views/items.py:92
-msgid "Sorry, only HEADINGs, URLs and ELECs can be added right now."
-msgstr ""
-
-#: syrup/views/items.py:395
-msgid "Unable to update"
-msgstr ""
-
-#: syrup/views/items.py:396
-msgid "Sorry, unable to update at this time, please try again."
-msgstr ""
-
-#: syrup/views/items.py:428
-msgid "Can only download ELEC documents!"
-msgstr ""
-
-#: syrup/views/items.py:434
-msgid "Sorry, but you are not allowed to access this resource."
-msgstr ""
-
-#: syrup/views/items.py:505
-msgid "Impossible item-move!"
-msgstr ""
-
-#: syrup/views/items.py:506
-msgid "You cannot make an item a descendant of itself!"
-msgstr ""
-
-#: syrup/views/sites.py:34
-msgid "You are not allowed to create sites."
-msgstr ""
-
-#: syrup/views/sites.py:89
-msgid "Everyone: no login required."
-msgstr ""
-
-#: syrup/views/sites.py:90
-msgid "Login required."
-msgstr ""
-
-#: syrup/views/sites.py:91
-msgid "Login required; only members can access electronic documents."
-msgstr ""
-
-#: syrup/views/sites.py:92
-msgid "Members only."
-msgstr ""
-
-#: syrup/views/sites.py:93
-msgid "Instructors only: this site is closed."
-msgstr ""
-
-#: syrup/views/sites.py:202
-msgid "You cannot join this site."
-msgstr ""
-
-#: syrup/views/sites.py:203
-msgid "Sorry, but you cannot join this site at this time."
-msgstr ""
-
-#: templates/browse_index.xhtml:1
-msgid "All Reserves, by Department"
-msgstr ""
-
-#: templates/browse_index.xhtml:16
-msgid ""
-"(Note: some reserve materials may require you\n"
-"    to"
-msgstr ""
-
-#: templates/browse_index.xhtml:18
-msgid "log in"
-msgstr ""
-
-#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
-msgid "lock"
-msgstr ""
-
-#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
-msgid "This resource is access-controlled."
-msgstr ""
-
-#: templates/edit_site.xhtml:1
-msgid "Site setup"
-msgstr ""
-
-#: templates/edit_site.xhtml:1
-msgid "Create a new site"
-msgstr ""
-
-#: templates/edit_site.xhtml:39
-msgid "e.g.,"
-msgstr ""
-
-#: templates/edit_site.xhtml:46
-msgid "Primary Instructor"
-msgstr ""
-
-#: templates/edit_site.xhtml:51 templates/edit_site_permissions.xhtml:105
-#: templates/admin/staff_add.xhtml:34
-msgid ""
-"Type a partial name or userid into the box; then select one of the "
-"matches."
-msgstr ""
-
-#: templates/edit_site.xhtml:62 templates/edit_site_permissions.xhtml:115
-#: templates/admin/staff_add.xhtml:42
-msgid "change"
-msgstr ""
-
-#: templates/edit_site.xhtml:74 templates/edit_site_permissions.xhtml:43
-#: templates/site_invitation.xhtml:28 templates/phys/checkout.xhtml:63
-#: templates/phys/circlist_index.xhtml:18 templates/phys/mark_arrived.xhtml:31
-#: templates/phys/mark_arrived_outcome.xhtml:20
-msgid "Continue"
-msgstr ""
-
-#: templates/edit_site.xhtml:78 templates/edit_site.xhtml:83
-msgid "Delete this site"
-msgstr ""
-
-#: templates/edit_site.xhtml:81
-msgid "Yes, I want to delete this site and all of its contents."
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:1
-msgid "Site permissions"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:47
-msgid "Who has permission to view resources in this site?"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:49
-msgid "Change security level"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:56
-msgid "Class lists and groups"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:57
-msgid "No external lists are currently associated."
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:61
-msgid "Class/group code"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:61
-msgid "Known members"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:67
-msgid "delete"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:72
-msgid "Add external group"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:74
-msgid "Add the class list for"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:75
-msgid ", section"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:77
-msgid "Add a class list or group by its group code:"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:80
-msgid "Add class list or group"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:87
-msgid "Current membership"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:90
-msgid "Role"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:90
-msgid "User ID"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:90
-msgid "Group"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:101
-msgid "Add new member"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:118
-msgid "Role for this user:"
-msgstr ""
-
-#: templates/edit_site_permissions.xhtml:125 templates/admin/staff_add.xhtml:46
-msgid "Add this user"
-msgstr ""
-
-#: templates/instructors.xhtml:1
-msgid "Instructors"
-msgstr ""
-
-#: templates/master.xhtml:1
-msgid "Syrup Reserves System"
-msgstr ""
-
-#: templates/master.xhtml:1
-msgid "search..."
-msgstr ""
-
-#: templates/master.xhtml:17
-msgid "unAPI"
-msgstr ""
-
-#: templates/master.xhtml:57
-#, python-format
-msgid "Welcome, %(user)s!"
-msgstr ""
-
-#: templates/master.xhtml:58
-msgid "Log Out"
-msgstr ""
-
-#: templates/master.xhtml:59 templates/master.xhtml:65 templates/prefs.xhtml:1
-msgid "Preferences"
-msgstr ""
-
-#: templates/master.xhtml:62
-msgid "Welcome!"
-msgstr ""
-
-#: templates/master.xhtml:63
-msgid "Log In"
-msgstr ""
-
-#: templates/master.xhtml:75
-msgid "Syrup is a subproject of [1:Project Conifer] © 2011"
-msgstr ""
-
-#: templates/master.xhtml:83
-msgid "or go back"
-msgstr ""
-
-#: templates/my_sites.xhtml:1 templates/tabbar.xhtml:14
-msgid "My Reserves"
-msgstr ""
-
-#: templates/my_sites.xhtml:19
-msgid "You are not part of any course-reserve sites at this time."
-msgstr ""
-
-#: templates/open_sites.xhtml:1
-msgid "Open Sites"
-msgstr ""
-
-#: templates/open_sites.xhtml:19
-msgid "Term"
-msgstr ""
-
-#: templates/open_sites.xhtml:19 templates/search_results.xhtml:31
-#: templates/item/item_add_cat_search.xhtml:61
-#: templates/item/item_delete_confirm.xhtml:28
-#: templates/item/item_metadata.xhtml:46
-#: templates/phys/circlist_for_term.xhtml:22
-msgid "Title"
-msgstr ""
-
-#: templates/paginate.xhtml:21 templates/item/item_add_cat_search.xhtml:50
-msgid "Previous"
-msgstr ""
-
-#: templates/paginate.xhtml:30 templates/item/item_add_cat_search.xhtml:54
-msgid "Next"
-msgstr ""
-
-#: templates/prefs.xhtml:16
-msgid "Preferred Language"
-msgstr ""
-
-#: templates/prefs.xhtml:23
-msgid "Change"
-msgstr ""
-
-#: templates/search_results.xhtml:1
-msgid "Search Results"
-msgstr ""
-
-#: templates/search_results.xhtml:26
-#, python-format
-msgid "You searched for: [1:%(query)s.] Found %(num)s matches."
-msgstr ""
-
-#: templates/search_results.xhtml:31
-#: templates/item/item_add_cat_search.xhtml:61
-#: templates/phys/circlist_for_term.xhtml:22
-msgid "Author"
-msgstr ""
-
-#: templates/search_results.xhtml:31
-msgid "Site"
-msgstr ""
-
-#: templates/search_results.xhtml:54
-msgid "Your searches may return more results if you [1:log in] before searching."
-msgstr ""
-
-#: templates/site_detail.xhtml:18
-msgid "There are no items associated with this site yet."
-msgstr ""
-
-#: templates/site_detail.xhtml:28
-msgid "Setup"
-msgstr ""
-
-#: templates/site_detail.xhtml:29
-msgid "Permissions"
-msgstr ""
-
-#: templates/site_detail.xhtml:32
-msgid "Join this site"
-msgstr ""
-
-#: templates/site_detail.xhtml:35
-msgid "Feeds"
-msgstr ""
-
-#: templates/site_invitation.xhtml:1
-msgid "Join a site using an Invitation Code"
-msgstr ""
-
-#: templates/site_invitation.xhtml:18
-msgid ""
-"Your instructor may have provided you with an Invitation Code,\n"
-"  which will give you access to your course's reserves. Enter the\n"
-"  invitation code below to continue. Note that not all courses require\n"
-"  an invitation code; contact your instructor or the library staff for\n"
-"  more information."
-msgstr ""
-
-#: templates/site_invitation.xhtml:26
-msgid "Invitation Code:"
-msgstr ""
-
-#: templates/site_join.xhtml:1
-msgid "Join this site?"
-msgstr ""
-
-#: templates/site_join.xhtml:16
-msgid ""
-"If you choose to join this site, it will be added to your \"My\n"
-"    Reserves\" list."
-msgstr ""
-
-#: templates/site_join.xhtml:19
-msgid "Yes, join this site"
-msgstr ""
-
-#: templates/tabbar.xhtml:11
-msgid "Return to CLEW"
-msgstr ""
-
-#: templates/tabbar.xhtml:15 templates/tabbar_anonymous.xhtml:11
-msgid "Browse"
-msgstr ""
-
-#: templates/tabbar.xhtml:18
-msgid "Admin Options"
-msgstr ""
-
-#: templates/tabbar.xhtml:20 templates/tabbar_anonymous.xhtml:12
-msgid "Faculty, How to place materials on Course Reserve"
-msgstr ""
-
-#: templates/z3950_test.xhtml:1
-msgid "Z39.50 Test"
-msgstr ""
-
-#: templates/zsearch.xhtml:1
-msgid "Search via Z39.50"
-msgstr ""
-
-#: templates/zsearch.xhtml:17
-msgid "Title:"
-msgstr ""
-
-#: templates/zsearch.xhtml:19
-msgid "Search this target"
-msgstr ""
-
-#: templates/zsearch_results.xhtml:1
-msgid "Z39.50 Search Results"
-msgstr ""
-
-#: templates/admin/index.xhtml:1
-msgid "Administrative Options"
-msgstr ""
-
-#: templates/admin/index.xhtml:18
-msgid "Create a new course site"
-msgstr ""
-
-#: templates/admin/index.xhtml:25
-msgid "Z39.50 Targets"
-msgstr ""
-
-#: templates/admin/index.xhtml:26
-msgid "Configuration settings"
-msgstr ""
-
-#: templates/admin/index.xhtml:33 templates/admin/staff_add.xhtml:1
-msgid "Add new staff user"
-msgstr ""
-
-#: templates/admin/index.xhtml:37
-msgid "Automatically update departments and courses"
-msgstr ""
-
-#: templates/admin/index.xhtml:40
-msgid "Automatically update terms"
-msgstr ""
-
-#: templates/admin/index.xhtml:44
-msgid "Advanced Administration"
-msgstr ""
-
-#: templates/admin/su.xhtml:1
-msgid "Impersonate another user"
-msgstr ""
-
-#: templates/admin/su.xhtml:17
-msgid "UWin ID to impersonate:"
-msgstr ""
-
-#: templates/admin/su.xhtml:19
-msgid "Impersonate"
-msgstr ""
-
-#: templates/admin/term.xhtml:1
-msgid "Add a new Term"
-msgstr ""
-
-#: templates/admin/term.xhtml:15
-msgid "Save"
-msgstr ""
-
-#: templates/auth/login.xhtml:1
-msgid "Please log in."
-msgstr ""
-
-#: templates/auth/login.xhtml:16
-msgid "You must log in to access this resource."
-msgstr ""
-
-#: templates/auth/login.xhtml:22
-msgid "User ID:"
-msgstr ""
-
-#: templates/auth/login.xhtml:26
-msgid "Password:"
-msgstr ""
-
-#: templates/auth/login.xhtml:30
-msgid "Log in"
-msgstr ""
-
-#: templates/components/site.xhtml:1
-msgid "search this site..."
-msgstr ""
-
-#: templates/components/site.xhtml:48 templates/components/site.xhtml:56
-#: templates/item/item_metadata.xhtml:73 templates/item/item_metadata.xhtml:81
-msgid "2 Hour Loan"
-msgstr ""
-
-#: templates/components/site.xhtml:49 templates/components/site.xhtml:57
-#: templates/item/item_metadata.xhtml:74 templates/item/item_metadata.xhtml:82
-msgid "3 Day Loan"
-msgstr ""
-
-#: templates/components/site.xhtml:50 templates/item/item_metadata.xhtml:75
-msgid "4 Day Loan"
-msgstr ""
-
-#: templates/components/site.xhtml:51 templates/components/site.xhtml:59
-#: templates/item/item_metadata.xhtml:76 templates/item/item_metadata.xhtml:84
-msgid "7 Day Loan"
-msgstr ""
-
-#: templates/components/site.xhtml:52 templates/item/item_metadata.xhtml:77
-msgid "1 Day Loan"
-msgstr ""
-
-#: templates/components/site.xhtml:53 templates/item/item_metadata.xhtml:78
-msgid "1 Hour Loan"
-msgstr ""
-
-#: templates/components/site.xhtml:54 templates/item/item_metadata.xhtml:79
-msgid "14 Day Loan"
-msgstr ""
-
-#: templates/components/site.xhtml:55 templates/item/item_metadata.xhtml:80
-msgid "2 Day Loan"
-msgstr ""
-
-#: templates/components/site.xhtml:58 templates/item/item_metadata.xhtml:83
-msgid "4 Hour Loan"
-msgstr ""
-
-#: templates/components/site.xhtml:61
-msgid "Ask for:"
-msgstr ""
-
-#: templates/components/site.xhtml:62
-msgid "NEXT DUE:"
-msgstr ""
-
-#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:87
-msgid "Availability unknown."
-msgstr ""
-
-#: templates/components/site.xhtml:90
-msgid "Show status of all copies"
-msgstr ""
-
-#: templates/components/site.xhtml:93
-msgid "Hide status details"
-msgstr ""
-
-#: templates/components/site.xhtml:103
-msgid "Sorry, this document is not available to you."
-msgstr ""
-
-#: templates/components/site.xhtml:115
-msgid "Awaiting copyright clearance: Not available to students."
-msgstr ""
-
-#: templates/components/site.xhtml:119
-msgid "About this item"
-msgstr ""
-
-#: templates/components/site.xhtml:123
-msgid "Edit"
-msgstr ""
-
-#: templates/components/site.xhtml:124
-msgid "Relocate"
-msgstr ""
-
-#: templates/components/site.xhtml:125 templates/generic/delete.xhtml:20
-msgid "Delete"
-msgstr ""
-
-#: templates/components/site.xhtml:135
-msgid "0"
-msgstr ""
-
-#: templates/components/site.xhtml:135
-msgid "Top Level"
-msgstr ""
-
-#: templates/components/site.xhtml:151
-msgid "Top"
-msgstr ""
-
-#: templates/components/site.xhtml:162
-msgid "Add a new item"
-msgstr ""
-
-#: templates/components/site.xhtml:164
-msgid "Link to external resource"
-msgstr ""
-
-#: templates/components/site.xhtml:165
-msgid "Uploaded electronic document"
-msgstr ""
-
-#: templates/components/site.xhtml:166
-msgid "Catalogued item (e.g., book)"
-msgstr ""
-
-#: templates/components/site.xhtml:167
-msgid "Subheading"
-msgstr ""
-
-#: templates/components/site.xhtml:182
-msgid "Show more attributes"
-msgstr ""
-
-#: templates/components/site.xhtml:187
-msgid "Attribute"
-msgstr ""
-
-#: templates/components/site.xhtml:187
-msgid "Value"
-msgstr ""
-
-#: templates/components/site.xhtml:187
-msgid "Delete?"
-msgstr ""
-
-#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:39
-msgid "Delete this item"
-msgstr ""
-
-#: templates/feeds/site_feed_index.xhtml:1
-#: templates/feeds/site_feed_index.xhtml:14
-msgid "Available Feeds"
-msgstr ""
-
-#: templates/feeds/site_feed_index.xhtml:16
-msgid "Recent changes"
-msgstr ""
-
-#: templates/feeds/site_feed_index.xhtml:17
-msgid "Top level items in this site"
-msgstr ""
-
-#: templates/feeds/site_feed_index.xhtml:18
-msgid "Tree-walk of all items in this site"
-msgstr ""
-
-#: templates/generic/delete.xhtml:1
-#, python-format
-msgid "Delete %s?"
-msgstr ""
-
-#: templates/generic/edit.xhtml:1
-#, python-format
-msgid "Modify %s"
-msgstr ""
-
-#: templates/generic/edit.xhtml:1
-#, python-format
-msgid "Add %s"
-msgstr ""
-
-#: templates/generic/edit.xhtml:18
-msgid "Save changes"
-msgstr ""
-
-#: templates/generic/edit.xhtml:19
-msgid "Delete this record"
-msgstr ""
-
-#: templates/generic/index.xhtml:36
-#, python-format
-msgid "Add %(thing)s"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:15
-msgid "Title of document"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:16
-#: templates/item/item_metadata.xhtml:47
-msgid "Title of source"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:18
-msgid "Author #"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:20
-#: templates/item/item_add_cat_search.xhtml:61
-#: templates/item/item_metadata.xhtml:50
-#: templates/phys/circlist_for_term.xhtml:22
-msgid "Publisher"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:21
-#: templates/item/item_metadata.xhtml:51
-msgid "Published"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:22
-#: templates/item/item_metadata.xhtml:52
-msgid "Volume"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:23
-#: templates/item/item_metadata.xhtml:53
-msgid "Issue"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:24
-#: templates/item/item_metadata.xhtml:54
-msgid "Pages"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:25
-#: templates/item/item_metadata.xhtml:55
-msgid "ISBN"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:26
-msgid "Bib Id of Item"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:28
-msgid "Copyright Status"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:39
-msgid "Catalogue Settings"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:44
-msgid "Update"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:54
-msgid "Barcode"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:60
-msgid "Location"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:70
-msgid "Modifier"
-msgstr ""
-
-#: templates/item/common_metadata.xhtml:80
-msgid "Call Number"
-msgstr ""
-
-#: templates/item/item_add_cat_search.xhtml:1
-msgid "Add physical or electronic item, by catalogue search"
-msgstr ""
-
-#: templates/item/item_add_cat_search.xhtml:1
-msgid "Use keywords or CCL syntax for searching, for example:"
-msgstr ""
-
-#: templates/item/item_add_cat_search.xhtml:42
-msgid "Search"
-msgstr ""
-
-#: templates/item/item_add_cat_search.xhtml:48
-msgid "of"
-msgstr ""
-
-#: templates/item/item_add_cat_search.xhtml:48
-msgid "results."
-msgstr ""
-
-#: templates/item/item_add_cat_search.xhtml:61
-#: templates/phys/circlist_for_term.xhtml:22
-msgid "PubDate"
-msgstr ""
-
-#: templates/item/item_add_cat_search.xhtml:69
-msgid "details"
-msgstr ""
-
-#: templates/item/item_add_cat_search.xhtml:70
-msgid "Electronic resource."
-msgstr ""
-
-#: templates/item/item_add_cat_search.xhtml:71
-msgid "view"
-msgstr ""
-
-#: templates/item/item_add_cat_search.xhtml:81
-msgid "Pick this item"
-msgstr ""
-
-#: templates/item/item_add_elec.xhtml:1
-msgid "Electronic document: Metadata"
-msgstr ""
-
-#: templates/item/item_add_elec.xhtml:1
-msgid "Add a new electronic document"
-msgstr ""
-
-#: templates/item/item_add_elec.xhtml:32 templates/item/item_add_elec.xhtml:50
-msgid "File"
-msgstr ""
-
-#: templates/item/item_add_elec.xhtml:34
-msgid "Upload file and Create item"
-msgstr ""
-
-#: templates/item/item_add_elec.xhtml:45
-msgid "Update metadata"
-msgstr ""
-
-#: templates/item/item_add_elec.xhtml:47
-msgid "Replace file contents"
-msgstr ""
-
-#: templates/item/item_add_elec.xhtml:52
-msgid "Upload new file contents"
-msgstr ""
-
-#: templates/item/item_add_heading.xhtml:1
-msgid "Edit a subheading"
-msgstr ""
-
-#: templates/item/item_add_heading.xhtml:1
-msgid "Add a new subheading"
-msgstr ""
-
-#: templates/item/item_add_heading.xhtml:30
-#: templates/item/item_add_phys.xhtml:28
-msgid "Add heading"
-msgstr ""
-
-#: templates/item/item_add_heading.xhtml:31
-msgid "Update heading"
-msgstr ""
-
-#: templates/item/item_add_phys.xhtml:1
-msgid "Edit a physical-item request"
-msgstr ""
-
-#: templates/item/item_add_phys.xhtml:1
-msgid "Add a physical-item request"
-msgstr ""
-
-#: templates/item/item_add_phys.xhtml:29
-msgid "Update physical-item request"
-msgstr ""
-
-#: templates/item/item_add_url.xhtml:1
-msgid "Edit a URL"
-msgstr ""
-
-#: templates/item/item_add_url.xhtml:1
-msgid "Add a new URL"
-msgstr ""
-
-#: templates/item/item_add_url.xhtml:26
-msgid "Import RIS"
-msgstr ""
-
-#: templates/item/item_add_url.xhtml:32
-msgid ""
-"Paste the Refworks/RIS citation in the space below. Note, the citation "
-"must include a \"UR\" (URL) attribute. (Tip: RIS citations can be dragged"
-" and dropped from Zotero.)"
-msgstr ""
-
-#: templates/item/item_add_url.xhtml:42 templates/item/item_metadata.xhtml:128
-msgid "Display MARC Record"
-msgstr ""
-
-#: templates/item/item_add_url.xhtml:54
-msgid "Add URL"
-msgstr ""
-
-#: templates/item/item_add_url.xhtml:55
-msgid "Update URL"
-msgstr ""
-
-#: templates/item/item_delete_confirm.xhtml:1
-msgid "Delete this heading?"
-msgstr ""
-
-#: templates/item/item_delete_confirm.xhtml:1
-msgid "Delete this item?"
-msgstr ""
-
-#: templates/item/item_delete_confirm.xhtml:23
-msgid "Are you sure you want to delete this?"
-msgstr ""
-
-#: templates/item/item_delete_confirm.xhtml:25
-msgid "Note: this will also delete all items under the heading!"
-msgstr ""
-
-#: templates/item/item_delete_confirm.xhtml:29
-#: templates/item/item_metadata.xhtml:60
-msgid "Type"
-msgstr ""
-
-#: templates/item/item_delete_confirm.xhtml:34
-msgid "Yes, delete it"
-msgstr ""
-
-#: templates/item/item_heading_detail.xhtml:21
-msgid "Edit this heading"
-msgstr ""
-
-#: templates/item/item_heading_detail.xhtml:24
-msgid "Delete this heading"
-msgstr ""
-
-#: templates/item/item_heading_detail.xhtml:27
-msgid "Relocate this heading"
-msgstr ""
-
-#: templates/item/item_heading_detail.xhtml:32
-msgid "There are no items in this section."
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:36
-msgid "Edit this item"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:42
-msgid "Relocate this item"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:48
-msgid "Format"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:49
-msgid "Author(s)"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:59
-msgid "Copyright status"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:68
-msgid "Call Number (take this to the counter)"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:70
-msgid "DUE:"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:96
-msgid "Status"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:102
-msgid "Download the document"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:103
-msgid ""
-"Note: this item is awaiting [1:copyright clearance]. Only staff and "
-"instructors may download it."
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:108
-msgid ""
-"By pressing the 'Request' button\n"
-"\tbelow, I am requesting a digital copy of a reading (chapter, article)\n"
-"\tfor my own private study and research use. I agree that I will not\n"
-"\treproduce, redistribute or transmit a copy of the reading in any\n"
-"\tformat."
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:113
-msgid "Request to download this document"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:116
-msgid "Click here to download the document."
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:117
-msgid "Document type:"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:117
-msgid ". Size:"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:117
-msgid "bytes."
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:123
-msgid "View status of all copies in catalogue"
-msgstr ""
-
-#: templates/item/item_relocate.xhtml:1
-msgid "Move item under a different heading"
-msgstr ""
-
-#: templates/item/item_relocate.xhtml:16
-msgid "Please choose the heading under which this item should be moved:"
-msgstr ""
-
-#: templates/item/item_relocate.xhtml:20
-msgid "Item title:"
-msgstr ""
-
-#: templates/item/item_relocate.xhtml:21
-msgid "Current heading:"
-msgstr ""
-
-#: templates/item/item_relocate.xhtml:24
-msgid "New heading:"
-msgstr ""
-
-#: templates/item/item_relocate.xhtml:32
-msgid "Move item"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:1 templates/phys/index.xhtml:15
-msgid "Patron Checkout of Item"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:27
-msgid "Patron Barcode"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:38 templates/phys/mark_arrived.xhtml:24
-#: templates/phys/mark_arrived_choose.xhtml:25
-msgid "Item Barcode"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:51
-msgid "The checkout was successful. Due Date:"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:52
-msgid "The checkout failed."
-msgstr ""
-
-#: templates/phys/checkout.xhtml:54
-msgid "Show details"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:63 templates/phys/mark_arrived.xhtml:31
-msgid "Check out another item"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:67
-msgid "Done"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:1
-#, python-format
-msgid "Wanted items: %s"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:31
-msgid "MARC"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:34
-msgid "Catalogue"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:38
-msgid "Reserves"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:42
-msgid "View Electronic"
-msgstr ""
-
-#: templates/phys/circlist_index.xhtml:1 templates/phys/index.xhtml:20
-msgid "Notify Circulation of wanted items"
-msgstr ""
-
-#: templates/phys/circlist_index.xhtml:13
-msgid "Please select a term:"
-msgstr ""
-
-#: templates/phys/index.xhtml:1
-msgid "Physical Item Processing"
-msgstr ""
-
-#: templates/phys/index.xhtml:13
-msgid "Patron assistance"
-msgstr ""
-
-#: templates/phys/index.xhtml:18
-msgid "Circulations workflow"
-msgstr ""
-
-#: templates/phys/index.xhtml:21
-msgid "Mark items as Arrived"
-msgstr ""
-
-#: templates/phys/mark_arrived.xhtml:1
-msgid "Mark Items as Arrived"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:1
-msgid "Mark Items as Arrived: Choose Match"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:29
-msgid "Detail"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:36
-msgid "Matches"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:38
-msgid "Optional: Small-number ID for this item:"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:42
-msgid "Associate item with matches selected below"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:54
-msgid "detail"
-msgstr ""
-
-#: templates/phys/mark_arrived_outcome.xhtml:1
-msgid "Matches saved; item marked as received"
-msgstr ""
-

Modified: servres/branches/i18n/conifer/locale/eo/LC_MESSAGES/django.po
===================================================================
--- servres/branches/i18n/conifer/locale/eo/LC_MESSAGES/django.po	2011-03-29 00:56:10 UTC (rev 1289)
+++ servres/branches/i18n/conifer/locale/eo/LC_MESSAGES/django.po	2011-03-29 00:56:15 UTC (rev 1290)
@@ -1,14 +1,14 @@
-# Esperanto translations for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2011.
-# 
+# ## Esperanto translations for Syrup Reserves.
+# Copyright (C) 2011 Project Conifer (http://conifer.mcmaster.ca/)
+# This file is distributed under the same license as the Syrup Reserves
+# project.
+# Art Rhyno <artrhyno at uwindsor.ca>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-03-27 13:28+0400\n"
-"PO-Revision-Date: 2011-03-27 15:44-0400\n"
+"Project-Id-Version: Syrup Reserves 0.1\n"
+"Report-Msgid-Bugs-To: Graham Fawcett <graham.fawcett at gmail.com>\n"
+"POT-Creation-Date: 2011-03-28 20:22+0400\n"
+"PO-Revision-Date: 2011-03-28 20:26-0400\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: eo <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,119 +17,87 @@
 "Generated-By: Babel 0.9.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: integration/linktool/templates/associate.xhtml:13
+#: integration/linktool/templates/associate.xhtml:14
 msgid "No associated reserves items."
 msgstr "NO AssOcIAtEd rEsErvEs ItEms."
 
-#: integration/linktool/templates/associate.xhtml:15
+#: integration/linktool/templates/associate.xhtml:16
 msgid ""
-"There are no reserves materials associated with this course\n"
-"      site. As an instructor, you can choose one of the following\n"
-"      options:"
+"There are no reserves materials associated with this course site. As an "
+"instructor, you can choose one of the following options:"
 msgstr ""
-"ThErE ArE nO rEsErvEs mAtErIAls AssOcIAtEd wIth thIs cOUrsE\n"
-"      sItE. as An InstrUctOr, yOU cAn chOOsE OnE Of thE fOllOwIng\n"
-"      OptIOns:"
+"ThErE ArE nO rEsErvEs mAtErIAls AssOcIAtEd wIth thIs cOUrsE sItE. as An "
+"InstrUctOr, yOU cAn chOOsE OnE Of thE fOllOwIng OptIOns:"
 
-#: integration/linktool/templates/associate.xhtml:20
+#: integration/linktool/templates/associate.xhtml:19
 msgid "Link this course site to one of my current reserves list"
 msgstr "LInk thIs cOUrsE sItE tO OnE Of my cUrrEnt rEsErvEs lIst"
 
-#: integration/linktool/templates/associate.xhtml:22
+#: integration/linktool/templates/associate.xhtml:21
 msgid "None available."
 msgstr "NOnE AvAIlAblE."
 
-#: integration/linktool/templates/associate.xhtml:43
-msgid "Or, you can just"
-msgstr "or, yOU cAn jUst"
+#: integration/linktool/templates/associate.xhtml:42
+msgid "Or, you can just [1:browse the reserves]."
+msgstr "or, yOU cAn jUst [1:brOwsE thE rEsErvEs]."
 
-#: integration/linktool/templates/associate.xhtml:43
-msgid "browse the reserves"
-msgstr "brOwsE thE rEsErvEs"
+#: integration/linktool/templates/associate.xhtml:46
+msgid "There are no reserves materials associated with this course site."
+msgstr "ThErE ArE nO rEsErvEs mAtErIAls AssOcIAtEd wIth thIs cOUrsE sItE."
 
 #: integration/linktool/templates/associate.xhtml:47
+#, python-format
 msgid ""
-"There are no reserves materials associated with this course\n"
-"      site."
+"You can create reserves lists for course sites associated with a current or "
+"future term. But this site is associated with the term \"%(term)s\" and the "
+"course \"%(course)s\" — so a reserves list cannot be created."
 msgstr ""
-"ThErE ArE nO rEsErvEs mAtErIAls AssOcIAtEd wIth thIs cOUrsE\n"
-"      sItE."
+"YOU cAn crEAtE rEsErvEs lIsts fOr cOUrsE sItEs AssOcIAtEd wIth A cUrrEnt Or "
+"fUtUrE tErm. BUt thIs sItE Is AssOcIAtEd wIth thE tErm \"%(term)s\" And thE "
+"cOUrsE \"%(course)s\" — sO A rEsErvEs lIst cAnnOt bE crEAtEd."
 
 #: integration/linktool/templates/associate.xhtml:48
-msgid ""
-"You can create reserves lists for course sites\n"
-"      associated with a current or future term. But this site is\n"
-"      associated with the term \""
-msgstr ""
-"YOU cAn crEAtE rEsErvEs lIsts fOr cOUrsE sItEs\n"
-"      AssOcIAtEd wIth A cUrrEnt Or fUtUrE tErm. BUt thIs sItE Is\n"
-"      AssOcIAtEd wIth thE tErm \""
-
-#: integration/linktool/templates/associate.xhtml:50
-msgid "\" and the course \""
-msgstr "\" And thE cOUrsE \""
-
-#: integration/linktool/templates/associate.xhtml:50
-msgid ""
-"\" — so\n"
-"      a reserves list cannot be created."
-msgstr ""
-"\" — sO\n"
-"      A rEsErvEs lIst cAnnOt bE crEAtEd."
-
-#: integration/linktool/templates/associate.xhtml:52
 msgid "Browse the reserves"
 msgstr "BrOwsE thE rEsErvEs"
 
 #: integration/linktool/templates/index.xhtml:6
-#: integration/linktool/templates/new_site_cannot.xhtml:6
+#: integration/linktool/templates/new_site_cannot.xhtml:7
 msgid "testing"
 msgstr "tEstIng"
 
-#: integration/linktool/templates/index.xhtml:13
-msgid "Welcome"
-msgstr "WElcOmE"
+#: integration/linktool/templates/index.xhtml:13 templates/master.xhtml:62
+msgid "Welcome!"
+msgstr "WElcOmE!"
 
-#: integration/linktool/templates/new_site_cannot.xhtml:13
+#: integration/linktool/templates/new_site_cannot.xhtml:14
 msgid "Cannot create site..."
 msgstr "CAnnOt crEAtE sItE..."
 
-#: integration/linktool/templates/new_site_cannot.xhtml:14
-msgid "Sorry, but your site's course code ("
-msgstr "SOrry, bUt yOUr sItE's cOUrsE cOdE ("
-
-#: integration/linktool/templates/new_site_cannot.xhtml:14
-msgid ""
-")\n"
-"    and/or term code ("
-msgstr ""
-")\n"
-"    And/Or tErm cOdE ("
-
 #: integration/linktool/templates/new_site_cannot.xhtml:15
+#, python-format
 msgid ""
-") do not match any known\n"
-"    codes in the reserves system."
+"Sorry, but your site's course code (%(course)s) and/or term code (%(term)s) "
+"do not match any known codes in the reserves system."
 msgstr ""
-") dO nOt mAtch Any knOwn\n"
-"    cOdEs In thE rEsErvEs systEm."
+"SOrry, bUt yOUr sItE's cOUrsE cOdE (%(course)s) And/Or tErm cOdE (%(term)s) "
+"dO nOt mAtch Any knOwn cOdEs In thE rEsErvEs systEm."
 
-#: integration/linktool/templates/new_site_cannot.xhtml:18
+#: integration/linktool/templates/new_site_cannot.xhtml:16
 #: templates/simplemessage.xhtml:11 templates/admin/staff_add.xhtml:50
 msgid "Go back"
 msgstr "GO bAck"
 
 #: integration/linktool/templates/whichsite.xhtml:7
-msgid "Please choose a set of reserves materials"
-msgstr "PlEAsE chOOsE A sEt Of rEsErvEs mAtErIAls"
+msgid "Please choose a set of reserves materials."
+msgstr "PlEAsE chOOsE A sEt Of rEsErvEs mAtErIAls."
 
 #: integration/linktool/templates/whichsite.xhtml:8
 msgid ""
-"There is more than one set of reserves materials related to this\n"
-"    site. Please choose from the list below:"
+"There is more than one set of reserves materials related to this site. "
+"Please choose from the list below:"
 msgstr ""
-"ThErE Is mOrE thAn OnE sEt Of rEsErvEs mAtErIAls rElAtEd tO thIs\n"
-"    sItE. PlEAsE chOOsE frOm thE lIst bElOw:"
+"ThErE Is mOrE thAn OnE sEt Of rEsErvEs mAtErIAls rElAtEd tO thIs sItE. "
+"PlEAsE chOOsE frOm thE lIst bElOw:"
 
 #: syrup/models.py:133
 msgid "ILS patron ID"
@@ -246,7 +214,7 @@
 msgid "Physical Book or Document"
 msgstr "PhysIcAl BOOk Or DOcUmEnt"
 
-#: syrup/models.py:565 templates/item/item_add_url.xhtml:37
+#: syrup/models.py:565 templates/item/item_add_url.xhtml:38
 #: templates/item/item_delete_confirm.xhtml:30
 #: templates/item/item_metadata.xhtml:98
 msgid "URL"
@@ -489,18 +457,10 @@
 msgid "All Reserves, by Department"
 msgstr "all REsErvEs, by DEpArtmEnt"
 
-#: templates/browse_index.xhtml:16
-msgid ""
-"(Note: some reserve materials may require you\n"
-"    to"
-msgstr ""
-"(NOtE: sOmE rEsErvE mAtErIAls mAy rEqUIrE yOU\n"
-"    tO"
+#: templates/browse_index.xhtml:17
+msgid "(Note: some reserve materials may require you to [1:log in])"
+msgstr "(NOtE: sOmE rEsErvE mAtErIAls mAy rEqUIrE yOU tO [1:lOg In])"
 
-#: templates/browse_index.xhtml:18
-msgid "log in"
-msgstr "lOg In"
-
 #: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
 msgid "lock"
 msgstr "lOck"
@@ -538,9 +498,7 @@
 msgstr "chAngE"
 
 #: templates/edit_site.xhtml:74 templates/edit_site_permissions.xhtml:43
-#: templates/site_invitation.xhtml:28 templates/phys/checkout.xhtml:63
-#: templates/phys/circlist_index.xhtml:18 templates/phys/mark_arrived.xhtml:31
-#: templates/phys/mark_arrived_outcome.xhtml:20
+#: templates/site_invitation.xhtml:24
 msgid "Continue"
 msgstr "COntInUE"
 
@@ -662,10 +620,6 @@
 msgid "Preferences"
 msgstr "PrEfErEncEs"
 
-#: templates/master.xhtml:62
-msgid "Welcome!"
-msgstr "WElcOmE!"
-
 #: templates/master.xhtml:63
 msgid "Log In"
 msgstr "LOg in"
@@ -695,18 +649,17 @@
 msgstr "TErm"
 
 #: templates/open_sites.xhtml:19 templates/search_results.xhtml:31
-#: templates/item/item_add_cat_search.xhtml:61
+#: templates/item/item_add_cat_search.xhtml:62
 #: templates/item/item_delete_confirm.xhtml:28
 #: templates/item/item_metadata.xhtml:46
-#: templates/phys/circlist_for_term.xhtml:22
 msgid "Title"
 msgstr "TItlE"
 
-#: templates/paginate.xhtml:21 templates/item/item_add_cat_search.xhtml:50
+#: templates/paginate.xhtml:21
 msgid "Previous"
 msgstr "PrEvIOUs"
 
-#: templates/paginate.xhtml:30 templates/item/item_add_cat_search.xhtml:54
+#: templates/paginate.xhtml:30
 msgid "Next"
 msgstr "NExt"
 
@@ -728,8 +681,7 @@
 msgstr "YOU sEArchEd fOr: [1:%(query)s.] FOUnd %(num)s mAtchEs."
 
 #: templates/search_results.xhtml:31
-#: templates/item/item_add_cat_search.xhtml:61
-#: templates/phys/circlist_for_term.xhtml:22
+#: templates/item/item_add_cat_search.xhtml:62
 msgid "Author"
 msgstr "aUthOr"
 
@@ -769,19 +721,17 @@
 
 #: templates/site_invitation.xhtml:18
 msgid ""
-"Your instructor may have provided you with an Invitation Code,\n"
-"  which will give you access to your course's reserves. Enter the\n"
-"  invitation code below to continue. Note that not all courses require\n"
-"  an invitation code; contact your instructor or the library staff for\n"
-"  more information."
+"Your instructor may have provided you with an Invitation Code, which will "
+"give you access to your course's reserves. Enter the invitation code below "
+"to continue. Note that not all courses require an invitation code; contact "
+"your instructor or the library staff for more information."
 msgstr ""
-"YOUr InstrUctOr mAy hAvE prOvIdEd yOU wIth An invItAtIOn COdE,\n"
-"  whIch wIll gIvE yOU AccEss tO yOUr cOUrsE's rEsErvEs. entEr thE\n"
-"  InvItAtIOn cOdE bElOw tO cOntInUE. NOtE thAt nOt All cOUrsEs rEqUIrE\n"
-"  An InvItAtIOn cOdE; cOntAct yOUr InstrUctOr Or thE lIbrAry stAff fOr\n"
-"  mOrE InfOrmAtIOn."
+"YOUr InstrUctOr mAy hAvE prOvIdEd yOU wIth An invItAtIOn COdE, whIch wIll "
+"gIvE yOU AccEss tO yOUr cOUrsE's rEsErvEs. entEr thE InvItAtIOn cOdE bElOw "
+"tO cOntInUE. NOtE thAt nOt All cOUrsEs rEqUIrE An InvItAtIOn cOdE; cOntAct "
+"yOUr InstrUctOr Or thE lIbrAry stAff fOr mOrE InfOrmAtIOn."
 
-#: templates/site_invitation.xhtml:26
+#: templates/site_invitation.xhtml:22
 msgid "Invitation Code:"
 msgstr "invItAtIOn COdE:"
 
@@ -791,13 +741,13 @@
 
 #: templates/site_join.xhtml:16
 msgid ""
-"If you choose to join this site, it will be added to your \"My\n"
-"    Reserves\" list."
+"If you choose to join this site, it will be added to your \"My Reserves\" "
+"list."
 msgstr ""
-"if yOU chOOsE tO jOIn thIs sItE, It wIll bE AddEd tO yOUr \"My\n"
-"    REsErvEs\" lIst."
+"if yOU chOOsE tO jOIn thIs sItE, It wIll bE AddEd tO yOUr \"My REsErvEs\" "
+"lIst."
 
-#: templates/site_join.xhtml:19
+#: templates/site_join.xhtml:18
 msgid "Yes, join this site"
 msgstr "YEs, jOIn thIs sItE"
 
@@ -874,8 +824,8 @@
 msgstr "impErsOnAtE AnOthEr UsEr"
 
 #: templates/admin/su.xhtml:17
-msgid "UWin ID to impersonate:"
-msgstr "uWIn iD tO ImpErsOnAtE:"
+msgid "User ID to impersonate:"
+msgstr "usEr iD tO ImpErsOnAtE:"
 
 #: templates/admin/su.xhtml:19
 msgid "Impersonate"
@@ -913,138 +863,136 @@
 msgid "search this site..."
 msgstr "sEArch thIs sItE..."
 
-#: templates/components/site.xhtml:48 templates/components/site.xhtml:56
+#: templates/components/site.xhtml:49 templates/components/site.xhtml:57
 #: templates/item/item_metadata.xhtml:73 templates/item/item_metadata.xhtml:81
 msgid "2 Hour Loan"
 msgstr "2 HOUr LOAn"
 
-#: templates/components/site.xhtml:49 templates/components/site.xhtml:57
+#: templates/components/site.xhtml:50 templates/components/site.xhtml:58
 #: templates/item/item_metadata.xhtml:74 templates/item/item_metadata.xhtml:82
 msgid "3 Day Loan"
 msgstr "3 DAy LOAn"
 
-#: templates/components/site.xhtml:50 templates/item/item_metadata.xhtml:75
+#: templates/components/site.xhtml:51 templates/item/item_metadata.xhtml:75
 msgid "4 Day Loan"
 msgstr "4 DAy LOAn"
 
-#: templates/components/site.xhtml:51 templates/components/site.xhtml:59
+#: templates/components/site.xhtml:52 templates/components/site.xhtml:60
 #: templates/item/item_metadata.xhtml:76 templates/item/item_metadata.xhtml:84
 msgid "7 Day Loan"
 msgstr "7 DAy LOAn"
 
-#: templates/components/site.xhtml:52 templates/item/item_metadata.xhtml:77
+#: templates/components/site.xhtml:53 templates/item/item_metadata.xhtml:77
 msgid "1 Day Loan"
 msgstr "1 DAy LOAn"
 
-#: templates/components/site.xhtml:53 templates/item/item_metadata.xhtml:78
+#: templates/components/site.xhtml:54 templates/item/item_metadata.xhtml:78
 msgid "1 Hour Loan"
 msgstr "1 HOUr LOAn"
 
-#: templates/components/site.xhtml:54 templates/item/item_metadata.xhtml:79
+#: templates/components/site.xhtml:55 templates/item/item_metadata.xhtml:79
 msgid "14 Day Loan"
 msgstr "14 DAy LOAn"
 
-#: templates/components/site.xhtml:55 templates/item/item_metadata.xhtml:80
+#: templates/components/site.xhtml:56 templates/item/item_metadata.xhtml:80
 msgid "2 Day Loan"
 msgstr "2 DAy LOAn"
 
-#: templates/components/site.xhtml:58 templates/item/item_metadata.xhtml:83
+#: templates/components/site.xhtml:59 templates/item/item_metadata.xhtml:83
 msgid "4 Hour Loan"
 msgstr "4 HOUr LOAn"
 
-#: templates/components/site.xhtml:61
+#: templates/components/site.xhtml:62
 msgid "Ask for:"
 msgstr "ask fOr:"
 
-#: templates/components/site.xhtml:62
-msgid "NEXT DUE:"
-msgstr "NeXT Due:"
+#. The next copy is due back:
+#: templates/components/site.xhtml:63
+#, python-format
+msgid "NEXT DUE: %(due_info)s"
+msgstr "NeXT Due: %(due_info)s"
 
-#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:87
+#: templates/components/site.xhtml:66 templates/item/item_metadata.xhtml:87
 msgid "Availability unknown."
 msgstr "avAIlAbIlIty UnknOwn."
 
-#: templates/components/site.xhtml:90
+#: templates/components/site.xhtml:91
 msgid "Show status of all copies"
 msgstr "ShOw stAtUs Of All cOpIEs"
 
-#: templates/components/site.xhtml:93
+#: templates/components/site.xhtml:94
 msgid "Hide status details"
 msgstr "HIdE stAtUs dEtAIls"
 
-#: templates/components/site.xhtml:103
+#: templates/components/site.xhtml:104
 msgid "Sorry, this document is not available to you."
 msgstr "SOrry, thIs dOcUmEnt Is nOt AvAIlAblE tO yOU."
 
-#: templates/components/site.xhtml:115
+#: templates/components/site.xhtml:116
 msgid "Awaiting copyright clearance: Not available to students."
 msgstr "awAItIng cOpyrIght clEArAncE: NOt AvAIlAblE tO stUdEnts."
 
-#: templates/components/site.xhtml:119
+#: templates/components/site.xhtml:120
 msgid "About this item"
 msgstr "abOUt thIs ItEm"
 
-#: templates/components/site.xhtml:123
+#: templates/components/site.xhtml:124
 msgid "Edit"
 msgstr "edIt"
 
-#: templates/components/site.xhtml:124
+#: templates/components/site.xhtml:125
 msgid "Relocate"
 msgstr "RElOcAtE"
 
-#: templates/components/site.xhtml:125 templates/generic/delete.xhtml:20
+#: templates/components/site.xhtml:126 templates/generic/delete.xhtml:20
 msgid "Delete"
 msgstr "DElEtE"
 
-#: templates/components/site.xhtml:135
-msgid "0"
-msgstr "0"
-
-#: templates/components/site.xhtml:135
+#: templates/components/site.xhtml:136
 msgid "Top Level"
 msgstr "TOp LEvEl"
 
-#: templates/components/site.xhtml:151
+#: templates/components/site.xhtml:152
 msgid "Top"
 msgstr "TOp"
 
-#: templates/components/site.xhtml:162
+#: templates/components/site.xhtml:163
 msgid "Add a new item"
 msgstr "add A nEw ItEm"
 
-#: templates/components/site.xhtml:164
+#: templates/components/site.xhtml:165
 msgid "Link to external resource"
 msgstr "LInk tO ExtErnAl rEsOUrcE"
 
-#: templates/components/site.xhtml:165
+#: templates/components/site.xhtml:166
 msgid "Uploaded electronic document"
 msgstr "uplOAdEd ElEctrOnIc dOcUmEnt"
 
-#: templates/components/site.xhtml:166
+#: templates/components/site.xhtml:167
 msgid "Catalogued item (e.g., book)"
 msgstr "CAtAlOgUEd ItEm (E.g., bOOk)"
 
-#: templates/components/site.xhtml:167
+#: templates/components/site.xhtml:168
 msgid "Subheading"
 msgstr "SUbhEAdIng"
 
-#: templates/components/site.xhtml:182
+#: templates/components/site.xhtml:183
 msgid "Show more attributes"
 msgstr "ShOw mOrE AttrIbUtEs"
 
-#: templates/components/site.xhtml:187
+#: templates/components/site.xhtml:188
 msgid "Attribute"
 msgstr "attrIbUtE"
 
-#: templates/components/site.xhtml:187
+#: templates/components/site.xhtml:188
 msgid "Value"
 msgstr "VAlUE"
 
-#: templates/components/site.xhtml:187
+#: templates/components/site.xhtml:188
 msgid "Delete?"
 msgstr "DElEtE?"
 
-#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:39
+#: templates/components/site.xhtml:200 templates/item/item_metadata.xhtml:39
 msgid "Delete this item"
 msgstr "DElEtE thIs ItEm"
 
@@ -1093,80 +1041,80 @@
 msgid "Add %(thing)s"
 msgstr "add %(thing)s"
 
-#: templates/item/common_metadata.xhtml:15
+#: templates/item/common_metadata.xhtml:16
 msgid "Title of document"
 msgstr "TItlE Of dOcUmEnt"
 
-#: templates/item/common_metadata.xhtml:16
+#: templates/item/common_metadata.xhtml:17
 #: templates/item/item_metadata.xhtml:47
 msgid "Title of source"
 msgstr "TItlE Of sOUrcE"
 
-#: templates/item/common_metadata.xhtml:18
-msgid "Author #"
-msgstr "aUthOr #"
+#: templates/item/common_metadata.xhtml:19
+#, python-format
+msgid "Author #%(num)s"
+msgstr "aUthOr #%(num)s"
 
-#: templates/item/common_metadata.xhtml:20
-#: templates/item/item_add_cat_search.xhtml:61
+#: templates/item/common_metadata.xhtml:21
+#: templates/item/item_add_cat_search.xhtml:62
 #: templates/item/item_metadata.xhtml:50
-#: templates/phys/circlist_for_term.xhtml:22
 msgid "Publisher"
 msgstr "PUblIshEr"
 
-#: templates/item/common_metadata.xhtml:21
+#: templates/item/common_metadata.xhtml:22
 #: templates/item/item_metadata.xhtml:51
 msgid "Published"
 msgstr "PUblIshEd"
 
-#: templates/item/common_metadata.xhtml:22
+#: templates/item/common_metadata.xhtml:23
 #: templates/item/item_metadata.xhtml:52
 msgid "Volume"
 msgstr "VOlUmE"
 
-#: templates/item/common_metadata.xhtml:23
+#: templates/item/common_metadata.xhtml:24
 #: templates/item/item_metadata.xhtml:53
 msgid "Issue"
 msgstr "issUE"
 
-#: templates/item/common_metadata.xhtml:24
+#: templates/item/common_metadata.xhtml:25
 #: templates/item/item_metadata.xhtml:54
 msgid "Pages"
 msgstr "PAgEs"
 
-#: templates/item/common_metadata.xhtml:25
+#: templates/item/common_metadata.xhtml:26
 #: templates/item/item_metadata.xhtml:55
 msgid "ISBN"
 msgstr "iSBN"
 
-#: templates/item/common_metadata.xhtml:26
+#: templates/item/common_metadata.xhtml:27
 msgid "Bib Id of Item"
 msgstr "BIb id Of itEm"
 
-#: templates/item/common_metadata.xhtml:28
+#: templates/item/common_metadata.xhtml:29
 msgid "Copyright Status"
 msgstr "COpyrIght StAtUs"
 
-#: templates/item/common_metadata.xhtml:39
+#: templates/item/common_metadata.xhtml:40
 msgid "Catalogue Settings"
 msgstr "CAtAlOgUE SEttIngs"
 
-#: templates/item/common_metadata.xhtml:44
+#: templates/item/common_metadata.xhtml:45
 msgid "Update"
 msgstr "updAtE"
 
-#: templates/item/common_metadata.xhtml:54
+#: templates/item/common_metadata.xhtml:55
 msgid "Barcode"
 msgstr "BArcOdE"
 
-#: templates/item/common_metadata.xhtml:60
+#: templates/item/common_metadata.xhtml:61
 msgid "Location"
 msgstr "LOcAtIOn"
 
-#: templates/item/common_metadata.xhtml:70
+#: templates/item/common_metadata.xhtml:71
 msgid "Modifier"
 msgstr "MOdIfIEr"
 
-#: templates/item/common_metadata.xhtml:80
+#: templates/item/common_metadata.xhtml:81
 msgid "Call Number"
 msgstr "CAll NUmbEr"
 
@@ -1178,36 +1126,42 @@
 msgid "Use keywords or CCL syntax for searching, for example:"
 msgstr "usE kEywOrds Or CCL syntAx fOr sEArchIng, fOr ExAmplE:"
 
-#: templates/item/item_add_cat_search.xhtml:42
+#: templates/item/item_add_cat_search.xhtml:43
 msgid "Search"
 msgstr "SEArch"
 
-#: templates/item/item_add_cat_search.xhtml:48
-msgid "of"
-msgstr "Of"
+#: templates/item/item_add_cat_search.xhtml:49
+#, python-format
+msgid "%(first)s–%(last)s of %(total)s results."
+msgstr "%(first)s–%(last)s Of %(total)s rEsUlts."
 
-#: templates/item/item_add_cat_search.xhtml:48
-msgid "results."
-msgstr "rEsUlts."
+#: templates/item/item_add_cat_search.xhtml:51
+#, python-format
+msgid "Previous %(count)s"
+msgstr "PrEvIOUs %(count)s"
 
-#: templates/item/item_add_cat_search.xhtml:61
-#: templates/phys/circlist_for_term.xhtml:22
+#: templates/item/item_add_cat_search.xhtml:55
+#, python-format
+msgid "Next %(count)s"
+msgstr "NExt %(count)s"
+
+#: templates/item/item_add_cat_search.xhtml:62
 msgid "PubDate"
 msgstr "PUbDAtE"
 
-#: templates/item/item_add_cat_search.xhtml:69
+#: templates/item/item_add_cat_search.xhtml:70
 msgid "details"
 msgstr "dEtAIls"
 
-#: templates/item/item_add_cat_search.xhtml:70
+#: templates/item/item_add_cat_search.xhtml:71
 msgid "Electronic resource."
 msgstr "elEctrOnIc rEsOUrcE."
 
-#: templates/item/item_add_cat_search.xhtml:71
+#: templates/item/item_add_cat_search.xhtml:72
 msgid "view"
 msgstr "vIEw"
 
-#: templates/item/item_add_cat_search.xhtml:81
+#: templates/item/item_add_cat_search.xhtml:82
 msgid "Pick this item"
 msgstr "PIck thIs ItEm"
 
@@ -1220,8 +1174,8 @@
 msgstr "add A nEw ElEctrOnIc dOcUmEnt"
 
 #: templates/item/item_add_elec.xhtml:32 templates/item/item_add_elec.xhtml:50
-msgid "File"
-msgstr "FIlE"
+msgid "Electronic file"
+msgstr "elEctrOnIc fIlE"
 
 #: templates/item/item_add_elec.xhtml:34
 msgid "Upload file and Create item"
@@ -1276,11 +1230,12 @@
 msgid "Add a new URL"
 msgstr "add A nEw uRL"
 
-#: templates/item/item_add_url.xhtml:26
+#. Refworks Import Format
+#: templates/item/item_add_url.xhtml:27
 msgid "Import RIS"
 msgstr "impOrt RiS"
 
-#: templates/item/item_add_url.xhtml:32
+#: templates/item/item_add_url.xhtml:33
 msgid ""
 "Paste the Refworks/RIS citation in the space below. Note, the citation must "
 "include a \"UR\" (URL) attribute. (Tip: RIS citations can be dragged and "
@@ -1290,15 +1245,15 @@
 "InclUdE A \"uR\" (uRL) AttrIbUtE. (TIp: RiS cItAtIOns cAn bE drAggEd And "
 "drOppEd frOm ZOtErO.)"
 
-#: templates/item/item_add_url.xhtml:42 templates/item/item_metadata.xhtml:128
+#: templates/item/item_add_url.xhtml:43 templates/item/item_metadata.xhtml:124
 msgid "Display MARC Record"
 msgstr "DIsplAy MaRC REcOrd"
 
-#: templates/item/item_add_url.xhtml:54
+#: templates/item/item_add_url.xhtml:55
 msgid "Add URL"
 msgstr "add uRL"
 
-#: templates/item/item_add_url.xhtml:55
+#: templates/item/item_add_url.xhtml:56
 msgid "Update URL"
 msgstr "updAtE uRL"
 
@@ -1368,8 +1323,9 @@
 msgstr "CAll NUmbEr (tAkE thIs tO thE cOUntEr)"
 
 #: templates/item/item_metadata.xhtml:70
-msgid "DUE:"
-msgstr "Due:"
+#, python-format
+msgid "DUE: %(duedate)s"
+msgstr "Due: %(duedate)s"
 
 #: templates/item/item_metadata.xhtml:96
 msgid "Status"
@@ -1389,39 +1345,30 @@
 
 #: templates/item/item_metadata.xhtml:108
 msgid ""
-"By pressing the 'Request' button\n"
-"\tbelow, I am requesting a digital copy of a reading (chapter, article)\n"
-"\tfor my own private study and research use. I agree that I will not\n"
-"\treproduce, redistribute or transmit a copy of the reading in any\n"
-"\tformat."
+"By pressing the 'Request' button below, I am requesting a digital copy of a "
+"reading (chapter, article) for my own private study and research use. I "
+"agree that I will not reproduce, redistribute or transmit a copy of the "
+"reading in any format."
 msgstr ""
-"By prEssIng thE 'REqUEst' bUttOn\n"
-"\tbElOw, i Am rEqUEstIng A dIgItAl cOpy Of A rEAdIng (chAptEr, ArtIclE)\n"
-"\tfOr my Own prIvAtE stUdy And rEsEArch UsE. i AgrEE thAt i wIll nOt\n"
-"\trEprOdUcE, rEdIstrIbUtE Or trAnsmIt A cOpy Of thE rEAdIng In Any\n"
-"\tfOrmAt."
+"By prEssIng thE 'REqUEst' bUttOn bElOw, i Am rEqUEstIng A dIgItAl cOpy Of A "
+"rEAdIng (chAptEr, ArtIclE) fOr my Own prIvAtE stUdy And rEsEArch UsE. i "
+"AgrEE thAt i wIll nOt rEprOdUcE, rEdIstrIbUtE Or trAnsmIt A cOpy Of thE "
+"rEAdIng In Any fOrmAt."
 
-#: templates/item/item_metadata.xhtml:113
+#: templates/item/item_metadata.xhtml:109
 msgid "Request to download this document"
 msgstr "REqUEst tO dOwnlOAd thIs dOcUmEnt"
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:112
 msgid "Click here to download the document."
 msgstr "ClIck hErE tO dOwnlOAd thE dOcUmEnt."
 
-#: templates/item/item_metadata.xhtml:117
-msgid "Document type:"
-msgstr "DOcUmEnt typE:"
+#: templates/item/item_metadata.xhtml:113
+#, python-format
+msgid "Document type: %(type)s. Size: %(bytes)s bytes."
+msgstr "DOcUmEnt typE: %(type)s. SIzE: %(bytes)s bytEs."
 
-#: templates/item/item_metadata.xhtml:117
-msgid ". Size:"
-msgstr ". SIzE:"
-
-#: templates/item/item_metadata.xhtml:117
-msgid "bytes."
-msgstr "bytEs."
-
-#: templates/item/item_metadata.xhtml:123
+#: templates/item/item_metadata.xhtml:119
 msgid "View status of all copies in catalogue"
 msgstr "VIEw stAtUs Of All cOpIEs In cAtAlOgUE"
 
@@ -1448,113 +1395,3 @@
 #: templates/item/item_relocate.xhtml:32
 msgid "Move item"
 msgstr "MOvE ItEm"
-
-#: templates/phys/checkout.xhtml:1 templates/phys/index.xhtml:15
-msgid "Patron Checkout of Item"
-msgstr "PAtrOn ChEckOUt Of itEm"
-
-#: templates/phys/checkout.xhtml:27
-msgid "Patron Barcode"
-msgstr "PAtrOn BArcOdE"
-
-#: templates/phys/checkout.xhtml:38 templates/phys/mark_arrived.xhtml:24
-#: templates/phys/mark_arrived_choose.xhtml:25
-msgid "Item Barcode"
-msgstr "itEm BArcOdE"
-
-#: templates/phys/checkout.xhtml:51
-msgid "The checkout was successful. Due Date:"
-msgstr "ThE chEckOUt wAs sUccEssfUl. DUE DAtE:"
-
-#: templates/phys/checkout.xhtml:52
-msgid "The checkout failed."
-msgstr "ThE chEckOUt fAIlEd."
-
-#: templates/phys/checkout.xhtml:54
-msgid "Show details"
-msgstr "ShOw dEtAIls"
-
-#: templates/phys/checkout.xhtml:63 templates/phys/mark_arrived.xhtml:31
-msgid "Check out another item"
-msgstr "ChEck OUt AnOthEr ItEm"
-
-#: templates/phys/checkout.xhtml:67
-msgid "Done"
-msgstr "DOnE"
-
-#: templates/phys/circlist_for_term.xhtml:1
-#, python-format
-msgid "Wanted items: %s"
-msgstr "WAntEd ItEms: %s"
-
-#: templates/phys/circlist_for_term.xhtml:31
-msgid "MARC"
-msgstr "MaRC"
-
-#: templates/phys/circlist_for_term.xhtml:34
-msgid "Catalogue"
-msgstr "CAtAlOgUE"
-
-#: templates/phys/circlist_for_term.xhtml:38
-msgid "Reserves"
-msgstr "REsErvEs"
-
-#: templates/phys/circlist_for_term.xhtml:42
-msgid "View Electronic"
-msgstr "VIEw elEctrOnIc"
-
-#: templates/phys/circlist_index.xhtml:1 templates/phys/index.xhtml:20
-msgid "Notify Circulation of wanted items"
-msgstr "NOtIfy CIrcUlAtIOn Of wAntEd ItEms"
-
-#: templates/phys/circlist_index.xhtml:13
-msgid "Please select a term:"
-msgstr "PlEAsE sElEct A tErm:"
-
-#: templates/phys/index.xhtml:1
-msgid "Physical Item Processing"
-msgstr "PhysIcAl itEm PrOcEssIng"
-
-#: templates/phys/index.xhtml:13
-msgid "Patron assistance"
-msgstr "PAtrOn AssIstAncE"
-
-#: templates/phys/index.xhtml:18
-msgid "Circulations workflow"
-msgstr "CIrcUlAtIOns wOrkflOw"
-
-#: templates/phys/index.xhtml:21
-msgid "Mark items as Arrived"
-msgstr "MArk ItEms As arrIvEd"
-
-#: templates/phys/mark_arrived.xhtml:1
-msgid "Mark Items as Arrived"
-msgstr "MArk itEms As arrIvEd"
-
-#: templates/phys/mark_arrived_choose.xhtml:1
-msgid "Mark Items as Arrived: Choose Match"
-msgstr "MArk itEms As arrIvEd: ChOOsE MAtch"
-
-#: templates/phys/mark_arrived_choose.xhtml:29
-msgid "Detail"
-msgstr "DEtAIl"
-
-#: templates/phys/mark_arrived_choose.xhtml:36
-msgid "Matches"
-msgstr "MAtchEs"
-
-#: templates/phys/mark_arrived_choose.xhtml:38
-msgid "Optional: Small-number ID for this item:"
-msgstr "optIOnAl: SmAll-nUmbEr iD fOr thIs ItEm:"
-
-#: templates/phys/mark_arrived_choose.xhtml:42
-msgid "Associate item with matches selected below"
-msgstr "assOcIAtE ItEm wIth mAtchEs sElEctEd bElOw"
-
-#: templates/phys/mark_arrived_choose.xhtml:54
-msgid "detail"
-msgstr "dEtAIl"
-
-#: templates/phys/mark_arrived_outcome.xhtml:1
-msgid "Matches saved; item marked as received"
-msgstr "MAtchEs sAvEd; ItEm mArkEd As rEcEIvEd"

Modified: servres/branches/i18n/conifer/locale/fr_CA/LC_MESSAGES/django.po
===================================================================
--- servres/branches/i18n/conifer/locale/fr_CA/LC_MESSAGES/django.po	2011-03-29 00:56:10 UTC (rev 1289)
+++ servres/branches/i18n/conifer/locale/fr_CA/LC_MESSAGES/django.po	2011-03-29 00:56:15 UTC (rev 1290)
@@ -1,14 +1,14 @@
-# French (Canada) translations for PROJECT.
-# Copyright (C) 2009 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
-#
+# ## French (Canada) translations for Syrup Reserves.
+# Copyright (C) 2011 Project Conifer (http://conifer.mcmaster.ca/)
+# This file is distributed under the same license as the Syrup Reserves
+# project.
+# Art Rhyno <artrhyno at uwindsor.ca>.
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2009-03-10 22:24+0400\n"
-"PO-Revision-Date: 2011-03-27 15:44-0400\n"
+"Project-Id-Version: Syrup Reserves 0.1\n"
+"Report-Msgid-Bugs-To: Graham Fawcett <graham.fawcett at gmail.com>\n"
+"POT-Creation-Date: 2011-03-28 20:22+0400\n"
+"PO-Revision-Date: 2011-03-28 20:26-0400\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: fr_CA <LL at li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
@@ -17,102 +17,77 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.4\n"
 
-#: integration/linktool/templates/associate.xhtml:13
+#: integration/linktool/templates/associate.xhtml:14
 msgid "No associated reserves items."
 msgstr ""
 
-#: integration/linktool/templates/associate.xhtml:15
+#: integration/linktool/templates/associate.xhtml:16
 msgid ""
-"There are no reserves materials associated with this course\n"
-"      site. As an instructor, you can choose one of the following\n"
-"      options:"
+"There are no reserves materials associated with this course site. As an "
+"instructor, you can choose one of the following options:"
 msgstr ""
 
-#: integration/linktool/templates/associate.xhtml:20
+#: integration/linktool/templates/associate.xhtml:19
 msgid "Link this course site to one of my current reserves list"
 msgstr ""
 
-#: integration/linktool/templates/associate.xhtml:22
+#: integration/linktool/templates/associate.xhtml:21
 msgid "None available."
 msgstr ""
 
-#: integration/linktool/templates/associate.xhtml:43
-msgid "Or, you can just"
+#: integration/linktool/templates/associate.xhtml:42
+msgid "Or, you can just [1:browse the reserves]."
 msgstr ""
 
-#: integration/linktool/templates/associate.xhtml:43
-msgid "browse the reserves"
+#: integration/linktool/templates/associate.xhtml:46
+msgid "There are no reserves materials associated with this course site."
 msgstr ""
 
 #: integration/linktool/templates/associate.xhtml:47
+#, python-format
 msgid ""
-"There are no reserves materials associated with this course\n"
-"      site."
+"You can create reserves lists for course sites associated with a current "
+"or future term. But this site is associated with the term \"%(term)s\" "
+"and the course \"%(course)s\" — so a reserves list cannot be created."
 msgstr ""
 
 #: integration/linktool/templates/associate.xhtml:48
-msgid ""
-"You can create reserves lists for course sites\n"
-"      associated with a current or future term. But this site is\n"
-"      associated with the term \""
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:50
-msgid "\" and the course \""
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:50
-msgid ""
-"\" — so\n"
-"      a reserves list cannot be created."
-msgstr ""
-
-#: integration/linktool/templates/associate.xhtml:52
 msgid "Browse the reserves"
 msgstr ""
 
 #: integration/linktool/templates/index.xhtml:6
-#: integration/linktool/templates/new_site_cannot.xhtml:6
+#: integration/linktool/templates/new_site_cannot.xhtml:7
 msgid "testing"
 msgstr ""
 
-#: integration/linktool/templates/index.xhtml:13
-msgid "Welcome"
-msgstr "Bienvenue"
+#: integration/linktool/templates/index.xhtml:13 templates/master.xhtml:62
+msgid "Welcome!"
+msgstr "Bienvenue!"
 
-#: integration/linktool/templates/new_site_cannot.xhtml:13
+#: integration/linktool/templates/new_site_cannot.xhtml:14
 msgid "Cannot create site..."
 msgstr ""
 
-#: integration/linktool/templates/new_site_cannot.xhtml:14
-msgid "Sorry, but your site's course code ("
-msgstr ""
-
-#: integration/linktool/templates/new_site_cannot.xhtml:14
-msgid ""
-")\n"
-"    and/or term code ("
-msgstr ""
-
 #: integration/linktool/templates/new_site_cannot.xhtml:15
+#, python-format
 msgid ""
-") do not match any known\n"
-"    codes in the reserves system."
+"Sorry, but your site's course code (%(course)s) and/or term code "
+"(%(term)s) do not match any known codes in the reserves system."
 msgstr ""
 
-#: integration/linktool/templates/new_site_cannot.xhtml:18
+#: integration/linktool/templates/new_site_cannot.xhtml:16
 #: templates/simplemessage.xhtml:11 templates/admin/staff_add.xhtml:50
 msgid "Go back"
 msgstr ""
 
 #: integration/linktool/templates/whichsite.xhtml:7
-msgid "Please choose a set of reserves materials"
+msgid "Please choose a set of reserves materials."
 msgstr ""
 
 #: integration/linktool/templates/whichsite.xhtml:8
 msgid ""
-"There is more than one set of reserves materials related to this\n"
-"    site. Please choose from the list below:"
+"There is more than one set of reserves materials related to this site. "
+"Please choose from the list below:"
 msgstr ""
 
 #: syrup/models.py:133
@@ -228,7 +203,7 @@
 msgid "Physical Book or Document"
 msgstr ""
 
-#: syrup/models.py:565 templates/item/item_add_url.xhtml:37
+#: syrup/models.py:565 templates/item/item_add_url.xhtml:38
 #: templates/item/item_delete_confirm.xhtml:30
 #: templates/item/item_metadata.xhtml:98
 msgid "URL"
@@ -469,16 +444,10 @@
 msgid "All Reserves, by Department"
 msgstr ""
 
-#: templates/browse_index.xhtml:16
-msgid ""
-"(Note: some reserve materials may require you\n"
-"    to"
+#: templates/browse_index.xhtml:17
+msgid "(Note: some reserve materials may require you to [1:log in])"
 msgstr ""
 
-#: templates/browse_index.xhtml:18
-msgid "log in"
-msgstr ""
-
 #: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
 msgid "lock"
 msgstr ""
@@ -516,9 +485,7 @@
 msgstr ""
 
 #: templates/edit_site.xhtml:74 templates/edit_site_permissions.xhtml:43
-#: templates/site_invitation.xhtml:28 templates/phys/checkout.xhtml:63
-#: templates/phys/circlist_index.xhtml:18 templates/phys/mark_arrived.xhtml:31
-#: templates/phys/mark_arrived_outcome.xhtml:20
+#: templates/site_invitation.xhtml:24
 msgid "Continue"
 msgstr ""
 
@@ -639,10 +606,6 @@
 msgid "Preferences"
 msgstr ""
 
-#: templates/master.xhtml:62
-msgid "Welcome!"
-msgstr "Bienvenue!"
-
 #: templates/master.xhtml:63
 msgid "Log In"
 msgstr ""
@@ -672,18 +635,17 @@
 msgstr ""
 
 #: templates/open_sites.xhtml:19 templates/search_results.xhtml:31
-#: templates/item/item_add_cat_search.xhtml:61
+#: templates/item/item_add_cat_search.xhtml:62
 #: templates/item/item_delete_confirm.xhtml:28
 #: templates/item/item_metadata.xhtml:46
-#: templates/phys/circlist_for_term.xhtml:22
 msgid "Title"
 msgstr ""
 
-#: templates/paginate.xhtml:21 templates/item/item_add_cat_search.xhtml:50
+#: templates/paginate.xhtml:21
 msgid "Previous"
 msgstr ""
 
-#: templates/paginate.xhtml:30 templates/item/item_add_cat_search.xhtml:54
+#: templates/paginate.xhtml:30
 msgid "Next"
 msgstr ""
 
@@ -705,8 +667,7 @@
 msgstr ""
 
 #: templates/search_results.xhtml:31
-#: templates/item/item_add_cat_search.xhtml:61
-#: templates/phys/circlist_for_term.xhtml:22
+#: templates/item/item_add_cat_search.xhtml:62
 msgid "Author"
 msgstr ""
 
@@ -744,14 +705,13 @@
 
 #: templates/site_invitation.xhtml:18
 msgid ""
-"Your instructor may have provided you with an Invitation Code,\n"
-"  which will give you access to your course's reserves. Enter the\n"
-"  invitation code below to continue. Note that not all courses require\n"
-"  an invitation code; contact your instructor or the library staff for\n"
-"  more information."
+"Your instructor may have provided you with an Invitation Code, which will"
+" give you access to your course's reserves. Enter the invitation code "
+"below to continue. Note that not all courses require an invitation code; "
+"contact your instructor or the library staff for more information."
 msgstr ""
 
-#: templates/site_invitation.xhtml:26
+#: templates/site_invitation.xhtml:22
 msgid "Invitation Code:"
 msgstr ""
 
@@ -761,11 +721,11 @@
 
 #: templates/site_join.xhtml:16
 msgid ""
-"If you choose to join this site, it will be added to your \"My\n"
-"    Reserves\" list."
+"If you choose to join this site, it will be added to your \"My Reserves\""
+" list."
 msgstr ""
 
-#: templates/site_join.xhtml:19
+#: templates/site_join.xhtml:18
 msgid "Yes, join this site"
 msgstr ""
 
@@ -842,7 +802,7 @@
 msgstr ""
 
 #: templates/admin/su.xhtml:17
-msgid "UWin ID to impersonate:"
+msgid "User ID to impersonate:"
 msgstr ""
 
 #: templates/admin/su.xhtml:19
@@ -881,138 +841,136 @@
 msgid "search this site..."
 msgstr ""
 
-#: templates/components/site.xhtml:48 templates/components/site.xhtml:56
+#: templates/components/site.xhtml:49 templates/components/site.xhtml:57
 #: templates/item/item_metadata.xhtml:73 templates/item/item_metadata.xhtml:81
 msgid "2 Hour Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:49 templates/components/site.xhtml:57
+#: templates/components/site.xhtml:50 templates/components/site.xhtml:58
 #: templates/item/item_metadata.xhtml:74 templates/item/item_metadata.xhtml:82
 msgid "3 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:50 templates/item/item_metadata.xhtml:75
+#: templates/components/site.xhtml:51 templates/item/item_metadata.xhtml:75
 msgid "4 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:51 templates/components/site.xhtml:59
+#: templates/components/site.xhtml:52 templates/components/site.xhtml:60
 #: templates/item/item_metadata.xhtml:76 templates/item/item_metadata.xhtml:84
 msgid "7 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:52 templates/item/item_metadata.xhtml:77
+#: templates/components/site.xhtml:53 templates/item/item_metadata.xhtml:77
 msgid "1 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:53 templates/item/item_metadata.xhtml:78
+#: templates/components/site.xhtml:54 templates/item/item_metadata.xhtml:78
 msgid "1 Hour Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:54 templates/item/item_metadata.xhtml:79
+#: templates/components/site.xhtml:55 templates/item/item_metadata.xhtml:79
 msgid "14 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:55 templates/item/item_metadata.xhtml:80
+#: templates/components/site.xhtml:56 templates/item/item_metadata.xhtml:80
 msgid "2 Day Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:58 templates/item/item_metadata.xhtml:83
+#: templates/components/site.xhtml:59 templates/item/item_metadata.xhtml:83
 msgid "4 Hour Loan"
 msgstr ""
 
-#: templates/components/site.xhtml:61
+#: templates/components/site.xhtml:62
 msgid "Ask for:"
 msgstr ""
 
-#: templates/components/site.xhtml:62
-msgid "NEXT DUE:"
+#. The next copy is due back:
+#: templates/components/site.xhtml:63
+#, python-format
+msgid "NEXT DUE: %(due_info)s"
 msgstr ""
 
-#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:87
+#: templates/components/site.xhtml:66 templates/item/item_metadata.xhtml:87
 msgid "Availability unknown."
 msgstr ""
 
-#: templates/components/site.xhtml:90
+#: templates/components/site.xhtml:91
 msgid "Show status of all copies"
 msgstr ""
 
-#: templates/components/site.xhtml:93
+#: templates/components/site.xhtml:94
 msgid "Hide status details"
 msgstr ""
 
-#: templates/components/site.xhtml:103
+#: templates/components/site.xhtml:104
 msgid "Sorry, this document is not available to you."
 msgstr ""
 
-#: templates/components/site.xhtml:115
+#: templates/components/site.xhtml:116
 msgid "Awaiting copyright clearance: Not available to students."
 msgstr ""
 
-#: templates/components/site.xhtml:119
+#: templates/components/site.xhtml:120
 msgid "About this item"
 msgstr ""
 
-#: templates/components/site.xhtml:123
+#: templates/components/site.xhtml:124
 msgid "Edit"
 msgstr ""
 
-#: templates/components/site.xhtml:124
+#: templates/components/site.xhtml:125
 msgid "Relocate"
 msgstr ""
 
-#: templates/components/site.xhtml:125 templates/generic/delete.xhtml:20
+#: templates/components/site.xhtml:126 templates/generic/delete.xhtml:20
 msgid "Delete"
 msgstr ""
 
-#: templates/components/site.xhtml:135
-msgid "0"
-msgstr ""
-
-#: templates/components/site.xhtml:135
+#: templates/components/site.xhtml:136
 msgid "Top Level"
 msgstr ""
 
-#: templates/components/site.xhtml:151
+#: templates/components/site.xhtml:152
 msgid "Top"
 msgstr ""
 
-#: templates/components/site.xhtml:162
+#: templates/components/site.xhtml:163
 msgid "Add a new item"
 msgstr ""
 
-#: templates/components/site.xhtml:164
+#: templates/components/site.xhtml:165
 msgid "Link to external resource"
 msgstr ""
 
-#: templates/components/site.xhtml:165
+#: templates/components/site.xhtml:166
 msgid "Uploaded electronic document"
 msgstr ""
 
-#: templates/components/site.xhtml:166
+#: templates/components/site.xhtml:167
 msgid "Catalogued item (e.g., book)"
 msgstr ""
 
-#: templates/components/site.xhtml:167
+#: templates/components/site.xhtml:168
 msgid "Subheading"
 msgstr ""
 
-#: templates/components/site.xhtml:182
+#: templates/components/site.xhtml:183
 msgid "Show more attributes"
 msgstr ""
 
-#: templates/components/site.xhtml:187
+#: templates/components/site.xhtml:188
 msgid "Attribute"
 msgstr ""
 
-#: templates/components/site.xhtml:187
+#: templates/components/site.xhtml:188
 msgid "Value"
 msgstr ""
 
-#: templates/components/site.xhtml:187
+#: templates/components/site.xhtml:188
 msgid "Delete?"
 msgstr ""
 
-#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:39
+#: templates/components/site.xhtml:200 templates/item/item_metadata.xhtml:39
 msgid "Delete this item"
 msgstr ""
 
@@ -1061,80 +1019,80 @@
 msgid "Add %(thing)s"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:15
+#: templates/item/common_metadata.xhtml:16
 msgid "Title of document"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:16
+#: templates/item/common_metadata.xhtml:17
 #: templates/item/item_metadata.xhtml:47
 msgid "Title of source"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:18
-msgid "Author #"
+#: templates/item/common_metadata.xhtml:19
+#, python-format
+msgid "Author #%(num)s"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:20
-#: templates/item/item_add_cat_search.xhtml:61
+#: templates/item/common_metadata.xhtml:21
+#: templates/item/item_add_cat_search.xhtml:62
 #: templates/item/item_metadata.xhtml:50
-#: templates/phys/circlist_for_term.xhtml:22
 msgid "Publisher"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:21
+#: templates/item/common_metadata.xhtml:22
 #: templates/item/item_metadata.xhtml:51
 msgid "Published"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:22
+#: templates/item/common_metadata.xhtml:23
 #: templates/item/item_metadata.xhtml:52
 msgid "Volume"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:23
+#: templates/item/common_metadata.xhtml:24
 #: templates/item/item_metadata.xhtml:53
 msgid "Issue"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:24
+#: templates/item/common_metadata.xhtml:25
 #: templates/item/item_metadata.xhtml:54
 msgid "Pages"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:25
+#: templates/item/common_metadata.xhtml:26
 #: templates/item/item_metadata.xhtml:55
 msgid "ISBN"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:26
+#: templates/item/common_metadata.xhtml:27
 msgid "Bib Id of Item"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:28
+#: templates/item/common_metadata.xhtml:29
 msgid "Copyright Status"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:39
+#: templates/item/common_metadata.xhtml:40
 msgid "Catalogue Settings"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:44
+#: templates/item/common_metadata.xhtml:45
 msgid "Update"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:54
+#: templates/item/common_metadata.xhtml:55
 msgid "Barcode"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:60
+#: templates/item/common_metadata.xhtml:61
 msgid "Location"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:70
+#: templates/item/common_metadata.xhtml:71
 msgid "Modifier"
 msgstr ""
 
-#: templates/item/common_metadata.xhtml:80
+#: templates/item/common_metadata.xhtml:81
 msgid "Call Number"
 msgstr ""
 
@@ -1146,36 +1104,42 @@
 msgid "Use keywords or CCL syntax for searching, for example:"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:42
+#: templates/item/item_add_cat_search.xhtml:43
 msgid "Search"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:48
-msgid "of"
+#: templates/item/item_add_cat_search.xhtml:49
+#, python-format
+msgid "%(first)s–%(last)s of %(total)s results."
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:48
-msgid "results."
+#: templates/item/item_add_cat_search.xhtml:51
+#, python-format
+msgid "Previous %(count)s"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:61
-#: templates/phys/circlist_for_term.xhtml:22
+#: templates/item/item_add_cat_search.xhtml:55
+#, python-format
+msgid "Next %(count)s"
+msgstr ""
+
+#: templates/item/item_add_cat_search.xhtml:62
 msgid "PubDate"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:69
+#: templates/item/item_add_cat_search.xhtml:70
 msgid "details"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:70
+#: templates/item/item_add_cat_search.xhtml:71
 msgid "Electronic resource."
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:71
+#: templates/item/item_add_cat_search.xhtml:72
 msgid "view"
 msgstr ""
 
-#: templates/item/item_add_cat_search.xhtml:81
+#: templates/item/item_add_cat_search.xhtml:82
 msgid "Pick this item"
 msgstr ""
 
@@ -1188,7 +1152,7 @@
 msgstr ""
 
 #: templates/item/item_add_elec.xhtml:32 templates/item/item_add_elec.xhtml:50
-msgid "File"
+msgid "Electronic file"
 msgstr ""
 
 #: templates/item/item_add_elec.xhtml:34
@@ -1244,26 +1208,27 @@
 msgid "Add a new URL"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:26
+#. Refworks Import Format
+#: templates/item/item_add_url.xhtml:27
 msgid "Import RIS"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:32
+#: templates/item/item_add_url.xhtml:33
 msgid ""
 "Paste the Refworks/RIS citation in the space below. Note, the citation "
 "must include a \"UR\" (URL) attribute. (Tip: RIS citations can be dragged"
 " and dropped from Zotero.)"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:42 templates/item/item_metadata.xhtml:128
+#: templates/item/item_add_url.xhtml:43 templates/item/item_metadata.xhtml:124
 msgid "Display MARC Record"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:54
+#: templates/item/item_add_url.xhtml:55
 msgid "Add URL"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:55
+#: templates/item/item_add_url.xhtml:56
 msgid "Update URL"
 msgstr ""
 
@@ -1333,7 +1298,8 @@
 msgstr ""
 
 #: templates/item/item_metadata.xhtml:70
-msgid "DUE:"
+#, python-format
+msgid "DUE: %(duedate)s"
 msgstr ""
 
 #: templates/item/item_metadata.xhtml:96
@@ -1352,34 +1318,26 @@
 
 #: templates/item/item_metadata.xhtml:108
 msgid ""
-"By pressing the 'Request' button\n"
-"\tbelow, I am requesting a digital copy of a reading (chapter, article)\n"
-"\tfor my own private study and research use. I agree that I will not\n"
-"\treproduce, redistribute or transmit a copy of the reading in any\n"
-"\tformat."
+"By pressing the 'Request' button below, I am requesting a digital copy of"
+" a reading (chapter, article) for my own private study and research use. "
+"I agree that I will not reproduce, redistribute or transmit a copy of the"
+" reading in any format."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:113
+#: templates/item/item_metadata.xhtml:109
 msgid "Request to download this document"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:112
 msgid "Click here to download the document."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:117
-msgid "Document type:"
+#: templates/item/item_metadata.xhtml:113
+#, python-format
+msgid "Document type: %(type)s. Size: %(bytes)s bytes."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:117
-msgid ". Size:"
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:117
-msgid "bytes."
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:123
+#: templates/item/item_metadata.xhtml:119
 msgid "View status of all copies in catalogue"
 msgstr ""
 
@@ -1407,113 +1365,3 @@
 msgid "Move item"
 msgstr ""
 
-#: templates/phys/checkout.xhtml:1 templates/phys/index.xhtml:15
-msgid "Patron Checkout of Item"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:27
-msgid "Patron Barcode"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:38 templates/phys/mark_arrived.xhtml:24
-#: templates/phys/mark_arrived_choose.xhtml:25
-msgid "Item Barcode"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:51
-msgid "The checkout was successful. Due Date:"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:52
-msgid "The checkout failed."
-msgstr ""
-
-#: templates/phys/checkout.xhtml:54
-msgid "Show details"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:63 templates/phys/mark_arrived.xhtml:31
-msgid "Check out another item"
-msgstr ""
-
-#: templates/phys/checkout.xhtml:67
-msgid "Done"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:1
-#, python-format
-msgid "Wanted items: %s"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:31
-msgid "MARC"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:34
-msgid "Catalogue"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:38
-msgid "Reserves"
-msgstr ""
-
-#: templates/phys/circlist_for_term.xhtml:42
-msgid "View Electronic"
-msgstr ""
-
-#: templates/phys/circlist_index.xhtml:1 templates/phys/index.xhtml:20
-msgid "Notify Circulation of wanted items"
-msgstr ""
-
-#: templates/phys/circlist_index.xhtml:13
-msgid "Please select a term:"
-msgstr ""
-
-#: templates/phys/index.xhtml:1
-msgid "Physical Item Processing"
-msgstr ""
-
-#: templates/phys/index.xhtml:13
-msgid "Patron assistance"
-msgstr ""
-
-#: templates/phys/index.xhtml:18
-msgid "Circulations workflow"
-msgstr ""
-
-#: templates/phys/index.xhtml:21
-msgid "Mark items as Arrived"
-msgstr ""
-
-#: templates/phys/mark_arrived.xhtml:1
-msgid "Mark Items as Arrived"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:1
-msgid "Mark Items as Arrived: Choose Match"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:29
-msgid "Detail"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:36
-msgid "Matches"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:38
-msgid "Optional: Small-number ID for this item:"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:42
-msgid "Associate item with matches selected below"
-msgstr ""
-
-#: templates/phys/mark_arrived_choose.xhtml:54
-msgid "detail"
-msgstr ""
-
-#: templates/phys/mark_arrived_outcome.xhtml:1
-msgid "Matches saved; item marked as received"
-msgstr ""
-

Modified: servres/branches/i18n/conifer/pybabel-extract
===================================================================
--- servres/branches/i18n/conifer/pybabel-extract	2011-03-29 00:56:10 UTC (rev 1289)
+++ servres/branches/i18n/conifer/pybabel-extract	2011-03-29 00:56:15 UTC (rev 1290)
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+from __future__ import with_statement
 
 import os
 import sys
@@ -6,9 +7,20 @@
 import re, sys
 import polib    # 'easy_install polib'.
 import HTMLParser
+from babel.dates import format_datetime
+from datetime import datetime
+from babel import __version__ as BABELVERSION
+from babel.util import LOCALTZ
 
-PROJECT = 'django'
+PROJCODE  = 'django'            # Django expects this to be 'django'
+PROJECT   = 'Syrup Reserves'
+COPYRIGHT = 'Project Conifer (http://conifer.mcmaster.ca/)'
+VERSION   = '0.1'
+AUTHOR    = 'Art Rhyno <artrhyno at uwindsor.ca>'
+BUGS      = 'Graham Fawcett <graham.fawcett at gmail.com>'
 
+POTFILE = 'locale/%(PROJCODE)s.pot' % vars()
+
 # commands: you can optionally specify a command, e.g., './pybabel-extract
 # compile'. If you omit a command, then all three phases are executed.
 
@@ -107,12 +119,47 @@
 
 # extraction
 if 'extract' in commands:
-    os.system('pybabel extract -F babel.cfg -o locale/%(PROJECT)s.pot .' % vars())
+    os.system(('pybabel extract '
+               '-F babel.cfg '
+               '--omit-header '
+               '-o %(POTFILE)s .'
+               ) % vars())
 
+    # toss in the header.
+    NOW = format_datetime(datetime.now(LOCALTZ), 
+                          'yyyy-MM-dd HH:mmZ', locale='en')
+    YEAR = datetime.now().year
+    
+    with open(POTFILE, 'r+w') as f:
+        body = f.read()
+        f.seek(0)
+        f.write(r"""### Translations template for %(PROJECT)s.
+# Copyright (C) %(YEAR)s %(COPYRIGHT)s
+# This file is distributed under the same license as the %(PROJECT)s project.
+# %(AUTHOR)s.
+msgid ""
+msgstr ""
+"Project-Id-Version: %(PROJECT)s %(VERSION)s\n"
+"Report-Msgid-Bugs-To: %(BUGS)s\n"
+"POT-Creation-Date: %(NOW)s\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: %(BABELVERSION)s\n"
+
+""" % vars())
+        f.write(body)
+    
+
+    # initialize any missing locales
+
     for locale in LOCALES:
-        fn = 'locale/%(locale)s/LC_MESSAGES/%(PROJECT)s.po' % vars()
+        fn = 'locale/%(locale)s/LC_MESSAGES/%(PROJCODE)s.po' % vars()
         if not os.path.isfile(fn):
-            os.system('pybabel init -D %(PROJECT)s -i locale/%(PROJECT)s.pot -d locale -l %(locale)s' % vars())
+            os.system('pybabel init -D %(PROJCODE)s -i %(POTFILE)s -d locale -l %(locale)s' % vars())
 
 # do the update
 
@@ -123,11 +170,11 @@
 # will revisit this hack.
 
 if 'update' in commands:
-    os.system('pybabel update -D %(PROJECT)s -i locale/%(PROJECT)s.pot -d locale' % vars())
+    os.system('pybabel update -D %(PROJCODE)s -i %(POTFILE)s -d locale' % vars())
     if 'eo' in LOCALES:
-        munge_one_file('locale/eo/LC_MESSAGES/%(PROJECT)s.po' % vars())
+        munge_one_file('locale/eo/LC_MESSAGES/%(PROJCODE)s.po' % vars())
 
 # compile to .mo
 if 'compile' in commands:
-    os.system('pybabel compile -D %(PROJECT)s -d locale' % vars())
+    os.system('pybabel compile -D %(PROJCODE)s -d locale' % vars())
 

Modified: servres/branches/i18n/conifer/settings.py
===================================================================
--- servres/branches/i18n/conifer/settings.py	2011-03-29 00:56:10 UTC (rev 1289)
+++ servres/branches/i18n/conifer/settings.py	2011-03-29 00:56:15 UTC (rev 1290)
@@ -22,16 +22,16 @@
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = 'America/Detroit'
+TIME_ZONE = 'America/Toronto'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en_US'
+LANGUAGE_CODE = 'en_CA'
 
 # Please only include languages here for which we have a locale in our
 # locale/ directory.
-LANGUAGES = [("en-us", "English"),
-             ("fr-ca", "Canadian French"),
+LANGUAGES = [("en-ca", "English"),
+             ("fr-ca", "French"),
              ]
 
 SITE_ID = 1

