[open-ils-commits] r1285 - in servres/branches/i18n: . conifer conifer/locale conifer/locale/en_US/LC_MESSAGES conifer/locale/eo conifer/locale/eo/LC_MESSAGES conifer/locale/fr_CA/LC_MESSAGES conifer/plumbing conifer/syrup conifer/syrup/views conifer/templates conifer/templates/admin conifer/templates/auth conifer/templates/generic conifer/templates/item conifer/templates/phys (gfawcett)

svn at svn.open-ils.org svn at svn.open-ils.org
Sun Mar 27 15:13:33 EDT 2011


Author: gfawcett
Date: 2011-03-27 15:13:28 -0400 (Sun, 27 Mar 2011)
New Revision: 1285

Added:
   servres/branches/i18n/conifer/locale/eo/
   servres/branches/i18n/conifer/locale/eo/LC_MESSAGES/
   servres/branches/i18n/conifer/locale/eo/LC_MESSAGES/django.po
Modified:
   servres/branches/i18n/.gitignore
   servres/branches/i18n/conifer/babel.cfg
   servres/branches/i18n/conifer/locale/django.pot
   servres/branches/i18n/conifer/locale/en_US/LC_MESSAGES/django.po
   servres/branches/i18n/conifer/locale/fr_CA/LC_MESSAGES/django.po
   servres/branches/i18n/conifer/plumbing/genshi_support.py
   servres/branches/i18n/conifer/pybabel-extract
   servres/branches/i18n/conifer/syrup/models.py
   servres/branches/i18n/conifer/syrup/urls.py
   servres/branches/i18n/conifer/syrup/views/admin.py
   servres/branches/i18n/conifer/syrup/views/general.py
   servres/branches/i18n/conifer/templates/admin/staff_add.xhtml
   servres/branches/i18n/conifer/templates/admin/su.xhtml
   servres/branches/i18n/conifer/templates/admin/term.xhtml
   servres/branches/i18n/conifer/templates/auth/login.xhtml
   servres/branches/i18n/conifer/templates/edit_site.xhtml
   servres/branches/i18n/conifer/templates/edit_site_permissions.xhtml
   servres/branches/i18n/conifer/templates/generic/delete.xhtml
   servres/branches/i18n/conifer/templates/generic/edit.xhtml
   servres/branches/i18n/conifer/templates/generic/index.xhtml
   servres/branches/i18n/conifer/templates/item/item_add_cat_search.xhtml
   servres/branches/i18n/conifer/templates/item/item_add_elec.xhtml
   servres/branches/i18n/conifer/templates/item/item_add_heading.xhtml
   servres/branches/i18n/conifer/templates/item/item_add_phys.xhtml
   servres/branches/i18n/conifer/templates/item/item_add_url.xhtml
   servres/branches/i18n/conifer/templates/item/item_delete_confirm.xhtml
   servres/branches/i18n/conifer/templates/item/item_metadata.xhtml
   servres/branches/i18n/conifer/templates/item/item_relocate.xhtml
   servres/branches/i18n/conifer/templates/master.xhtml
   servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml
   servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml
   servres/branches/i18n/conifer/templates/prefs.xhtml
   servres/branches/i18n/conifer/templates/search_results.xhtml
   servres/branches/i18n/conifer/templates/site_invitation.xhtml
   servres/branches/i18n/conifer/templates/site_join.xhtml
   servres/branches/i18n/conifer/templates/zsearch.xhtml
   servres/branches/i18n/conifer/urls.py
Log:
i18n extraction pass; gettext'ed many missed texts.

I'm abusing 'Esperanto' as a target translation that uses 'poxx', by Ned
Batchelder, which just takes the input POT and transforms it by changing the
case of all vowels. This results in "A trAnslAtIOn lIkE thIs" which is
readable, but exposes texts which still need to be marked for i18n.

To add poxx/Esperanto to your Syrup, add this to your local_settings.py:

    LANGUAGES = [("en-us", "English"),
                 ("fr-ca", "Canadian French"),
                 ("eo", "POXX")]
    LANGUAGE_CODE = 'eo'

Then you can pick it using the 'Preferences' link.

I've noticed a few differences between Genshi 0.5 and 0.6 with respect to how
they handle complex texts, like this one:

    <h2 py:if="query_string" i18n:msg="query, num">
        You searched for: <i>${query_string}.</i> Found ${len(results)} matches.
    </h2>

which results in a PO entry like this:

    You searched for: [1:%(query)s.] Found %(num)s matches.

The "i18n:msg" attribute specifies the placeholder names, comma separated. But
this doesn't localize properly under Genshi 0.5. We'll probably have to insist
upon 'genshi>=0.6' as the required veresion, but I don't think 0.6 has made it
to PyPI yet, which would make 'easy_install'ing more difficult.

Modified: servres/branches/i18n/.gitignore
===================================================================
--- servres/branches/i18n/.gitignore	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/.gitignore	2011-03-27 19:13:28 UTC (rev 1285)
@@ -15,3 +15,4 @@
 /conifer/test.db
 /conifer/syrup/test.db
 /conifer/uwindsor_migration/data/
+oils/

Modified: servres/branches/i18n/conifer/babel.cfg
===================================================================
--- servres/branches/i18n/conifer/babel.cfg	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/babel.cfg	2011-03-27 19:13:28 UTC (rev 1285)
@@ -1,5 +1,6 @@
 [python:**.py]
 [genshi:**.xhtml]
-include_attrs = alt,title,summary,value
+include_attrs = alt title summary value
+#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-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/locale/django.pot	2011-03-27 19:13:28 UTC (rev 1285)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-03-26 21:07-0400\n"
+"POT-Creation-Date: 2011-03-27 14:59-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"
@@ -119,58 +119,200 @@
 msgid "ILS patron ID"
 msgstr ""
 
-#: syrup/models.py:237
+#: 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:238
+#: syrup/models.py:248
 msgid "Accessible to all logged-in users"
 msgstr ""
 
-#: syrup/models.py:239
+#: syrup/models.py:249
 msgid ""
 "Accessible to all logged-in users, but only course-site members can read "
 "electronic documents."
 msgstr ""
 
-#: syrup/models.py:240
+#: syrup/models.py:250
 msgid "Accessible to course-site members"
 msgstr ""
 
-#: syrup/models.py:241
+#: syrup/models.py:251
 msgid "Accessible only to course-site owners"
 msgstr ""
 
-#: syrup/models.py:508
+#: syrup/models.py:518
 msgid "Instructor"
 msgstr ""
 
-#: syrup/models.py:509
+#: syrup/models.py:519
 msgid "Assistant/Support"
 msgstr ""
 
-#: syrup/models.py:510
+#: syrup/models.py:520
 msgid "Student"
 msgstr ""
 
-#: syrup/models.py:553
+#: syrup/models.py:563
 msgid "Attached Electronic Document"
 msgstr ""
 
-#: syrup/models.py:554
+#: syrup/models.py:564
 msgid "Physical Book or Document"
 msgstr ""
 
-#: syrup/models.py:555 templates/item/item_add_url.xhtml:37
+#: syrup/models.py:565 templates/item/item_add_url.xhtml:37
 #: templates/item/item_delete_confirm.xhtml:30
-#: templates/item/item_metadata.xhtml:97
+#: templates/item/item_metadata.xhtml:98
 msgid "URL"
 msgstr ""
 
-#: syrup/models.py:556 templates/item/item_add_heading.xhtml:24
+#: 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 ""
@@ -213,8 +355,8 @@
 msgid "Courses"
 msgstr ""
 
-#: syrup/views/admin.py:33
-msgid "ServiceDesks"
+#: syrup/views/admin.py:33 templates/admin/index.xhtml:22
+msgid "Service Desks"
 msgstr ""
 
 #: syrup/views/admin.py:48 templates/admin/index.xhtml:21
@@ -225,11 +367,6 @@
 msgid "start must precede finish"
 msgstr ""
 
-#: syrup/views/admin.py:71 templates/departments.xhtml:1
-#: templates/admin/index.xhtml:23
-msgid "Departments"
-msgstr ""
-
 #: syrup/views/admin.py:87
 msgid "Targets"
 msgstr ""
@@ -246,12 +383,12 @@
 msgid "Sorry, this account has been disabled."
 msgstr ""
 
-#: syrup/views/general.py:140
+#: syrup/views/general.py:149
 #, python-format
 msgid "Courses taught by %s"
 msgstr ""
 
-#: syrup/views/general.py:156
+#: syrup/views/general.py:165
 #, python-format
 msgid "Courses with Materials in %s"
 msgstr ""
@@ -338,17 +475,16 @@
 "    to"
 msgstr ""
 
-#: templates/browse_index.xhtml:18 templates/search_results.xhtml:56
+#: templates/browse_index.xhtml:18
 msgid "log in"
 msgstr ""
 
-#: templates/courses.xhtml:19 templates/edit_site_permissions.xhtml:90
-#: templates/instructors.xhtml:19 templates/zsearch_results.xhtml:28
-msgid "Name"
+#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
+msgid "lock"
 msgstr ""
 
-#: templates/departments.xhtml:19
-msgid "Department"
+#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
+msgid "This resource is access-controlled."
 msgstr ""
 
 #: templates/edit_site.xhtml:1
@@ -374,7 +510,19 @@
 "matches."
 msgstr ""
 
-#: templates/edit_site.xhtml:78
+#: 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 ""
 
@@ -386,16 +534,14 @@
 msgid "Site permissions"
 msgstr ""
 
-#: templates/edit_site_permissions.xhtml:43 templates/phys/checkout.xhtml:63
-#: templates/phys/mark_arrived.xhtml:31
-#: templates/phys/mark_arrived_outcome.xhtml:20
-msgid "Continue"
-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 ""
@@ -416,6 +562,10 @@
 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 ""
@@ -428,6 +578,10 @@
 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 ""
@@ -444,10 +598,18 @@
 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 ""
@@ -460,30 +622,39 @@
 msgid "search..."
 msgstr ""
 
-#: templates/master.xhtml:56
-msgid "Welcome,"
+#: 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:61
-msgid "Welcome!"
+#: templates/master.xhtml:59 templates/master.xhtml:65 templates/prefs.xhtml:1
+msgid "Preferences"
 msgstr ""
 
 #: templates/master.xhtml:62
-msgid "Log In"
+msgid "Welcome!"
 msgstr ""
 
-#: templates/master.xhtml:74
-msgid "Syrup is a subproject of"
+#: templates/master.xhtml:63
+msgid "Log In"
 msgstr ""
 
 #: templates/master.xhtml:75
-msgid "Project Conifer"
+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 ""
@@ -500,14 +671,10 @@
 msgid "Term"
 msgstr ""
 
-#: templates/open_sites.xhtml:19
-msgid "Code"
-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:45
+#: templates/item/item_metadata.xhtml:46
 #: templates/phys/circlist_for_term.xhtml:22
 msgid "Title"
 msgstr ""
@@ -520,44 +687,23 @@
 msgid "Next"
 msgstr ""
 
-#: templates/prefs.xhtml:1
-msgid "Preferences"
-msgstr ""
-
-#: templates/prefs.xhtml:15
+#: templates/prefs.xhtml:16
 msgid "Preferred Language"
 msgstr ""
 
-#: templates/prefs.xhtml:25
-msgid "Notification preferences"
+#: templates/prefs.xhtml:23
+msgid "Change"
 msgstr ""
 
-#: templates/prefs.xhtml:27
-msgid "This doesn't work yet."
-msgstr ""
-
-#: templates/prefs.xhtml:30
-msgid ""
-"I would like to receive emails when new items are added to my course-"
-"reserve sites."
-msgstr ""
-
 #: templates/search_results.xhtml:1
 msgid "Search Results"
 msgstr ""
 
-#: templates/search_results.xhtml:25
-msgid "You searched for:"
-msgstr ""
-
 #: templates/search_results.xhtml:26
-msgid "Found"
+#, python-format
+msgid "You searched for: [1:%(query)s.] Found %(num)s matches."
 msgstr ""
 
-#: templates/search_results.xhtml:27
-msgid "matches."
-msgstr ""
-
 #: templates/search_results.xhtml:31
 #: templates/item/item_add_cat_search.xhtml:61
 #: templates/phys/circlist_for_term.xhtml:22
@@ -569,15 +715,9 @@
 msgstr ""
 
 #: templates/search_results.xhtml:54
-msgid "Your searches may return more results if you"
+msgid "Your searches may return more results if you [1:log in] before searching."
 msgstr ""
 
-#: templates/search_results.xhtml:56
-msgid ""
-"before\n"
-"      searching."
-msgstr ""
-
 #: templates/site_detail.xhtml:18
 msgid "There are no items associated with this site yet."
 msgstr ""
@@ -625,6 +765,10 @@
 "    Reserves\" list."
 msgstr ""
 
+#: templates/site_join.xhtml:19
+msgid "Yes, join this site"
+msgstr ""
+
 #: templates/tabbar.xhtml:11
 msgid "Return to CLEW"
 msgstr ""
@@ -653,6 +797,10 @@
 msgid "Title:"
 msgstr ""
 
+#: templates/zsearch.xhtml:19
+msgid "Search this target"
+msgstr ""
+
 #: templates/zsearch_results.xhtml:1
 msgid "Z39.50 Search Results"
 msgstr ""
@@ -665,10 +813,6 @@
 msgid "Create a new course site"
 msgstr ""
 
-#: templates/admin/index.xhtml:22
-msgid "Service Desks"
-msgstr ""
-
 #: templates/admin/index.xhtml:25
 msgid "Z39.50 Targets"
 msgstr ""
@@ -701,10 +845,18 @@
 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 ""
@@ -721,46 +873,50 @@
 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:72 templates/item/item_metadata.xhtml:80
+#: 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:73 templates/item/item_metadata.xhtml:81
+#: 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:74
+#: 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:75 templates/item/item_metadata.xhtml:83
+#: 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:76
+#: 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:77
+#: 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:78
+#: 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:79
+#: 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:82
+#: templates/components/site.xhtml:58 templates/item/item_metadata.xhtml:83
 msgid "4 Hour Loan"
 msgstr ""
 
@@ -772,7 +928,7 @@
 msgid "NEXT DUE:"
 msgstr ""
 
-#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:86
+#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:87
 msgid "Availability unknown."
 msgstr ""
 
@@ -784,6 +940,10 @@
 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 ""
@@ -800,11 +960,15 @@
 msgid "Relocate"
 msgstr ""
 
-#: templates/components/site.xhtml:125
+#: 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 ""
 
@@ -848,7 +1012,7 @@
 msgid "Delete?"
 msgstr ""
 
-#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:38
+#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:39
 msgid "Delete this item"
 msgstr ""
 
@@ -884,12 +1048,17 @@
 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:34
-msgid "Add"
+#: templates/generic/index.xhtml:36
+#, python-format
+msgid "Add %(thing)s"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:15
@@ -897,7 +1066,7 @@
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:16
-#: templates/item/item_metadata.xhtml:46
+#: templates/item/item_metadata.xhtml:47
 msgid "Title of source"
 msgstr ""
 
@@ -907,33 +1076,33 @@
 
 #: templates/item/common_metadata.xhtml:20
 #: templates/item/item_add_cat_search.xhtml:61
-#: templates/item/item_metadata.xhtml:49
+#: 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:50
+#: templates/item/item_metadata.xhtml:51
 msgid "Published"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:22
-#: templates/item/item_metadata.xhtml:51
+#: templates/item/item_metadata.xhtml:52
 msgid "Volume"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:23
-#: templates/item/item_metadata.xhtml:52
+#: templates/item/item_metadata.xhtml:53
 msgid "Issue"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:24
-#: templates/item/item_metadata.xhtml:53
+#: templates/item/item_metadata.xhtml:54
 msgid "Pages"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:25
-#: templates/item/item_metadata.xhtml:54
+#: templates/item/item_metadata.xhtml:55
 msgid "ISBN"
 msgstr ""
 
@@ -977,6 +1146,10 @@
 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 ""
@@ -1002,6 +1175,10 @@
 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 ""
@@ -1014,10 +1191,22 @@
 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 ""
@@ -1026,6 +1215,15 @@
 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 ""
@@ -1034,6 +1232,10 @@
 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 ""
@@ -1053,10 +1255,18 @@
 " and dropped from Zotero; ask Graham for details.)"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:42 templates/item/item_metadata.xhtml:127
+#: 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 ""
@@ -1074,10 +1284,14 @@
 msgstr ""
 
 #: templates/item/item_delete_confirm.xhtml:29
-#: templates/item/item_metadata.xhtml:59
+#: 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 ""
@@ -1094,55 +1308,49 @@
 msgid "There are no items in this section."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:35
+#: templates/item/item_metadata.xhtml:36
 msgid "Edit this item"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:41
+#: templates/item/item_metadata.xhtml:42
 msgid "Relocate this item"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:47
+#: templates/item/item_metadata.xhtml:48
 msgid "Format"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:48
+#: templates/item/item_metadata.xhtml:49
 msgid "Author(s)"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:58
+#: templates/item/item_metadata.xhtml:59
 msgid "Copyright status"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:67
+#: templates/item/item_metadata.xhtml:68
 msgid "Call Number (take this to the counter)"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:69
+#: templates/item/item_metadata.xhtml:70
 msgid "DUE:"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:95
+#: templates/item/item_metadata.xhtml:96
 msgid "Status"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:101
+#: templates/item/item_metadata.xhtml:102
 msgid "Download the document"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:102
-msgid "Note: this item is awaiting"
-msgstr ""
-
 #: templates/item/item_metadata.xhtml:103
-msgid "copyright clearance"
+msgid ""
+"Note: this item is awaiting [1:copyright clearance]. Only staff and "
+"instructors may download it."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:103
-msgid ". Only staff and instructors may download it."
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:107
+#: 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"
@@ -1151,30 +1359,34 @@
 "\tformat."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:112
+#: templates/item/item_metadata.xhtml:113
 msgid "Request to download this document"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:115
+#: templates/item/item_metadata.xhtml:116
 msgid "Click here to download the document."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:117
 msgid "Document type:"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:117
 msgid ". Size:"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:117
 msgid "bytes."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:122
+#: 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 ""
@@ -1191,6 +1403,10 @@
 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 ""
@@ -1289,6 +1505,10 @@
 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 ""

Modified: servres/branches/i18n/conifer/locale/en_US/LC_MESSAGES/django.po
===================================================================
--- servres/branches/i18n/conifer/locale/en_US/LC_MESSAGES/django.po	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/locale/en_US/LC_MESSAGES/django.po	2011-03-27 19:13:28 UTC (rev 1285)
@@ -1,15 +1,15 @@
 # English (United States) translations for PROJECT.
-# Copyright (C) 2009 ORGANIZATION
+# Copyright (C) 2011 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+# 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: 2009-03-10 22:24+0400\n"
-"PO-Revision-Date: 2011-03-26 21:07-0400\n"
+"POT-Creation-Date: 2011-03-27 13:48+0400\n"
+"PO-Revision-Date: 2011-03-27 14:59-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"
@@ -120,58 +120,200 @@
 msgid "ILS patron ID"
 msgstr ""
 
-#: syrup/models.py:237
+#: 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:238
+#: syrup/models.py:248
 msgid "Accessible to all logged-in users"
 msgstr ""
 
-#: syrup/models.py:239
+#: syrup/models.py:249
 msgid ""
 "Accessible to all logged-in users, but only course-site members can read "
 "electronic documents."
 msgstr ""
 
-#: syrup/models.py:240
+#: syrup/models.py:250
 msgid "Accessible to course-site members"
 msgstr ""
 
-#: syrup/models.py:241
+#: syrup/models.py:251
 msgid "Accessible only to course-site owners"
 msgstr ""
 
-#: syrup/models.py:508
+#: syrup/models.py:518
 msgid "Instructor"
 msgstr ""
 
-#: syrup/models.py:509
+#: syrup/models.py:519
 msgid "Assistant/Support"
 msgstr ""
 
-#: syrup/models.py:510
+#: syrup/models.py:520
 msgid "Student"
 msgstr ""
 
-#: syrup/models.py:553
+#: syrup/models.py:563
 msgid "Attached Electronic Document"
 msgstr ""
 
-#: syrup/models.py:554
+#: syrup/models.py:564
 msgid "Physical Book or Document"
 msgstr ""
 
-#: syrup/models.py:555 templates/item/item_add_url.xhtml:37
+#: syrup/models.py:565 templates/item/item_add_url.xhtml:37
 #: templates/item/item_delete_confirm.xhtml:30
-#: templates/item/item_metadata.xhtml:97
+#: templates/item/item_metadata.xhtml:98
 msgid "URL"
 msgstr ""
 
-#: syrup/models.py:556 templates/item/item_add_heading.xhtml:24
+#: 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 ""
@@ -214,8 +356,8 @@
 msgid "Courses"
 msgstr ""
 
-#: syrup/views/admin.py:33
-msgid "ServiceDesks"
+#: syrup/views/admin.py:33 templates/admin/index.xhtml:22
+msgid "Service Desks"
 msgstr ""
 
 #: syrup/views/admin.py:48 templates/admin/index.xhtml:21
@@ -226,11 +368,6 @@
 msgid "start must precede finish"
 msgstr ""
 
-#: syrup/views/admin.py:71 templates/departments.xhtml:1
-#: templates/admin/index.xhtml:23
-msgid "Departments"
-msgstr ""
-
 #: syrup/views/admin.py:87
 msgid "Targets"
 msgstr ""
@@ -247,12 +384,12 @@
 msgid "Sorry, this account has been disabled."
 msgstr ""
 
-#: syrup/views/general.py:140
+#: syrup/views/general.py:149
 #, python-format
 msgid "Courses taught by %s"
 msgstr ""
 
-#: syrup/views/general.py:156
+#: syrup/views/general.py:165
 #, python-format
 msgid "Courses with Materials in %s"
 msgstr ""
@@ -339,17 +476,16 @@
 "    to"
 msgstr ""
 
-#: templates/browse_index.xhtml:18 templates/search_results.xhtml:56
+#: templates/browse_index.xhtml:18
 msgid "log in"
 msgstr ""
 
-#: templates/courses.xhtml:19 templates/edit_site_permissions.xhtml:90
-#: templates/instructors.xhtml:19 templates/zsearch_results.xhtml:28
-msgid "Name"
+#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
+msgid "lock"
 msgstr ""
 
-#: templates/departments.xhtml:19
-msgid "Department"
+#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
+msgid "This resource is access-controlled."
 msgstr ""
 
 #: templates/edit_site.xhtml:1
@@ -375,7 +511,19 @@
 "matches."
 msgstr ""
 
-#: templates/edit_site.xhtml:78
+#: 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 ""
 
@@ -387,16 +535,14 @@
 msgid "Site permissions"
 msgstr ""
 
-#: templates/edit_site_permissions.xhtml:43 templates/phys/checkout.xhtml:63
-#: templates/phys/mark_arrived.xhtml:31
-#: templates/phys/mark_arrived_outcome.xhtml:20
-msgid "Continue"
-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 ""
@@ -417,6 +563,10 @@
 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 ""
@@ -429,6 +579,10 @@
 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 ""
@@ -445,10 +599,18 @@
 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 ""
@@ -461,30 +623,39 @@
 msgid "search..."
 msgstr ""
 
-#: templates/master.xhtml:56
-msgid "Welcome,"
+#: 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:61
-msgid "Welcome!"
+#: templates/master.xhtml:59 templates/master.xhtml:65 templates/prefs.xhtml:1
+msgid "Preferences"
 msgstr ""
 
 #: templates/master.xhtml:62
-msgid "Log In"
+msgid "Welcome!"
 msgstr ""
 
-#: templates/master.xhtml:74
-msgid "Syrup is a subproject of"
+#: templates/master.xhtml:63
+msgid "Log In"
 msgstr ""
 
 #: templates/master.xhtml:75
-msgid "Project Conifer"
+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 ""
@@ -501,14 +672,10 @@
 msgid "Term"
 msgstr ""
 
-#: templates/open_sites.xhtml:19
-msgid "Code"
-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:45
+#: templates/item/item_metadata.xhtml:46
 #: templates/phys/circlist_for_term.xhtml:22
 msgid "Title"
 msgstr ""
@@ -521,44 +688,23 @@
 msgid "Next"
 msgstr ""
 
-#: templates/prefs.xhtml:1
-msgid "Preferences"
-msgstr ""
-
-#: templates/prefs.xhtml:15
+#: templates/prefs.xhtml:16
 msgid "Preferred Language"
 msgstr ""
 
-#: templates/prefs.xhtml:25
-msgid "Notification preferences"
+#: templates/prefs.xhtml:23
+msgid "Change"
 msgstr ""
 
-#: templates/prefs.xhtml:27
-msgid "This doesn't work yet."
-msgstr ""
-
-#: templates/prefs.xhtml:30
-msgid ""
-"I would like to receive emails when new items are added to my course-"
-"reserve sites."
-msgstr ""
-
 #: templates/search_results.xhtml:1
 msgid "Search Results"
 msgstr ""
 
-#: templates/search_results.xhtml:25
-msgid "You searched for:"
-msgstr ""
-
 #: templates/search_results.xhtml:26
-msgid "Found"
+#, python-format
+msgid "You searched for: [1:%(query)s.] Found %(num)s matches."
 msgstr ""
 
-#: templates/search_results.xhtml:27
-msgid "matches."
-msgstr ""
-
 #: templates/search_results.xhtml:31
 #: templates/item/item_add_cat_search.xhtml:61
 #: templates/phys/circlist_for_term.xhtml:22
@@ -570,15 +716,9 @@
 msgstr ""
 
 #: templates/search_results.xhtml:54
-msgid "Your searches may return more results if you"
+msgid "Your searches may return more results if you [1:log in] before searching."
 msgstr ""
 
-#: templates/search_results.xhtml:56
-msgid ""
-"before\n"
-"      searching."
-msgstr ""
-
 #: templates/site_detail.xhtml:18
 msgid "There are no items associated with this site yet."
 msgstr ""
@@ -626,6 +766,10 @@
 "    Reserves\" list."
 msgstr ""
 
+#: templates/site_join.xhtml:19
+msgid "Yes, join this site"
+msgstr ""
+
 #: templates/tabbar.xhtml:11
 msgid "Return to CLEW"
 msgstr ""
@@ -654,6 +798,10 @@
 msgid "Title:"
 msgstr ""
 
+#: templates/zsearch.xhtml:19
+msgid "Search this target"
+msgstr ""
+
 #: templates/zsearch_results.xhtml:1
 msgid "Z39.50 Search Results"
 msgstr ""
@@ -666,10 +814,6 @@
 msgid "Create a new course site"
 msgstr ""
 
-#: templates/admin/index.xhtml:22
-msgid "Service Desks"
-msgstr ""
-
 #: templates/admin/index.xhtml:25
 msgid "Z39.50 Targets"
 msgstr ""
@@ -702,10 +846,18 @@
 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 ""
@@ -722,46 +874,50 @@
 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:72 templates/item/item_metadata.xhtml:80
+#: 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:73 templates/item/item_metadata.xhtml:81
+#: 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:74
+#: 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:75 templates/item/item_metadata.xhtml:83
+#: 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:76
+#: 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:77
+#: 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:78
+#: 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:79
+#: 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:82
+#: templates/components/site.xhtml:58 templates/item/item_metadata.xhtml:83
 msgid "4 Hour Loan"
 msgstr ""
 
@@ -773,7 +929,7 @@
 msgid "NEXT DUE:"
 msgstr ""
 
-#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:86
+#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:87
 msgid "Availability unknown."
 msgstr ""
 
@@ -785,6 +941,10 @@
 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 ""
@@ -801,11 +961,15 @@
 msgid "Relocate"
 msgstr ""
 
-#: templates/components/site.xhtml:125
+#: 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 ""
 
@@ -849,7 +1013,7 @@
 msgid "Delete?"
 msgstr ""
 
-#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:38
+#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:39
 msgid "Delete this item"
 msgstr ""
 
@@ -885,12 +1049,17 @@
 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:34
-msgid "Add"
+#: templates/generic/index.xhtml:36
+#, python-format
+msgid "Add %(thing)s"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:15
@@ -898,7 +1067,7 @@
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:16
-#: templates/item/item_metadata.xhtml:46
+#: templates/item/item_metadata.xhtml:47
 msgid "Title of source"
 msgstr ""
 
@@ -908,33 +1077,33 @@
 
 #: templates/item/common_metadata.xhtml:20
 #: templates/item/item_add_cat_search.xhtml:61
-#: templates/item/item_metadata.xhtml:49
+#: 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:50
+#: templates/item/item_metadata.xhtml:51
 msgid "Published"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:22
-#: templates/item/item_metadata.xhtml:51
+#: templates/item/item_metadata.xhtml:52
 msgid "Volume"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:23
-#: templates/item/item_metadata.xhtml:52
+#: templates/item/item_metadata.xhtml:53
 msgid "Issue"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:24
-#: templates/item/item_metadata.xhtml:53
+#: templates/item/item_metadata.xhtml:54
 msgid "Pages"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:25
-#: templates/item/item_metadata.xhtml:54
+#: templates/item/item_metadata.xhtml:55
 msgid "ISBN"
 msgstr ""
 
@@ -978,6 +1147,10 @@
 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 ""
@@ -1003,6 +1176,10 @@
 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 ""
@@ -1015,10 +1192,22 @@
 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 ""
@@ -1027,6 +1216,15 @@
 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 ""
@@ -1035,6 +1233,10 @@
 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 ""
@@ -1054,10 +1256,18 @@
 " and dropped from Zotero; ask Graham for details.)"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:42 templates/item/item_metadata.xhtml:127
+#: 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 ""
@@ -1075,10 +1285,14 @@
 msgstr ""
 
 #: templates/item/item_delete_confirm.xhtml:29
-#: templates/item/item_metadata.xhtml:59
+#: 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 ""
@@ -1095,55 +1309,49 @@
 msgid "There are no items in this section."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:35
+#: templates/item/item_metadata.xhtml:36
 msgid "Edit this item"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:41
+#: templates/item/item_metadata.xhtml:42
 msgid "Relocate this item"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:47
+#: templates/item/item_metadata.xhtml:48
 msgid "Format"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:48
+#: templates/item/item_metadata.xhtml:49
 msgid "Author(s)"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:58
+#: templates/item/item_metadata.xhtml:59
 msgid "Copyright status"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:67
+#: templates/item/item_metadata.xhtml:68
 msgid "Call Number (take this to the counter)"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:69
+#: templates/item/item_metadata.xhtml:70
 msgid "DUE:"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:95
+#: templates/item/item_metadata.xhtml:96
 msgid "Status"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:101
+#: templates/item/item_metadata.xhtml:102
 msgid "Download the document"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:102
-msgid "Note: this item is awaiting"
-msgstr ""
-
 #: templates/item/item_metadata.xhtml:103
-msgid "copyright clearance"
+msgid ""
+"Note: this item is awaiting [1:copyright clearance]. Only staff and "
+"instructors may download it."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:103
-msgid ". Only staff and instructors may download it."
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:107
+#: 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"
@@ -1152,30 +1360,34 @@
 "\tformat."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:112
+#: templates/item/item_metadata.xhtml:113
 msgid "Request to download this document"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:115
+#: templates/item/item_metadata.xhtml:116
 msgid "Click here to download the document."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:117
 msgid "Document type:"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:117
 msgid ". Size:"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:117
 msgid "bytes."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:122
+#: 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 ""
@@ -1192,6 +1404,10 @@
 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 ""
@@ -1290,6 +1506,10 @@
 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 ""
@@ -1298,3 +1518,6 @@
 msgid "Matches saved; item marked as received"
 msgstr ""
 
+#~ msgid "ServiceDesks"
+#~ msgstr ""
+

Copied: servres/branches/i18n/conifer/locale/eo/LC_MESSAGES/django.po (from rev 1284, servres/branches/i18n/conifer/locale/django.pot)
===================================================================
--- servres/branches/i18n/conifer/locale/eo/LC_MESSAGES/django.po	                        (rev 0)
+++ servres/branches/i18n/conifer/locale/eo/LC_MESSAGES/django.po	2011-03-27 19:13:28 UTC (rev 1285)
@@ -0,0 +1,1563 @@
+# 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.
+# 
+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 14:59-0400\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: eo <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"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: integration/linktool/templates/associate.xhtml:13
+msgid "No associated reserves items."
+msgstr "NO AssOcIAtEd rEsErvEs ItEms."
+
+#: 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 ""
+"ThErE ArE nO rEsErvEs mAtErIAls AssOcIAtEd wIth thIs cOUrsE\n"
+"      sItE. as An InstrUctOr, yOU cAn chOOsE OnE Of thE fOllOwIng\n"
+"      OptIOns:"
+
+#: integration/linktool/templates/associate.xhtml:20
+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
+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:43
+msgid "browse the reserves"
+msgstr "brOwsE thE rEsErvEs"
+
+#: integration/linktool/templates/associate.xhtml:47
+msgid ""
+"There are no reserves materials associated with this course\n"
+"      site."
+msgstr ""
+"ThErE ArE nO rEsErvEs mAtErIAls AssOcIAtEd wIth thIs cOUrsE\n"
+"      sItE."
+
+#: 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
+msgid "testing"
+msgstr "tEstIng"
+
+#: integration/linktool/templates/index.xhtml:13
+msgid "Welcome"
+msgstr "WElcOmE"
+
+#: integration/linktool/templates/new_site_cannot.xhtml:13
+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
+msgid ""
+") do not match any known\n"
+"    codes in the reserves system."
+msgstr ""
+") dO nOt mAtch Any knOwn\n"
+"    cOdEs In thE rEsErvEs systEm."
+
+#: integration/linktool/templates/new_site_cannot.xhtml:18
+#: 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"
+
+#: 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 ""
+"ThErE Is mOrE thAn OnE sEt Of rEsErvEs mAtErIAls rElAtEd tO thIs\n"
+"    sItE. PlEAsE chOOsE frOm thE lIst bElOw:"
+
+#: syrup/models.py:133
+msgid "ILS patron ID"
+msgstr "iLS pAtrOn iD"
+
+#: 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 "NAmE"
+
+#: syrup/models.py:155 syrup/models.py:189
+msgid "Is active?"
+msgstr "is ActIvE?"
+
+#: syrup/models.py:156
+msgid "External ID"
+msgstr "extErnAl iD"
+
+#: syrup/models.py:159
+msgid "service desk"
+msgstr "sErvIcE dEsk"
+
+#: syrup/models.py:160
+msgid "service desks"
+msgstr "sErvIcE dEsks"
+
+#: syrup/models.py:170 syrup/models.py:202 templates/open_sites.xhtml:19
+msgid "Code"
+msgstr "COdE"
+
+#: syrup/models.py:172
+msgid "Start (Y-M-D)"
+msgstr "StArt (Y-M-D)"
+
+#: syrup/models.py:173
+msgid "Finish (Y-M-D)"
+msgstr "FInIsh (Y-M-D)"
+
+#: syrup/models.py:176
+msgid "term"
+msgstr "tErm"
+
+#: syrup/models.py:177
+msgid "terms"
+msgstr "tErms"
+
+#: syrup/models.py:190 syrup/models.py:244
+msgid "Service desk"
+msgstr "SErvIcE dEsk"
+
+#: syrup/models.py:193 templates/departments.xhtml:19
+msgid "Department"
+msgstr "DEpArtmEnt"
+
+#: syrup/models.py:194 syrup/views/admin.py:71 templates/departments.xhtml:1
+#: templates/admin/index.xhtml:23
+msgid "Departments"
+msgstr "DEpArtmEnts"
+
+#: syrup/models.py:240
+msgid "Course"
+msgstr "COUrsE"
+
+#: syrup/models.py:241
+msgid "Start term"
+msgstr "StArt tErm"
+
+#: syrup/models.py:242
+msgid "End term"
+msgstr "end tErm"
+
+#: syrup/models.py:247
+msgid "World-accessible"
+msgstr "WOrld-AccEssIblE"
+
+#: syrup/models.py:248
+msgid "Accessible to all logged-in users"
+msgstr "accEssIblE tO All lOggEd-In UsErs"
+
+#: syrup/models.py:249
+msgid ""
+"Accessible to all logged-in users, but only course-site members can read "
+"electronic documents."
+msgstr ""
+"accEssIblE tO All lOggEd-In UsErs, bUt Only cOUrsE-sItE mEmbErs cAn rEAd "
+"ElEctrOnIc dOcUmEnts."
+
+#: syrup/models.py:250
+msgid "Accessible to course-site members"
+msgstr "accEssIblE tO cOUrsE-sItE mEmbErs"
+
+#: syrup/models.py:251
+msgid "Accessible only to course-site owners"
+msgstr "accEssIblE Only tO cOUrsE-sItE OwnErs"
+
+#: syrup/models.py:518
+msgid "Instructor"
+msgstr "instrUctOr"
+
+#: syrup/models.py:519
+msgid "Assistant/Support"
+msgstr "assIstAnt/SUppOrt"
+
+#: syrup/models.py:520
+msgid "Student"
+msgstr "StUdEnt"
+
+#: syrup/models.py:563
+msgid "Attached Electronic Document"
+msgstr "attAchEd elEctrOnIc DOcUmEnt"
+
+#: syrup/models.py:564
+msgid "Physical Book or Document"
+msgstr "PhysIcAl BOOk Or DOcUmEnt"
+
+#: 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 "uRL"
+
+#: syrup/models.py:566 templates/item/item_add_heading.xhtml:24
+msgid "Heading"
+msgstr "HEAdIng"
+
+#: syrup/models.py:590
+msgid "Bib Record ID"
+msgstr "BIb REcOrd iD"
+
+#: syrup/models.py:591
+msgid "MARCXML"
+msgstr "MaRCXML"
+
+#: syrup/models.py:646
+msgid "Normal"
+msgstr "NOrmAl"
+
+#: syrup/models.py:647
+msgid "2 Hour"
+msgstr "2 HOUr"
+
+#: syrup/models.py:648
+msgid "1 Day"
+msgstr "1 DAy"
+
+#: syrup/models.py:649
+msgid "3 Day"
+msgstr "3 DAy"
+
+#: syrup/models.py:650
+msgid "7 Day"
+msgstr "7 DAy"
+
+#: syrup/models.py:660
+msgid "Reserves Counter"
+msgstr "REsErvEs COUntEr"
+
+#: syrup/models.py:661
+msgid "Circulating Collection"
+msgstr "CIrcUlAtIng COllEctIOn"
+
+#: syrup/models.py:688
+msgid "Item Type"
+msgstr "itEm TypE"
+
+#: syrup/models.py:811
+msgid "Status information not available."
+msgstr "StAtUs InfOrmAtIOn nOt AvAIlAblE."
+
+#: syrup/models.py:815
+#, python-format
+msgid ""
+"%d of %d copies available at reserves desk; %d total copies in library "
+"system"
+msgstr ""
+"%d Of %d cOpIEs AvAIlAblE At rEsErvEs dEsk; %d tOtAl cOpIEs In lIbrAry "
+"systEm"
+
+#: syrup/models.py:820
+msgid "videocartridge"
+msgstr "vIdEOcArtrIdgE"
+
+#: syrup/models.py:821
+msgid "videodisc"
+msgstr "vIdEOdIsc"
+
+#: syrup/models.py:822
+msgid "videocassette"
+msgstr "vIdEOcAssEttE"
+
+#: syrup/models.py:823
+msgid "videoreel"
+msgstr "vIdEOrEEl"
+
+#: syrup/models.py:824
+msgid "video, other format"
+msgstr "vIdEO, OthEr fOrmAt"
+
+#: syrup/models.py:832
+msgid "video, unknown format"
+msgstr "vIdEO, UnknOwn fOrmAt"
+
+#: syrup/views/_common.py:60 syrup/views/items.py:433
+msgid "Access denied."
+msgstr "accEss dEnIEd."
+
+#: syrup/views/_common.py:74
+msgid "Only instructors are allowed here."
+msgstr "only InstrUctOrs ArE AllOwEd hErE."
+
+#: syrup/views/_common.py:87
+msgid "Please log in, so that you can enter this site."
+msgstr "PlEAsE lOg In, sO thAt yOU cAn EntEr thIs sItE."
+
+#: syrup/views/_common.py:89
+msgid "Sorry, but you can no longer access this site."
+msgstr "SOrry, bUt yOU cAn nO lOngEr AccEss thIs sItE."
+
+#: syrup/views/_common.py:91
+msgid "Only site members are allowed here."
+msgstr "only sItE mEmbErs ArE AllOwEd hErE."
+
+#: syrup/views/_common.py:105
+msgid "Only administrators are allowed here."
+msgstr "only AdmInIstrAtOrs ArE AllOwEd hErE."
+
+#: syrup/views/_common.py:131
+#, python-format
+msgid "Error: %s"
+msgstr "errOr: %s"
+
+#: syrup/views/_common.py:136
+msgid "Not found"
+msgstr "NOt fOUnd"
+
+#: syrup/views/_common.py:137
+msgid "The page you requested could not be found"
+msgstr "ThE pAgE yOU rEqUEstEd cOUld nOt bE fOUnd"
+
+#: syrup/views/admin.py:17 templates/courses.xhtml:1
+#: templates/admin/index.xhtml:24
+msgid "Courses"
+msgstr "COUrsEs"
+
+#: syrup/views/admin.py:33 templates/admin/index.xhtml:22
+msgid "Service Desks"
+msgstr "SErvIcE DEsks"
+
+#: syrup/views/admin.py:48 templates/admin/index.xhtml:21
+msgid "Terms"
+msgstr "TErms"
+
+#: syrup/views/admin.py:60
+msgid "start must precede finish"
+msgstr "stArt mUst prEcEdE fInIsh"
+
+#: syrup/views/admin.py:87
+msgid "Targets"
+msgstr "TArgEts"
+
+#: syrup/views/admin.py:103
+msgid "Configs"
+msgstr "COnfIgs"
+
+#: syrup/views/auth.py:24
+msgid "Invalid username or password. Please try again."
+msgstr "invAlId UsErnAmE Or pAsswOrd. PlEAsE try AgAIn."
+
+#: syrup/views/auth.py:27
+msgid "Sorry, this account has been disabled."
+msgstr "SOrry, thIs AccOUnt hAs bEEn dIsAblEd."
+
+#: syrup/views/general.py:149
+#, python-format
+msgid "Courses taught by %s"
+msgstr "COUrsEs tAUght by %s"
+
+#: syrup/views/general.py:165
+#, python-format
+msgid "Courses with Materials in %s"
+msgstr "COUrsEs wIth MAtErIAls In %s"
+
+#: syrup/views/items.py:76 syrup/views/items.py:238 syrup/views/items.py:266
+msgid "You can only add items to headings!"
+msgstr "YOU cAn Only Add ItEms tO hEAdIngs!"
+
+#: syrup/views/items.py:85 syrup/views/items.py:269
+msgid "You are not an editor."
+msgstr "YOU ArE nOt An EdItOr."
+
+#: syrup/views/items.py:88
+msgid "No item_type parameter was provided."
+msgstr "NO ItEm_typE pArAmEtEr wAs prOvIdEd."
+
+#: syrup/views/items.py:92
+msgid "Sorry, only HEADINGs, URLs and ELECs can be added right now."
+msgstr "SOrry, Only HeaDiNGs, uRLs And eLeCs cAn bE AddEd rIght nOw."
+
+#: syrup/views/items.py:395
+msgid "Unable to update"
+msgstr "unAblE tO UpdAtE"
+
+#: syrup/views/items.py:396
+msgid "Sorry, unable to update at this time, please try again."
+msgstr "SOrry, UnAblE tO UpdAtE At thIs tImE, plEAsE try AgAIn."
+
+#: syrup/views/items.py:428
+msgid "Can only download ELEC documents!"
+msgstr "CAn Only dOwnlOAd eLeC dOcUmEnts!"
+
+#: syrup/views/items.py:434
+msgid "Sorry, but you are not allowed to access this resource."
+msgstr "SOrry, bUt yOU ArE nOt AllOwEd tO AccEss thIs rEsOUrcE."
+
+#: syrup/views/items.py:505
+msgid "Impossible item-move!"
+msgstr "impOssIblE ItEm-mOvE!"
+
+#: syrup/views/items.py:506
+msgid "You cannot make an item a descendant of itself!"
+msgstr "YOU cAnnOt mAkE An ItEm A dEscEndAnt Of ItsElf!"
+
+#: syrup/views/sites.py:34
+msgid "You are not allowed to create sites."
+msgstr "YOU ArE nOt AllOwEd tO crEAtE sItEs."
+
+#: syrup/views/sites.py:89
+msgid "Everyone: no login required."
+msgstr "evEryOnE: nO lOgIn rEqUIrEd."
+
+#: syrup/views/sites.py:90
+msgid "Login required."
+msgstr "LOgIn rEqUIrEd."
+
+#: syrup/views/sites.py:91
+msgid "Login required; only members can access electronic documents."
+msgstr "LOgIn rEqUIrEd; Only mEmbErs cAn AccEss ElEctrOnIc dOcUmEnts."
+
+#: syrup/views/sites.py:92
+msgid "Members only."
+msgstr "MEmbErs Only."
+
+#: syrup/views/sites.py:93
+msgid "Instructors only: this site is closed."
+msgstr "instrUctOrs Only: thIs sItE Is clOsEd."
+
+#: syrup/views/sites.py:202
+msgid "You cannot join this site."
+msgstr "YOU cAnnOt jOIn thIs sItE."
+
+#: syrup/views/sites.py:203
+msgid "Sorry, but you cannot join this site at this time."
+msgstr "SOrry, bUt yOU cAnnOt jOIn thIs sItE At thIs tImE."
+
+#: templates/browse_index.xhtml:1
+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:18
+msgid "log in"
+msgstr "lOg In"
+
+#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
+msgid "lock"
+msgstr "lOck"
+
+#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
+msgid "This resource is access-controlled."
+msgstr "ThIs rEsOUrcE Is AccEss-cOntrOllEd."
+
+#: templates/edit_site.xhtml:1
+msgid "Site setup"
+msgstr "SItE sEtUp"
+
+#: templates/edit_site.xhtml:1
+msgid "Create a new site"
+msgstr "CrEAtE A nEw sItE"
+
+#: templates/edit_site.xhtml:39
+msgid "e.g.,"
+msgstr "E.g.,"
+
+#: templates/edit_site.xhtml:46
+msgid "Primary Instructor"
+msgstr "PrImAry instrUctOr"
+
+#: 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 ""
+"TypE A pArtIAl nAmE Or UsErId IntO thE bOx; thEn sElEct OnE Of thE mAtchEs."
+
+#: templates/edit_site.xhtml:62 templates/edit_site_permissions.xhtml:115
+#: templates/admin/staff_add.xhtml:42
+msgid "change"
+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
+msgid "Continue"
+msgstr "COntInUE"
+
+#: templates/edit_site.xhtml:78 templates/edit_site.xhtml:83
+msgid "Delete this site"
+msgstr "DElEtE thIs sItE"
+
+#: templates/edit_site.xhtml:81
+msgid "Yes, I want to delete this site and all of its contents."
+msgstr "YEs, i wAnt tO dElEtE thIs sItE And All Of Its cOntEnts."
+
+#: templates/edit_site_permissions.xhtml:1
+msgid "Site permissions"
+msgstr "SItE pErmIssIOns"
+
+#: templates/edit_site_permissions.xhtml:47
+msgid "Who has permission to view resources in this site?"
+msgstr "WhO hAs pErmIssIOn tO vIEw rEsOUrcEs In thIs sItE?"
+
+#: templates/edit_site_permissions.xhtml:49
+msgid "Change security level"
+msgstr "ChAngE sEcUrIty lEvEl"
+
+#: templates/edit_site_permissions.xhtml:56
+msgid "Class lists and groups"
+msgstr "ClAss lIsts And grOUps"
+
+#: templates/edit_site_permissions.xhtml:57
+msgid "No external lists are currently associated."
+msgstr "NO ExtErnAl lIsts ArE cUrrEntly AssOcIAtEd."
+
+#: templates/edit_site_permissions.xhtml:61
+msgid "Class/group code"
+msgstr "ClAss/grOUp cOdE"
+
+#: templates/edit_site_permissions.xhtml:61
+msgid "Known members"
+msgstr "KnOwn mEmbErs"
+
+#: templates/edit_site_permissions.xhtml:67
+msgid "delete"
+msgstr "dElEtE"
+
+#: templates/edit_site_permissions.xhtml:72
+msgid "Add external group"
+msgstr "add ExtErnAl grOUp"
+
+#: templates/edit_site_permissions.xhtml:74
+msgid "Add the class list for"
+msgstr "add thE clAss lIst fOr"
+
+#: templates/edit_site_permissions.xhtml:75
+msgid ", section"
+msgstr ", sEctIOn"
+
+#: templates/edit_site_permissions.xhtml:77
+msgid "Add a class list or group by its group code:"
+msgstr "add A clAss lIst Or grOUp by Its grOUp cOdE:"
+
+#: templates/edit_site_permissions.xhtml:80
+msgid "Add class list or group"
+msgstr "add clAss lIst Or grOUp"
+
+#: templates/edit_site_permissions.xhtml:87
+msgid "Current membership"
+msgstr "CUrrEnt mEmbErshIp"
+
+#: templates/edit_site_permissions.xhtml:90
+msgid "Role"
+msgstr "ROlE"
+
+#: templates/edit_site_permissions.xhtml:90
+msgid "User ID"
+msgstr "usEr iD"
+
+#: templates/edit_site_permissions.xhtml:90
+msgid "Group"
+msgstr "GrOUp"
+
+#: templates/edit_site_permissions.xhtml:101
+msgid "Add new member"
+msgstr "add nEw mEmbEr"
+
+#: templates/edit_site_permissions.xhtml:118
+msgid "Role for this user:"
+msgstr "ROlE fOr thIs UsEr:"
+
+#: templates/edit_site_permissions.xhtml:125
+#: templates/admin/staff_add.xhtml:46
+msgid "Add this user"
+msgstr "add thIs UsEr"
+
+#: templates/instructors.xhtml:1
+msgid "Instructors"
+msgstr "instrUctOrs"
+
+#: templates/master.xhtml:1
+msgid "Syrup Reserves System"
+msgstr "SyrUp REsErvEs SystEm"
+
+#: templates/master.xhtml:1
+msgid "search..."
+msgstr "sEArch..."
+
+#: templates/master.xhtml:17
+msgid "unAPI"
+msgstr "UnaPi"
+
+#: templates/master.xhtml:57
+#, python-format
+msgid "Welcome, %(user)s!"
+msgstr "WElcOmE, %(user)s!"
+
+#: templates/master.xhtml:58
+msgid "Log Out"
+msgstr "LOg oUt"
+
+#: templates/master.xhtml:59 templates/master.xhtml:65 templates/prefs.xhtml:1
+msgid "Preferences"
+msgstr "PrEfErEncEs"
+
+#: templates/master.xhtml:62
+msgid "Welcome!"
+msgstr "WElcOmE!"
+
+#: templates/master.xhtml:63
+msgid "Log In"
+msgstr "LOg in"
+
+#: templates/master.xhtml:75
+msgid "Syrup is a subproject of [1:Project Conifer] © 2011"
+msgstr "SyrUp Is A sUbprOjEct Of [1:PrOjEct COnIfEr] © 2011"
+
+#: templates/master.xhtml:83
+msgid "or go back"
+msgstr "Or gO bAck"
+
+#: templates/my_sites.xhtml:1 templates/tabbar.xhtml:14
+msgid "My Reserves"
+msgstr "My REsErvEs"
+
+#: templates/my_sites.xhtml:19
+msgid "You are not part of any course-reserve sites at this time."
+msgstr "YOU ArE nOt pArt Of Any cOUrsE-rEsErvE sItEs At thIs tImE."
+
+#: templates/open_sites.xhtml:1
+msgid "Open Sites"
+msgstr "opEn SItEs"
+
+#: templates/open_sites.xhtml:19
+msgid "Term"
+msgstr "TErm"
+
+#: 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 "TItlE"
+
+#: templates/paginate.xhtml:21 templates/item/item_add_cat_search.xhtml:50
+msgid "Previous"
+msgstr "PrEvIOUs"
+
+#: templates/paginate.xhtml:30 templates/item/item_add_cat_search.xhtml:54
+msgid "Next"
+msgstr "NExt"
+
+#: templates/prefs.xhtml:16
+msgid "Preferred Language"
+msgstr "PrEfErrEd LAngUAgE"
+
+#: templates/prefs.xhtml:23
+msgid "Change"
+msgstr "ChAngE"
+
+#: templates/search_results.xhtml:1
+msgid "Search Results"
+msgstr "SEArch REsUlts"
+
+#: templates/search_results.xhtml:26
+#, python-format
+msgid "You searched for: [1:%(query)s.] Found %(num)s matches."
+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
+msgid "Author"
+msgstr "aUthOr"
+
+#: templates/search_results.xhtml:31
+msgid "Site"
+msgstr "SItE"
+
+#: templates/search_results.xhtml:54
+msgid ""
+"Your searches may return more results if you [1:log in] before searching."
+msgstr ""
+"YOUr sEArchEs mAy rEtUrn mOrE rEsUlts If yOU [1:lOg In] bEfOrE sEArchIng."
+
+#: templates/site_detail.xhtml:18
+msgid "There are no items associated with this site yet."
+msgstr "ThErE ArE nO ItEms AssOcIAtEd wIth thIs sItE yEt."
+
+#: templates/site_detail.xhtml:28
+msgid "Setup"
+msgstr "SEtUp"
+
+#: templates/site_detail.xhtml:29
+msgid "Permissions"
+msgstr "PErmIssIOns"
+
+#: templates/site_detail.xhtml:32
+msgid "Join this site"
+msgstr "JOIn thIs sItE"
+
+#: templates/site_detail.xhtml:35
+msgid "Feeds"
+msgstr "FEEds"
+
+#: templates/site_invitation.xhtml:1
+msgid "Join a site using an Invitation Code"
+msgstr "JOIn A sItE UsIng An invItAtIOn COdE"
+
+#: 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 ""
+"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."
+
+#: templates/site_invitation.xhtml:26
+msgid "Invitation Code:"
+msgstr "invItAtIOn COdE:"
+
+#: templates/site_join.xhtml:1
+msgid "Join this site?"
+msgstr "JOIn thIs sItE?"
+
+#: templates/site_join.xhtml:16
+msgid ""
+"If you choose to join this site, it will be added to your \"My\n"
+"    Reserves\" list."
+msgstr ""
+"if yOU chOOsE tO jOIn thIs sItE, It wIll bE AddEd tO yOUr \"My\n"
+"    REsErvEs\" lIst."
+
+#: templates/site_join.xhtml:19
+msgid "Yes, join this site"
+msgstr "YEs, jOIn thIs sItE"
+
+#: templates/tabbar.xhtml:11
+msgid "Return to CLEW"
+msgstr "REtUrn tO CLeW"
+
+#: templates/tabbar.xhtml:15 templates/tabbar_anonymous.xhtml:11
+msgid "Browse"
+msgstr "BrOwsE"
+
+#: templates/tabbar.xhtml:18
+msgid "Admin Options"
+msgstr "admIn optIOns"
+
+#: templates/tabbar.xhtml:20 templates/tabbar_anonymous.xhtml:12
+msgid "Faculty, How to place materials on Course Reserve"
+msgstr "FAcUlty, HOw tO plAcE mAtErIAls On COUrsE REsErvE"
+
+#: templates/z3950_test.xhtml:1
+msgid "Z39.50 Test"
+msgstr "Z39.50 TEst"
+
+#: templates/zsearch.xhtml:1
+msgid "Search via Z39.50"
+msgstr "SEArch vIA Z39.50"
+
+#: templates/zsearch.xhtml:17
+msgid "Title:"
+msgstr "TItlE:"
+
+#: templates/zsearch.xhtml:19
+msgid "Search this target"
+msgstr "SEArch thIs tArgEt"
+
+#: templates/zsearch_results.xhtml:1
+msgid "Z39.50 Search Results"
+msgstr "Z39.50 SEArch REsUlts"
+
+#: templates/admin/index.xhtml:1
+msgid "Administrative Options"
+msgstr "admInIstrAtIvE optIOns"
+
+#: templates/admin/index.xhtml:18
+msgid "Create a new course site"
+msgstr "CrEAtE A nEw cOUrsE sItE"
+
+#: templates/admin/index.xhtml:25
+msgid "Z39.50 Targets"
+msgstr "Z39.50 TArgEts"
+
+#: templates/admin/index.xhtml:26
+msgid "Configuration settings"
+msgstr "COnfIgUrAtIOn sEttIngs"
+
+#: templates/admin/index.xhtml:33 templates/admin/staff_add.xhtml:1
+msgid "Add new staff user"
+msgstr "add nEw stAff UsEr"
+
+#: templates/admin/index.xhtml:37
+msgid "Automatically update departments and courses"
+msgstr "aUtOmAtIcAlly UpdAtE dEpArtmEnts And cOUrsEs"
+
+#: templates/admin/index.xhtml:40
+msgid "Automatically update terms"
+msgstr "aUtOmAtIcAlly UpdAtE tErms"
+
+#: templates/admin/index.xhtml:44
+msgid "Advanced Administration"
+msgstr "advAncEd admInIstrAtIOn"
+
+#: templates/admin/su.xhtml:1
+msgid "Impersonate another user"
+msgstr "impErsOnAtE AnOthEr UsEr"
+
+#: templates/admin/su.xhtml:17
+msgid "UWin ID to impersonate:"
+msgstr "uWIn iD tO ImpErsOnAtE:"
+
+#: templates/admin/su.xhtml:19
+msgid "Impersonate"
+msgstr "impErsOnAtE"
+
+#: templates/admin/term.xhtml:1
+msgid "Add a new Term"
+msgstr "add A nEw TErm"
+
+#: templates/admin/term.xhtml:15
+msgid "Save"
+msgstr "SAvE"
+
+#: templates/auth/login.xhtml:1
+msgid "Please log in."
+msgstr "PlEAsE lOg In."
+
+#: templates/auth/login.xhtml:16
+msgid "You must log in to access this resource."
+msgstr "YOU mUst lOg In tO AccEss thIs rEsOUrcE."
+
+#: templates/auth/login.xhtml:22
+msgid "User ID:"
+msgstr "usEr iD:"
+
+#: templates/auth/login.xhtml:26
+msgid "Password:"
+msgstr "PAsswOrd:"
+
+#: templates/auth/login.xhtml:30
+msgid "Log in"
+msgstr "LOg In"
+
+#: templates/components/site.xhtml:1
+msgid "search this site..."
+msgstr "sEArch thIs sItE..."
+
+#: 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 "2 HOUr LOAn"
+
+#: 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 "3 DAy LOAn"
+
+#: templates/components/site.xhtml:50 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/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
+msgid "1 Day Loan"
+msgstr "1 DAy LOAn"
+
+#: templates/components/site.xhtml:53 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
+msgid "14 Day Loan"
+msgstr "14 DAy LOAn"
+
+#: templates/components/site.xhtml:55 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
+msgid "4 Hour Loan"
+msgstr "4 HOUr LOAn"
+
+#: templates/components/site.xhtml:61
+msgid "Ask for:"
+msgstr "ask fOr:"
+
+#: templates/components/site.xhtml:62
+msgid "NEXT DUE:"
+msgstr "NeXT Due:"
+
+#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:87
+msgid "Availability unknown."
+msgstr "avAIlAbIlIty UnknOwn."
+
+#: templates/components/site.xhtml:90
+msgid "Show status of all copies"
+msgstr "ShOw stAtUs Of All cOpIEs"
+
+#: templates/components/site.xhtml:93
+msgid "Hide status details"
+msgstr "HIdE stAtUs dEtAIls"
+
+#: templates/components/site.xhtml:103
+msgid "Sorry, this document is not available to you."
+msgstr "SOrry, thIs dOcUmEnt Is nOt AvAIlAblE tO yOU."
+
+#: templates/components/site.xhtml:115
+msgid "Awaiting copyright clearance: Not available to students."
+msgstr "awAItIng cOpyrIght clEArAncE: NOt AvAIlAblE tO stUdEnts."
+
+#: templates/components/site.xhtml:119
+msgid "About this item"
+msgstr "abOUt thIs ItEm"
+
+#: templates/components/site.xhtml:123
+msgid "Edit"
+msgstr "edIt"
+
+#: templates/components/site.xhtml:124
+msgid "Relocate"
+msgstr "RElOcAtE"
+
+#: templates/components/site.xhtml:125 templates/generic/delete.xhtml:20
+msgid "Delete"
+msgstr "DElEtE"
+
+#: templates/components/site.xhtml:135
+msgid "0"
+msgstr "0"
+
+#: templates/components/site.xhtml:135
+msgid "Top Level"
+msgstr "TOp LEvEl"
+
+#: templates/components/site.xhtml:151
+msgid "Top"
+msgstr "TOp"
+
+#: templates/components/site.xhtml:162
+msgid "Add a new item"
+msgstr "add A nEw ItEm"
+
+#: templates/components/site.xhtml:164
+msgid "Link to external resource"
+msgstr "LInk tO ExtErnAl rEsOUrcE"
+
+#: templates/components/site.xhtml:165
+msgid "Uploaded electronic document"
+msgstr "uplOAdEd ElEctrOnIc dOcUmEnt"
+
+#: templates/components/site.xhtml:166
+msgid "Catalogued item (e.g., book)"
+msgstr "CAtAlOgUEd ItEm (E.g., bOOk)"
+
+#: templates/components/site.xhtml:167
+msgid "Subheading"
+msgstr "SUbhEAdIng"
+
+#: templates/components/site.xhtml:182
+msgid "Show more attributes"
+msgstr "ShOw mOrE AttrIbUtEs"
+
+#: templates/components/site.xhtml:187
+msgid "Attribute"
+msgstr "attrIbUtE"
+
+#: templates/components/site.xhtml:187
+msgid "Value"
+msgstr "VAlUE"
+
+#: templates/components/site.xhtml:187
+msgid "Delete?"
+msgstr "DElEtE?"
+
+#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:39
+msgid "Delete this item"
+msgstr "DElEtE thIs ItEm"
+
+#: templates/feeds/site_feed_index.xhtml:1
+#: templates/feeds/site_feed_index.xhtml:14
+msgid "Available Feeds"
+msgstr "avAIlAblE FEEds"
+
+#: templates/feeds/site_feed_index.xhtml:16
+msgid "Recent changes"
+msgstr "REcEnt chAngEs"
+
+#: templates/feeds/site_feed_index.xhtml:17
+msgid "Top level items in this site"
+msgstr "TOp lEvEl ItEms In thIs sItE"
+
+#: templates/feeds/site_feed_index.xhtml:18
+msgid "Tree-walk of all items in this site"
+msgstr "TrEE-wAlk Of All ItEms In thIs sItE"
+
+#: templates/generic/delete.xhtml:1
+#, python-format
+msgid "Delete %s?"
+msgstr "DElEtE %s?"
+
+#: templates/generic/edit.xhtml:1
+#, python-format
+msgid "Modify %s"
+msgstr "MOdIfy %s"
+
+#: templates/generic/edit.xhtml:1
+#, python-format
+msgid "Add %s"
+msgstr "add %s"
+
+#: templates/generic/edit.xhtml:18
+msgid "Save changes"
+msgstr "SAvE chAngEs"
+
+#: templates/generic/edit.xhtml:19
+msgid "Delete this record"
+msgstr "DElEtE thIs rEcOrd"
+
+#: templates/generic/index.xhtml:36
+#, python-format
+msgid "Add %(thing)s"
+msgstr "add %(thing)s"
+
+#: templates/item/common_metadata.xhtml:15
+msgid "Title of document"
+msgstr "TItlE Of dOcUmEnt"
+
+#: templates/item/common_metadata.xhtml:16
+#: 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: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 "PUblIshEr"
+
+#: templates/item/common_metadata.xhtml:21
+#: templates/item/item_metadata.xhtml:51
+msgid "Published"
+msgstr "PUblIshEd"
+
+#: templates/item/common_metadata.xhtml:22
+#: templates/item/item_metadata.xhtml:52
+msgid "Volume"
+msgstr "VOlUmE"
+
+#: templates/item/common_metadata.xhtml:23
+#: templates/item/item_metadata.xhtml:53
+msgid "Issue"
+msgstr "issUE"
+
+#: templates/item/common_metadata.xhtml:24
+#: templates/item/item_metadata.xhtml:54
+msgid "Pages"
+msgstr "PAgEs"
+
+#: templates/item/common_metadata.xhtml:25
+#: templates/item/item_metadata.xhtml:55
+msgid "ISBN"
+msgstr "iSBN"
+
+#: templates/item/common_metadata.xhtml:26
+msgid "Bib Id of Item"
+msgstr "BIb id Of itEm"
+
+#: templates/item/common_metadata.xhtml:28
+msgid "Copyright Status"
+msgstr "COpyrIght StAtUs"
+
+#: templates/item/common_metadata.xhtml:39
+msgid "Catalogue Settings"
+msgstr "CAtAlOgUE SEttIngs"
+
+#: templates/item/common_metadata.xhtml:44
+msgid "Update"
+msgstr "updAtE"
+
+#: templates/item/common_metadata.xhtml:54
+msgid "Barcode"
+msgstr "BArcOdE"
+
+#: templates/item/common_metadata.xhtml:60
+msgid "Location"
+msgstr "LOcAtIOn"
+
+#: templates/item/common_metadata.xhtml:70
+msgid "Modifier"
+msgstr "MOdIfIEr"
+
+#: templates/item/common_metadata.xhtml:80
+msgid "Call Number"
+msgstr "CAll NUmbEr"
+
+#: templates/item/item_add_cat_search.xhtml:1
+msgid "Add physical or electronic item, by catalogue search"
+msgstr "add physIcAl Or ElEctrOnIc ItEm, by cAtAlOgUE sEArch"
+
+#: templates/item/item_add_cat_search.xhtml:1
+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
+msgid "Search"
+msgstr "SEArch"
+
+#: templates/item/item_add_cat_search.xhtml:48
+msgid "of"
+msgstr "Of"
+
+#: templates/item/item_add_cat_search.xhtml:48
+msgid "results."
+msgstr "rEsUlts."
+
+#: templates/item/item_add_cat_search.xhtml:61
+#: templates/phys/circlist_for_term.xhtml:22
+msgid "PubDate"
+msgstr "PUbDAtE"
+
+#: templates/item/item_add_cat_search.xhtml:69
+msgid "details"
+msgstr "dEtAIls"
+
+#: templates/item/item_add_cat_search.xhtml:70
+msgid "Electronic resource."
+msgstr "elEctrOnIc rEsOUrcE."
+
+#: templates/item/item_add_cat_search.xhtml:71
+msgid "view"
+msgstr "vIEw"
+
+#: templates/item/item_add_cat_search.xhtml:81
+msgid "Pick this item"
+msgstr "PIck thIs ItEm"
+
+#: templates/item/item_add_elec.xhtml:1
+msgid "Electronic document: Metadata"
+msgstr "elEctrOnIc dOcUmEnt: MEtAdAtA"
+
+#: templates/item/item_add_elec.xhtml:1
+msgid "Add a new electronic document"
+msgstr "add A nEw ElEctrOnIc dOcUmEnt"
+
+#: templates/item/item_add_elec.xhtml:32 templates/item/item_add_elec.xhtml:50
+msgid "File"
+msgstr "FIlE"
+
+#: templates/item/item_add_elec.xhtml:34
+msgid "Upload file and Create item"
+msgstr "uplOAd fIlE And CrEAtE ItEm"
+
+#: templates/item/item_add_elec.xhtml:45
+msgid "Update metadata"
+msgstr "updAtE mEtAdAtA"
+
+#: templates/item/item_add_elec.xhtml:47
+msgid "Replace file contents"
+msgstr "REplAcE fIlE cOntEnts"
+
+#: templates/item/item_add_elec.xhtml:52
+msgid "Upload new file contents"
+msgstr "uplOAd nEw fIlE cOntEnts"
+
+#: templates/item/item_add_heading.xhtml:1
+msgid "Edit a subheading"
+msgstr "edIt A sUbhEAdIng"
+
+#: templates/item/item_add_heading.xhtml:1
+msgid "Add a new subheading"
+msgstr "add A nEw sUbhEAdIng"
+
+#: templates/item/item_add_heading.xhtml:30
+#: templates/item/item_add_phys.xhtml:28
+msgid "Add heading"
+msgstr "add hEAdIng"
+
+#: templates/item/item_add_heading.xhtml:31
+msgid "Update heading"
+msgstr "updAtE hEAdIng"
+
+#: templates/item/item_add_phys.xhtml:1
+msgid "Edit a physical-item request"
+msgstr "edIt A physIcAl-ItEm rEqUEst"
+
+#: templates/item/item_add_phys.xhtml:1
+msgid "Add a physical-item request"
+msgstr "add A physIcAl-ItEm rEqUEst"
+
+#: templates/item/item_add_phys.xhtml:29
+msgid "Update physical-item request"
+msgstr "updAtE physIcAl-ItEm rEqUEst"
+
+#: templates/item/item_add_url.xhtml:1
+msgid "Edit a URL"
+msgstr "edIt A uRL"
+
+#: templates/item/item_add_url.xhtml:1
+msgid "Add a new URL"
+msgstr "add A nEw uRL"
+
+#: templates/item/item_add_url.xhtml:26
+msgid "Import RIS"
+msgstr "impOrt RiS"
+
+#: 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; ask Graham for details.)"
+msgstr ""
+"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; Ask GrAhAm fOr dEtAIls.)"
+
+#: templates/item/item_add_url.xhtml:42 templates/item/item_metadata.xhtml:128
+msgid "Display MARC Record"
+msgstr "DIsplAy MaRC REcOrd"
+
+#: templates/item/item_add_url.xhtml:54
+msgid "Add URL"
+msgstr "add uRL"
+
+#: templates/item/item_add_url.xhtml:55
+msgid "Update URL"
+msgstr "updAtE uRL"
+
+#: templates/item/item_delete_confirm.xhtml:1
+msgid "Delete this heading?"
+msgstr "DElEtE thIs hEAdIng?"
+
+#: templates/item/item_delete_confirm.xhtml:1
+msgid "Delete this item?"
+msgstr "DElEtE thIs ItEm?"
+
+#: templates/item/item_delete_confirm.xhtml:23
+msgid "Are you sure you want to delete this?"
+msgstr "arE yOU sUrE yOU wAnt tO dElEtE thIs?"
+
+#: templates/item/item_delete_confirm.xhtml:25
+msgid "Note: this will also delete all items under the heading!"
+msgstr "NOtE: thIs wIll AlsO dElEtE All ItEms UndEr thE hEAdIng!"
+
+#: templates/item/item_delete_confirm.xhtml:29
+#: templates/item/item_metadata.xhtml:60
+msgid "Type"
+msgstr "TypE"
+
+#: templates/item/item_delete_confirm.xhtml:34
+msgid "Yes, delete it"
+msgstr "YEs, dElEtE It"
+
+#: templates/item/item_heading_detail.xhtml:21
+msgid "Edit this heading"
+msgstr "edIt thIs hEAdIng"
+
+#: templates/item/item_heading_detail.xhtml:24
+msgid "Delete this heading"
+msgstr "DElEtE thIs hEAdIng"
+
+#: templates/item/item_heading_detail.xhtml:27
+msgid "Relocate this heading"
+msgstr "RElOcAtE thIs hEAdIng"
+
+#: templates/item/item_heading_detail.xhtml:32
+msgid "There are no items in this section."
+msgstr "ThErE ArE nO ItEms In thIs sEctIOn."
+
+#: templates/item/item_metadata.xhtml:36
+msgid "Edit this item"
+msgstr "edIt thIs ItEm"
+
+#: templates/item/item_metadata.xhtml:42
+msgid "Relocate this item"
+msgstr "RElOcAtE thIs ItEm"
+
+#: templates/item/item_metadata.xhtml:48
+msgid "Format"
+msgstr "FOrmAt"
+
+#: templates/item/item_metadata.xhtml:49
+msgid "Author(s)"
+msgstr "aUthOr(s)"
+
+#: templates/item/item_metadata.xhtml:59
+msgid "Copyright status"
+msgstr "COpyrIght stAtUs"
+
+#: templates/item/item_metadata.xhtml:68
+msgid "Call Number (take this to the counter)"
+msgstr "CAll NUmbEr (tAkE thIs tO thE cOUntEr)"
+
+#: templates/item/item_metadata.xhtml:70
+msgid "DUE:"
+msgstr "Due:"
+
+#: templates/item/item_metadata.xhtml:96
+msgid "Status"
+msgstr "StAtUs"
+
+#: templates/item/item_metadata.xhtml:102
+msgid "Download the document"
+msgstr "DOwnlOAd thE dOcUmEnt"
+
+#: templates/item/item_metadata.xhtml:103
+msgid ""
+"Note: this item is awaiting [1:copyright clearance]. Only staff and "
+"instructors may download it."
+msgstr ""
+"NOtE: thIs ItEm Is AwAItIng [1:cOpyrIght clEArAncE]. only stAff And "
+"InstrUctOrs mAy dOwnlOAd It."
+
+#: 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 ""
+"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."
+
+#: templates/item/item_metadata.xhtml:113
+msgid "Request to download this document"
+msgstr "REqUEst tO dOwnlOAd thIs dOcUmEnt"
+
+#: templates/item/item_metadata.xhtml:116
+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:117
+msgid ". Size:"
+msgstr ". SIzE:"
+
+#: templates/item/item_metadata.xhtml:117
+msgid "bytes."
+msgstr "bytEs."
+
+#: templates/item/item_metadata.xhtml:123
+msgid "View status of all copies in catalogue"
+msgstr "VIEw stAtUs Of All cOpIEs In cAtAlOgUE"
+
+#: templates/item/item_relocate.xhtml:1
+msgid "Move item under a different heading"
+msgstr "MOvE ItEm UndEr A dIffErEnt hEAdIng"
+
+#: templates/item/item_relocate.xhtml:16
+msgid "Please choose the heading under which this item should be moved:"
+msgstr "PlEAsE chOOsE thE hEAdIng UndEr whIch thIs ItEm shOUld bE mOvEd:"
+
+#: templates/item/item_relocate.xhtml:20
+msgid "Item title:"
+msgstr "itEm tItlE:"
+
+#: templates/item/item_relocate.xhtml:21
+msgid "Current heading:"
+msgstr "CUrrEnt hEAdIng:"
+
+#: templates/item/item_relocate.xhtml:24
+msgid "New heading:"
+msgstr "NEw hEAdIng:"
+
+#: 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"
+
+#~ msgid "ServiceDesks"
+#~ msgstr "SErvIcEDEsks"

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-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/locale/fr_CA/LC_MESSAGES/django.po	2011-03-27 19:13:28 UTC (rev 1285)
@@ -8,7 +8,7 @@
 "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-26 21:07-0400\n"
+"PO-Revision-Date: 2011-03-27 14:59-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"
@@ -77,9 +77,8 @@
 msgstr ""
 
 #: integration/linktool/templates/index.xhtml:13
-#, fuzzy
 msgid "Welcome"
-msgstr "Bienvenue,"
+msgstr "Bienvenue"
 
 #: integration/linktool/templates/new_site_cannot.xhtml:13
 msgid "Cannot create site..."
@@ -120,58 +119,200 @@
 msgid "ILS patron ID"
 msgstr ""
 
-#: syrup/models.py:237
+#: 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:238
+#: syrup/models.py:248
 msgid "Accessible to all logged-in users"
 msgstr ""
 
-#: syrup/models.py:239
+#: syrup/models.py:249
 msgid ""
 "Accessible to all logged-in users, but only course-site members can read "
 "electronic documents."
 msgstr ""
 
-#: syrup/models.py:240
+#: syrup/models.py:250
 msgid "Accessible to course-site members"
 msgstr ""
 
-#: syrup/models.py:241
+#: syrup/models.py:251
 msgid "Accessible only to course-site owners"
 msgstr ""
 
-#: syrup/models.py:508
+#: syrup/models.py:518
 msgid "Instructor"
 msgstr ""
 
-#: syrup/models.py:509
+#: syrup/models.py:519
 msgid "Assistant/Support"
 msgstr ""
 
-#: syrup/models.py:510
+#: syrup/models.py:520
 msgid "Student"
 msgstr ""
 
-#: syrup/models.py:553
+#: syrup/models.py:563
 msgid "Attached Electronic Document"
 msgstr ""
 
-#: syrup/models.py:554
+#: syrup/models.py:564
 msgid "Physical Book or Document"
 msgstr ""
 
-#: syrup/models.py:555 templates/item/item_add_url.xhtml:37
+#: syrup/models.py:565 templates/item/item_add_url.xhtml:37
 #: templates/item/item_delete_confirm.xhtml:30
-#: templates/item/item_metadata.xhtml:97
+#: templates/item/item_metadata.xhtml:98
 msgid "URL"
 msgstr ""
 
-#: syrup/models.py:556 templates/item/item_add_heading.xhtml:24
+#: 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 ""
@@ -214,8 +355,8 @@
 msgid "Courses"
 msgstr ""
 
-#: syrup/views/admin.py:33
-msgid "ServiceDesks"
+#: syrup/views/admin.py:33 templates/admin/index.xhtml:22
+msgid "Service Desks"
 msgstr ""
 
 #: syrup/views/admin.py:48 templates/admin/index.xhtml:21
@@ -226,11 +367,6 @@
 msgid "start must precede finish"
 msgstr ""
 
-#: syrup/views/admin.py:71 templates/departments.xhtml:1
-#: templates/admin/index.xhtml:23
-msgid "Departments"
-msgstr ""
-
 #: syrup/views/admin.py:87
 msgid "Targets"
 msgstr ""
@@ -247,12 +383,12 @@
 msgid "Sorry, this account has been disabled."
 msgstr ""
 
-#: syrup/views/general.py:140
+#: syrup/views/general.py:149
 #, python-format
 msgid "Courses taught by %s"
 msgstr ""
 
-#: syrup/views/general.py:156
+#: syrup/views/general.py:165
 #, python-format
 msgid "Courses with Materials in %s"
 msgstr ""
@@ -339,17 +475,16 @@
 "    to"
 msgstr ""
 
-#: templates/browse_index.xhtml:18 templates/search_results.xhtml:56
+#: templates/browse_index.xhtml:18
 msgid "log in"
 msgstr ""
 
-#: templates/courses.xhtml:19 templates/edit_site_permissions.xhtml:90
-#: templates/instructors.xhtml:19 templates/zsearch_results.xhtml:28
-msgid "Name"
+#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
+msgid "lock"
 msgstr ""
 
-#: templates/departments.xhtml:19
-msgid "Department"
+#: templates/browse_index.xhtml:21 templates/search_results.xhtml:20
+msgid "This resource is access-controlled."
 msgstr ""
 
 #: templates/edit_site.xhtml:1
@@ -375,7 +510,19 @@
 "matches."
 msgstr ""
 
-#: templates/edit_site.xhtml:78
+#: 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 ""
 
@@ -387,16 +534,14 @@
 msgid "Site permissions"
 msgstr ""
 
-#: templates/edit_site_permissions.xhtml:43 templates/phys/checkout.xhtml:63
-#: templates/phys/mark_arrived.xhtml:31
-#: templates/phys/mark_arrived_outcome.xhtml:20
-msgid "Continue"
-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 ""
@@ -417,6 +562,10 @@
 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 ""
@@ -429,6 +578,10 @@
 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 ""
@@ -445,10 +598,18 @@
 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 ""
@@ -461,28 +622,37 @@
 msgid "search..."
 msgstr ""
 
-#: templates/master.xhtml:56
-msgid "Welcome,"
-msgstr "Bienvenue,"
+#: templates/master.xhtml:17
+msgid "unAPI"
+msgstr ""
 
 #: templates/master.xhtml:57
+#, python-format
+msgid "Welcome, %(user)s!"
+msgstr "Bienvenue, %(user)s!"
+
+#: templates/master.xhtml:58
 msgid "Log Out"
 msgstr ""
 
-#: templates/master.xhtml:61
+#: templates/master.xhtml:59 templates/master.xhtml:65 templates/prefs.xhtml:1
+msgid "Preferences"
+msgstr ""
+
+#: templates/master.xhtml:62
 msgid "Welcome!"
 msgstr "Bienvenue!"
 
-#: templates/master.xhtml:62
+#: templates/master.xhtml:63
 msgid "Log In"
 msgstr ""
 
-#: templates/master.xhtml:74
-msgid "Syrup is a subproject of"
+#: templates/master.xhtml:75
+msgid "Syrup is a subproject of [1:Project Conifer] © 2011"
 msgstr ""
 
-#: templates/master.xhtml:75
-msgid "Project Conifer"
+#: templates/master.xhtml:83
+msgid "or go back"
 msgstr ""
 
 #: templates/my_sites.xhtml:1 templates/tabbar.xhtml:14
@@ -501,14 +671,10 @@
 msgid "Term"
 msgstr ""
 
-#: templates/open_sites.xhtml:19
-msgid "Code"
-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:45
+#: templates/item/item_metadata.xhtml:46
 #: templates/phys/circlist_for_term.xhtml:22
 msgid "Title"
 msgstr ""
@@ -521,44 +687,23 @@
 msgid "Next"
 msgstr ""
 
-#: templates/prefs.xhtml:1
-msgid "Preferences"
-msgstr ""
-
-#: templates/prefs.xhtml:15
+#: templates/prefs.xhtml:16
 msgid "Preferred Language"
 msgstr ""
 
-#: templates/prefs.xhtml:25
-msgid "Notification preferences"
+#: templates/prefs.xhtml:23
+msgid "Change"
 msgstr ""
 
-#: templates/prefs.xhtml:27
-msgid "This doesn't work yet."
-msgstr ""
-
-#: templates/prefs.xhtml:30
-msgid ""
-"I would like to receive emails when new items are added to my course-"
-"reserve sites."
-msgstr ""
-
 #: templates/search_results.xhtml:1
 msgid "Search Results"
 msgstr ""
 
-#: templates/search_results.xhtml:25
-msgid "You searched for:"
-msgstr ""
-
 #: templates/search_results.xhtml:26
-msgid "Found"
+#, python-format
+msgid "You searched for: [1:%(query)s.] Found %(num)s matches."
 msgstr ""
 
-#: templates/search_results.xhtml:27
-msgid "matches."
-msgstr ""
-
 #: templates/search_results.xhtml:31
 #: templates/item/item_add_cat_search.xhtml:61
 #: templates/phys/circlist_for_term.xhtml:22
@@ -570,15 +715,9 @@
 msgstr ""
 
 #: templates/search_results.xhtml:54
-msgid "Your searches may return more results if you"
+msgid "Your searches may return more results if you [1:log in] before searching."
 msgstr ""
 
-#: templates/search_results.xhtml:56
-msgid ""
-"before\n"
-"      searching."
-msgstr ""
-
 #: templates/site_detail.xhtml:18
 msgid "There are no items associated with this site yet."
 msgstr ""
@@ -626,6 +765,10 @@
 "    Reserves\" list."
 msgstr ""
 
+#: templates/site_join.xhtml:19
+msgid "Yes, join this site"
+msgstr ""
+
 #: templates/tabbar.xhtml:11
 msgid "Return to CLEW"
 msgstr ""
@@ -654,6 +797,10 @@
 msgid "Title:"
 msgstr ""
 
+#: templates/zsearch.xhtml:19
+msgid "Search this target"
+msgstr ""
+
 #: templates/zsearch_results.xhtml:1
 msgid "Z39.50 Search Results"
 msgstr ""
@@ -666,10 +813,6 @@
 msgid "Create a new course site"
 msgstr ""
 
-#: templates/admin/index.xhtml:22
-msgid "Service Desks"
-msgstr ""
-
 #: templates/admin/index.xhtml:25
 msgid "Z39.50 Targets"
 msgstr ""
@@ -702,10 +845,18 @@
 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 ""
@@ -722,46 +873,50 @@
 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:72 templates/item/item_metadata.xhtml:80
+#: 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:73 templates/item/item_metadata.xhtml:81
+#: 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:74
+#: 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:75 templates/item/item_metadata.xhtml:83
+#: 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:76
+#: 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:77
+#: 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:78
+#: 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:79
+#: 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:82
+#: templates/components/site.xhtml:58 templates/item/item_metadata.xhtml:83
 msgid "4 Hour Loan"
 msgstr ""
 
@@ -773,7 +928,7 @@
 msgid "NEXT DUE:"
 msgstr ""
 
-#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:86
+#: templates/components/site.xhtml:65 templates/item/item_metadata.xhtml:87
 msgid "Availability unknown."
 msgstr ""
 
@@ -785,6 +940,10 @@
 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 ""
@@ -801,11 +960,15 @@
 msgid "Relocate"
 msgstr ""
 
-#: templates/components/site.xhtml:125
+#: 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 ""
 
@@ -849,7 +1012,7 @@
 msgid "Delete?"
 msgstr ""
 
-#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:38
+#: templates/components/site.xhtml:199 templates/item/item_metadata.xhtml:39
 msgid "Delete this item"
 msgstr ""
 
@@ -885,12 +1048,17 @@
 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:34
-msgid "Add"
+#: templates/generic/index.xhtml:36
+#, python-format
+msgid "Add %(thing)s"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:15
@@ -898,7 +1066,7 @@
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:16
-#: templates/item/item_metadata.xhtml:46
+#: templates/item/item_metadata.xhtml:47
 msgid "Title of source"
 msgstr ""
 
@@ -908,33 +1076,33 @@
 
 #: templates/item/common_metadata.xhtml:20
 #: templates/item/item_add_cat_search.xhtml:61
-#: templates/item/item_metadata.xhtml:49
+#: 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:50
+#: templates/item/item_metadata.xhtml:51
 msgid "Published"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:22
-#: templates/item/item_metadata.xhtml:51
+#: templates/item/item_metadata.xhtml:52
 msgid "Volume"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:23
-#: templates/item/item_metadata.xhtml:52
+#: templates/item/item_metadata.xhtml:53
 msgid "Issue"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:24
-#: templates/item/item_metadata.xhtml:53
+#: templates/item/item_metadata.xhtml:54
 msgid "Pages"
 msgstr ""
 
 #: templates/item/common_metadata.xhtml:25
-#: templates/item/item_metadata.xhtml:54
+#: templates/item/item_metadata.xhtml:55
 msgid "ISBN"
 msgstr ""
 
@@ -978,6 +1146,10 @@
 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 ""
@@ -1003,6 +1175,10 @@
 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 ""
@@ -1015,10 +1191,22 @@
 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 ""
@@ -1027,6 +1215,15 @@
 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 ""
@@ -1035,6 +1232,10 @@
 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 ""
@@ -1054,10 +1255,18 @@
 " and dropped from Zotero; ask Graham for details.)"
 msgstr ""
 
-#: templates/item/item_add_url.xhtml:42 templates/item/item_metadata.xhtml:127
+#: 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 ""
@@ -1075,10 +1284,14 @@
 msgstr ""
 
 #: templates/item/item_delete_confirm.xhtml:29
-#: templates/item/item_metadata.xhtml:59
+#: 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 ""
@@ -1095,55 +1308,49 @@
 msgid "There are no items in this section."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:35
+#: templates/item/item_metadata.xhtml:36
 msgid "Edit this item"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:41
+#: templates/item/item_metadata.xhtml:42
 msgid "Relocate this item"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:47
+#: templates/item/item_metadata.xhtml:48
 msgid "Format"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:48
+#: templates/item/item_metadata.xhtml:49
 msgid "Author(s)"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:58
+#: templates/item/item_metadata.xhtml:59
 msgid "Copyright status"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:67
+#: templates/item/item_metadata.xhtml:68
 msgid "Call Number (take this to the counter)"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:69
+#: templates/item/item_metadata.xhtml:70
 msgid "DUE:"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:95
+#: templates/item/item_metadata.xhtml:96
 msgid "Status"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:101
+#: templates/item/item_metadata.xhtml:102
 msgid "Download the document"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:102
-msgid "Note: this item is awaiting"
-msgstr ""
-
 #: templates/item/item_metadata.xhtml:103
-msgid "copyright clearance"
+msgid ""
+"Note: this item is awaiting [1:copyright clearance]. Only staff and "
+"instructors may download it."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:103
-msgid ". Only staff and instructors may download it."
-msgstr ""
-
-#: templates/item/item_metadata.xhtml:107
+#: 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"
@@ -1152,30 +1359,34 @@
 "\tformat."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:112
+#: templates/item/item_metadata.xhtml:113
 msgid "Request to download this document"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:115
+#: templates/item/item_metadata.xhtml:116
 msgid "Click here to download the document."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:117
 msgid "Document type:"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:117
 msgid ". Size:"
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:116
+#: templates/item/item_metadata.xhtml:117
 msgid "bytes."
 msgstr ""
 
-#: templates/item/item_metadata.xhtml:122
+#: 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 ""
@@ -1192,6 +1403,10 @@
 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 ""
@@ -1290,6 +1505,10 @@
 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 ""
@@ -1298,3 +1517,6 @@
 msgid "Matches saved; item marked as received"
 msgstr ""
 
+#~ msgid "ServiceDesks"
+#~ msgstr ""
+

Modified: servres/branches/i18n/conifer/plumbing/genshi_support.py
===================================================================
--- servres/branches/i18n/conifer/plumbing/genshi_support.py	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/plumbing/genshi_support.py	2011-03-27 19:13:28 UTC (rev 1285)
@@ -56,7 +56,10 @@
         return file(fn)
 
     def template_loaded(self, template):
-        template.filters.insert(0, Translator(ugettext))
+        if hasattr(translator, 'setup'): # Genshi 0.6
+            translator.setup(template)
+        else:
+            template.filters.insert(0, translator)
 
     def template(self, tname):
         return self.loader.load(tname)

Modified: servres/branches/i18n/conifer/pybabel-extract
===================================================================
--- servres/branches/i18n/conifer/pybabel-extract	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/pybabel-extract	2011-03-27 19:13:28 UTC (rev 1285)
@@ -2,9 +2,12 @@
 
 import os
 import sys
+import settings
+import re, sys
+import polib    # 'easy_install polib'.
+import HTMLParser
 
 PROJECT = 'django'
-LOCALES = ['en_US', 'fr_CA']
 
 # commands: you can optionally specify a command, e.g., './pybabel-extract
 # compile'. If you omit a command, then all three phases are executed.
@@ -13,8 +16,87 @@
 if not commands:
     commands = ['extract', 'update', 'compile']
 
-import settings
+
+#---------------------------------------------------------------------------
+
+"""Munge a .po file so we English-bound can see what strings aren't marked for
+translation yet. This code is in the public domain. (Author: Ned Batchelder,
+source: http://nedbatchelder.com/blog/201012/faked_translations_poxxpy.html).
+"""
+
+class HtmlAwareMessageMunger(HTMLParser.HTMLParser):
+    def __init__(self):
+        HTMLParser.HTMLParser.__init__(self)
+        self.s = ""
+
+    def result(self):
+        return self.s
+
+    def xform(self, s):
+        return re.sub("[aeiouAEIOU]", self.munge_vowel, s)
+
+    def munge_vowel(self, v):
+        v = v.group(0)
+        if v.isupper():
+            return v.lower()
+        else:
+            return v.upper()
+
+    def handle_starttag(self, tag, attrs, closed=False):
+        self.s += "<" + tag
+        for name, val in attrs:
+            self.s += " "
+            self.s += name
+            self.s += '="'
+            if name in ['alt', 'title']:
+                self.s += self.xform(val)
+            else:
+                self.s += val
+            self.s += '"'
+        if closed:
+            self.s += " /"
+        self.s += ">"
+
+    def handle_startendtag(self, tag, attrs):
+        self.handle_starttag(tag, attrs, closed=True)
+
+    def handle_endtag(self, tag):
+        self.s += "</" + tag + ">"
+
+    def handle_data(self, data):
+        # We don't want to munge placeholders, so split on them, keeping them
+        # in the list, then xform every other token.
+        toks = re.split(r"(%\(\w+\)s)", data)
+        for i, tok in enumerate(toks):
+            if i % 2:
+                self.s += tok
+            else:
+                self.s += self.xform(tok)
+
+    def handle_charref(self, name):
+        self.s += "&#" + name + ";"
+
+    def handle_entityref(self, name):
+        self.s += "&" + name + ";"
+
+def munge_one_file(fname):
+    po = polib.pofile(fname)
+    count = 0
+    for entry in po:
+        hamm = HtmlAwareMessageMunger()
+        hamm.feed(entry.msgid)
+        entry.msgstr = hamm.result()
+        if 'fuzzy' in entry.flags:
+            entry.flags.remove('fuzzy') # clear the fuzzy flag
+        count += 1
+    print "Munged %d messages in %s" % (count, fname)
+    po.save()
+
+#---------------------------------------------------------------------------
+
 def convert_locale_code(code):
+    if not '-' in code:
+        return code
     parts = code.split('-')
     if len(parts) > 1:
         return '%s_%s' % (parts[0], parts[1].upper())
@@ -33,9 +115,19 @@
             os.system('pybabel init -D %(PROJECT)s -i locale/%(PROJECT)s.pot -d locale -l %(locale)s' % vars())
 
 # do the update
+
+# Note, we're abusing the Esperanto translation here, as a target for
+# Batchelder's POXX code. Babel requires that a locale code map to a known,
+# registered locale, so I can't just make up a locale like 'xx' without
+# getting errors. If anyone ever wants to translate Syrup into Esperanto, we
+# will revisit this hack.
+
 if 'update' in commands:
     os.system('pybabel update -D %(PROJECT)s -i locale/%(PROJECT)s.pot -d locale' % vars())
+    if 'eo' in LOCALES:
+        munge_one_file('locale/eo/LC_MESSAGES/%(PROJECT)s.po' % vars())
 
 # compile to .mo
 if 'compile' in commands:
     os.system('pybabel compile -D %(PROJECT)s -d locale' % vars())
+

Modified: servres/branches/i18n/conifer/syrup/models.py
===================================================================
--- servres/branches/i18n/conifer/syrup/models.py	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/syrup/models.py	2011-03-27 19:13:28 UTC (rev 1285)
@@ -151,10 +151,14 @@
 # Lookup tables
 
 class ServiceDesk(BaseModel):
-    name        = m.CharField(max_length=100, unique=True)
-    active      = m.BooleanField(default=True)
-    external_id = m.CharField(max_length=256, blank=True, null=True)
+    name        = m.CharField(_('Name'), max_length=100, unique=True)
+    active      = m.BooleanField(_('Is active?'), default=True)
+    external_id = m.CharField(_('External ID'), max_length=256, blank=True, null=True)
 
+    class Meta:
+        verbose_name = _('service desk')
+        verbose_name_plural = _('service desks')
+
     def __unicode__(self):
         return self.name
 
@@ -163,12 +167,14 @@
         return cls.objects.get(pk=Config.get('default.desk', 1))
 
 class Term(BaseModel):
-    code   = m.CharField(max_length=64, unique=True)
-    name   = m.CharField(max_length=256)
-    start  = m.DateField('Start (Y-M-D)')
-    finish = m.DateField('Finish (Y-M-D)')
+    code   = m.CharField(_('Code'), max_length=64, unique=True)
+    name   = m.CharField(_('Name'), max_length=256)
+    start  = m.DateField(_('Start (Y-M-D)'))
+    finish = m.DateField(_('Finish (Y-M-D)'))
 
     class Meta:
+        verbose_name = _('term') 
+        verbose_name_plural = _('terms')
         ordering = ['start', 'code']
 
     def __unicode__(self):
@@ -179,17 +185,21 @@
 
 
 class Department(BaseModel):
-    name   = m.CharField(max_length=256)
-    active = m.BooleanField(default=True)
-    service_desk = m.ForeignKey(ServiceDesk)
+    name   = m.CharField(_('Name'), max_length=256)
+    active = m.BooleanField(_('Is active?'),default=True)
+    service_desk = m.ForeignKey(ServiceDesk, verbose_name=_('Service desk'))
 
+    class Meta:
+        verbose_name = _('Department')
+        verbose_name_plural = _('Departments')
+
     def __unicode__(self):
         return self.name
 
 
 class Course(BaseModel):
     """An abstract course (not a course offering.)"""
-    code = m.CharField(max_length=64, unique=True)
+    code = m.CharField(_('Code'), max_length=64, unique=True)
     name = m.CharField(max_length=1024)
     department = m.ForeignKey(Department)
 
@@ -227,11 +237,11 @@
 
 class Site(BaseModel):
     """A a list of materials for one (or more) course offering(s)."""
-    course       = m.ForeignKey(Course)
-    start_term   = m.ForeignKey(Term, related_name='start_term')
-    end_term     = m.ForeignKey(Term, related_name='end_term')
+    course       = m.ForeignKey(Course, verbose_name=_('Course'))
+    start_term   = m.ForeignKey(Term, related_name='start_term', verbose_name=_('Start term'))
+    end_term     = m.ForeignKey(Term, related_name='end_term', verbose_name=_('End term'))
     owner        = m.ForeignKey(User)
-    service_desk = m.ForeignKey(ServiceDesk)
+    service_desk = m.ForeignKey(ServiceDesk, verbose_name=_('Service desk'))
 
     ACCESS_CHOICES = [
         ('ANON',  _('World-accessible')),
@@ -577,8 +587,8 @@
     # Remember that electronic (ELEC and URL) items may also have
     # bib_id's and MARC records.
 
-    bib_id = m.CharField('Bib Record ID', max_length=256, blank=True, null=True)
-    marcxml = m.TextField('MARCXML', blank=True, null=True)
+    bib_id = m.CharField(_('Bib Record ID'), max_length=256, blank=True, null=True)
+    marcxml = m.TextField(_('MARCXML'), blank=True, null=True)
 
     # Fundamental metadata. These attributes may be populated from
     # MARCXML or DC attributes. Even if these attributes exist in the
@@ -633,11 +643,11 @@
 
     # Options for circ modifiers
     CIRC_MODIFIER_CHOICES = [
-        ('CIRC', 'Normal'),
-        ('RSV2', '2 Hour'),
-        ('RSV1', '1 Day'),
-        ('RSV3', '3 Day'),
-        ('RSV7', '7 Day'),
+        ('CIRC', _('Normal')),
+        ('RSV2', _('2 Hour')),
+        ('RSV1', _('1 Day')),
+        ('RSV3', _('3 Day')),
+        ('RSV7', _('7 Day')),
         ]
 
     circ_modifier = m.CharField(max_length=10, 
@@ -645,9 +655,10 @@
                                    default='RSV2')
 
     # Options for circ desk
+    # TODO: Are these Leddy-specific?
     CIRC_DESK_CHOICES = [
-        ('631', 'Reserves Counter'),
-        ('598', 'Circulating Collection'),
+        ('631', _('Reserves Counter')),
+        ('598', _('Circulating Collection')),
         ]
 
     circ_desk = m.CharField(max_length=5, 
@@ -674,7 +685,7 @@
         ('r', 'Three-dimensional object'),
         ('t', 'Manuscript'),
         ]
-    itemtype  = m.CharField('Type', max_length=1, db_index=True,
+    itemtype  = m.CharField(_('Item Type'), max_length=1, db_index=True,
                             null=True, blank=True,
                             choices=ITEMTYPE_CHOICES)
 
@@ -797,20 +808,20 @@
         #return (True, 'NOT-IMPLEMENTED')
         stat = callhook('item_status', self)
         if not stat:
-            return (False, 'Status information not available.')
+            return (False, _('Status information not available.'))
         else:
             lib, desk, avail, callno, dueinfo, circmod, alldues = stat
             return (avail > 0,
-                    '%d of %d copies available at reserves desk; '
-                    '%d total copies in library system'
+                    _('%d of %d copies available at reserves desk; '
+                    '%d total copies in library system')
                     % (avail, desk, lib))
 
     _video_type_re = re.compile(r'tag="007">v(.)')
-    _video_types = {'c':'videocartridge',
-                    'd':'videodisc',
-                    'f':'videocassette',
-                    'r':'videoreel',
-                    'z':'video, other format'}
+    _video_types = {'c':_('videocartridge'),
+                    'd':_('videodisc'),
+                    'f':_('videocassette'),
+                    'r':_('videoreel'),
+                    'z':_('video, other format')}
 
     def video_type(self):
         if not self.marcxml:
@@ -818,11 +829,13 @@
         m = self._video_type_re.search(self.marcxml)
         if m:
             vtype = m.group(1)
-            return self._video_types.get(vtype, 'video, unknown format')
+            return self._video_types.get(vtype, _('video, unknown format'))
 
     def call_number(self):
         dct = self.marc_as_dict()
         if dct:
+            # TODO. This may be Leddy specific. Consider adding an integration
+            # hook for this logic, and putting it in uwindsor.py.
             try:
                 if '092a' in dct:   # for ZPR's?. FIXME, is this legit?
                     return dct['092a']

Modified: servres/branches/i18n/conifer/syrup/urls.py
===================================================================
--- servres/branches/i18n/conifer/syrup/urls.py	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/syrup/urls.py	2011-03-27 19:13:28 UTC (rev 1285)
@@ -8,13 +8,14 @@
 
 urlpatterns = patterns('conifer.syrup.views',
     (r'^$', 'welcome'),                       
-    (r'^test/$', 'item_ils_update_test'),
+#   (r'^test/$', 'item_ils_update_test'),
     (r'^site/$', 'my_sites'),
     (r'^site/new/$', 'add_new_site'),
     (r'^site/invitation/$', 'site_invitation'),
     (r'^browse/$', 'browse'),
     (r'^browse/(?P<browse_option>.*)/$', 'browse'),
     (r'^prefs/$', 'user_prefs'),
+    (r'^prefs/setlang/$', 'user_prefs_set_lang'),
     (r'^z3950test/$', 'z3950_test'),
     #MARK: propose we kill open_sites, we have browse.
     (r'^opensite/$', 'open_sites'),

Modified: servres/branches/i18n/conifer/syrup/views/admin.py
===================================================================
--- servres/branches/i18n/conifer/syrup/views/admin.py	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/syrup/views/admin.py	2011-03-27 19:13:28 UTC (rev 1285)
@@ -30,7 +30,7 @@
         model = models.ServiceDesk
 
     class Index:
-        title = _('ServiceDesks')
+        title = _('Service Desks')
         all   = models.ServiceDesk.objects.order_by('name').all
         cols  = ['name']
         links = [0]

Modified: servres/branches/i18n/conifer/syrup/views/general.py
===================================================================
--- servres/branches/i18n/conifer/syrup/views/general.py	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/syrup/views/general.py	2011-03-27 19:13:28 UTC (rev 1285)
@@ -52,6 +52,15 @@
         profile.save()
         return HttpResponseRedirect('../')
 
+
+def user_prefs_set_lang(request):
+    if request.method != 'POST':
+        return g.render('prefs.xhtml')
+    else:
+        lang = request.POST.get('language')
+        request.session['django_language'] = lang
+        return HttpResponseRedirect('../')
+
 def z3950_test(request):
     #z39.50 testing area
 

Modified: servres/branches/i18n/conifer/templates/admin/staff_add.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/admin/staff_add.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/admin/staff_add.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -39,11 +39,11 @@
     <div id="fuzzyview" style="display: none;">
       <span id="fuzzyname">
       </span>
-      <input id="fuzzychange" type="button" value="change" onclick="fuzzyLookup.edit();"
+      <input id="fuzzychange" type="button" value="${_('change')}" onclick="fuzzyLookup.edit();"
 	     style="margin-left: 1em;"/>
       <form action="." method="POST">
 	<input type="hidden" id="userid" name="userid" value=""/>
-	<p><input type="submit" value="Add this user"/></p>
+	<p><input type="submit" value="${_('Add this user')}"/></p>
       </form>
     </div>
   </div>

Modified: servres/branches/i18n/conifer/templates/admin/su.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/admin/su.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/admin/su.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -16,7 +16,7 @@
   <form action="." method="POST">
 	<p>UWin ID to impersonate:</p>
 	<p><input type="text" name="userid"/></p>
-	<p><input type="submit" value="Impersonate"/></p>
+	<p><input type="submit" value="${_('Impersonate')}"/></p>
   </form>
 </body>
 </html>

Modified: servres/branches/i18n/conifer/templates/admin/term.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/admin/term.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/admin/term.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -12,7 +12,7 @@
   <h1>${title}</h1>
   <form action="." method="POST">
   <table>${Markup(form.as_table())}</table>
-  <input type="submit" value="Save"/>
+  <input type="submit" value="${_('Save')}"/>
   </form>
 </body>
 </html>

Modified: servres/branches/i18n/conifer/templates/auth/login.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/auth/login.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/auth/login.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -27,7 +27,7 @@
       <td><input type="password" id="pwd" name="password" style="width: 200px;"/></td>
     </tr>
     <tr><th style="background-color: white; border: none;"/>
-    <td><input type="submit" value="Log in" style="width: 200px;"/></td></tr>
+    <td><input type="submit" value="${_('Log in')}" style="width: 200px;"/></td></tr>
   </table>
   </form>
 </body>

Modified: servres/branches/i18n/conifer/templates/edit_site.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/edit_site.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/edit_site.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -59,7 +59,7 @@
 			  ${owner.get_full_name()} [${owner}]
 			</span>
 			</span>
-			<input type="button" value="change" id="fuzzychange" style="margin-left: 1em;"/>
+			<input type="button" value="${_('change')}" id="fuzzychange" style="margin-left: 1em;"/>
 		  </div>
 		</td>
 	  </tr>
@@ -71,7 +71,7 @@
     <!-- ${field_row(form.department)} -->
     <!-- <tr><th>Department</th><td>${Markup(form.department)} ${errorlist(form.department)}</td></tr> -->
   </table>
-  <p><input type="submit" value="Continue"/> ${go_back_link()}</p>
+  <p><input type="submit" value="${_('Continue')}"/> ${go_back_link()}</p>
   </form>
   <div class="gap"/>
   <div py:if="instance.id">
@@ -80,7 +80,7 @@
       <p><input type="checkbox" name="confirm_delete" id="confirm_delete"/>
       <label for="confirm_delete">Yes, I want to delete this site and all of its contents.</label>
       </p>
-      <p><input type="submit" value="Delete this site"/> ${go_back_link()}</p>
+      <p><input type="submit" value="${_('Delete this site')}"/> ${go_back_link()}</p>
     </form>
   </div>
 </body>

Modified: servres/branches/i18n/conifer/templates/edit_site_permissions.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/edit_site_permissions.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/edit_site_permissions.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -46,7 +46,7 @@
 	<div>
 	  <p style="margin-bottom: 0;">Who has permission to view resources in this site?</p>
 	  <div id="access_level" style="margin: 8;">${Markup(choose_access.render('access', site.access, {'id':'id_access'}, []))}</div>
-	  <p><input type="submit" name="action_access_level" value="Change security level"/>
+	  <p><input type="submit" name="action_access_level" value="${_('Change security level')}"/>
 	  ${go_back_link('../../')}</p>
 	</div>
   </form>
@@ -69,7 +69,7 @@
 		</tbody>
 	  </table>
 	  <div>
-		<p><input type="button" value="Add external group" onclick="$('#addExternalGroupPopup').fadeIn('slow')[0].scrollIntoView(true);"/></p>
+		<p><input type="button" value="${_('Add external group')}" onclick="$('#addExternalGroupPopup').fadeIn('slow')[0].scrollIntoView(true);"/></p>
 		<div class="popup" id="addExternalGroupPopup" style="display: none;">
 		  <li py:if="show_add_section_panel">
 			Add the class list for ${site.course.code}, section <input name="section" style="width: 2em;"/>, ${site.start_term.name}
@@ -77,7 +77,7 @@
 		  <li>
 			Add a class list or group by its group code: <input name="groupcode" style="width: 15em;"/>
 		  </li>
-		  <p><input id="aad" type="submit" name="action_add_group" value="Add class list or group"/>
+		  <p><input id="aad" type="submit" name="action_add_group" value="${_('Add class list or group')}"/>
 		  	  ${go_back_link('../../')}</p>
 		</div>
 	  </div>
@@ -98,7 +98,7 @@
       </tr>
     </table>
     	  <div>
-		<p><input type="button" value="Add new member" onclick="$('#addMemberPopup').fadeIn('slow')[0].scrollIntoView(true);"/></p>
+		<p><input type="button" value="${_('Add new member')}" onclick="$('#addMemberPopup').fadeIn('slow')[0].scrollIntoView(true);"/></p>
 		<div class="popup" id="addMemberPopup" style="display: none;">
 		  <div>
 		    <div id="fuzzyedit" style="display: block">
@@ -112,7 +112,7 @@
 		    <div id="fuzzyview" style="display: none;">
 		      <span id="fuzzyname">
 		      </span>
-		      <input id="fuzzychange" type="button" value="change" onclick="fuzzyLookup.edit();"
+		      <input id="fuzzychange" type="button" value="${_('change')}" onclick="fuzzyLookup.edit();"
 			     style="margin-left: 1em;"/>
 		      <div>
 			<p>
@@ -122,7 +122,7 @@
 			  </select>
 			</p>
 			<input type="hidden" id="userid" name="userid" value=""/>
-			<p><input name="action_add_member" type="submit" value="Add this user"/>
+			<p><input name="action_add_member" type="submit" value="${_('Add this user')}"/>
 			${go_back_link('../../')}</p>
 		      </div>
 		    </div>

Modified: servres/branches/i18n/conifer/templates/generic/delete.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/generic/delete.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/generic/delete.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -17,7 +17,7 @@
       <td>${instance}</td>
     </tr>
   </table>
-  <p><input type="submit" value="Delete"/>${go_back_link('../')}</p>
+  <p><input type="submit" value="${_('Delete')}"/>${go_back_link('../')}</p>
   </form>
 </body>
 </html>

Modified: servres/branches/i18n/conifer/templates/generic/edit.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/generic/edit.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/generic/edit.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -1,8 +1,8 @@
 <?python
 if instance:
-    title = _('Modify %s') % form.Meta.model.__name__
+    title = _('Modify %s') % form.Meta.model._meta.verbose_name
 else:
-    title = _('Add %s') % form.Meta.model.__name__
+    title = _('Add %s') % form.Meta.model._meta.verbose_name
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -15,7 +15,7 @@
   <h1>${title}</h1>
   <form action="." method="POST">
   <table class="metadata_table">${Markup(form.as_table())}</table>
-  <p><input type="submit" value="Save changes"/> ${go_back_link()}</p>
+  <p><input type="submit" value="${_('Save changes')}"/> ${go_back_link()}</p>
   <p py:if="instance is not None"><a href="delete">Delete this record</a></p>
   </form>
 </body>

Modified: servres/branches/i18n/conifer/templates/generic/index.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/generic/index.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/generic/index.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -6,9 +6,11 @@
         return obj() or dflt
     else:
         return obj or dflt
+disp = lambda fld: form.Meta.model._meta.get_field_by_name(fld)[0].verbose_name
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:i18n="http://genshi.edgewall.org/i18n"
       xmlns:py="http://genshi.edgewall.org/">
 <xi:include href="../master.xhtml"/>
 <head>
@@ -20,7 +22,7 @@
 <body>
   <h1>${title}</h1>
   <table class="pagetable">
-    <thead><tr><th py:for="c in form.Index.cols">${c}</th></tr></thead>
+    <thead><tr><th py:for="c in form.Index.cols">${disp(c)}</th></tr></thead>
     <tbody>
       <tr py:for="r in form.Index.all()">
 	<td py:for="n, c in enumerate(form.Index.cols)">
@@ -31,6 +33,6 @@
       </tr>
     </tbody>
   </table>
-  <p><a href="0/">Add ${form.Meta.model.__name__}</a></p>
+  <p><a href="0/ " i18n:msg="thing">Add ${form.Meta.model._meta.verbose_name}</a></p>
 </body>
 </html>

Modified: servres/branches/i18n/conifer/templates/item/item_add_cat_search.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_add_cat_search.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/item/item_add_cat_search.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -39,7 +39,7 @@
     <form method="GET" action=".">
       <input type="text" id="query" name="query" value="${query}" 
 	     style="font-size: larger; width: 600px;"/>
-      <input type="submit" value="Search"/>
+      <input type="submit" value="${_('Search')}"/>
 	${go_back_link()}
 
     </form>
@@ -78,7 +78,7 @@
 	      <input type="hidden" name="bibid" value="${bibid}"/>
 	      <input type="hidden" name="bc" value="${bc}"/>
 	      <input type="hidden" name="pickitem" value="${ET.tostring(res)}"/>
-	      <input type="submit" value="Pick this item"/>
+	      <input type="submit" value="${_('Pick this item')}"/>
 	    </form>
 	  </td>
 	</tr>

Modified: servres/branches/i18n/conifer/templates/item/item_add_elec.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_add_elec.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/item/item_add_elec.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -31,7 +31,7 @@
 	  ${common_table(item)}
 	  <tr><th>File</th><td><input type="file" name="file"/></td></tr>
 	</table>
-	<p><input type="submit" value="Upload file and Create item"/>
+	<p><input type="submit" value="${_('Upload file and Create item')}"/>
 	${go_back_link()}
 	</p>
       </form>
@@ -42,14 +42,14 @@
 	<table class="metadata_table">
 	  ${common_table()}
 	</table>
-	<p><input type="submit" value="Update metadata"/> ${go_back_link()}</p>
+	<p><input type="submit" value="${_('Update metadata')}"/> ${go_back_link()}</p>
       </form>
       <h2>Replace file contents</h2>
       <form action="." method="POST" enctype="multipart/form-data">
 	<table class="metadata_table">
 	  <tr><th>File</th><td><input type="file" name="file"/></td></tr>
 	</table>
-	<p><input type="submit" value="Upload new file contents"/></p>
+	<p><input type="submit" value="${_('Upload new file contents')}"/></p>
 
       </form>
     </div>

Modified: servres/branches/i18n/conifer/templates/item/item_add_heading.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_add_heading.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/item/item_add_heading.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -27,8 +27,8 @@
 	</td></tr>
       </table>
       <p>
-	<input py:if="not is_edit" type="submit" value="Add heading"/>
-	<input py:if="is_edit" type="submit" value="Update heading"/>
+	<input py:if="not is_edit" type="submit" value="${_('Add heading')}"/>
+	<input py:if="is_edit" type="submit" value="${_('Update heading')}"/>
 	${go_back_link()}
       </p>
 

Modified: servres/branches/i18n/conifer/templates/item/item_add_phys.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_add_phys.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/item/item_add_phys.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -25,8 +25,8 @@
 	${common_table()}
       </table>
       <p>
-    	<input py:if="not is_edit" type="submit" value="Add heading"/>
-    	<input py:if="is_edit" type="submit" value="Update physical-item request"/>
+    	<input py:if="not is_edit" type="submit" value="${_('Add heading')}"/>
+    	<input py:if="is_edit" type="submit" value="${_('Update physical-item request')}"/>
 	${go_back_link()}
       </p>
 

Modified: servres/branches/i18n/conifer/templates/item/item_add_url.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_add_url.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/item/item_add_url.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -51,8 +51,8 @@
 	    </div>
     </div>
       <p>
-	<input py:if="not is_edit" type="submit" value="Add URL"/>
-	<input py:if="is_edit" type="submit" value="Update URL"/>
+	<input py:if="not is_edit" type="submit" value="${_('Add URL')}"/>
+	<input py:if="is_edit" type="submit" value="${_('Update URL')}"/>
 	${go_back_link()}</p>
     </form>
 </body>

Modified: servres/branches/i18n/conifer/templates/item/item_delete_confirm.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_delete_confirm.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/item/item_delete_confirm.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -31,7 +31,7 @@
     </table>
     <p>
     <form action="." method="POST">
-      <input type="submit" name="yes" value="Yes, delete it" style="padding: 4 12; margin-right: 24;"/>
+      <input type="submit" name="yes" value="${_('Yes, delete it')}" style="padding: 4 12; margin-right: 24;"/>
       ${go_back_link()}
     </form>
     </p>

Modified: servres/branches/i18n/conifer/templates/item/item_metadata.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_metadata.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/item/item_metadata.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -9,6 +9,7 @@
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:i18n="http://genshi.edgewall.org/i18n"
       xmlns:py="http://genshi.edgewall.org/">
   <xi:include href="../master.xhtml"/>
   <xi:include href="../components/site.xhtml"/>
@@ -99,7 +100,7 @@
 
     <div py:if="item.item_type=='ELEC' and not access_forbidden">
       <h2 class="metadata_subhead">Download the document</h2>
-      <div class="errors" py:if="not item.copyright_status_ok()">
+      <div class="errors" py:if="not item.copyright_status_ok()" i18n:msg="copy_awaiting">
 	Note: this item is awaiting <a href="edit/">copyright clearance</a>. Only staff and instructors may download it.
       </div>
       <div id="ask_to_download_panel">

Modified: servres/branches/i18n/conifer/templates/item/item_relocate.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_relocate.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/item/item_relocate.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -1,5 +1,5 @@
 <?python
-title = 'Move item under a different heading'
+title = _('Move item under a different heading')
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -29,7 +29,7 @@
 	  </tr>
 	  <tr>
 	    <th/>
-	    <td><input type="submit" value="Move item"/>    
+	    <td><input type="submit" value="${_('Move item')}"/>    
 	    ${go_back_link()}
 	    </td>
 	  </tr>

Modified: servres/branches/i18n/conifer/templates/master.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/master.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/master.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -7,6 +7,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:py="http://genshi.edgewall.org/"
       xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:i18n="http://genshi.edgewall.org/i18n"
       py:strip="">
   <py:match path="head" once="True">
     <head py:attrs="select('@*')"
@@ -53,15 +54,15 @@
         </div>
       <div id="welcome" py:if="user.is_authenticated()">
 		<?python user.maybe_refresh_external_memberships() ?>
-		<strong style="padding-right: 18px;">Welcome, ${user.first_name or user.username}!</strong>
+		<strong style="padding-right: 18px;" i18n:msg="user">Welcome, ${user.first_name or user.username}!</strong>
 		<a href="${ROOT}${settings.LOGOUT_URL}">Log Out</a>
-		<!-- &bull; <a href="${ROOT}/prefs/">Preferences</a> -->
+		&bull; <a href="${ROOT}/prefs/">Preferences</a>
       </div>
       <div id="welcome" py:if="not user.is_authenticated()">
 	<strong style="padding-right: 18px;">Welcome!</strong>
 	<a class="loginbutton" href="${ROOT}${settings.LOGIN_URL}">Log In</a>
 	<span py:if="settings.USE_I18N">
-	  <!-- &bull; <a href="${ROOT}/prefs/">Preferences</a> -->
+	  &bull; <a href="${ROOT}/prefs/">Preferences</a>
 	</span>
       </div>
     </div>
@@ -71,7 +72,7 @@
 	${select('*|text()')}
       </div>
       <div id="footer">
-	<div> 
+	<div i18n:msg="conifer"> 
     Syrup is a subproject of <a href="http://projectconifer.ca">Project Conifer</a> &copy; 2011
     </div>
       </div>
@@ -79,7 +80,10 @@
     </body>
   </py:match>
 
-  <span py:def="go_back_link(url=None, msg=_('or go back'))" py:with="url=url or request.META.get('HTTP_REFERER', '../')">
+  <?python
+    go_back_msg = _('or go back')
+  ?>
+  <span py:def="go_back_link(url=None, msg=go_back_msg)" py:with="url=url or request.META.get('HTTP_REFERER', '../')">
     <a style="margin-left: 12px;" href="${url}">${msg}</a>
   </span>
 

Modified: servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/phys/circlist_index.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -15,7 +15,7 @@
     <select name="term">
       <option py:for="term in terms" value="${term.code}">${term}</option>
     </select>
-    <input type="submit" value="Continue"/>
+    <input type="submit" value="${_('Continue')}"/>
   </form>
 </body>
 </html>

Modified: servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/phys/mark_arrived_choose.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -39,7 +39,7 @@
       Optional: Small-number ID for this item: 
       <input type="text" name="smallint"/>
     </div>
-    <p><input type="submit" value="Associate item with matches selected below"/></p>
+    <p><input type="submit" value="${_('Associate item with matches selected below')}"/></p>
     <input type="hidden" name="barcode" value="${barcode}"/>
     <table class="metadata_table" width="100%;">
       <thead style="font-size: 70%;">

Modified: servres/branches/i18n/conifer/templates/prefs.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/prefs.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/prefs.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -1,6 +1,7 @@
 <?python
 from django.conf import settings
 title = _('Preferences')
+current_lang = request.session.get('django_language')
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -13,23 +14,25 @@
 <h1>${title}</h1>
 <div py:if="settings.USE_I18N">
 <h2>Preferred Language</h2>
-<form action="../i18n/setlang/" method="post">
+<form action="setlang/" method="post">
 <input name="next" type="hidden" value="${ROOT}/" />
 <select name="language">
 <option py:for="code,descr in settings.LANGUAGES"
-	value="${code}">${_(descr)}</option>
-</select> <input type="submit" value="Change" />
+	value="${code}"
+	py:attrs="{'selected':current_lang==code and 'selected' or None}">${_(descr)}</option>
+</select> <input type="submit" value="${_('Change')}" />
 </form>
 </div>
-<div py:if="user.is_authenticated()">
+<!-- !<div py:if="user.is_authenticated()">
   <h2>Notification preferences</h2>
   <form action="." method="POST">
     <p><b>This doesn't work yet.</b></p>
     <input type="checkbox" name="wants_email_notices" id="id_wants_email_notices"
 	   py:attrs="{'checked':user.get_profile().wants_email_notices or None}"/>
     <label for="id_wants_email_notices">I would like to receive emails when new items are added to my course-reserve sites.</label>
-    <p><input type="submit" value="Update notification preferences"/></p>
+    <p><input type="submit" value="${_('Update notification preferences')}"/></p>
   </form>
 </div>
+-->
 </body>
 </html>

Modified: servres/branches/i18n/conifer/templates/search_results.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/search_results.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/search_results.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -3,6 +3,7 @@
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:i18n="http://genshi.edgewall.org/i18n"
       xmlns:py="http://genshi.edgewall.org/">
 <xi:include href="master.xhtml"/>
 <xi:include href="paginate.xhtml"/>
@@ -22,9 +23,8 @@
 	 alt="lock" title="This resource is access-controlled."/>
     
 
-    <h2 py:if="query_string">
-        You searched for: <i>${query_string}.</i>
-	Found ${len(results)} matches.
+    <h2 py:if="query_string" i18n:msg="query, num">
+        You searched for: <i>${query_string}.</i> Found ${len(results)} matches.
     </h2>
   
     <tr py:if="results" py:def="pageheader()">
@@ -51,10 +51,9 @@
     </span>
     ${pagetable(paginator, count, pagerow, pageheader, query=query_string)}
 
-    <div py:if="user.is_anonymous()">
+    <div py:if="user.is_anonymous()" i18n:msg="better_to_log_in">
       Your searches may return more results if you <a
-      href="${ROOT}${settings.LOGIN_URL}?next=${ROOT}/">log in</a> before
-      searching.
+      href="${ROOT}${settings.LOGIN_URL}?next=${ROOT}/">log in</a> before searching.
     </div>
 
 

Modified: servres/branches/i18n/conifer/templates/site_invitation.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/site_invitation.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/site_invitation.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -25,7 +25,7 @@
   <table class="metadata_table">
     <tr><th>Invitation Code:</th><td><input type="text" id="code" name="code" size="30" value="${code}"/></td></tr>
   </table>
-<p><input type="submit" value="Continue"/> ${go_back_link()}</p>
+<p><input type="submit" value="${_('Continue')}"/> ${go_back_link()}</p>
   </form>
   <div class="gap"/>
 </body>

Modified: servres/branches/i18n/conifer/templates/site_join.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/site_join.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/site_join.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -16,7 +16,7 @@
     <p>If you choose to join this site, it will be added to your "My
     Reserves" list.</p>
     <form action="." method="POST">
-      <p><input type="submit" value="Yes, join this site"/> ${go_back_link()}</p>
+      <p><input type="submit" value="${_('Yes, join this site')}"/> ${go_back_link()}</p>
     </form>    
 
   </body>

Modified: servres/branches/i18n/conifer/templates/zsearch.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/zsearch.xhtml	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/templates/zsearch.xhtml	2011-03-27 19:13:28 UTC (rev 1285)
@@ -16,7 +16,7 @@
             <option  py:for="target in targets">${target.name}</option>
     </select>
     Title: <input id="ztitle" name="ztitle" maxlength="100" size="100" type="text"/>
-    <p><input type="submit" value="Search target"/></p>
+    <p><input type="submit" value="${_('Search this target')}"/></p>
     </form>
   <div class="gap"/>
 </body>

Modified: servres/branches/i18n/conifer/urls.py
===================================================================
--- servres/branches/i18n/conifer/urls.py	2011-03-27 19:13:24 UTC (rev 1284)
+++ servres/branches/i18n/conifer/urls.py	2011-03-27 19:13:28 UTC (rev 1285)
@@ -27,9 +27,6 @@
     (r'^static/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT}),
     (r'^accounts/(?P<path>.*)$', 'conifer.syrup.views.auth_handler'),
-
-#    (r'^syrup/setlang', 'conifer.syrup.views.setlang'),
-    (r'^i18n/', include('django.conf.urls.i18n')),
     (r'', include('conifer.syrup.urls')),
 
 )



More information about the open-ils-commits mailing list